underscore_extensions 0.2.3 → 0.2.4

data/Rakefile

@@ -3,7 +3,7 @@ ENV['JASMINE_SPEC_FORMAT'] = 'Fuubar'
 # ENV['JASMINE_BROWSER'] = 'chrome'
 
 require 'bundler/gem_tasks'
-require 'jslint/tasks'
+require 'jshint/tasks'
 
 begin
   require 'jasmine'
@@ -14,6 +14,6 @@ rescue LoadError
   end
 end
 
-JSLint.config_path = 'config/jslint.yml'
+JSHint.config_path = 'config/jshint.yml'
 
-task :default => [:jslint, :'jasmine:ci']
+task :default => [:jshint, :'jasmine:ci']

data/config/{jslint.yml → jshint.yml}

@@ -51,13 +51,14 @@ indent:   2         # Number of spaces that should be used for indentation - use
 maxerr:   50        # The maximum number of warnings reported (per file)
 passfail: false     # true if the scan should stop on first error (per file)
 # following are relevant only if undef = true
-predef:   ''        # Names of predefined global variables - comma-separated string or a YAML array
+predef:             # Names of predefined global variables - comma-separated string or a YAML array
+  - InflectionJS
 browser:  true      # true if the standard browser globals should be predefined
 rhino:    false     # true if the Rhino environment globals should be predefined
 windows:  false     # true if Windows-specific globals should be predefined
 widget:   false     # true if the Yahoo Widgets globals should be predefined
 devel:    true      # true if functions like alert, confirm, console, prompt etc. are predefined
-
+validthis: true
 
 # ------------ jslint_on_rails custom lint options (switch to true to disable some annoying warnings) ------------
 

data/lib/assets/javascripts/underscore.extensions.js

@@ -1,4 +1,7 @@
-(function(_) {
+(function() {
+  'use strict';
+  var exports = this, _ = exports._;
+
   if (_.str && _.str.exports) {
     _.mixin(_.str.exports());
   }
@@ -12,11 +15,11 @@
     else if (argLength === 2 && (result = obj && hasProperty.call(obj, key))) {
       return result;
     }
-    return (result = obj && hasProperty.call(obj, key)) && has.apply(this, [obj[key]].concat(_(arguments).rest(2)));
+    return (result = obj && hasProperty.call(obj, key)) && has.apply(this, [obj[key]].concat(_.rest(arguments, 2)));
   }
 
   function namespace(obj, ns) {
-    return _(ns).inject(function(base, n) {
+    return _.reduce(ns, function(base, n) {
       var _baseN = _(base[n]);
       if (_baseN.isUndefined() || _baseN.isNull()) {
         base[n] = {};
@@ -27,7 +30,7 @@
 
   _.mixin({
     has: function(obj, key) {
-      var isArray = _(key).isArray();
+      var isArray = _.isArray(key);
       if (arguments.length === 2 && !isArray) {
         return hasProperty.call(obj, key);
       } else {
@@ -36,7 +39,7 @@
     },
     namespace: function(obj, ns) {
       if (arguments.length === 2) {
-        if (_(ns).isArray()) {
+        if (_.isArray(ns)) {
           return namespace(obj, ns);
         } else {
           return namespace(obj, ns.split('.'));
@@ -47,10 +50,10 @@
     }
   });
 
-  if (this.InflectionJS) {
+  if (exports.InflectionJS) {
     _.mixin({
       pluralize: function(obj, number, options) {
-        if (!_(number).isNumber()) {
+        if (!_.isNumber(number)) {
           options = number;
           number = 0;
         }
@@ -68,4 +71,4 @@
       }
     });
   }
-}).call(this, _);
+}).call(this);

data/lib/underscore_extensions/version.rb

@@ -1,5 +1,5 @@
 module UnderscoreExtensions
-  VERSION = '0.2.3'
-  UNDERSCORE_VERSION = '1.4.3'
+  VERSION = '0.2.4'
+  UNDERSCORE_VERSION = '1.4.4'
   UNDERSCORE_STRING_VERSION  = '2.3.0'
 end

data/spec/javascripts/underscore.extensions_spec.js

@@ -3,7 +3,7 @@ describe('_', function() {
     describe('when the namespace is passed as a single parameter with period separator', function() {
       it('should create the namespace', function() {
         var result = {};
-        baz = _(result).namespace('foo.bar.baz');
+        baz = _.namespace(result, 'foo.bar.baz');
         baz.property = 'property';
         expect(result.foo.bar.baz).toBeDefined();
         expect(result.foo.bar.baz.property).toBeDefined();
@@ -11,7 +11,7 @@ describe('_', function() {
 
       it('should not overwrite existing namespaces', function() {
         var result = { foo: {a: 'b'}};
-        baz = _(result).namespace('foo.bar.baz');
+        baz = _.namespace(result, 'foo.bar.baz');
         expect(result.foo.bar.baz).toBeDefined();
         expect(result.foo.a).toEqual('b');
       });
@@ -20,7 +20,7 @@ describe('_', function() {
     describe('when the namespace is passed as multiple parameters', function() {
       it('should create the namespace', function() {
         var result = {};
-        baz = _(result).namespace('foo', 'bar', 'baz');
+        baz = _.namespace(result, 'foo', 'bar', 'baz');
         baz.property = 'property';
         expect(result.foo.bar.baz).toBeDefined();
         expect(result.foo.bar.baz.property).toBeDefined();
@@ -28,7 +28,7 @@ describe('_', function() {
 
       it('should not overwrite existing namespaces', function() {
         var result = { foo: {a: 'b'}};
-        baz = _(result).namespace('foo', 'bar', 'baz');
+        baz = _.namespace(result, 'foo', 'bar', 'baz');
         expect(result.foo.bar.baz).toBeDefined();
         expect(result.foo.a).toEqual('b');
       });
@@ -37,7 +37,7 @@ describe('_', function() {
     describe('when the namespace is passed as an array', function() {
       it('should create the namespace', function() {
         var result = {};
-        baz = _(result).namespace(['foo', 'bar', 'baz']);
+        baz = _.namespace(result, ['foo', 'bar', 'baz']);
         baz.property = 'property';
         expect(result.foo.bar.baz).toBeDefined();
         expect(result.foo.bar.baz.property).toBeDefined();
@@ -45,7 +45,7 @@ describe('_', function() {
 
       it('should not overwrite existing namespaces', function() {
         var result = { foo: {a: 'b'}};
-        baz = _(result).namespace(['foo', 'bar', 'baz']);
+        baz = _.namespace(result, ['foo', 'bar', 'baz']);
         expect(result.foo.bar.baz).toBeDefined();
         expect(result.foo.a).toEqual('b');
       });
@@ -55,51 +55,51 @@ describe('_', function() {
   describe('#has', function() {
     it('should check each property on the object', function() {
       var obj = {foo: {bar: {baz: true}}};
-      expect(_(obj).has('foo', 'fizz')).toBe(false);
-      expect(_(obj).has('foo', 'bar', 'baz')).toBe(true);
-      expect(_(obj).has('foo', 'bar', 'baz', 'buzz')).toBe(false);
+      expect(_.has(obj, 'foo', 'fizz')).toBe(false);
+      expect(_.has(obj, 'foo', 'bar', 'baz')).toBe(true);
+      expect(_.has(obj, 'foo', 'bar', 'baz', 'buzz')).toBe(false);
     });
 
     it('should check array arguments on the object', function() {
       var obj = {foo: {bar: {baz: true}}};
-      expect(_(obj).has(['foo', 'fizz'])).toBe(false);
-      expect(_(obj).has(['foo', 'bar', 'baz'])).toBe(true);
-      expect(_(obj).has(['foo', 'bar', 'baz', 'buzz'])).toBe(false);
+      expect(_.has(obj, ['foo', 'fizz'])).toBe(false);
+      expect(_.has(obj, ['foo', 'bar', 'baz'])).toBe(true);
+      expect(_.has(obj, ['foo', 'bar', 'baz', 'buzz'])).toBe(false);
     });
   });
 
   describe('#pluralize', function() {
     it("should pluralize a model name", function() {
-      expect(_('point').pluralize()).toEqual('points');
-      expect(_('story').pluralize()).toEqual('stories');
+      expect(_.pluralize('point')).toEqual('points');
+      expect(_.pluralize('story')).toEqual('stories');
     });
 
     it('should pass the skip option', function() {
-      expect(_('foo').pluralize({skip: 'foo'})).toEqual('foo');
+      expect(_.pluralize('foo', {skip: 'foo'})).toEqual('foo');
     });
 
     describe('when a number is provided', function() {
       it('should not pluralize when the number is 1', function() {
-        expect(_('foo').pluralize(0)).toEqual('foos');
-        expect(_('foo').pluralize(1)).toEqual('foo');
-        expect(_('foo').pluralize(2)).toEqual('foos');
+        expect(_.pluralize('foo', 0)).toEqual('foos');
+        expect(_.pluralize('foo', 1)).toEqual('foo');
+        expect(_.pluralize('foo', 2)).toEqual('foos');
       });
 
       it('should pass the skip option', function() {
-        expect(_('foo').pluralize(2, {skip: 'bar'})).toEqual('foos');
-        expect(_('foo').pluralize(2, {skip: 'foo'})).toEqual('foo');
+        expect(_.pluralize('foo', 2, {skip: 'bar'})).toEqual('foos');
+        expect(_.pluralize('foo', 2, {skip: 'foo'})).toEqual('foo');
       });
     });
   });
 
   describe('#singularize', function() {
     it('should singularize a model name', function() {
-      expect(_('octopi').singularize()).toEqual('octopus');
-      expect(_('stories').singularize()).toEqual('story');
+      expect(_.singularize('octopi')).toEqual('octopus');
+      expect(_.singularize('stories')).toEqual('story');
     });
 
     it('should pass the skip option', function() {
-      expect(_('foos').singularize({skip: 'foos'})).toEqual('foos');
+      expect(_.singularize('foos', {skip: 'foos'})).toEqual('foos');
     });
   });
 });

data/underscore_extensions.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency 'fuubar'
-  s.add_development_dependency 'jasmine', ">= 1.2.1"
-  s.add_development_dependency 'jslint_on_rails'
+  s.add_development_dependency 'jasmine', '>= 1.3.2'
+  s.add_development_dependency 'jshint_on_rails'
   s.add_development_dependency 'thin'
   s.add_runtime_dependency 'rails', '>= 3.1'
 end

data/vendor/assets/javascripts/underscore.js

@@ -1,12 +1,13 @@
-//     Underscore.js 1.4.3
-//     http://underscorejs.org
-//     (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
-//     Underscore may be freely distributed under the MIT license.
+// Underscore.js 1.4.4
+// ===================
 
-(function() {
+// > http://underscorejs.org
+// > (c) 2009-2013 Jeremy Ashkenas, DocumentCloud Inc.
+// > Underscore may be freely distributed under the MIT license.
 
-  // Baseline setup
-  // --------------
+// Baseline setup
+// --------------
+(function() {
 
   // Establish the root object, `window` in the browser, or `global` on the server.
   var root = this;
@@ -30,18 +31,18 @@
   // All **ECMAScript 5** native function implementations that we hope to use
   // are declared here.
   var
-    nativeForEach      = ArrayProto.forEach,
-    nativeMap          = ArrayProto.map,
-    nativeReduce       = ArrayProto.reduce,
-    nativeReduceRight  = ArrayProto.reduceRight,
-    nativeFilter       = ArrayProto.filter,
-    nativeEvery        = ArrayProto.every,
-    nativeSome         = ArrayProto.some,
-    nativeIndexOf      = ArrayProto.indexOf,
-    nativeLastIndexOf  = ArrayProto.lastIndexOf,
-    nativeIsArray      = Array.isArray,
-    nativeKeys         = Object.keys,
-    nativeBind         = FuncProto.bind;
+      nativeForEach      = ArrayProto.forEach,
+      nativeMap          = ArrayProto.map,
+      nativeReduce       = ArrayProto.reduce,
+      nativeReduceRight  = ArrayProto.reduceRight,
+      nativeFilter       = ArrayProto.filter,
+      nativeEvery        = ArrayProto.every,
+      nativeSome         = ArrayProto.some,
+      nativeIndexOf      = ArrayProto.indexOf,
+      nativeLastIndexOf  = ArrayProto.lastIndexOf,
+      nativeIsArray      = Array.isArray,
+      nativeKeys         = Object.keys,
+      nativeBind         = FuncProto.bind;
 
   // Create a safe reference to the Underscore object for use below.
   var _ = function(obj) {
@@ -64,7 +65,7 @@
   }
 
   // Current version.
-  _.VERSION = '1.4.3';
+  _.VERSION = '1.4.4';
 
   // Collection Functions
   // --------------------
@@ -224,8 +225,9 @@
   // Invoke a method (with arguments) on every item in a collection.
   _.invoke = function(obj, method) {
     var args = slice.call(arguments, 2);
+    var isFunc = _.isFunction(method);
     return _.map(obj, function(value) {
-      return (_.isFunction(method) ? method : value[method]).apply(value, args);
+      return (isFunc ? method : value[method]).apply(value, args);
     });
   };
 
@@ -235,10 +237,10 @@
   };
 
   // Convenience version of a common use case of `filter`: selecting only objects
-  // with specific `key:value` pairs.
-  _.where = function(obj, attrs) {
-    if (_.isEmpty(attrs)) return [];
-    return _.filter(obj, function(value) {
+  // containing specific `key:value` pairs.
+  _.where = function(obj, attrs, first) {
+    if (_.isEmpty(attrs)) return first ? null : [];
+    return _[first ? 'find' : 'filter'](obj, function(value) {
       for (var key in attrs) {
         if (attrs[key] !== value[key]) return false;
       }
@@ -246,6 +248,12 @@
     });
   };
 
+  // Convenience version of a common use case of `find`: getting the first object
+  // containing specific `key:value` pairs.
+  _.findWhere = function(obj, attrs) {
+    return _.where(obj, attrs, true);
+  };
+
   // Return the maximum element or (element-based computation).
   // Can't optimize arrays of integers longer than 65,535 elements.
   // See: https://bugs.webkit.org/show_bug.cgi?id=80797
@@ -304,14 +312,14 @@
         criteria : iterator.call(context, value, index, list)
       };
     }).sort(function(left, right) {
-      var a = left.criteria;
-      var b = right.criteria;
-      if (a !== b) {
-        if (a > b || a === void 0) return 1;
-        if (a < b || b === void 0) return -1;
-      }
-      return left.index < right.index ? -1 : 1;
-    }), 'value');
+          var a = left.criteria;
+          var b = right.criteria;
+          if (a !== b) {
+            if (a > b || a === void 0) return 1;
+            if (a < b || b === void 0) return -1;
+          }
+          return left.index < right.index ? -1 : 1;
+        }), 'value');
   };
 
   // An internal function used for aggregate "group by" operations.
@@ -567,26 +575,23 @@
   // Function (ahem) Functions
   // ------------------
 
-  // Reusable constructor function for prototype setting.
-  var ctor = function(){};
-
   // Create a function bound to a given object (assigning `this`, and arguments,
-  // optionally). Binding with arguments is also known as `curry`.
-  // Delegates to **ECMAScript 5**'s native `Function.bind` if available.
-  // We check for `func.bind` first, to fail fast when `func` is undefined.
+  // optionally). Delegates to **ECMAScript 5**'s native `Function.bind` if
+  // available.
   _.bind = function(func, context) {
-    var args, bound;
     if (func.bind === nativeBind && nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
-    if (!_.isFunction(func)) throw new TypeError;
-    args = slice.call(arguments, 2);
-    return bound = function() {
-      if (!(this instanceof bound)) return func.apply(context, args.concat(slice.call(arguments)));
-      ctor.prototype = func.prototype;
-      var self = new ctor;
-      ctor.prototype = null;
-      var result = func.apply(self, args.concat(slice.call(arguments)));
-      if (Object(result) === result) return result;
-      return self;
+    var args = slice.call(arguments, 2);
+    return function() {
+      return func.apply(context, args.concat(slice.call(arguments)));
+    };
+  };
+
+  // Partially apply a function by creating a version that has had some of its
+  // arguments pre-filled, without changing its dynamic `this` context.
+  _.partial = function(func) {
+    var args = slice.call(arguments, 1);
+    return function() {
+      return func.apply(this, args.concat(slice.call(arguments)));
     };
   };
 
@@ -594,7 +599,7 @@
   // all callbacks defined on an object belong to it.
   _.bindAll = function(obj) {
     var funcs = slice.call(arguments, 1);
-    if (funcs.length == 0) funcs = _.functions(obj);
+    if (funcs.length === 0) funcs = _.functions(obj);
     each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); });
     return obj;
   };
@@ -781,7 +786,7 @@
     return copy;
   };
 
-   // Return a copy of the object without the blacklisted properties.
+  // Return a copy of the object without the blacklisted properties.
   _.omit = function(obj) {
     var copy = {};
     var keys = concat.apply(ArrayProto, slice.call(arguments, 1));
@@ -849,9 +854,9 @@
       // RegExps are compared by their source patterns and flags.
       case '[object RegExp]':
         return a.source == b.source &&
-               a.global == b.global &&
-               a.multiline == b.multiline &&
-               a.ignoreCase == b.ignoreCase;
+            a.global == b.global &&
+            a.multiline == b.multiline &&
+            a.ignoreCase == b.ignoreCase;
     }
     if (typeof a != 'object' || typeof b != 'object') return false;
     // Assume equality for cyclic structures. The algorithm for detecting cyclic
@@ -882,7 +887,7 @@
       // from different frames are.
       var aCtor = a.constructor, bCtor = b.constructor;
       if (aCtor !== bCtor && !(_.isFunction(aCtor) && (aCtor instanceof aCtor) &&
-                               _.isFunction(bCtor) && (bCtor instanceof bCtor))) {
+          _.isFunction(bCtor) && (bCtor instanceof bCtor))) {
         return false;
       }
       // Deep compare objects.
@@ -1019,7 +1024,7 @@
       max = min;
       min = 0;
     }
-    return min + (0 | Math.random() * (max - min + 1));
+    return min + Math.floor(Math.random() * (max - min + 1));
   };
 
   // List of HTML entities for escaping.
@@ -1075,7 +1080,7 @@
   // Useful for temporary DOM ids.
   var idCounter = 0;
   _.uniqueId = function(prefix) {
-    var id = '' + ++idCounter;
+    var id = ++idCounter + '';
     return prefix ? prefix + id : id;
   };
 
@@ -1110,6 +1115,7 @@
   // Underscore templating handles arbitrary delimiters, preserves whitespace,
   // and correctly escapes quotes within interpolated code.
   _.template = function(text, data, settings) {
+    var render;
     settings = _.defaults({}, settings, _.templateSettings);
 
     // Combine delimiters into one regular expression via alternation.
@@ -1124,7 +1130,7 @@
     var source = "__p+='";
     text.replace(matcher, function(match, escape, interpolate, evaluate, offset) {
       source += text.slice(index, offset)
-        .replace(escaper, function(match) { return '\\' + escapes[match]; });
+          .replace(escaper, function(match) { return '\\' + escapes[match]; });
 
       if (escape) {
         source += "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'";
@@ -1144,11 +1150,11 @@
     if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n';
 
     source = "var __t,__p='',__j=Array.prototype.join," +
-      "print=function(){__p+=__j.call(arguments,'');};\n" +
-      source + "return __p;\n";
+        "print=function(){__p+=__j.call(arguments,'');};\n" +
+        source + "return __p;\n";
 
     try {
-      var render = new Function(settings.variable || 'obj', '_', source);
+      render = new Function(settings.variable || 'obj', '_', source);
     } catch (e) {
       e.source = source;
       throw e;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: underscore_extensions
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fuubar
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,9 +42,9 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
-  name: jslint_on_rails
+  name: jshint_on_rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -106,7 +106,7 @@ files:
 - Gemfile
 - README.markdown
 - Rakefile
-- config/jslint.yml
+- config/jshint.yml
 - lib/assets/javascripts/underscore.extensions.js
 - lib/underscore_extensions.rb
 - lib/underscore_extensions/version.rb
@@ -131,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1223180764248458327
+      hash: 1293456751333068915
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1223180764248458327
+      hash: 1293456751333068915
 requirements: []
 rubyforge_project: underscore_extensions
 rubygems_version: 1.8.24