ultimate-base 0.3.1.1 → 0.3.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ultimate-base (0.3.1.1)
+    ultimate-base (0.3.2)
 
 GEM
   remote: http://rubygems.org/
@@ -34,7 +34,7 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
-    builder (3.0.0)
+    builder (3.0.3)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -45,16 +45,16 @@ GEM
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    haml (3.1.4)
-    haml-rails (0.3.4)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      haml (~> 3.0)
-      railties (~> 3.0)
+    haml (3.1.7)
+    haml-rails (0.3.5)
+      actionpack (>= 3.1, < 4.1)
+      activesupport (>= 3.1, < 4.1)
+      haml (~> 3.1)
+      railties (>= 3.1, < 4.1)
     hike (1.2.1)
-    i18n (0.6.0)
+    i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.1.1)
+    jquery-rails (2.1.3)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
     json (1.7.5)
@@ -65,8 +65,8 @@ GEM
     mime-types (1.19)
     multi_json (1.3.6)
     polyglot (0.3.3)
-    quiet_assets (1.0.0)
-      rails (~> 3.1)
+    quiet_assets (1.0.1)
+      railties (~> 3.1)
     qunit-rails (0.0.2)
       railties (~> 3.2.3)
     rack (1.4.1)
@@ -74,7 +74,7 @@ GEM
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
     rails (3.2.8)
       actionmailer (= 3.2.8)
@@ -94,8 +94,8 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    sass (3.1.14)
-    sass-rails (3.2.4)
+    sass (3.2.1)
+    sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)

data/app/assets/javascripts/ultimate/backbone/lib/backbone.js

@@ -183,22 +183,22 @@
   // is automatically generated and assigned for you.
   var Model = Backbone.Model = function(attributes, options) {
     var defaults;
-    attributes || (attributes = {});
+    var attrs = attributes || {};
     if (options && options.collection) this.collection = options.collection;
     if (options && options.parse) attributes = this.parse(attributes);
     if (defaults = _.result(this, 'defaults')) {
-      attributes = _.extend({}, defaults, attributes);
+      attrs = _.extend({}, defaults, attrs);
     }
     this.attributes = {};
     this._escapedAttributes = {};
     this.cid = _.uniqueId('c');
     this.changed = {};
-    this._silent = {};
+    this._changes = {};
     this._pending = {};
-    this.set(attributes, {silent: true});
+    this.set(attrs, {silent: true});
     // Reset change tracking.
     this.changed = {};
-    this._silent = {};
+    this._changes = {};
     this._pending = {};
     this._previousAttributes = _.clone(this.attributes);
     this.initialize.apply(this, arguments);
@@ -210,14 +210,18 @@
     // A hash of attributes whose current and previous value differ.
     changed: null,
 
-    // A hash of attributes that have silently changed since the last time
-    // `change` was called.  Will become pending attributes on the next call.
-    _silent: null,
+    // A hash of attributes that have changed since the last time `change`
+    // was called.
+    _changes: null,
 
-    // A hash of attributes that have changed since the last `'change'` event
+    // A hash of attributes that have changed since the last `change` event
     // began.
     _pending: null,
 
+    // A hash of attributes with the current model state to determine if
+    // a `change` should be recorded within a nested `change` block.
+    _changing : null,
+
     // The default name for the JSON `id` attribute is `"id"`. MongoDB and
     // CouchDB users may want to set this to `"_id"`.
     idAttribute: 'id',
@@ -257,23 +261,22 @@
 
     // Set a hash of model attributes on the object, firing `"change"` unless
     // you choose to silence it.
-    set: function(key, value, options) {
-      var attrs, attr, val;
+    set: function(attrs, options) {
+      var attr, key, val;
+      if (attrs == null) return this;
 
       // Handle both `"key", value` and `{key: value}` -style arguments.
-      if (_.isObject(key) || key == null) {
-        attrs = key;
-        options = value;
-      } else {
-        attrs = {};
-        attrs[key] = value;
+      if (!_.isObject(attrs)) {
+        key = attrs;
+        (attrs = {})[key] = options;
+        options = arguments[2];
       }
 
       // Extract attributes and options.
-      options || (options = {});
-      if (!attrs) return this;
+      var silent = options && options.silent;
+      var unset = options && options.unset;
       if (attrs instanceof Model) attrs = attrs.attributes;
-      if (options.unset) for (attr in attrs) attrs[attr] = void 0;
+      if (unset) for (attr in attrs) attrs[attr] = void 0;
 
       // Run validation.
       if (!this._validate(attrs, options)) return false;
@@ -281,7 +284,7 @@
       // Check for changes of `id`.
       if (this.idAttribute in attrs) this.id = attrs[this.idAttribute];
 
-      var changes = options.changes = {};
+      var changing = this._changing;
       var now = this.attributes;
       var escaped = this._escapedAttributes;
       var prev = this._previousAttributes || {};
@@ -291,27 +294,30 @@
         val = attrs[attr];
 
         // If the new and current value differ, record the change.
-        if (!_.isEqual(now[attr], val) || (options.unset && _.has(now, attr))) {
+        if (!_.isEqual(now[attr], val) || (unset && _.has(now, attr))) {
           delete escaped[attr];
-          (options.silent ? this._silent : changes)[attr] = true;
+          this._changes[attr] = true;
         }
 
         // Update or delete the current value.
-        options.unset ? delete now[attr] : now[attr] = val;
+        unset ? delete now[attr] : now[attr] = val;
 
         // If the new and previous value differ, record the change.  If not,
         // then remove changes for this attribute.
         if (!_.isEqual(prev[attr], val) || (_.has(now, attr) !== _.has(prev, attr))) {
           this.changed[attr] = val;
-          if (!options.silent) this._pending[attr] = true;
+          if (!silent) this._pending[attr] = true;
         } else {
           delete this.changed[attr];
           delete this._pending[attr];
+          if (!changing) delete this._changes[attr];
         }
+
+        if (changing && _.isEqual(now[attr], changing[attr])) delete this._changes[attr];
       }
 
       // Fire the `"change"` events.
-      if (!options.silent) this.change(options);
+      if (!silent) this.change(options);
       return this;
     },
 
@@ -346,16 +352,14 @@
     // Set a hash of model attributes, and sync the model to the server.
     // If the server returns an attributes hash that differs, the model's
     // state will be `set` again.
-    save: function(key, value, options) {
-      var attrs, current, done;
+    save: function(attrs, options) {
+      var key, current, done;
 
-      // Handle both `("key", value)` and `({key: value})` -style calls.
-      if (_.isObject(key) || key == null) {
-        attrs = key;
-        options = value;
-      } else {
-        attrs = {};
-        attrs[key] = value;
+      // Handle both `"key", value` and `{key: value}` -style arguments.
+      if (attrs != null && !_.isObject(attrs)) {
+        key = attrs;
+        (attrs = {})[key] = options;
+        options = arguments[2];
       }
       options = options ? _.clone(options) : {};
 
@@ -372,7 +376,7 @@
       }
 
       // Do not persist invalid models.
-      if (!attrs && !this.isValid()) return false;
+      if (!attrs && !this._validate(null, options)) return false;
 
       // After a successful server-side save, the client is (optionally)
       // updated with the server-side state.
@@ -455,18 +459,25 @@
     // a `"change:attribute"` event for each changed attribute.
     // Calling this will cause all objects observing the model to update.
     change: function(options) {
-      options || (options = {});
       var changing = this._changing;
-      this._changing = true;
+      var current = this._changing = {};
 
       // Silent changes become pending changes.
-      for (var attr in this._silent) this._pending[attr] = true;
+      for (var attr in this._changes) this._pending[attr] = true;
+
+      // Trigger 'change:attr' for any new or silent changes.
+      var changes = this._changes;
+      this._changes = {};
 
-      // Silent changes are triggered.
-      var changes = _.extend({}, options.changes, this._silent);
-      this._silent = {};
+      // Set the correct state for this._changing values
+      var triggers = [];
       for (var attr in changes) {
-        this.trigger('change:' + attr, this, this.get(attr), options);
+        current[attr] = this.get(attr);
+        triggers.push(attr);
+      }
+
+      for (var i=0, l=triggers.length; i < l; i++) {
+        this.trigger('change:' + triggers[i], this, current[triggers[i]], options);
       }
       if (changing) return this;
 
@@ -476,13 +487,13 @@
         this.trigger('change', this, options);
         // Pending and silent changes still remain.
         for (var attr in this.changed) {
-          if (this._pending[attr] || this._silent[attr]) continue;
+          if (this._pending[attr] || this._changes[attr]) continue;
           delete this.changed[attr];
         }
         this._previousAttributes = _.clone(this.attributes);
       }
 
-      this._changing = false;
+      this._changing = null;
       return this;
     },
 
@@ -532,7 +543,7 @@
     // returning `true` if all is well. If a specific `error` callback has
     // been passed, call that instead of firing the general `"error"` event.
     _validate: function(attrs, options) {
-      if (options.silent || !this.validate) return true;
+      if (options && options.silent || !this.validate) return true;
       attrs = _.extend({}, this.attributes, attrs);
       var error = this.validate(attrs, options);
       if (!error) return true;
@@ -894,9 +905,10 @@
 
   // Cached regular expressions for matching named param parts and splatted
   // parts of route strings.
+  var optionalParam = /\((.*?)\)/g;
   var namedParam    = /:\w+/g;
   var splatParam    = /\*\w+/g;
-  var escapeRegExp  = /[-[\]{}()+?.,\\^$|#\s]/g;
+  var escapeRegExp  = /[-{}[\]+?.,\\^$|#\s]/g;
 
   // Set up all inheritable **Backbone.Router** properties and methods.
   _.extend(Router.prototype, Events, {
@@ -926,6 +938,7 @@
     // Simple proxy to `Backbone.history` to save a fragment into the history.
     navigate: function(fragment, options) {
       Backbone.history.navigate(fragment, options);
+      return this;
     },
 
     // Bind all defined routes to `Backbone.history`. We have to reverse the
@@ -946,6 +959,7 @@
     // against the current location hash.
     _routeToRegExp: function(route) {
       route = route.replace(escapeRegExp, '\\$&')
+                   .replace(optionalParam, '(?:$1)?')
                    .replace(namedParam, '([^\/]+)')
                    .replace(splatParam, '(.*?)');
       return new RegExp('^' + route + '$');
@@ -1058,7 +1072,7 @@
       // opened by a non-pushState browser.
       this.fragment = fragment;
       var loc = this.location;
-      var atRoot = (loc.pathname.replace(/[^/]$/, '$&/') === this.root) && !loc.search;
+      var atRoot = loc.pathname.replace(/[^\/]$/, '$&/') === this.root;
 
       // If we've started off with a route from a `pushState`-enabled browser,
       // but we're currently in a browser that doesn't support it...
@@ -1072,7 +1086,7 @@
       // in a browser where it could be `pushState`-based instead...
       } else if (this._wantsPushState && this._hasPushState && atRoot && loc.hash) {
         this.fragment = this.getHash().replace(routeStripper, '');
-        this.history.replaceState({}, document.title, this.root + this.fragment);
+        this.history.replaceState({}, document.title, this.root + this.fragment + loc.search);
       }
 
       if (!this.options.silent) return this.loadUrl();
@@ -1220,8 +1234,8 @@
     // memory leaks.
     dispose: function() {
       this.undelegateEvents();
-      if (this.model) this.model.off(null, null, this);
-      if (this.collection) this.collection.off(null, null, this);
+      if (this.model && this.model.off) this.model.off(null, null, this);
+      if (this.collection && this.collection.off) this.collection.off(null, null, this);
       return this;
     },
 
@@ -1319,7 +1333,7 @@
         if (this.className) attrs['class'] = _.result(this, 'className');
         this.setElement(this.make(_.result(this, 'tagName'), attrs), false);
       } else {
-        this.setElement(this.el, false);
+        this.setElement(_.result(this, 'el'), false);
       }
     }
 
@@ -1434,9 +1448,12 @@
       child = function(){ parent.apply(this, arguments); };
     }
 
+    // Add static properties to the constructor function, if supplied.
+    _.extend(child, parent, staticProps);
+
     // Set the prototype chain to inherit from `parent`, without calling
     // `parent`'s constructor function.
-    function Surrogate(){ this.constructor = child; };
+    var Surrogate = function(){ this.constructor = child; };
     Surrogate.prototype = parent.prototype;
     child.prototype = new Surrogate;
 
@@ -1444,9 +1461,6 @@
     // if supplied.
     if (protoProps) _.extend(child.prototype, protoProps);
 
-    // Add static properties to the constructor function, if supplied.
-    _.extend(child, parent, staticProps);
-
     // Set a convenience property in case the parent's prototype is needed
     // later.
     child.__super__ = parent.prototype;

data/app/assets/javascripts/ultimate/backbone/model.js.coffee

@@ -18,5 +18,5 @@ class Ultimate.Backbone.Model extends Backbone.Model
       callback.apply context, [@]
 
   singular: ->
-    _.singularize(_.string.underscored(constructor.name))
-    (@className or @constructor.name or 'Model')
+    modelName = @constructor.modelName or @modelName or @className or @constructor.name or 'Model'
+    _.singularize(_.string.underscored(modelName))

data/app/assets/javascripts/ultimate/backbone/view.js.coffee

@@ -1,4 +1,5 @@
 #  * Require ./../underscore/underscore.outcasts
+#  * Require ./../underscore/underscore.string
 #= require ./base
 
 class Ultimate.Backbone.View extends Backbone.View
@@ -42,7 +43,7 @@ class Ultimate.Backbone.View extends Backbone.View
 
   findNodes: (jRoot = @$el, nodes = @nodes) ->
     jNodes = {}
-    nodes = nodes()  if _.isFunction(nodes)
+    nodes = if _.isFunction(nodes) then @nodes.call(@) else _.clone(nodes)
     if _.isObject(nodes)
       for nodeName, selector of nodes
         _isObject = _.isObject(selector)
@@ -58,8 +59,7 @@ class Ultimate.Backbone.View extends Backbone.View
 
   # Overload and proxy parent method Backbone.View.delegateEvents() as hook for normalizeEvents().
   delegateEvents: (events) ->
-    args = []
-    Array::push.apply args, arguments  if arguments.length > 0
+    args = _.toArray(arguments)
     args[0] = @normalizeEvents(events)
     super args...
 
@@ -73,8 +73,9 @@ class Ultimate.Backbone.View extends Backbone.View
       for key, method of events
         [[], eventName, selector] = key.match(delegateEventSplitter)
         selector = _.result(@, selector)
-        selector = selector.selector if selector instanceof jQuery
+        selector = selector.selector  if selector instanceof jQuery
         if _.isString(selector)
+          selector = selector.replace(@$el.selector, '')  if _.string.startsWith(selector, @$el.selector)
           key = "#{eventName} #{selector}"
         normalizedEvents[key] = method
       events = normalizedEvents

data/app/assets/javascripts/ultimate/backbone/views/typed-fields.js.coffee

@@ -38,4 +38,4 @@ class Ultimate.Backbone.Observers.TypedFields extends Ultimate.Backbone.View
 
 
 
-Ultimate.Backbone.createJQueryPlugin? "typedFields", Ultimate.Backbone.Observers.TypedFields
+Ultimate.createJQueryPlugin? "typedFields", Ultimate.Backbone.Observers.TypedFields

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

@@ -4,7 +4,7 @@
 @Ultimate.Helpers.AssetTag =
 
   favicon_link_tag: (source = 'favicon.ico', options = {}) ->
-    tag 'link', _.extend {},
+    tag 'link', _.extend
         rel: 'shortcut icon'
         type: 'image/vnd.microsoft.icon'
         href: @path_to_image(source)
@@ -13,7 +13,7 @@
   image_path: (source) ->
     if source then @compute_public_path(source, 'images') else ''
 
-  path_to_image: (args...) -> @image_path args...  # aliased to avoid conflicts with an image_path named route
+  path_to_image: -> @image_path arguments...   # aliased to avoid conflicts with an image_path named route
 
   image_tag: (source, options = {}) ->
     src = options['src'] = @path_to_image(source)
@@ -23,10 +23,12 @@
       if matches = size.match(/^(\d+)x(\d+)$/)
         options['width']  = matches[1]
         options['height'] = matches[2]
+      else if /^(\d+)$/.test(size)
+        options['width'] = options['height'] = size
     Ultimate.Helpers.Tag.tag('img', options)
 
   image_alt: (src) ->
-    _.string.capitalize @without_extension(@basename(src)).replace(/-[A-Fa-f0-9]{32}/, '')
+    _.string.capitalize @_without_extension(@_basename(src)).replace(/-[A-Fa-f0-9]{32}/, '')
 
 
 
@@ -41,40 +43,40 @@
 
   compute_public_path: (source, dir, options = {}) ->
     return source  if @is_uri(source)
-    source = @rewrite_extension(source, options['ext'])  if options['ext']
-    source = @rewrite_asset_path(source, dir)
-    source = @rewrite_relative_url_root(source, @RELATIVE_URL_ROOT)
+    source = @_rewrite_extension(source, options['ext'])  if options['ext']
+    source = @_rewrite_asset_path(source, dir)
+    source = @_rewrite_relative_url_root(source, @RELATIVE_URL_ROOT)
     source
 
-  rewrite_extension: (source, ext) ->
-    "#{@without_extension(source)}.#{ext}"
+  _rewrite_extension: (source, ext) ->
+    "#{@_without_extension(source)}.#{ext}"
 
-  without_extension: (source) ->
+  _without_extension: (source) ->
     source.replace(/^(.+)(\.\w+)$/, '$1')
 
-  ASSET_ID: ''
-  asset_ids_cache: {}
+  _ASSET_ID: ''
+  _asset_ids_cache: {}
   # Use the ASSET_ID inscope variable or the random hash as its cache-busting asset id.
-  asset_id: (source) ->
-    if _.isString(@ASSET_ID)
-      @ASSET_ID
+  _asset_id: (source) ->
+    if _.isString(@_ASSET_ID)
+      @_ASSET_ID
     else
-      @asset_ids_cache[source] or (@asset_ids_cache[source] = 10000000 + Math.floor(Math.random() * 90000000))
+      @_asset_ids_cache[source] or (@_asset_ids_cache[source] = 10000000 + Math.floor(Math.random() * 90000000))
 
   # Break out the asset path rewrite in case plugins wish to put the asset id
   # someplace other than the query string.
-  rewrite_asset_path: (source, dir) ->
+  _rewrite_asset_path: (source, dir) ->
     source = "/#{dir}/#{source}"  unless source[0] is '/'
-    if id = @asset_id(source)
+    if id = @_asset_id(source)
       "#{source}?#{id}"
     else
       source
 
-  rewrite_relative_url_root: (source, relative_url_root) ->
+  _rewrite_relative_url_root: (source, relative_url_root) ->
     if relative_url_root and not _.startsWith(source, "#{relative_url_root}/")
       "#{relative_url_root}#{source}"
     else
       source
 
-  basename: (source) ->
+  _basename: (source) ->
     source = matches[2]  if matches = source.match(/^(.*\/)?(.+)?$/)