Add utility functions to utils

Author: Amir Tocker

lib/utils.js

@@ -4,32 +4,43 @@
   * @borrows module:auth_token as generate_auth_token
 ###
 
-clone = require('lodash/clone');
+utils = exports
+
+config = require("./config")
+crypto = require('crypto')
+querystring = require('querystring')
+url = require('url')
+
+# Functions used internally
+
 compact = require('lodash/compact');
-extend = require('lodash/extend');
-filter = require('lodash/filter');
+defaults = require('lodash/defaults');
+find = require('lodash/find');
 first = require('lodash/first');
 identity = require('lodash/identity');
-isArray = require('lodash/isArray');
-isEmpty = require('lodash/isEmpty');
 isFunction = require('lodash/isFunction');
-isObject = require('lodash/isObject');
 isPlainObject = require('lodash/isPlainObject');
-isString = require('lodash/isString');
-isUndefined = require('lodash/isUndefined');
 last = require('lodash/last');
 map = require('lodash/map');
-merge = require('lodash/merge');
-merge = require('lodash/merge');
 sortBy = require('lodash/sortBy');
 take = require('lodash/take');
 
-config = require("./config")
-crypto = require('crypto')
-querystring = require('querystring')
-url = require('url')
+# Exposed functions
+
+utils.at = at = require('lodash/at');
+utils.clone = clone = require('lodash/clone');
+utils.extend = extend = require('lodash/extend');
+utils.filter = filter = require('lodash/filter');
+utils.includes = includes = require('lodash/includes');
+utils.isArray = isArray = require('lodash/isArray');
+utils.isEmpty = isEmpty = require('lodash/isEmpty');
+utils.isNumber = isNumber = require('lodash/isNumber');
+utils.isObject = isObject = require('lodash/isObject');
+utils.isString = isString = require('lodash/isString');
+utils.isUndefined = isUndefined = require('lodash/isUndefined');
+utils.keys = keys = require('lodash/keys');
+utils.merge = merge = require('lodash/merge');
 
-utils = exports
 generate_token = require("./auth_token")
 exports.generate_auth_token = (options)->
   token_options = Object.assign {}, config().auth_token, options

lib/utils.js.map

@@ -4,10 +4,12 @@ expect = require("expect.js")
 cloudinary = require("../cloudinary")
 utils = require("../lib/utils")
 {
-  find,
-  keys,
-  matchesProperty
+  matchesProperty,
+  merge
 } = utils
+matchesProperty = require('lodash/matchesProperty')
+find = require('lodash/find')
+keys = require('lodash/keys')
 sinon = require('sinon')
 ClientRequest = require('_http_client').ClientRequest
 http = require('http')
@@ -566,7 +568,7 @@ describe "api", ->
       cloudinary.v2.api.create_upload_preset folder: "folder", (error, preset) ->
         name = preset.name
         cloudinary.v2.api.upload_preset name, (error, preset) ->
-          cloudinary.v2.api.update_upload_preset name, utils.merge(preset.settings, {colors: true, unsigned: true, disallow_public_id: true}), (error, preset) ->
+          cloudinary.v2.api.update_upload_preset name, merge(preset.settings, {colors: true, unsigned: true, disallow_public_id: true}), (error, preset) ->
             cloudinary.v2.api.upload_preset name, (error, preset) ->
               expect(preset.name).to.eql(name)
               expect(preset.unsigned).to.eql(true)

src/utils.coffee

@@ -4,7 +4,7 @@ https = require('https')
 expect = require("expect.js")
 cloudinary = require("../cloudinary")
 utils = cloudinary.v2.utils
-last = utils.last
+last = require('lodash/last')
 api = cloudinary.v2.api
 uploader = cloudinary.v2.uploader
 zlib = require('zlib')

test/api_spec.coffee

@@ -1,11 +1,12 @@
 expect = require('expect.js')
 utils = require("../lib/utils")
 {
-  cloneDeep 
   isEmpty 
   isFunction 
   last
 } = utils
+isFunction = require('lodash/isFunction')
+cloneDeep = require('lodash/cloneDeep')
 http = require('http')
 
 exports.TIMEOUT_SHORT   = 5000

test/archivespec.coffee

@@ -2,11 +2,10 @@ require('dotenv').load(silent: true)
 
 expect = require("expect.js")
 cloudinary = require("../cloudinary")
-utils = require("../lib/utils")
 sinon = require('sinon')
 ClientRequest = require('_http_client').ClientRequest
 http = require('http')
-{keys} = utils
+keys = require('lodash/keys')
 Q = require('q')
 fs = require('fs')
 

test/spechelper.coffee

@@ -6,7 +6,8 @@ sinon = require('sinon')
 cloudinary = require("../cloudinary")
 fs = require('fs')
 Q = require('q')
-{at} = cloudinary.utils
+isFunction = require('lodash/isFunction')
+at = require('lodash/at')
 ClientRequest = require('_http_client').ClientRequest
 require('jsdom-global')()
 

test/streaming_profiles_spec.coffee

@@ -5,11 +5,11 @@ cloudinary = require("../cloudinary")
 utils = require("../lib/utils")
 {
   clone, 
-  defaults, 
   isString, 
   merge, 
   only
 } = utils
+defaults = require('lodash/defaults')
 api = require("../lib/api")
 Q = require('q')
 fs = require('fs')