rails-backbone 0.2.0 → 0.5.0

data/README.md

@@ -1,6 +1,6 @@
 # Backbone-Rails
 
-Easily setup and use backbone.js with rails 3.1
+Easily setup and use backbone.js (0.5.0) with rails 3.1
 
 ## Rails 3.1 setup
 This gem requires the use of rails 3.1, coffeescript and the new rails asset pipeline provided by sprockets.
@@ -22,7 +22,7 @@ Then run the following commands:
 
 Running `rails g backbone:install` will create the following directory structure under `app/assets/javascripts/backbone`:
   
-    controllers/
+    routers/
     models/
     templates/
     views/
@@ -30,7 +30,8 @@ Running `rails g backbone:install` will create the following directory structure
 It will also create a toplevel app_name.coffee file to setup namespacing and setup initial requires.
     
 ## Generators
-backbone-rails provides 3 simple generators to help get you started using bacbone.js with rails 3.1
+backbone-rails provides 3 simple generators to help get you started using bacbone.js with rails 3.1. 
+The generators will only create client side code (javascript).
 
 ### Model Generator
 
@@ -38,14 +39,44 @@ backbone-rails provides 3 simple generators to help get you started using bacbon
     
 This generator creates a backbone model and collection inside `app/assets/javascript/backbone/models` to be used to talk to the rails backend.
 
-### Controller
+### Routers
     
-    rails g backbone:controller
+    rails g backbone:router
     
-This generator creates a backbone controller with corresponding views and templates for the given actions provided.
+This generator creates a backbone router with corresponding views and templates for the given actions provided.
 
 ### Scaffolding
 
     rails g backbone:scaffold
     
-This generator creates a controller, views, templates, model and collection to create a simple crud single page app
+This generator creates a router, views, templates, model and collection to create a simple crud single page app
+
+## Example Usage
+
+Say we have just created a new rails 3.1 application called `blog`. Edit your gemfile and add `gem rails-backbone`.
+
+Install the gem and generate scaffolding.
+
+    bundle install
+    rails g backbone:install
+    rails g scaffold Post title:string content:string
+    rake db:migrate
+    rails g backbone:scaffold Post title:string content:string
+    
+You now have installed the backbone-rails gem, setup a default directory structure for your frontend backbone code. 
+Then you generated the usual rails server side crud scaffolding and finally generated backbone.js code to provide a simple single page crud app.
+You have one last step:
+
+Edit your posts index view `app/views/posts/index.html.erb` with the following contents:
+
+    <div id="posts"></div>
+
+    <script type="text/javascript">
+      $(function() {
+        window.router = new Blog.Routers.PostsRouter({posts: <%= @posts.to_json.html_safe -%>});
+        Backbone.history.start();
+      });
+    </script>
+    
+Now start your server `rails s` and browse to [localhost:3000/posts](http://localhost:3000/posts)
+You should now have a fully functioning single page crud app for Post models.

data/lib/generators/backbone/install/install_generator.rb

@@ -15,14 +15,14 @@ module Backbone
       end
     
       def create_dir_layout
-        %W{controllers models views templates}.each do |dir|
+        %W{routers models views templates}.each do |dir|
           empty_directory "app/assets/javascripts/backbone/#{dir}" 
           create_file "app/assets/javascripts/backbone/#{dir}/.gitkeep" unless options[:skip_git]
         end
       end
     
       def create_app_file
-        template "app.coffee", "app/assets/javascripts/backbone/#{application_name}.coffee"
+        template "app.coffee", "app/assets/javascripts/backbone/#{application_name}.js.coffee"
       end
     
       protected

data/lib/generators/backbone/install/templates/app.coffee

@@ -2,10 +2,10 @@
 #= require_tree ./templates
 #= require_tree ./models
 #= require_tree ./views
-#= require_tree ./controllers
+#= require_tree ./routers
 
 window.<%= application_name.capitalize %> =
   Models: {}
   Collections: {}
-  Controllers: {}
+  Routers: {}
   Views: {}

data/lib/generators/backbone/model/model_generator.rb

@@ -11,7 +11,7 @@ module Backbone
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
     
       def create_backbone_model
-        template "model.coffee", "#{backbone_path}/models/#{file_name}.coffee"
+        template "model.coffee", "#{backbone_path}/models/#{file_name}.js.coffee"
       end
     
     end

data/lib/generators/backbone/resource_helpers.rb

@@ -18,8 +18,8 @@ module Backbone
         [application_name.capitalize, "Views", plural_name.capitalize].join(".")
       end
       
-      def controller_namespace
-        [application_name.capitalize, "Controllers", plural_name.capitalize].join(".")
+      def router_namespace
+        [application_name.capitalize, "Routers", plural_name.capitalize].join(".")
       end
       
       def jst(action)

data/lib/generators/backbone/{controller/controller_generator.rb → router/router_generator.rb}

@@ -2,11 +2,11 @@ require 'generators/backbone/resource_helpers'
 
 module Backbone
   module Generators
-    class ControllerGenerator < Rails::Generators::NamedBase
+    class RouterGenerator < Rails::Generators::NamedBase
       include Backbone::Generators::ResourceHelpers
       
       source_root File.expand_path("../templates", __FILE__)
-      desc "This generator creates a backbone controller with views and templates for the provided actions"
+      desc "This generator creates a backbone router with views and templates for the provided actions"
       
       argument :actions, :type => :array, :default => [], :banner => "action action"
       
@@ -24,14 +24,14 @@ module Backbone
         end
       end
       
-      def create_controller_files 
-        template 'controller.coffee', File.join(backbone_path, "controllers", class_path, "#{file_name}_controller.coffee")
+      def create_router_files 
+        template 'router.coffee', File.join(backbone_path, "routers", class_path, "#{file_name}_router.js.coffee")
       end
       
       def create_view_files
          actions.each do |action|
            @action = action
-           @view_path = File.join(backbone_path, "views", plural_name, "#{action}_view.coffee")
+           @view_path = File.join(backbone_path, "views", plural_name, "#{action}_view.js.coffee")
            @jst_path = File.join(backbone_path,"templates", plural_name, "#{action}.jst.ejs")
            
            template "view.coffee", @view_path

data/lib/generators/backbone/{controller/templates/controller.coffee → router/templates/router.coffee}

@@ -1,4 +1,4 @@
-class <%= controller_namespace %>Controller extends Backbone.Controller
+class <%= router_namespace %>Router extends Backbone.Router
   initialize: (options) ->
     
   routes:

data/lib/generators/backbone/scaffold/scaffold_generator.rb

@@ -7,17 +7,17 @@ module Backbone
       source_root File.expand_path("../templates", __FILE__)
       desc "This generator creates the client side crud scaffolding"
       
-      def create_controller_files 
-        template 'controller.coffee', File.join(backbone_path, "controllers", class_path, "#{plural_name}_controller.coffee")
+      def create_router_files 
+        template 'router.coffee', File.join(backbone_path, "routers", class_path, "#{plural_name}_router.js.coffee")
       end
       
       def create_view_files
         available_views.each do |view|
-          template "views/#{view}_view.coffee", File.join(backbone_path, "views", plural_name, "#{view}_view.coffee")
+          template "views/#{view}_view.coffee", File.join(backbone_path, "views", plural_name, "#{view}_view.js.coffee")
           template "templates/#{view}.jst", File.join(backbone_path, "templates", plural_name, "#{view}.jst.ejs")       
         end
         
-        template "views/model_view.coffee", File.join(backbone_path, "views", plural_name, "#{singular_name}_view.coffee")
+        template "views/model_view.coffee", File.join(backbone_path, "views", plural_name, "#{singular_name}_view.js.coffee")
         template "templates/model.jst", File.join(backbone_path, "templates", plural_name, "#{singular_name}.jst.ejs") 
       end
       

data/lib/generators/backbone/scaffold/templates/{controller.coffee → router.coffee}

@@ -1,7 +1,7 @@
-class <%= controller_namespace %>Controller extends Backbone.Controller
+class <%= router_namespace %>Router extends Backbone.Router
   initialize: (options) ->
     @<%= plural_name %> = new <%= collection_namespace %>Collection()
-    @<%= plural_name %>.refresh options.<%= plural_name %>
+    @<%= plural_name %>.reset options.<%= plural_name %>
 
   routes:
     "/new": "new<%= class_name %>"

data/lib/generators/backbone/scaffold/templates/views/index_view.coffee

@@ -6,7 +6,7 @@ class <%= view_namespace %>.IndexView extends Backbone.View
   initialize: () ->
     _.bindAll(this, 'addOne', 'addAll', 'render');
     
-    @options.<%= plural_name %>.bind('refresh', this.addAll);
+    @options.<%= plural_name %>.bind('reset', this.addAll);
    
   addAll: () ->
     @options.<%= plural_name %>.each(this.addOne)

data/vendor/assets/javascripts/backbone.js

@@ -1,4 +1,4 @@
-//     Backbone.js 0.3.3
+//     Backbone.js 0.5.0
 //     (c) 2010 Jeremy Ashkenas, DocumentCloud Inc.
 //     Backbone may be freely distributed under the MIT license.
 //     For all details and documentation:
@@ -25,7 +25,7 @@
   }
 
   // Current version of the library. Keep in sync with `package.json`.
-  Backbone.VERSION = '0.3.3';
+  Backbone.VERSION = '0.5.0';
 
   // Require Underscore, if we're on the server, and it's not already present.
   var _ = root._;
@@ -70,7 +70,7 @@
     // Passing `"all"` will bind the callback to all events fired.
     bind : function(ev, callback) {
       var calls = this._callbacks || (this._callbacks = {});
-      var list  = this._callbacks[ev] || (this._callbacks[ev] = []);
+      var list  = calls[ev] || (calls[ev] = []);
       list.push(callback);
       return this;
     },
@@ -103,13 +103,13 @@
     // same arguments as `trigger` is, apart from the event name.
     // Listening for `"all"` passes the true event name as the first argument.
     trigger : function(eventName) {
-      var list, calls, ev, callback, args, i, l;
+      var list, calls, ev, callback, args;
       var both = 2;
       if (!(calls = this._callbacks)) return this;
       while (both--) {
         ev = both ? eventName : 'all';
         if (list = calls[ev]) {
-          for (i = 0, l = list.length; i < l; i++) {
+          for (var i = 0, l = list.length; i < l; i++) {
             if (!(callback = list[i])) {
               list.splice(i, 1); i--; l--;
             } else {
@@ -143,7 +143,7 @@
     this._changed = false;
     this._previousAttributes = _.clone(this.attributes);
     if (options && options.collection) this.collection = options.collection;
-    this.initialize(attributes, options);
+    this.initialize.apply(this, arguments);
   };
 
   // Attach all inheritable methods to the Model prototype.
@@ -204,6 +204,10 @@
       // Check for changes of `id`.
       if (this.idAttribute in attrs) this.id = attrs[this.idAttribute];
 
+      // We're about to start triggering change events.
+      var alreadyChanging = this._changing;
+      this._changing = true;
+
       // Update attributes.
       for (var attr in attrs) {
         var val = attrs[attr];
@@ -216,7 +220,8 @@
       }
 
       // Fire the `"change"` event, if the model has been changed.
-      if (!options.silent && this._changed) this.change(options);
+      if (!alreadyChanging && !options.silent && this._changed) this.change(options);
+      this._changing = false;
       return this;
     },
 
@@ -248,6 +253,7 @@
     // to silence it.
     clear : function(options) {
       options || (options = {});
+      var attr;
       var old = this.attributes;
 
       // Run validation.
@@ -299,10 +305,11 @@
       return (this.sync || Backbone.sync).call(this, method, this, options);
     },
 
-    // Destroy this model on the server. Upon success, the model is removed
+    // Destroy this model on the server if it was already persisted. Upon success, the model is removed
     // from its collection, if it has one.
     destroy : function(options) {
       options || (options = {});
+      if (this.isNew()) return this.trigger('destroy', this, this.collection, options);
       var model = this;
       var success = options.success;
       options.success = function(resp) {
@@ -333,10 +340,9 @@
       return new this.constructor(this);
     },
 
-    // A model is new if it has never been saved to the server, and has a negative
-    // ID.
+    // A model is new if it has never been saved to the server, and lacks an id.
     isNew : function() {
-      return !this.id;
+      return this.id == null;
     },
 
     // Call this method to manually fire a `change` event for this model.
@@ -391,7 +397,7 @@
       var error = this.validate(attrs);
       if (error) {
         if (options.error) {
-          options.error(this, error);
+          options.error(this, error, options);
         } else {
           this.trigger('error', this, error, options);
         }
@@ -410,14 +416,11 @@
   // its models in sort order, as they're added and removed.
   Backbone.Collection = function(models, options) {
     options || (options = {});
-    if (options.comparator) {
-      this.comparator = options.comparator;
-      delete options.comparator;
-    }
+    if (options.comparator) this.comparator = options.comparator;
     _.bindAll(this, '_onModelEvent', '_removeReference');
     this._reset();
-    if (models) this.refresh(models, {silent: true});
-    this.initialize(models, options);
+    if (models) this.reset(models, {silent: true});
+    this.initialize.apply(this, arguments);
   };
 
   // Define the Collection's inheritable methods.
@@ -485,7 +488,7 @@
       options || (options = {});
       if (!this.comparator) throw new Error('Cannot sort a set without a comparator');
       this.models = this.sortBy(this.comparator);
-      if (!options.silent) this.trigger('refresh', this, options);
+      if (!options.silent) this.trigger('reset', this, options);
       return this;
     },
 
@@ -495,27 +498,27 @@
     },
 
     // When you have more items than you want to add or remove individually,
-    // you can refresh the entire set with a new list of models, without firing
-    // any `added` or `removed` events. Fires `refresh` when finished.
-    refresh : function(models, options) {
+    // you can reset the entire set with a new list of models, without firing
+    // any `added` or `removed` events. Fires `reset` when finished.
+    reset : function(models, options) {
       models  || (models = []);
       options || (options = {});
       this.each(this._removeReference);
       this._reset();
       this.add(models, {silent: true});
-      if (!options.silent) this.trigger('refresh', this, options);
+      if (!options.silent) this.trigger('reset', this, options);
       return this;
     },
 
-    // Fetch the default set of models for this collection, refreshing the
+    // Fetch the default set of models for this collection, resetting the
     // collection when they arrive. If `add: true` is passed, appends the
-    // models to the collection instead of refreshing.
+    // models to the collection instead of resetting.
     fetch : function(options) {
       options || (options = {});
       var collection = this;
       var success = options.success;
       options.success = function(resp, status, xhr) {
-        collection[options.add ? 'add' : 'refresh'](collection.parse(resp, xhr), options);
+        collection[options.add ? 'add' : 'reset'](collection.parse(resp, xhr), options);
         if (success) success(collection, resp);
       };
       options.error = wrapError(options.error, collection, options);
@@ -524,19 +527,15 @@
 
     // Create a new instance of a model in this collection. After the model
     // has been created on the server, it will be added to the collection.
+    // Returns the model, or 'false' if validation on a new model fails.
     create : function(model, options) {
       var coll = this;
       options || (options = {});
-      if (!(model instanceof Backbone.Model)) {
-        var attrs = model;
-        model = new this.model(null, {collection: coll});
-        if (!model.set(attrs, options)) return false;
-      } else {
-        model.collection = coll;
-      }
+      model = this._prepareModel(model, options);
+      if (!model) return false;
       var success = options.success;
       options.success = function(nextModel, resp, xhr) {
-        coll.add(nextModel);
+        coll.add(nextModel, options);
         if (success) success(nextModel, resp, xhr);
       };
       model.save(null, options);
@@ -556,7 +555,7 @@
       return _(this.models).chain();
     },
 
-    // Reset all internal state. Called when the collection is refreshed.
+    // Reset all internal state. Called when the collection is reset.
     _reset : function(options) {
       this.length = 0;
       this.models = [];
@@ -564,21 +563,32 @@
       this._byCid = {};
     },
 
+    // Prepare a model to be added to this collection
+    _prepareModel: function(model, options) {
+      if (!(model instanceof Backbone.Model)) {
+        var attrs = model;
+        model = new this.model(attrs, {collection: this});
+        if (model.validate && !model._performValidation(attrs, options)) model = false;
+      } else if (!model.collection) {
+        model.collection = this;
+      }
+      return model;
+    },
+
     // Internal implementation of adding a single model to the set, updating
     // hash indexes for `id` and `cid` lookups.
+    // Returns the model, or 'false' if validation on a new model fails.
     _add : function(model, options) {
       options || (options = {});
-      if (!(model instanceof Backbone.Model)) {
-        model = new this.model(model, {collection: this});
-      }
-      var already = this.getByCid(model);
+      model = this._prepareModel(model, options);
+      if (!model) return false;
+      var already = this.getByCid(model) || this.get(model);
       if (already) throw new Error(["Can't add the same model to a set twice", already.id]);
       this._byId[model.id] = model;
       this._byCid[model.cid] = model;
-      if (!model.collection) {
-        model.collection = this;
-      }
-      var index = this.comparator ? this.sortedIndex(model, this.comparator) : this.length;
+      var index = options.at != null ? options.at :
+                  this.comparator ? this.sortedIndex(model, this.comparator) :
+                  this.length;
       this.models.splice(index, 0, model);
       model.bind('all', this._onModelEvent);
       this.length++;
@@ -640,16 +650,16 @@
     };
   });
 
-  // Backbone.Controller
+  // Backbone.Router
   // -------------------
 
-  // Controllers map faux-URLs to actions, and fire events when routes are
+  // Routers map faux-URLs to actions, and fire events when routes are
   // matched. Creating a new one sets its `routes` hash, if not set statically.
-  Backbone.Controller = function(options) {
+  Backbone.Router = function(options) {
     options || (options = {});
     if (options.routes) this.routes = options.routes;
     this._bindRoutes();
-    this.initialize(options);
+    this.initialize.apply(this, arguments);
   };
 
   // Cached regular expressions for matching named param parts and splatted
@@ -658,8 +668,8 @@
   var splatParam    = /\*([\w\d]+)/g;
   var escapeRegExp  = /[-[\]{}()+?.,\\^$|#\s]/g;
 
-  // Set up all inheritable **Backbone.Controller** properties and methods.
-  _.extend(Backbone.Controller.prototype, Backbone.Events, {
+  // Set up all inheritable **Backbone.Router** properties and methods.
+  _.extend(Backbone.Router.prototype, Backbone.Events, {
 
     // Initialize is an empty function by default. Override it with your own
     // initialization logic.
@@ -674,17 +684,16 @@
     route : function(route, name, callback) {
       Backbone.history || (Backbone.history = new Backbone.History);
       if (!_.isRegExp(route)) route = this._routeToRegExp(route);
-      Backbone.history.route(route, _.bind(function(hash) {
-        var args = this._extractParameters(route, hash);
+      Backbone.history.route(route, _.bind(function(fragment) {
+        var args = this._extractParameters(route, fragment);
         callback.apply(this, args);
         this.trigger.apply(this, ['route:' + name].concat(args));
       }, this));
     },
 
-    // Simple proxy to `Backbone.history` to save a fragment into the history,
-    // without triggering routes.
-    saveLocation : function(hash) {
-      Backbone.history.saveLocation(hash);
+    // Simple proxy to `Backbone.history` to save a fragment into the history.
+    navigate : function(fragment, triggerRoute) {
+      Backbone.history.navigate(fragment, triggerRoute);
     },
 
     // Bind all defined routes to `Backbone.history`. We have to reverse the
@@ -712,8 +721,8 @@
 
     // Given a route, and a URL fragment that it matches, return the array of
     // extracted parameters.
-    _extractParameters : function(route, hash) {
-      return route.exec(hash).slice(1);
+    _extractParameters : function(route, fragment) {
+      return route.exec(fragment).slice(1);
     }
 
   });
@@ -721,7 +730,7 @@
   // Backbone.History
   // ----------------
 
-  // Handles cross-browser history management, based on URL hashes. If the
+  // Handles cross-browser history management, based on URL fragments. If the
   // browser does not support `onhashchange`, falls back to polling.
   Backbone.History = function() {
     this.handlers = [];
@@ -744,33 +753,67 @@
     // twenty times a second.
     interval: 50,
 
-    // Get the cross-browser normalized URL fragment.
-    getHash : function(loc) {
-      return (loc || window.location).hash.replace(hashStrip, '');
+    // Get the cross-browser normalized URL fragment, either from the URL,
+    // the hash, or the override.
+    getFragment : function(fragment, forcePushState) {
+      if (fragment == null) {
+        if (this._hasPushState || forcePushState) {
+          fragment = window.location.pathname;
+          var search = window.location.search;
+          if (search) fragment += search;
+          if (fragment.indexOf(this.options.root) == 0) fragment = fragment.substr(this.options.root.length);
+        } else {
+          fragment = window.location.hash;
+        }
+      }
+      return fragment.replace(hashStrip, '');
     },
 
     // Start the hash change handling, returning `true` if the current URL matches
     // an existing route, and `false` otherwise.
-    start : function() {
+    start : function(options) {
+
+      // Figure out the initial configuration. Do we need an iframe?
+      // Is pushState desired ... is it available?
       if (historyStarted) throw new Error("Backbone.history has already been started");
-      var hash = this.getHash();
-      var docMode = document.documentMode;
-      var oldIE = (isExplorer.exec(navigator.userAgent.toLowerCase()) && (!docMode || docMode <= 7));
+      this.options          = _.extend({}, {root: '/'}, this.options, options);
+      this._wantsPushState  = !!this.options.pushState;
+      this._hasPushState    = !!(this.options.pushState && window.history && window.history.pushState);
+      var fragment          = this.getFragment();
+      var docMode           = document.documentMode;
+      var oldIE             = (isExplorer.exec(navigator.userAgent.toLowerCase()) && (!docMode || docMode <= 7));
       if (oldIE) {
         this.iframe = $('<iframe src="javascript:0" tabindex="-1" />').hide().appendTo('body')[0].contentWindow;
-        this.saveLocation(hash);
+        this.navigate(fragment);
       }
-      if ('onhashchange' in window && !oldIE) {
+
+      // Depending on whether we're using pushState or hashes, and whether
+      // 'onhashchange' is supported, determine how we check the URL state.
+      if (this._hasPushState) {
+        $(window).bind('popstate', this.checkUrl);
+      } else if ('onhashchange' in window && !oldIE) {
         $(window).bind('hashchange', this.checkUrl);
       } else {
         setInterval(this.checkUrl, this.interval);
       }
-      this.hash = hash;
+
+      // Determine if we need to change the base url, for a pushState link
+      // opened by a non-pushState browser.
+      this.fragment = fragment;
       historyStarted = true;
-      return this.loadUrl();
+      var started = this.loadUrl() || this.loadUrl(window.location.hash);
+      var atRoot  = window.location.pathname == this.options.root;
+      if (this._wantsPushState && !this._hasPushState && !atRoot) {
+        this.fragment = this.getFragment(null, true);
+        window.location = this.options.root + '#' + this.fragment;
+      } else if (this._wantsPushState && this._hasPushState && atRoot && window.location.hash) {
+        this.navigate(window.location.hash);
+      } else {
+        return started;
+      }
     },
 
-    // Add a route to be tested when the hash changes. Routes added later may
+    // Add a route to be tested when the fragment changes. Routes added later may
     // override previous routes.
     route : function(route, callback) {
       this.handlers.unshift({route : route, callback : callback});
@@ -778,23 +821,22 @@
 
     // Checks the current URL to see if it has changed, and if it has,
     // calls `loadUrl`, normalizing across the hidden iframe.
-    checkUrl : function() {
-      var hash = this.getHash();
-      if (hash == this.hash && this.iframe) hash = this.getHash(this.iframe.location);
-      if (hash == this.hash || hash == decodeURIComponent(this.hash)) return false;
-      if (this.iframe) this.saveLocation(hash);
-      this.hash = hash;
-      this.loadUrl();
+    checkUrl : function(e) {
+      var current = this.getFragment();
+      if (current == this.fragment && this.iframe) current = this.getFragment(this.iframe.location.hash);
+      if (current == this.fragment || current == decodeURIComponent(this.fragment)) return false;
+      if (this.iframe) this.navigate(current);
+      this.loadUrl() || this.loadUrl(window.location.hash);
     },
 
     // Attempt to load the current URL fragment. If a route succeeds with a
     // match, returns `true`. If no defined routes matches the fragment,
     // returns `false`.
-    loadUrl : function() {
-      var hash = this.hash;
+    loadUrl : function(fragmentOverride) {
+      var fragment = this.fragment = this.getFragment(fragmentOverride);
       var matched = _.any(this.handlers, function(handler) {
-        if (handler.route.test(hash)) {
-          handler.callback(hash);
+        if (handler.route.test(fragment)) {
+          handler.callback(fragment);
           return true;
         }
       });
@@ -804,14 +846,22 @@
     // Save a fragment into the hash history. You are responsible for properly
     // URL-encoding the fragment in advance. This does not trigger
     // a `hashchange` event.
-    saveLocation : function(hash) {
-      hash = (hash || '').replace(hashStrip, '');
-      if (this.hash == hash) return;
-      window.location.hash = this.hash = hash;
-      if (this.iframe && (hash != this.getHash(this.iframe.location))) {
-        this.iframe.document.open().close();
-        this.iframe.location.hash = hash;
+    navigate : function(fragment, triggerRoute) {
+      fragment = (fragment || '').replace(hashStrip, '');
+      if (this.fragment == fragment || this.fragment == decodeURIComponent(fragment)) return;
+      if (this._hasPushState) {
+        var loc = window.location;
+        if (fragment.indexOf(this.options.root) != 0) fragment = this.options.root + fragment;
+        this.fragment = fragment;
+        window.history.pushState({}, document.title, loc.protocol + '//' + loc.host + fragment);
+      } else {
+        window.location.hash = this.fragment = fragment;
+        if (this.iframe && (fragment != this.getFragment(this.iframe.location.hash))) {
+          this.iframe.document.open().close();
+          this.iframe.location.hash = fragment;
+        }
       }
+      if (triggerRoute) this.loadUrl(fragment);
     }
 
   });
@@ -826,7 +876,7 @@
     this._configure(options || {});
     this._ensureElement();
     this.delegateEvents();
-    this.initialize(options);
+    this.initialize.apply(this, arguments);
   };
 
   // Element lookup, scoped to DOM elements within the current view.
@@ -899,10 +949,11 @@
       if (!(events || (events = this.events))) return;
       $(this.el).unbind('.delegateEvents' + this.cid);
       for (var key in events) {
-        var methodName = events[key];
+        var method = this[events[key]];
+        if (!method) throw new Error('Event "' + events[key] + '" does not exist');
         var match = key.match(eventSplitter);
         var eventName = match[1], selector = match[2];
-        var method = _.bind(this[methodName], this);
+        method = _.bind(method, this);
         eventName += '.delegateEvents' + this.cid;
         if (selector === '') {
           $(this.el).bind(eventName, method);
@@ -950,7 +1001,7 @@
 
   // Set up inheritance for the model, collection, and view.
   Backbone.Model.extend = Backbone.Collection.extend =
-    Backbone.Controller.extend = Backbone.View.extend = extend;
+    Backbone.Router.extend = Backbone.View.extend = extend;
 
   // Map from CRUD to HTTP for our default `Backbone.sync` implementation.
   var methodMap = {
@@ -1076,7 +1127,7 @@
 
   // Throw an error when a URL is needed, and none is supplied.
   var urlError = function() {
-    throw new Error("A 'url' property or function must be specified");
+    throw new Error('A "url" property or function must be specified');
   };
 
   // Wrap an optional error callback with a fallback error event.
@@ -1092,7 +1143,7 @@
 
   // Helper function to escape a string for HTML rendering.
   var escapeHTML = function(string) {
-    return string.replace(/&(?!\w+;|#\d+;|#x[\da-f]+;)/gi, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+    return string.replace(/&(?!\w+;|#\d+;|#x[\da-f]+;)/gi, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#x27').replace(/\//g,'&#x2F;');
   };
 
 }).call(this);

data/vendor/assets/javascripts/backbone_rails_sync.js

@@ -22,7 +22,11 @@
     var params = _.extend({
       type:         type,
       dataType:     'json',
-      processData:  false
+      processData:  false,
+      beforeSend: function( xhr ) {
+        var token = $('meta[name="csrf-token"]').attr('content');
+        if (token) xhr.setRequestHeader('X-CSRF-Token', token);
+      }
     }, options);
 
     if (!params.url) {

data/vendor/assets/javascripts/underscore.js

@@ -55,8 +55,7 @@
     module.exports = _;
     _._ = _;
   } else {
-    // Exported as a string, for Closure Compiler "advanced" mode.
-    root['_'] = _;
+    root._ = _;
   }
 
   // Current version.
@@ -74,7 +73,7 @@
       obj.forEach(iterator, context);
     } else if (_.isNumber(obj.length)) {
       for (var i = 0, l = obj.length; i < l; i++) {
-        if (i in obj && iterator.call(context, obj[i], i, obj) === breaker) return;
+        if (iterator.call(context, obj[i], i, obj) === breaker) return;
       }
     } else {
       for (var key in obj) {
@@ -252,16 +251,6 @@
     }), 'value');
   };
 
-  // Groups the object's values by a criterion produced by an iterator
-  _.groupBy = function(obj, iterator) {
-    var result = {};
-    each(obj, function(value, index) {
-      var key = iterator(value, index);
-      (result[key] || (result[key] = [])).push(value);
-    });
-    return result;
-  };
-
   // Use a comparator function to figure out at what index an object should
   // be inserted so as to maintain order. Uses binary search.
   _.sortedIndex = function(array, obj, iterator) {
@@ -513,7 +502,7 @@
     var funcs = slice.call(arguments);
     return function() {
       var args = slice.call(arguments);
-      for (var i = funcs.length - 1; i >= 0; i--) {
+      for (var i=funcs.length-1; i >= 0; i--) {
         args = [funcs[i].apply(this, args)];
       }
       return args[0];

metadata

@@ -2,7 +2,7 @@
 name: rails-backbone
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Ryan Fitzgerald
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-19 00:00:00 -04:00
+date: 2011-07-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.1.0.beta1
+        version: "3.1"
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.2.0
+        version: "2.2"
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -58,18 +58,18 @@ extra_rdoc_files: []
 
 files: 
 - lib/backbone-rails.rb
-- lib/generators/backbone/controller/controller_generator.rb
-- lib/generators/backbone/controller/templates/controller.coffee
-- lib/generators/backbone/controller/templates/template.jst
-- lib/generators/backbone/controller/templates/view.coffee
 - lib/generators/backbone/install/install_generator.rb
 - lib/generators/backbone/install/templates/app.coffee
 - lib/generators/backbone/model/model_generator.rb
 - lib/generators/backbone/model/templates/model.coffee
 - lib/generators/backbone/resource_helpers.rb
+- lib/generators/backbone/router/router_generator.rb
+- lib/generators/backbone/router/templates/router.coffee
+- lib/generators/backbone/router/templates/template.jst
+- lib/generators/backbone/router/templates/view.coffee
 - lib/generators/backbone/scaffold/scaffold_generator.rb
-- lib/generators/backbone/scaffold/templates/controller.coffee
 - lib/generators/backbone/scaffold/templates/model.coffee
+- lib/generators/backbone/scaffold/templates/router.coffee
 - lib/generators/backbone/scaffold/templates/templates/edit.jst
 - lib/generators/backbone/scaffold/templates/templates/index.jst
 - lib/generators/backbone/scaffold/templates/templates/model.jst
@@ -103,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1804076716045259291
+      hash: -730083928370135301
       segments: 
       - 0
       version: "0"
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1804076716045259291
+      hash: -730083928370135301
       segments: 
       - 0
       version: "0"