underscore-source 0.4.7 → 0.5.0

data/lib/underscore-source/version.rb

@@ -1,5 +1,5 @@
 module Underscore
   module Source
-    VERSION = "0.4.7"
+    VERSION = "0.5.0"
   end
 end

data/vendor/assets/javascripts/underscore.js

@@ -30,11 +30,8 @@
   // Export the Underscore object for CommonJS.
   if (typeof exports !== 'undefined') exports._ = _;
 
-  // Maintain a reference to the Object prototype for quick access.
-  var objPro = Object.prototype;
-
   // Current version.
-  _.VERSION = '0.4.7';
+  _.VERSION = '0.5.0';
 
   /*------------------------ Collection Functions: ---------------------------*/
 
@@ -337,20 +334,20 @@
 
   // Create a function bound to a given object (assigning 'this', and arguments,
   // optionally). Binding with arguments is also known as 'curry'.
-  _.bind = function(func, context) {
+  _.bind = function(func, obj) {
     var args = _.rest(arguments, 2);
     return function() {
-      return func.apply(context || root, args.concat(_.toArray(arguments)));
+      return func.apply(obj || root, args.concat(_.toArray(arguments)));
     };
   };
 
   // Bind all of an object's methods to that object. Useful for ensuring that
   // all callbacks defined on an object belong to it.
-  _.bindAll = function() {
-    var context = Array.prototype.pop.call(arguments);
-    _.each(arguments, function(methodName) {
-      context[methodName] = _.bind(context[methodName], context);
-    });
+  _.bindAll = function(obj) {
+    var funcs = _.rest(arguments);
+    if (funcs.length == 0) funcs = _.functions(obj);
+    _.each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); });
+    return obj;
   };
 
   // Delays a function for the given number of milliseconds, and then calls
@@ -395,7 +392,7 @@
   _.keys = function(obj) {
     if(_.isArray(obj)) return _.range(0, obj.length);
     var keys = [];
-    for (var key in obj) if (objPro.hasOwnProperty.call(obj, key)) keys.push(key);
+    for (var key in obj) if (Object.prototype.hasOwnProperty.call(obj, key)) keys.push(key);
     return keys;
   };
 
@@ -425,16 +422,22 @@
     if (atype != btype) return false;
     // Basic equality test (watch out for coercions).
     if (a == b) return true;
-    // Check dates' integer values.
-    if (_.isDate(a) && _.isDate(b)) return a.getTime() === b.getTime();
     // One of them implements an isEqual()?
     if (a.isEqual) return a.isEqual(b);
+    // Check dates' integer values.
+    if (_.isDate(a) && _.isDate(b)) return a.getTime() === b.getTime();
     // Both are NaN?
     if (_.isNaN(a) && _.isNaN(b)) return true;
+    // Compare regular expressions.
+    if (_.isRegExp(a) && _.isRegExp(b))
+      return a.source     === b.source &&
+             a.global     === b.global &&
+             a.ignoreCase === b.ignoreCase &&
+             a.multiline  === b.multiline;
     // If a is not an object by this point, we can't handle it.
     if (atype !== 'object') return false;
     // Check for different array lengths before comparing contents.
-    if (!_.isUndefined(a.length) && a.length !== b.length) return false;
+    if (a.length && (a.length !== b.length)) return false;
     // Nothing else worked, deep compare the contents.
     var aKeys = _.keys(a), bKeys = _.keys(b);
     // Different object sizes?
@@ -454,31 +457,6 @@
     return !!(obj && obj.nodeType == 1);
   };
 
-  // Is a given value a real Array?
-  _.isArray = function(obj) {
-    return objPro.toString.call(obj) == '[object Array]';
-  };
-
-  // Is a given value a Function?
-  _.isFunction = function(obj) {
-    return objPro.toString.call(obj) == '[object Function]';
-  };
-
-  // Is a given value a String?
-  _.isString = function(obj) {
-    return objPro.toString.call(obj) == '[object String]';
-  };
-
-  // Is a given value a Number?
-  _.isNumber = function(obj) {
-    return objPro.toString.call(obj) == '[object Number]';
-  };
-
-  // Is a given value a Date?
-  _.isDate = function(obj) {
-    return objPro.toString.call(obj) == '[object Date]';
-  };
-
   // Is the given value NaN -- this one is interesting. NaN != NaN, and
   // isNaN(undefined) == true, so we make sure it's a number first.
   _.isNaN = function(obj) {
@@ -495,6 +473,14 @@
     return typeof obj == 'undefined';
   };
 
+  // Define the isArray, isDate, isFunction, isNumber, isRegExp, and
+  // isString functions based on their toString identifiers.
+  _.each(['Array', 'Date', 'Function', 'Number', 'RegExp', 'String'], function(type) {
+    _['is' + type] = function(obj) {
+      return Object.prototype.toString.call(obj) == '[object ' + type + ']';
+    };
+  });
+
   /* -------------------------- Utility Functions: -------------------------- */
 
   // Run Underscore.js in noConflict mode, returning the '_' variable to its
@@ -523,8 +509,8 @@
   };
 
   // Return a sorted list of the function names available in Underscore.
-  _.functions = function() {
-    return _.without(_.keys(_), 'VERSION', 'prototype', 'noConflict').sort();
+  _.functions = function(obj) {
+    return _.select(_.keys(obj), function(key){ return _.isFunction(obj[key]); }).sort();
   };
 
   // JavaScript templating a-la ERB, pilfered from John Resig's
@@ -565,7 +551,7 @@
   };
 
   // Add all of the Underscore functions to the wrapper object.
-  _.each(_.functions(), function(name) {
+  _.each(_.functions(_), function(name) {
     wrapper.prototype[name] = function() {
       Array.prototype.unshift.call(arguments, this._wrapped);
       return result(_[name].apply(_, arguments), this._chain);

metadata

@@ -2,7 +2,7 @@
 name: underscore-source
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.7
+  version: 0.5.0
 platform: ruby
 authors: 
 - Daniel X. Moore