ultimate-helpers 0.1.0.1 → 0.2.0

data/.gitignore

@@ -1,7 +1,7 @@
 *.gem
 .bundle
 pkg/*
-.idea/
+Gemfile.lock
 test/dummy/db/*.sqlite3
 test/dummy/log/*.log
 test/dummy/tmp/

data/Gemfile.lock

@@ -1,115 +1,117 @@
 PATH
   remote: .
   specs:
-    ultimate-helpers (0.1.0.1)
+    ultimate-helpers (0.2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
-      mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
     arel (3.0.2)
-    builder (3.0.3)
+    builder (3.0.4)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.3.3)
+    coffee-script-source (1.6.2)
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    haml (3.1.7)
-    haml-rails (0.3.5)
+    haml (4.0.1)
+      tilt
+    haml-rails (0.4)
       actionpack (>= 3.1, < 4.1)
       activesupport (>= 3.1, < 4.1)
-      haml (~> 3.1)
+      haml (>= 3.1, < 4.1)
       railties (>= 3.1, < 4.1)
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.1.3)
-      railties (>= 3.1.0, < 5.0)
-      thor (~> 0.14)
-    json (1.7.5)
-    mail (2.4.4)
+    jquery-rails (2.2.1)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.7.7)
+    mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.3.6)
+    mime-types (1.22)
+    multi_json (1.7.2)
     polyglot (0.3.3)
-    quiet_assets (1.0.1)
-      railties (~> 3.1)
-    qunit-rails (0.0.2)
-      railties (~> 3.2.3)
-    rack (1.4.1)
+    quiet_assets (1.0.2)
+      railties (>= 3.1, < 5.0)
+    qunit-rails (0.0.3)
+      railties (>= 3.2.3)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
       bundler (~> 1.0)
-      railties (= 3.2.8)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    rake (10.0.4)
+    rdoc (3.12.2)
       json (~> 1.4)
-    sass (3.2.1)
-    sass-rails (3.2.5)
+    sass (3.2.7)
+    sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    sprockets (2.1.3)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    thor (0.16.0)
-    tilt (1.3.3)
-    treetop (1.4.10)
+    sqlite3 (1.3.7)
+    thor (0.18.1)
+    tilt (1.3.6)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/app/assets/javascripts/ultimate/base.js.coffee

@@ -1,11 +1 @@
-#= require ./helpers
-
-@Ultimate ||=
-
-  debugMode: false
-
-  debug: ->
-    if @debugMode
-      a = ["info", "Ultimate"]
-      Array::push.apply a, arguments  if arguments.length > 0
-      cout.apply @, a
+window.Ultimate ||= {}

data/app/assets/javascripts/ultimate/helpers.js.coffee

@@ -1,8 +1,5 @@
 ###
- *  front-end js helpers
- *    0.3.3.alpha / 2010-2011
- *    Karpunin Dmitry / Evrone.com
- *    koderfunk_at_gmail_dot_com
+ *  global front-end js helpers
 ###
 
 @DEBUG_MODE ?= false
@@ -31,12 +28,6 @@
   if @LOG_TODO
     @cout 'warn', "TODO: #{subject}#{if location then " ### #{location}" else ''}#{if numberOrString then (if _.isNumber(numberOrString) then ":#{numberOrString}" else " > #{numberOrString}") else ''}"
 
-@args = (a) ->
-  @deprecate 'arg()', '_.toArray()'
-  r = []
-  Array::push.apply(r, a)  if a.length > 0
-  r
-
 @logicalXOR = (a, b) ->
   ( a and not b ) or ( not a and b )
 
@@ -45,12 +36,12 @@
 
 
 
-@getParams = ->
-  q = location.search.substring(1).split('&')
+@getParams = (searchString = location.search) ->
+  q = searchString.replace(/^\?/, '').split('&')
   r = {}
   for e in q
     t = e.split('=')
-    r[t[0]] = t[1]
+    r[decodeURIComponent(t[0])] = decodeURIComponent(t[1])
   r
 
 @respondFormat = (url, format = null) ->
@@ -64,59 +55,3 @@
   ah[0] = ad.join('.')
   aq[0] = ah.join('#')
   aq.join('?')
-
-
-
-###########   Deprecated   ###########
-
-# Helper function to get a value from a object as a property or as a function.
-@getValue = (object, prop) ->
-  @deprecate "getValue()", "_.result()"
-  return null  unless object and object[prop]
-  return if _.isFunction(object[prop]) then object[prop]() else object[prop]
-
-@isset = (obj) =>
-  @deprecate 'isset(obj)', '_.isUndefined(obj) OR "obj isnt undefined" OR "obj?'
-  obj isnt undefined
-
-@isString = (v) =>
-  @deprecate 'isString(v)', '_.isString(v)'
-  _.isString v
-
-@isNumber = (v) =>
-  @deprecate 'isNumber(v)', '_.isNumber(v)'
-  not isNaN(parseInt(v))
-
-@isJQ = (obj) ->
-  @deprecate 'isJQ(obj)', 'obj instanceof jQuery'
-  _.isObject(obj) and _.isString(obj.jquery)
-
-@uniq = (arrOrString) ->
-  @deprecate 'uniq(a)', '_.uniq(a)'
-  isStr = _.isString(arrOrString)
-  return arrOrString  unless isStr or _.isArray(arrOrString)
-  r = []
-  r.push(e)  for e in arrOrString  when not _.include(r, e)
-  if isStr then r.join('') else r
-
-@regexpSpace = /^\s*$/
-@regexpTrim = /^\s*(.*?)\s*$/
-
-@strTrim = (s) =>
-  @deprecate "strTrim(s)", "_.trim(s)"
-  s.match(@regexpTrim)[1]
-
-
-
-@rails_data = {}
-
-@rails_scope = (controller_name, action_name, scopedCloasure = null, scopedCloasureArguments...) =>
-  @deprecate 'rails_scope'
-  return false if _.isString(controller_name) and controller_name isnt @rails_data['controller_name']
-  return false if _.isString(action_name)     and action_name     isnt @rails_data['action_name']
-  if _.isFunction(scopedCloasure)
-    arguments[2] scopedCloasureArguments...
-  true
-
-$ =>
-  @rails_data = $('body').data()

data/app/assets/javascripts/ultimate/helpers/base.js.coffee

@@ -1,3 +1,20 @@
 #= require ultimate/base
 
-@Ultimate.Helpers ||= {}
+@Ultimate.Helpers ||=
+  version: '0.2.0'
+
+  globalizeScopes: (include = false, exclude = false) ->
+    for scopeName, scope of @  when /^[A-Z]/.test(scopeName)
+      if (not include or scopeName in include) and not (exclude and scopeName in exclude)
+        _.extend window, scope
+
+  scopes: ->
+    _.filter( _.keys(@), (key) -> /^[A-Z]/.test(key) )
+
+#  underscored version
+#  globalizeScopes: (include = false, exclude = false) ->
+#    keys = _.filter( _.keys(@), (key) -> /^[A-Z]/.test(key) )
+#    keys = _.intersection(keys, include)  if include
+#    keys = _.difference(keys, exclude)  if exclude
+#    for scopeName in keys
+#      _.extend window, @[scopeName]

data/app/assets/javascripts/ultimate/helpers/record_tag.js.coffee

@@ -1,5 +1,6 @@
 #= require ./base
 #= require ./tag
+# ! require underscore.inflection for use _.singularize()
 
 @Ultimate.Helpers.RecordTag =
 

data/app/assets/javascripts/ultimate/helpers/tag.js.coffee

@@ -28,10 +28,6 @@
     content = _.string.escapeHTML(content)  if _escapeContent
     "<#{name}#{@tag_options(options, escape)}>#{@PRE_CONTENT_STRINGS[name] ? ''}#{content}</#{name}>"
 
-  html_options_to_s: (html_options, escape = false, prefix = "") ->
-    deprecate 'html_options_to_s()', "tag_options()"
-    @tag_options arguments...
-
   tag_options: (options, escape = true) ->
     return ""  if _.isEmpty(options)
     attrs = []

data/app/assets/javascripts/ultimate/jquery.base.js.coffee

@@ -62,24 +62,3 @@ do ($ = jQuery) =>
       matches = content.match($.regexp.HTML)
       return false  unless matches?
       not strong or matches[1] is matches[2]
-
-  # TODO replace usages to underscore methods and using distribution
-  unless $.isRegExp
-    $.isRegExp = (candidate) ->
-      deprecate '$.isRegExp', '_.isRegExp'
-      typeof candidate is "object" and typeof candidate.test is "function"
-
-  unless $.isBoolean
-    $.isBoolean = (v) ->
-      deprecate '$.isBoolean', '_.isBoolean'
-      typeof v is "boolean"
-
-  unless $.isString
-    $.isString = (v) ->
-      deprecate '$.isString', '_.isString'
-      typeof v is "string"
-
-  if typeof $.isEmptyString is "undefined"
-    $.isEmptyString = (v) ->
-      deprecate '$.isEmptyString', '_.isBlank'
-      regexpSpace.test v

data/app/assets/javascripts/ultimate/underscore/underscore.inflection.js

@@ -33,9 +33,10 @@
     pluralize : function( word, count, includeNumber )
     {
       var result;
-      
+
       if( count !== undefined )
       {
+        count = Math.round(count);
         result = ( count === 1 ) ? this.singularize( word ) : this.pluralize( word );
         result = ( includeNumber ) ? [ count, result ].join( ' ' ) : result;
       }
@@ -56,7 +57,7 @@
         },
         this );
       }
-      
+
       return result;
     },
 
@@ -172,5 +173,5 @@
    * Underscore integration
    */
   _.mixin( inflector.resetInflections( ) );
-  
+
 } )( _ );

data/app/assets/javascripts/ultimate/underscore/underscore.js

@@ -1,12 +1,13 @@
-//     Underscore.js 1.4.2
-//     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;
@@ -24,7 +25,6 @@
   var push             = ArrayProto.push,
       slice            = ArrayProto.slice,
       concat           = ArrayProto.concat,
-      unshift          = ArrayProto.unshift,
       toString         = ObjProto.toString,
       hasOwnProperty   = ObjProto.hasOwnProperty;
 
@@ -61,11 +61,11 @@
     }
     exports._ = _;
   } else {
-    root['_'] = _;
+    root._ = _;
   }
 
   // Current version.
-  _.VERSION = '1.4.2';
+  _.VERSION = '1.4.4';
 
   // Collection Functions
   // --------------------
@@ -102,6 +102,8 @@
     return results;
   };
 
+  var reduceError = 'Reduce of empty array with no initial value';
+
   // **Reduce** builds up a single result from a list of values, aka `inject`,
   // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available.
   _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) {
@@ -119,7 +121,7 @@
         memo = iterator.call(context, memo, value, index, list);
       }
     });
-    if (!initial) throw new TypeError('Reduce of empty array with no initial value');
+    if (!initial) throw new TypeError(reduceError);
     return memo;
   };
 
@@ -130,7 +132,7 @@
     if (obj == null) obj = [];
     if (nativeReduceRight && obj.reduceRight === nativeReduceRight) {
       if (context) iterator = _.bind(iterator, context);
-      return arguments.length > 2 ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator);
+      return initial ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator);
     }
     var length = obj.length;
     if (length !== +length) {
@@ -146,7 +148,7 @@
         memo = iterator.call(context, memo, obj[index], index, list);
       }
     });
-    if (!initial) throw new TypeError('Reduce of empty array with no initial value');
+    if (!initial) throw new TypeError(reduceError);
     return memo;
   };
 
@@ -177,12 +179,9 @@
 
   // Return all the elements for which a truth test fails.
   _.reject = function(obj, iterator, context) {
-    var results = [];
-    if (obj == null) return results;
-    each(obj, function(value, index, list) {
-      if (!iterator.call(context, value, index, list)) results[results.length] = value;
-    });
-    return results;
+    return _.filter(obj, function(value, index, list) {
+      return !iterator.call(context, value, index, list);
+    }, context);
   };
 
   // Determine whether all of the elements match a truth test.
@@ -216,20 +215,19 @@
   // Determine if the array or object contains a given value (using `===`).
   // Aliased as `include`.
   _.contains = _.include = function(obj, target) {
-    var found = false;
-    if (obj == null) return found;
+    if (obj == null) return false;
     if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1;
-    found = any(obj, function(value) {
+    return any(obj, function(value) {
       return value === target;
     });
-    return found;
   };
 
   // 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);
     });
   };
 
@@ -239,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;
       }
@@ -250,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
@@ -258,7 +262,7 @@
       return Math.max.apply(Math, obj);
     }
     if (!iterator && _.isEmpty(obj)) return -Infinity;
-    var result = {computed : -Infinity};
+    var result = {computed : -Infinity, value: -Infinity};
     each(obj, function(value, index, list) {
       var computed = iterator ? iterator.call(context, value, index, list) : value;
       computed >= result.computed && (result = {value : value, computed : computed});
@@ -272,7 +276,7 @@
       return Math.min.apply(Math, obj);
     }
     if (!iterator && _.isEmpty(obj)) return Infinity;
-    var result = {computed : Infinity};
+    var result = {computed : Infinity, value: Infinity};
     each(obj, function(value, index, list) {
       var computed = iterator ? iterator.call(context, value, index, list) : value;
       computed < result.computed && (result = {value : value, computed : computed});
@@ -321,7 +325,7 @@
   // An internal function used for aggregate "group by" operations.
   var group = function(obj, value, context, behavior) {
     var result = {};
-    var iterator = lookupIterator(value);
+    var iterator = lookupIterator(value || _.identity);
     each(obj, function(value, index) {
       var key = iterator.call(context, value, index, obj);
       behavior(result, key, value);
@@ -341,7 +345,7 @@
   // either a string attribute to count by, or a function that returns the
   // criterion.
   _.countBy = function(obj, value, context) {
-    return group(obj, value, context, function(result, key, value) {
+    return group(obj, value, context, function(result, key) {
       if (!_.has(result, key)) result[key] = 0;
       result[key]++;
     });
@@ -363,7 +367,8 @@
   // Safely convert anything iterable into a real, live array.
   _.toArray = function(obj) {
     if (!obj) return [];
-    if (obj.length === +obj.length) return slice.call(obj);
+    if (_.isArray(obj)) return slice.call(obj);
+    if (obj.length === +obj.length) return _.map(obj, _.identity);
     return _.values(obj);
   };
 
@@ -413,7 +418,7 @@
 
   // Trim out all falsy values from an array.
   _.compact = function(array) {
-    return _.filter(array, function(value){ return !!value; });
+    return _.filter(array, _.identity);
   };
 
   // Internal implementation of a recursive `flatten` function.
@@ -442,6 +447,11 @@
   // been sorted, you have the option of using a faster algorithm.
   // Aliased as `unique`.
   _.uniq = _.unique = function(array, isSorted, iterator, context) {
+    if (_.isFunction(isSorted)) {
+      context = iterator;
+      iterator = isSorted;
+      isSorted = false;
+    }
     var initial = iterator ? _.map(array, iterator, context) : array;
     var results = [];
     var seen = [];
@@ -565,25 +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.
-  _.bind = function bind(func, context) {
-    var bound, args;
+  // optionally). Delegates to **ECMAScript 5**'s native `Function.bind` if
+  // available.
+  _.bind = function(func, context) {
     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;
-      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)));
     };
   };
 
@@ -591,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;
   };
@@ -622,25 +630,26 @@
   // Returns a function, that, when invoked, will only be triggered at most once
   // during a given window of time.
   _.throttle = function(func, wait) {
-    var context, args, timeout, throttling, more, result;
-    var whenDone = _.debounce(function(){ more = throttling = false; }, wait);
+    var context, args, timeout, result;
+    var previous = 0;
+    var later = function() {
+      previous = new Date;
+      timeout = null;
+      result = func.apply(context, args);
+    };
     return function() {
-      context = this; args = arguments;
-      var later = function() {
+      var now = new Date;
+      var remaining = wait - (now - previous);
+      context = this;
+      args = arguments;
+      if (remaining <= 0) {
+        clearTimeout(timeout);
         timeout = null;
-        if (more) {
-          result = func.apply(context, args);
-        }
-        whenDone();
-      };
-      if (!timeout) timeout = setTimeout(later, wait);
-      if (throttling) {
-        more = true;
-      } else {
-        throttling = true;
+        previous = now;
         result = func.apply(context, args);
+      } else if (!timeout) {
+        timeout = setTimeout(later, remaining);
       }
-      whenDone();
       return result;
     };
   };
@@ -758,8 +767,10 @@
   // Extend a given object with all the properties in passed-in object(s).
   _.extend = function(obj) {
     each(slice.call(arguments, 1), function(source) {
-      for (var prop in source) {
-        obj[prop] = source[prop];
+      if (source) {
+        for (var prop in source) {
+          obj[prop] = source[prop];
+        }
       }
     });
     return obj;
@@ -788,8 +799,10 @@
   // Fill in a given object with default properties.
   _.defaults = function(obj) {
     each(slice.call(arguments, 1), function(source) {
-      for (var prop in source) {
-        if (obj[prop] == null) obj[prop] = source[prop];
+      if (source) {
+        for (var prop in source) {
+          if (obj[prop] == null) obj[prop] = source[prop];
+        }
       }
     });
     return obj;
@@ -954,7 +967,7 @@
 
   // Is a given object a finite number?
   _.isFinite = function(obj) {
-    return _.isNumber(obj) && isFinite(obj);
+    return isFinite(obj) && !isNaN(parseFloat(obj));
   };
 
   // Is the given value `NaN`? (NaN is the only number which does not equal itself).
@@ -1000,7 +1013,9 @@
 
   // Run a function **n** times.
   _.times = function(n, iterator, context) {
-    for (var i = 0; i < n; i++) iterator.call(context, i);
+    var accum = Array(n);
+    for (var i = 0; i < n; i++) accum[i] = iterator.call(context, i);
+    return accum;
   };
 
   // Return a random integer between min and max (inclusive).
@@ -1009,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.
@@ -1065,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;
   };
 
@@ -1100,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.
@@ -1115,11 +1131,18 @@
     text.replace(matcher, function(match, escape, interpolate, evaluate, offset) {
       source += text.slice(index, offset)
         .replace(escaper, function(match) { return '\\' + escapes[match]; });
-      source +=
-        escape ? "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'" :
-        interpolate ? "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'" :
-        evaluate ? "';\n" + evaluate + "\n__p+='" : '';
+
+      if (escape) {
+        source += "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'";
+      }
+      if (interpolate) {
+        source += "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'";
+      }
+      if (evaluate) {
+        source += "';\n" + evaluate + "\n__p+='";
+      }
       index = offset + match.length;
+      return match;
     });
     source += "';\n";
 
@@ -1131,7 +1154,7 @@
       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;

data/app/assets/javascripts/ultimate/underscore/underscore.string.js

@@ -41,12 +41,13 @@
     lt: '<',
     gt: '>',
     quot: '"',
-    apos: "'",
-    amp: '&'
+    amp: '&',
+    apos: "'"
   };
 
   var reversedEscapeChars = {};
-  for(var key in escapeChars){ reversedEscapeChars[escapeChars[key]] = key; }
+  for(var key in escapeChars) reversedEscapeChars[escapeChars[key]] = key;
+  reversedEscapeChars["'"] = '#39';
 
   // sprintf() for JavaScript 0.7-beta1
   // http://www.diveintojavascript.com/projects/javascript-sprintf
@@ -206,7 +207,22 @@
 
     count: function(str, substr){
       if (str == null || substr == null) return 0;
-      return String(str).split(substr).length - 1;
+
+      str = String(str);
+      substr = String(substr);
+
+      var count = 0,
+        pos = 0,
+        length = substr.length;
+
+      while (true) {
+        pos = str.indexOf(substr, pos);
+        if (pos === -1) break;
+        count++;
+        pos += length;
+      }
+
+      return count;
     },
 
     chars: function(str) {
@@ -320,7 +336,7 @@
     },
 
     classify: function(str){
-      return _s.titleize(String(str).replace(/_/g, ' ')).replace(/\s/g, '');
+      return _s.titleize(String(str).replace(/[\W_]/g, ' ')).replace(/\s/g, '');
     },
 
     humanize: function(str){
@@ -429,17 +445,17 @@
     },
 
     toNumber: function(str, decimals) {
-      if (str == null || str == '') return 0;
-      str = String(str);
-      var num = parseNumber(parseNumber(str).toFixed(~~decimals));
-      return num === 0 && !str.match(/^0+$/) ? Number.NaN : num;
+      if (!str) return 0;
+      str = _s.trim(str);
+      if (!str.match(/^-?\d+(?:\.\d+)?$/)) return NaN;
+      return parseNumber(parseNumber(str).toFixed(~~decimals));
     },
 
     numberFormat : function(number, dec, dsep, tsep) {
       if (isNaN(number) || number == null) return '';
 
       number = number.toFixed(~~dec);
-      tsep = tsep || ',';
+      tsep = typeof tsep == 'string' ? tsep : ',';
 
       var parts = number.split('.'), fnums = parts[0],
         decimals = parts[1] ? (dsep || '.') + parts[1] : '';
@@ -494,8 +510,8 @@
     slugify: function(str) {
       if (str == null) return '';
 
-      var from  = "ąàáäâãåæćęèéëêìíïîłńòóöôõøùúüûñçżź",
-          to    = "aaaaaaaaceeeeeiiiilnoooooouuuunczz",
+      var from  = "ąàáäâãåæćęèéëêìíïîłńòóöôõøśùúüûñçżź",
+          to    = "aaaaaaaaceeeeeiiiilnoooooosuuuunczz",
           regex = new RegExp(defaultToWhiteSpace(from), 'g');
 
       str = String(str).toLowerCase().replace(regex, function(c){
@@ -538,6 +554,36 @@
       return repeat.join(separator);
     },
 
+    naturalCmp: function(str1, str2){
+      if (str1 == str2) return 0;
+      if (!str1) return -1;
+      if (!str2) return 1;
+
+      var cmpRegex = /(\.\d+)|(\d+)|(\D+)/g,
+        tokens1 = String(str1).toLowerCase().match(cmpRegex),
+        tokens2 = String(str2).toLowerCase().match(cmpRegex),
+        count = Math.min(tokens1.length, tokens2.length);
+
+      for(var i = 0; i < count; i++) {
+        var a = tokens1[i], b = tokens2[i];
+
+        if (a !== b){
+          var num1 = parseInt(a, 10);
+          if (!isNaN(num1)){
+            var num2 = parseInt(b, 10);
+            if (!isNaN(num2) && num1 - num2)
+              return num1 - num2;
+          }
+          return a < b ? -1 : 1;
+        }
+      }
+
+      if (tokens1.length === tokens2.length)
+        return tokens1.length - tokens2.length;
+
+      return str1 < str2 ? -1 : 1;
+    },
+
     levenshtein: function(str1, str2) {
       if (str1 == null && str2 == null) return 0;
       if (str1 == null) return String(str2).length;
@@ -576,25 +622,23 @@
   _s.contains = _s.include;
   _s.q        = _s.quote;
 
+  // Exporting
+
   // CommonJS module is defined
   if (typeof exports !== 'undefined') {
-    if (typeof module !== 'undefined' && module.exports) {
-      // Export module
+    if (typeof module !== 'undefined' && module.exports)
       module.exports = _s;
-    }
-    exports._s = _s;
 
-  } else if (typeof define === 'function' && define.amd) {
-    // Register as a named module with AMD.
-    define('underscore.string', [], function() {
-      return _s;
-    });
-
-  } else {
-    // Integrate with Underscore.js if defined
-    // or create our own underscore object.
-    root._ = root._ || {};
-    root._.string = root._.str = _s;
+    exports._s = _s;
   }
 
+  // Register as a named module with AMD.
+  if (typeof define === 'function' && define.amd)
+    define('underscore.string', [], function(){ return _s; });
+
+
+  // Integrate with Underscore.js if defined
+  // or create our own underscore object.
+  root._ = root._ || {};
+  root._.string = root._.str = _s;
 }(this, String);

data/lib/ultimate/helpers/version.rb

@@ -1,5 +1,5 @@
 module Ultimate
   module Helpers
-    VERSION = '0.1.0.1'
+    VERSION = '0.2.0'
   end
 end

data/test/javascripts/tests/base_test.js.coffee

@@ -0,0 +1,42 @@
+#= require ultimate/underscore/underscore
+#= require ultimate/underscore/underscore.string
+#= require ultimate/jquery.base
+
+module "ultimate/jquery.base"
+
+test "ror_id", ->
+  strictEqual ror_id("some_id_123"), "123"
+  strictEqual ror_id("some_id"), null
+  strictEqual ror_id($('')), null
+  strictEqual ror_id(), null
+  strictEqual ror_id($('<div></div>')), null
+  jObj = $('<div id="some_123"></div>')
+  strictEqual ror_id(jObj), "123"
+  strictEqual jObj.data("rorId"), "123"
+
+test "$.fn.rorId", ->
+  jObj = $('<div></div>')
+  strictEqual jObj.rorId(), null
+  strictEqual jObj.rorId(123)[0], jObj[0]
+  strictEqual jObj.attr("id"), undefined
+  strictEqual jObj.rorId(), 123
+  strictEqual jObj.rorId(777, "book").attr("id"), "book_777"
+  strictEqual jObj.rorId(), 777
+
+test "$.fn.getClasses", ->
+  jObj = $('<div class="apple banana coconut"></div>')
+  deepEqual jObj.getClasses(), ["apple", "banana", "coconut"]
+  deepEqual jObj.attr('class', '').getClasses(), []
+
+test "$.fn.getAttributes", ->
+  deepEqual $("").getAttributes(), {}
+  deepEqual $("<div></div>").getAttributes(), {}
+  deepEqual $('<div id="some_id_123" class="apple" data-loading-text="Loading..."></div>').getAttributes(), {id: "some_id_123", class: "apple", "data-loading-text": "Loading..."}
+
+test "$.isHTML", ->
+  strictEqual $.isHTML(''), false
+  strictEqual $.isHTML('Some plain text'), false
+  strictEqual $.isHTML('Some plain text with <html></html>'), false
+  strictEqual $.isHTML('<span></span><p></p>'), true
+  strictEqual $.isHTML('<span></span><p></p>', true), false
+  strictEqual $.isHTML('<p><span></span></p>', true), true

data/test/javascripts/tests/helpers/form_options_test.js.coffee

@@ -40,7 +40,7 @@ test "options_for_select", ->
   equal options_for_select({ "$": "Dollar", "<DKR>": "<Kroner>" }, [ "Dollar", "<Kroner>" ]),
         "<option selected=\"selected\" value=\"Dollar\">$</option>\n<option selected=\"selected\" value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>"
   equal options_for_select([ [ "<Denmark>", { class: 'bold' } ], [ "USA", { onclick: "alert('Hello World');" } ], [ "Sweden" ], "Germany" ]),
-        "<option class=\"bold\" value=\"&lt;Denmark&gt;\">&lt;Denmark&gt;</option>\n<option onclick=\"alert(&apos;Hello World&apos;);\" value=\"USA\">USA</option>\n<option value=\"Sweden\">Sweden</option>\n<option value=\"Germany\">Germany</option>"
+        "<option class=\"bold\" value=\"&lt;Denmark&gt;\">&lt;Denmark&gt;</option>\n<option onclick=\"alert(&#39;Hello World&#39;);\" value=\"USA\">USA</option>\n<option value=\"Sweden\">Sweden</option>\n<option value=\"Germany\">Germany</option>"
   equal options_for_select([ [ "<Denmark>", { data: { test: 'bold' } } ] ]),
         "<option data-test=\"bold\" value=\"&lt;Denmark&gt;\">&lt;Denmark&gt;</option>"
   equal options_for_select([ [ "<Denmark>", { data: { test: '<bold>' } } ] ]),

data/test/javascripts/tests/helpers/form_tag_test.js.coffee

@@ -124,7 +124,7 @@ test "radio_button_tag", ->
 
 test "submit_tag", ->
   equal submit_tag("Save", onclick: "alert('hello!')", data: { disable_with: "Saving..." }),
-        '<input data-disable-with="Saving..." name="commit" onclick="alert(&apos;hello!&apos;)" type="submit" value="Save" />'
+        '<input data-disable-with="Saving..." name="commit" onclick="alert(&#39;hello!&#39;)" type="submit" value="Save" />'
   equal submit_tag("Save", data: { disable_with: "Saving..." }),
         '<input data-disable-with="Saving..." name="commit" type="submit" value="Save" />'
   equal submit_tag("Save", data: { confirm: "Are you sure?" }),

data/test/javascripts/tests/helpers/number_test.js.coffee

@@ -39,6 +39,7 @@ test "number_to_currency", ->
   equal number_to_currency(1234567891.50, precision: 0), "$1,234,567,892"
   equal number_to_currency(1234567890.50, precision: 1), "$1,234,567,890.5"
   equal number_to_currency(1234567890.50, unit: "£", separator: ",", delimiter: ""), "£1234567890,50"
+  equal number_to_currency(1234567890.50, unit: '<span class="unit">Руб.</span>', format: "%n %u"), "1,234,567,890.50 <span class=\"unit\">Руб.</span>"
   equal number_to_currency("1234567890.50"), "$1,234,567,890.50"
   equal number_to_currency("1234567890.50", unit: "K&#269;", format: "%n %u"), "1,234,567,890.50 K&#269;"
   equal number_to_currency("-1234567890.50", unit: "K&#269;", format: "%n %u", negative_format: "%n - %u"), "1,234,567,890.50 - K&#269;"

data/test/javascripts/tests/helpers_test.js.coffee

@@ -0,0 +1,47 @@
+#= require ultimate/underscore/underscore
+#= require ultimate/helpers
+
+module "ultimate/helpers"
+
+test "cout", ->
+  ok _.isBoolean(window.DEBUG_MODE), "global DEBUG_MODE is Boolean"
+  window.DEBUG_MODE = true
+  strictEqual cout(123), 123, "cout() must return first argument"
+  window.DEBUG_MODE = false
+  for method in ['log', 'info', 'warn', 'error', 'assert', 'clear']
+    strictEqual cout(method, 123), 123, "cout() must return second argument if first is `#{method}` as method"
+  window.DEBUG_MODE = true
+
+test "_cout", ->
+  strictEqual _cout(123), 123, "_cout() must return first argument"
+  for method in ['log', 'info', 'warn', 'error', 'assert', 'clear']
+    strictEqual _cout(method, 123), method, "_cout() on so strong that it does not use the method `#{method}` as first argument, and return first argument always"
+
+test "deprecate", ->
+  equal deprecate('first thing'), "`first thing` DEPRECATED!", "log and return message about deprecated function"
+  equal deprecate('first thing', 'second thing'), "`first thing` DEPRECATED! Use instead `second thing`", "log and return message about deprecated function, and hint about using instead"
+
+test "todo", ->
+  ok _.isBoolean(window.LOG_TODO), "global LOG_TODO is Boolean"
+  window.LOG_TODO = true
+  equal todo('some todo'), "TODO: some todo", "log and return todo"
+  equal todo('some todo', "helpers_test.js.coffee"), "TODO: some todo ### helpers_test.js.coffee", "log and return todo with location string"
+  equal todo('some todo', "helpers_test.js.coffee", "test \"deprecate\""), "TODO: some todo ### helpers_test.js.coffee > test \"deprecate\"", "log and return todo with description of function"
+  equal todo('some todo', "helpers_test.js.coffee", 12), "TODO: some todo ### helpers_test.js.coffee:12", "log and return message with string number"
+  window.LOG_TODO = false
+  equal todo('some todo'), undefined, "don't log and return `undefined` if global LOG_TODO == false"
+  window.LOG_TODO = true
+
+test "logicalXOR", ->
+  strictEqual logicalXOR(false, false), false,  "false  XOR false === false"
+  strictEqual logicalXOR(false, true),  true,   "false  XOR true  === true"
+  strictEqual logicalXOR(true, false),  true,   "true   XOR false === true"
+  strictEqual logicalXOR(true, true),   false,  "true   XOR true  === false"
+
+test "bound", ->
+  equal bound(0, 10, 100), 10
+  equal bound(100, 10, 100), 100
+  equal bound(50, 10, 100), 50
+  equal bound(-20, -10, 100), -10
+  equal bound(-20, 10, -10), 10
+  equal bound(20, 10, -10), 10

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ultimate-helpers
 version: !ruby/object:Gem::Version
-  version: 0.1.0.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,8 +67,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
-- .rvmrc.example
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -147,6 +145,7 @@ files:
 - test/dummy/script/rails
 - test/javascripts/all_tests.js.coffee
 - test/javascripts/test_helper.js.coffee
+- test/javascripts/tests/base_test.js.coffee
 - test/javascripts/tests/helpers/asset_tag_test.js.coffee
 - test/javascripts/tests/helpers/form_options_test.js.coffee
 - test/javascripts/tests/helpers/form_tag_test.js.coffee
@@ -155,6 +154,7 @@ files:
 - test/javascripts/tests/helpers/record_tag_test.js.coffee
 - test/javascripts/tests/helpers/tag_test.js.coffee
 - test/javascripts/tests/helpers/url_test.js.coffee
+- test/javascripts/tests/helpers_test.js.coffee
 - test/javascripts/tests/underscore/underscore.outcasts.test.js.coffee
 - test/javascripts/vendors/backbone.js
 - test/javascripts/vendors/i18n-lite.js.coffee
@@ -186,8 +186,79 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ultimate-helpers
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ultimate Helpers, Rails ActionView helpers ported to CoffeeScript
-test_files: []
+test_files:
+- test/dummy/Rakefile
+- test/dummy/_emfile
+- test/dummy/app/assets/images/.gitkeep
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/stylesheets/global/forms.css.scss
+- test/dummy/app/assets/stylesheets/global/layout.css.scss
+- test/dummy/app/assets/stylesheets/global/layout/footer.scss
+- test/dummy/app/assets/stylesheets/global/layout/header.scss
+- test/dummy/app/assets/stylesheets/global/layout/main-menu.scss
+- test/dummy/app/assets/stylesheets/global/reserved.css.scss
+- test/dummy/app/assets/stylesheets/global/reset.css.scss
+- test/dummy/app/assets/stylesheets/global/structures.css.scss
+- test/dummy/app/assets/stylesheets/import/base.scss
+- test/dummy/app/assets/stylesheets/plugins/qunit.css.scss
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/main_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/mailers/.gitkeep
+- test/dummy/app/models/.gitkeep
+- test/dummy/app/views/application/_footer.html.haml
+- test/dummy/app/views/application/_header.html.haml
+- test/dummy/app/views/application/_main_menu.html.haml
+- test/dummy/app/views/layouts/application.html.haml
+- test/dummy/app/views/main/index.html.haml
+- test/dummy/app/views/main/qunit.html.haml
+- test/dummy/config.ru
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/database.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/qunit-rails.rb
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/routes.rb
+- test/dummy/log/.gitkeep
+- test/dummy/public/404.html
+- test/dummy/public/422.html
+- test/dummy/public/500.html
+- test/dummy/public/favicon.ico
+- test/dummy/script/rails
+- test/javascripts/all_tests.js.coffee
+- test/javascripts/test_helper.js.coffee
+- test/javascripts/tests/base_test.js.coffee
+- test/javascripts/tests/helpers/asset_tag_test.js.coffee
+- test/javascripts/tests/helpers/form_options_test.js.coffee
+- test/javascripts/tests/helpers/form_tag_test.js.coffee
+- test/javascripts/tests/helpers/javascript_test.js.coffee
+- test/javascripts/tests/helpers/number_test.js.coffee
+- test/javascripts/tests/helpers/record_tag_test.js.coffee
+- test/javascripts/tests/helpers/tag_test.js.coffee
+- test/javascripts/tests/helpers/url_test.js.coffee
+- test/javascripts/tests/helpers_test.js.coffee
+- test/javascripts/tests/underscore/underscore.outcasts.test.js.coffee
+- test/javascripts/vendors/backbone.js
+- test/javascripts/vendors/i18n-lite.js.coffee
+- test/stylesheets/test_helper.css
+- test/stylesheets/vendors/ultimate/mixins/_routines.scss
+- test/stylesheets/vendors/ultimate/mixins/_vendors.scss
+- test/stylesheets/vendors/ultimate/mixins/css3.scss
+- test/stylesheets/vendors/ultimate/mixins/css3/_text-shadow.scss
+- test/stylesheets/vendors/ultimate/mixins/fonts.scss
+- test/stylesheets/vendors/ultimate/mixins/microstructures.scss

data/.rvmrc

@@ -1 +0,0 @@
-rvm 1.9.3@ultimate

data/.rvmrc.example

@@ -1 +0,0 @@
-rvm 1.9.3@ultimate