backbone_extensions 0.0.18 → 0.0.19

data/lib/assets/javascripts/backbone_extensions/associations.js

@@ -28,7 +28,7 @@
 
         function createAssociation() {
           var self = this, collectionName = _.str.classify(associationName), className = options.className && _.str.classify(options.className),
-              newOptions = fn.mergeOptions(options, globalOptions, this._options);
+              newOptions = fn.mergeOptions(globalOptions, options, this._options);
 
           if (options.inverseOf) {
             newOptions[_.str.camelize(options.inverseOf)] = function() { return self; };
@@ -70,6 +70,10 @@
         }
 
         if (options.parse) {
+          if (!_(this).has('_parsers')) {
+            this._parsers = [];
+          }
+
           var associations = {
             hasMany: function(assocResponse, association, newOptions) {
               association.add(assocResponse, newOptions);
@@ -112,7 +116,7 @@
               },
               associationFn: function(assocResponse) {
                 return assocResponse &&
-                    associations[associationType].call(this, assocResponse, this[associationName](), fn.mergeOptions(options, globalOptions, this._options));
+                    associations[associationType].call(this, assocResponse, this[associationName](), fn.mergeOptions(globalOptions, options, this._options));
               }
             });
           }
@@ -127,10 +131,7 @@
         }).reduce(function(associations, defaultOptions, associationType) {
               associations[associationType] = function(name, options) {
                 var associationName = _.str.camelize(name);
-                options = _({}).extend(defaultOptions, options);
-                if (options.parse && !_(this).has('_parsers')) {
-                  this._parsers = [];
-                }
+                options = _({}).extend(defaultOptions, globalOptions, options);
                 fn.buildAssociation.call(this, associationType, associationName, options);
                 fn.parseAssociation.call(this, associationType, associationName, options);
                 return this;

data/lib/backbone_extensions/version.rb

@@ -1,3 +1,3 @@
 module BackboneExtensions
-  VERSION = '0.0.18'
+  VERSION = '0.0.19'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backbone_extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1206709655256402287
+      hash: -3332237154857686362
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1206709655256402287
+      hash: -3332237154857686362
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24