remove unused rebind dep and simplify functions

rijs · Jan 9, 2016 · ae2041f · ae2041f
1 parent 46e58b0
commit ae2041f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 46 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -21,10 +21,6 @@ var _identity = require('utilise/identity');
 
 var _identity2 = _interopRequireDefault(_identity);
 
-var _rebind = require('utilise/rebind');
-
-var _rebind2 = _interopRequireDefault(_rebind);
-
 var _header = require('utilise/header');
 
 var _header2 = _interopRequireDefault(_header);
@@ -80,7 +76,7 @@ function core() {
   }
 }
 
-function register(ripple) {
+var register = function register(ripple) {
   return function (_ref) {
     var name = _ref.name;
     var body = _ref.body;
@@ -96,33 +92,33 @@ function register(ripple) {
     ripple.emit('change', [ripple.resources[name], { type: type }]);
     return ripple.resources[name].body;
   };
-}
+};
 
-function normalise(ripple) {
+var normalise = function normalise(ripple) {
   return function (res) {
     if (!(0, _header2.default)('content-type')(res)) (0, _values2.default)(ripple.types).sort((0, _za2.default)('priority')).some(contentType(res));
     if (!(0, _header2.default)('content-type')(res)) return err('could not understand resource', res), false;
     return parse(ripple)(res);
   };
-}
+};
 
-function parse(ripple) {
+var parse = function parse(ripple) {
   return function (res) {
     var type = (0, _header2.default)('content-type')(res);
     if (!ripple.types[type]) return err('could not understand type', type), false;
     return (ripple.types[type].parse || _identity2.default)(res);
   };
-}
+};
 
-function contentType(res) {
+var contentType = function contentType(res) {
   return function (type) {
     return type.check(res) && (res.headers['content-type'] = type.header);
   };
-}
+};
 
-function types() {
+var types = function types() {
   return [_text2.default].reduce(_to2.default.obj('header'), 1);
-}
+};
 
 var err = require('utilise/err')('[ri/core]'),
     log = require('utilise/log')('[ri/core]');
diff --git a/src/index.js b/src/index.js
@@ -14,7 +14,7 @@
 export default function core(){
   log('creating')
 
-  var resources = {}
+  const resources = {}
   ripple.resources = resources
   ripple.resource  = chainable(ripple)
   ripple.register  = ripple
@@ -34,53 +34,42 @@ export default function core(){
   }
 }
 
-function register(ripple) { 
-  return ({name, body, headers = {}}) => {
-    log('registering', name)
-    var res = normalise(ripple)({ name, body, headers })
+const register = ripple => ({name, body, headers = {}}) => {
+  log('registering', name)
+  const res = normalise(ripple)({ name, body, headers })
       , type = !ripple.resources[name] ? 'load' : ''
 
-    if (!res) return err('failed to register', name), false
-    ripple.resources[name] = res
-    ripple.emit('change', [ripple.resources[name], { type }])
-    return ripple.resources[name].body
-  }
+  if (!res) return err('failed to register', name), false
+  ripple.resources[name] = res
+  ripple.emit('change', [ripple.resources[name], { type }])
+  return ripple.resources[name].body
 }
 
-function normalise(ripple) {
-  return (res) => {
-    if (!header('content-type')(res)) values(ripple.types).sort(za('priority')).some(contentType(res))
-    if (!header('content-type')(res)) return err('could not understand resource', res), false
-    return parse(ripple)(res)
-  }
+const normalise = ripple => res => {
+  if (!header('content-type')(res)) values(ripple.types).sort(za('priority')).some(contentType(res))
+  if (!header('content-type')(res)) return err('could not understand resource', res), false
+  return parse(ripple)(res)
 }
 
-function parse(ripple) {
-  return (res) => {
-    var type = header('content-type')(res)
-    if (!ripple.types[type]) return err('could not understand type', type), false
-    return (ripple.types[type].parse || identity)(res)
-  }
+const parse = ripple => res => {
+  var type = header('content-type')(res)
+  if (!ripple.types[type]) return err('could not understand type', type), false
+  return (ripple.types[type].parse || identity)(res)
 }
 
-function contentType(res){
-  return (type) => type.check(res) && (res.headers['content-type'] = type.header)
-}
+const contentType = res => type => type.check(res) && (res.headers['content-type'] = type.header)
 
-function types() {
-  return [text].reduce(to.obj('header'), 1)
-}
+const types = () => [text].reduce(to.obj('header'), 1)
 
+const err = require('utilise/err')('[ri/core]')
+    , log = require('utilise/log')('[ri/core]')
 import emitterify from 'utilise/emitterify'
 import colorfill  from 'utilise/colorfill'
 import chainable  from 'utilise/chainable'
 import identity   from 'utilise/identity'
-import rebind     from 'utilise/rebind'
 import header     from 'utilise/header'
 import values     from 'utilise/values'
 import is         from 'utilise/is'
 import to         from 'utilise/to'
 import za         from 'utilise/za'
-import text       from './types/text'
-var err = require('utilise/err')('[ri/core]')
-  , log = require('utilise/log')('[ri/core]')
+import text       from './types/text'