backbone_extensions 0.0.6 → 0.0.7

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

@@ -53,16 +53,11 @@
 
     function parseAssociation(associationType, associationName, options) {
       function parseResponseWith(key, response) {
-        var camelized = _.str.camelize(key), underscored = _.str.underscored(key);
-        if (response[camelized]) {
-          return {key: camelized, response: response[camelized]};
-        }
-        else if (response[underscored]) {
-          return {key: underscored, response: response[underscored]};
-        }
-        else {
-          return {response: null};
-        }
+        var parseKey;
+        return _([_.str.camelize, _.str.underscored]).any(function(fn) {
+          var k = fn(key);
+          return (parseKey = response[k] && {key: k, response: response[k]});
+        }) && parseKey || {response: null};
       }
 
       function through(response) {
@@ -114,7 +109,7 @@
           this._parsers.push({
             parseFn: parseFunc,
             associationFn: function(assocResponse) {
-              associations[associationType].call(this, assocResponse, this[associationName](), mergeAssociationOptions(options, this.options));
+              associations[associationType].call(this, assocResponse, this[associationName](), mergeAssociationOptions(options, this._options));
             }
           });
         }

data/lib/backbone_extensions/version.rb

@@ -1,3 +1,3 @@
 module BackboneExtensions
-  VERSION = "0.0.6"
+  VERSION = '0.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backbone_extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1650966973307354674
+      hash: -2212629205291919389
 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: 1650966973307354674
+      hash: -2212629205291919389
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24