backbone-relational-rails 0.7.0 → 0.7.1

data/README.md

@@ -18,7 +18,7 @@ Add the following directive to your Javascript manifest file (application.js):
 
 ## Versioning
 
-backbone-relational-rails 0.7.0 == Backbone-relational 0.7.0
+backbone-relational-rails 0.7.1 == Backbone-relational 0.7.1
 
 Every attempt is made to mirror the currently shipping Backbone-relational version number wherever possible.
 The major, minor, and patch version numbers will always represent the Backbone-relational version. Should a gem
@@ -26,7 +26,7 @@ bug be discovered, a 4th version identifier will be added and incremented.
 
 ## Backbone Version
 
-This release of Backbone-relational is only compatible with Backbone >= 0.9.9.
+This release of Backbone-relational is only compatible with Backbone >= 0.9.10.
 
 ## Acknowledgements
 

data/lib/backbone-relational-rails/version.rb

@@ -1,7 +1,7 @@
 module Backbone
   module Relational
     module Rails
-      VERSION = "0.7.0"
+      VERSION = "0.7.1"
     end
   end
 end

data/vendor/assets/javascripts/backbone-relational.js

@@ -1,7 +1,7 @@
-/* vim: set tabstop=4:softtabstop=4:shiftwidth=4:noexpandtab */
+/* vim: set tabstop=4 softtabstop=4 shiftwidth=4 noexpandtab: */
 /**
- * Backbone-relational.js 0.7.0
- * (c) 2011-2013 Paul Uithol
+ * Backbone-relational.js 0.7.1
+ * (c) 2011-2013 Paul Uithol and contributors (https://github.com/PaulUithol/Backbone-relational/graphs/contributors)
  * 
  * Backbone-relational may be freely distributed under the MIT license; see the accompanying LICENSE.txt.
  * For details and documentation: https://github.com/PaulUithol/Backbone-relational.
@@ -234,8 +234,8 @@
 			}
 			
 			var coll = _.detect( this._collections, function( c ) {
-					return c.model === rootModel;
-				});
+				return c.model === rootModel;
+			});
 			
 			if ( !coll ) {
 				coll = this._createCollection( rootModel );
@@ -445,6 +445,10 @@
 		if ( instance ) {
 			this.initialize();
 
+			if ( options.autoFetch ) {
+				this.instance.fetchRelated( options.key, _.isObject( options.autoFetch ) ? options.autoFetch : {} );
+			}
+
 			// When a model in the store is destroyed, check if it is 'this.instance'.
 			Backbone.Relational.store.getCollection( this.instance )
 				.bind( 'relational:remove', this._modelRemovedFromCollection );
@@ -462,7 +466,8 @@
 		options: {
 			createModels: true,
 			includeInJSON: true,
-			isAutoRelation: false
+			isAutoRelation: false,
+			autoFetch: false
 		},
 		
 		instance: null,
@@ -549,7 +554,7 @@
 			this.related = related;
 
 			this.instance.acquire();
-			this.instance.set( this.key, related, _.defaults( options || {}, { silent: true } ) );
+			this.instance.attributes[ this.key ] = related;
 			this.instance.release();
 		},
 		
@@ -1313,17 +1318,6 @@
 			
 			return result;
 		},
-		
-		/**
-		 * Override 'change', so the change will only execute after 'set' has finised (relations are updated),
-		 * and 'previousAttributes' will be available when the event is fired.
-		 */
-		change: function( options ) {
-			var dit = this, args = arguments;
-			Backbone.Relational.eventQueue.add( function() {
-					Backbone.Model.prototype.change.apply( dit, args );
-				});
-		},
 
 		clone: function() {
 			var attributes = _.clone( this.attributes );
@@ -1522,25 +1516,27 @@
 		/**
 		 * Find an instance of `this` type in 'Backbone.Relational.store'.
 		 * - If `attributes` is a string or a number, `findOrCreate` will just query the `store` and return a model if found.
-		 * - If `attributes` is an object, the model will be updated with `attributes` if found.
+		 * - If `attributes` is an object and is found in the store, the model will be updated with `attributes` unless `options.update` is `false`. 
 		 *   Otherwise, a new model is created with `attributes` (unless `options.create` is explicitly set to `false`).
 		 * @param {Object|String|Number} attributes Either a model's id, or the attributes used to create or update a model.
 		 * @param {Object} [options]
 		 * @param {Boolean} [options.create=true]
+		 * @param {Boolean} [options.update=true]
 		 * @return {Backbone.RelationalModel}
 		 */
 		findOrCreate: function( attributes, options ) {
+			options || ( options = {} );
 			var parsedAttributes = (_.isObject( attributes ) && this.prototype.parse) ? this.prototype.parse( attributes ) : attributes;
 			// Try to find an instance of 'this' model type in the store
 			var model = Backbone.Relational.store.find( this, parsedAttributes );
 
-			// If we found an instance, update it with the data in 'item'; if not, create an instance
-			// (unless 'options.create' is false).
+			// If we found an instance, update it with the data in 'item' (unless 'options.update' is false).
+			// If not, create an instance (unless 'options.create' is false).
 			if ( _.isObject( attributes ) ) {
-				if ( model ) {
+				if ( model && options.update !== false ) {
 					model.set( parsedAttributes, options );
 				}
-				else if ( !options || ( options && options.create !== false ) ) {
+				else if ( !model && options.create !== false ) {
 					model = this.build( attributes, options );
 				}
 			}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backbone-relational-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -56,7 +56,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4485082081012907281
+      hash: -2197334988705490769
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4485082081012907281
+      hash: -2197334988705490769
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24