underscore-source 1.0.4 → 1.1.0

data/lib/underscore-source/version.rb

@@ -1,5 +1,5 @@
 module Underscore
   module Source
-    VERSION = "1.0.4"
+    VERSION = "1.1.0"
   end
 end

data/vendor/assets/javascripts/underscore.js

@@ -55,7 +55,7 @@
   root._ = _;
 
   // Current version.
-  _.VERSION = '1.0.4';
+  _.VERSION = '1.1.0';
 
   // ------------------------ Collection Functions: ---------------------------
 
@@ -92,8 +92,11 @@
 
   // Reduce builds up a single result from a list of values, aka inject, or foldl.
   // Delegates to JavaScript 1.8's native reduce if available.
-  _.reduce = function(obj, memo, iterator, context) {
-    if (nativeReduce && obj.reduce === nativeReduce) return obj.reduce(_.bind(iterator, context), memo);
+  _.reduce = function(obj, iterator, memo, context) {
+    if (nativeReduce && obj.reduce === nativeReduce) {
+      if (context) iterator = _.bind(iterator, context);
+      return obj.reduce(iterator, memo);
+    }
     each(obj, function(value, index, list) {
       memo = iterator.call(context, memo, value, index, list);
     });
@@ -102,10 +105,13 @@
 
   // The right-associative version of reduce, also known as foldr. Uses
   // Delegates to JavaScript 1.8's native reduceRight if available.
-  _.reduceRight = function(obj, memo, iterator, context) {
-    if (nativeReduceRight && obj.reduceRight === nativeReduceRight) return obj.reduceRight(_.bind(iterator, context), memo);
+  _.reduceRight = function(obj, iterator, memo, context) {
+    if (nativeReduceRight && obj.reduceRight === nativeReduceRight) {
+      if (context) iterator = _.bind(iterator, context);
+      return obj.reduceRight(iterator, memo);
+    }
     var reversed = _.clone(_.toArray(obj)).reverse();
-    return _.reduce(reversed, memo, iterator, context);
+    return _.reduce(reversed, iterator, memo, context);
   };
 
   // Return the first value which passes a truth test.
@@ -277,11 +283,11 @@
 
   // Return a completely flattened version of an array.
   _.flatten = function(array) {
-    return _.reduce(array, [], function(memo, value) {
+    return _.reduce(array, function(memo, value) {
       if (_.isArray(value)) return memo.concat(_.flatten(value));
       memo.push(value);
       return memo;
-    });
+    }, []);
   };
 
   // Return a version of the array that does not contain the specified value(s).
@@ -293,10 +299,10 @@
   // Produce a duplicate-free version of the array. If the array has already
   // been sorted, you have the option of using a faster algorithm.
   _.uniq = function(array, isSorted) {
-    return _.reduce(array, [], function(memo, el, i) {
+    return _.reduce(array, function(memo, el, i) {
       if (0 == i || (isSorted === true ? _.last(memo) != el : !_.include(memo, el))) memo.push(el);
       return memo;
-    });
+    }, []);
   };
 
   // Produce an array that contains every item shared between all the
@@ -619,17 +625,19 @@
   // JavaScript templating a-la ERB, pilfered from John Resig's
   // "Secrets of the JavaScript Ninja", page 83.
   // Single-quote fix from Rick Strahl's version.
-  // With alterations for arbitrary delimiters.
+  // With alterations for arbitrary delimiters, and to preserve whitespace.
   _.template = function(str, data) {
     var c  = _.templateSettings;
     var endMatch = new RegExp("'(?=[^"+c.end.substr(0, 1)+"]*"+escapeRegExp(c.end)+")","g");
     var fn = new Function('obj',
       'var p=[],print=function(){p.push.apply(p,arguments);};' +
-      'with(obj){p.push(\'' +
-      str.replace(/[\r\t\n]/g, " ")
-         .replace(endMatch,"\t")
+      'with(obj||{}){p.push(\'' +
+      str.replace(/\r/g, '\\r')
+         .replace(/\n/g, '\\n')
+         .replace(/\t/g, '\\t')
+         .replace(endMatch,"✄")
          .split("'").join("\\'")
-         .split("\t").join("'")
+         .split("✄").join("'")
          .replace(c.interpolate, "',$1,'")
          .split(c.start).join("');")
          .split(c.end).join("p.push('")
@@ -645,6 +653,7 @@
   _.select   = _.filter;
   _.all      = _.every;
   _.any      = _.some;
+  _.contains = _.include;
   _.head     = _.first;
   _.tail     = _.rest;
   _.methods  = _.functions;

metadata

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