rails-backbone 0.5.1 → 0.5.2

data/README.md

@@ -53,7 +53,13 @@ This generator creates a router, views, templates, model and collection to creat
 
 ## Example Usage
 
-Say we have just created a new rails 3.1 application called `blog`. Edit your gemfile and add `gem rails-backbone`.
+Created a new rails 3.1 application called `blog`.
+
+    rails new blog
+
+Edit your Gemfile and add
+
+    gem 'rails-backbone'
 
 Install the gem and generate scaffolding.
 
@@ -73,6 +79,7 @@ Edit your posts index view `app/views/posts/index.html.erb` with the following c
 
     <script type="text/javascript">
       $(function() {
+        // Blog is the app name
         window.router = new Blog.Routers.PostsRouter({posts: <%= @posts.to_json.html_safe -%>});
         Backbone.history.start();
       });

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

@@ -28,7 +28,7 @@ module Backbone
       protected
         def application_name
           if defined?(Rails) && Rails.application
-            Rails.application.class.name.split('::').first.underscore
+            Rails.application.class.name.split('::').first
           else
             "application"
           end

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

@@ -4,7 +4,7 @@
 #= require_tree ./views
 #= require_tree ./routers
 
-window.<%= application_name.capitalize %> =
+window.<%= application_name.camelize %> =
   Models: {}
   Collections: {}
   Routers: {}

data/lib/generators/backbone/resource_helpers.rb

@@ -7,25 +7,37 @@ module Backbone
       end
       
       def model_namespace
-        [application_name.capitalize, "Models", class_name].join(".")
+        [application_name.camelize, "Models", class_name].join(".")
+      end
+      
+      def singular_model_name
+        uncapitalize singular_name.camelize
+      end
+      
+      def plural_model_name
+        uncapitalize(plural_name.camelize)
       end
       
       def collection_namespace
-        [application_name.capitalize, "Collections", plural_name.capitalize].join(".")
+        [application_name.camelize, "Collections", plural_name.camelize].join(".")
       end
       
       def view_namespace
-        [application_name.capitalize, "Views", plural_name.capitalize].join(".")
+        [application_name.camelize, "Views", plural_name.camelize].join(".")
       end
       
       def router_namespace
-        [application_name.capitalize, "Routers", plural_name.capitalize].join(".")
+        [application_name.camelize, "Routers", plural_name.camelize].join(".")
       end
       
       def jst(action)
         "backbone/templates/#{plural_name}/#{action}"
       end
       
+      def uncapitalize(str)
+          str[0, 1].downcase + str[1..-1]
+      end
+      
     end
   end
 end

data/lib/generators/backbone/router/templates/router.coffee

@@ -8,7 +8,7 @@ class <%= router_namespace %>Router extends Backbone.Router
   
 <% actions.each do |action| -%>
   <%= action %>: ->
-    @view = new <%= "#{view_namespace}.#{action.capitalize}View()" %>
+    @view = new <%= "#{view_namespace}.#{action.camelize}View()" %>
     $("#<%= plural_name %>").html(@view.render().el)
     
 <% end -%>

data/lib/generators/backbone/router/templates/view.coffee

@@ -1,6 +1,6 @@
 <%= view_namespace %> ||= {}
 
-class <%= view_namespace %>.<%= @action.capitalize %>View extends Backbone.View
+class <%= view_namespace %>.<%= @action.camelize %>View extends Backbone.View
   template: JST["<%= jst @action %>"]
        
   render: ->

data/lib/generators/backbone/scaffold/templates/router.coffee

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

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

@@ -6,17 +6,17 @@ class <%= view_namespace %>.IndexView extends Backbone.View
   initialize: () ->
     _.bindAll(this, 'addOne', 'addAll', 'render');
     
-    @options.<%= plural_name %>.bind('reset', this.addAll);
+    @options.<%= plural_model_name %>.bind('reset', this.addAll);
    
   addAll: () ->
-    @options.<%= plural_name %>.each(this.addOne)
+    @options.<%= plural_model_name %>.each(this.addOne)
   
-  addOne: (<%= singular_name %>) ->
-    view = new <%= view_namespace %>.<%= singular_name.capitalize %>View({model : <%= singular_name %>})
+  addOne: (<%= singular_model_name %>) ->
+    view = new <%= view_namespace %>.<%= singular_name.camelize %>View({model : <%= singular_model_name %>})
     this.$("tbody").append(view.render().el)
        
   render: ->
-    $(this.el).html(this.template(<%= plural_name %>: this.options.<%= plural_name %>.toJSON() ))
+    $(this.el).html(this.template(<%= plural_model_name %>: this.options.<%= plural_model_name %>.toJSON() ))
     @addAll()
     
     return this

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

@@ -1,6 +1,6 @@
 <%= view_namespace %> ||= {}
 
-class <%= view_namespace %>.<%= singular_name.capitalize %>View extends Backbone.View
+class <%= view_namespace %>.<%= singular_name.camelize %>View extends Backbone.View
   template: JST["<%= jst singular_name %>"]
   
   events:

data/vendor/assets/javascripts/backbone.js

@@ -1,4 +1,4 @@
-//     Backbone.js 0.5.1
+//     Backbone.js 0.5.2
 //     (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.5.1';
+  Backbone.VERSION = '0.5.2';
 
   // Require Underscore, if we're on the server, and it's not already present.
   var _ = root._;
@@ -41,7 +41,7 @@
     return this;
   };
 
-  // Turn on `emulateHTTP` to use support legacy HTTP servers. Setting this option will
+  // Turn on `emulateHTTP` to support legacy HTTP servers. Setting this option will
   // fake `"PUT"` and `"DELETE"` requests via the `_method` parameter and set a
   // `X-Http-Method-Override` header.
   Backbone.emulateHTTP = false;
@@ -68,10 +68,10 @@
 
     // Bind an event, specified by a string name, `ev`, to a `callback` function.
     // Passing `"all"` will bind the callback to all events fired.
-    bind : function(ev, callback) {
+    bind : function(ev, callback, context) {
       var calls = this._callbacks || (this._callbacks = {});
       var list  = calls[ev] || (calls[ev] = []);
-      list.push(callback);
+      list.push([callback, context]);
       return this;
     },
 
@@ -89,7 +89,7 @@
           var list = calls[ev];
           if (!list) return this;
           for (var i = 0, l = list.length; i < l; i++) {
-            if (callback === list[i]) {
+            if (list[i] && callback === list[i][0]) {
               list[i] = null;
               break;
             }
@@ -114,7 +114,7 @@
               list.splice(i, 1); i--; l--;
             } else {
               args = both ? Array.prototype.slice.call(arguments, 1) : arguments;
-              callback.apply(this, args);
+              callback[0].apply(callback[1] || this, args);
             }
           }
         }
@@ -133,7 +133,7 @@
     var defaults;
     attributes || (attributes = {});
     if (defaults = this.defaults) {
-      if (_.isFunction(defaults)) defaults = defaults();
+      if (_.isFunction(defaults)) defaults = defaults.call(this);
       attributes = _.extend({}, defaults, attributes);
     }
     this.attributes = {};
@@ -641,7 +641,7 @@
   var methods = ['forEach', 'each', 'map', 'reduce', 'reduceRight', 'find', 'detect',
     'filter', 'select', 'reject', 'every', 'all', 'some', 'any', 'include',
     'contains', 'invoke', 'max', 'min', 'sortBy', 'sortedIndex', 'toArray', 'size',
-    'first', 'rest', 'last', 'without', 'indexOf', 'lastIndexOf', 'isEmpty'];
+    'first', 'rest', 'last', 'without', 'indexOf', 'lastIndexOf', 'isEmpty', 'groupBy'];
 
   // Mix in each Underscore method as a proxy to `Collection#models`.
   _.each(methods, function(method) {
@@ -806,6 +806,8 @@
       if (this._wantsPushState && !this._hasPushState && !atRoot) {
         this.fragment = this.getFragment(null, true);
         window.location.replace(this.options.root + '#' + this.fragment);
+        // Return immediately as browser will do redirect to new url
+        return true;
       } else if (this._wantsPushState && this._hasPushState && atRoot && loc.hash) {
         this.fragment = loc.hash.replace(hashStrip, '');
         window.history.replaceState({}, document.title, loc.protocol + '//' + loc.host + this.options.root + this.fragment);
@@ -947,6 +949,7 @@
     // not `change`, `submit`, and `reset` in Internet Explorer.
     delegateEvents : function(events) {
       if (!(events || (events = this.events))) return;
+      if (_.isFunction(events)) events = events.call(this);
       $(this.el).unbind('.delegateEvents' + this.cid);
       for (var key in events) {
         var method = this[events[key]];
@@ -1035,8 +1038,7 @@
     // Default JSON-request options.
     var params = _.extend({
       type:         type,
-      dataType:     'json',
-      processData:  false
+      dataType:     'json'
     }, options);
 
     // Ensure that we have a URL.
@@ -1053,7 +1055,6 @@
     // For older servers, emulate JSON by encoding the request into an HTML-form.
     if (Backbone.emulateJSON) {
       params.contentType = 'application/x-www-form-urlencoded';
-      params.processData = true;
       params.data        = params.data ? {model : params.data} : {};
     }
 
@@ -1069,6 +1070,11 @@
       }
     }
 
+    // Don't process data on a non-GET request.
+    if (params.type !== 'GET' && ! Backbone.emulateJSON) {
+      params.processData = false;
+    }
+
     // Make the request.
     return $.ajax(params);
   };

data/vendor/assets/javascripts/backbone_rails_sync.js

@@ -22,7 +22,6 @@
     var params = _.extend({
       type:         type,
       dataType:     'json',
-      processData:  false,
       beforeSend: function( xhr ) {
         var token = $('meta[name="csrf-token"]').attr('content');
         if (token) xhr.setRequestHeader('X-CSRF-Token', token);
@@ -48,6 +47,11 @@
       params.data = JSON.stringify(data)
     }
 
+    // Don't process data on a non-GET request.
+    if (params.type !== 'GET') {
+      params.processData = false;
+    }
+    
     // Make the request.
     return $.ajax(params);
   }

data/vendor/assets/javascripts/underscore.js

@@ -1,4 +1,4 @@
-//     Underscore.js 1.1.6
+//     Underscore.js 1.1.7
 //     (c) 2011 Jeremy Ashkenas, DocumentCloud Inc.
 //     Underscore is freely distributable under the MIT license.
 //     Portions of Underscore are inspired or borrowed from Prototype,
@@ -60,19 +60,19 @@
   }
 
   // Current version.
-  _.VERSION = '1.1.6';
+  _.VERSION = '1.1.7';
 
   // Collection Functions
   // --------------------
 
   // The cornerstone, an `each` implementation, aka `forEach`.
-  // Handles objects implementing `forEach`, arrays, and raw objects.
+  // Handles objects with the built-in `forEach`, arrays, and raw objects.
   // Delegates to **ECMAScript 5**'s native `forEach` if available.
   var each = _.each = _.forEach = function(obj, iterator, context) {
     if (obj == null) return;
     if (nativeForEach && obj.forEach === nativeForEach) {
       obj.forEach(iterator, context);
-    } else if (_.isNumber(obj.length)) {
+    } else if (obj.length === +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;
       }
@@ -107,7 +107,7 @@
       return initial ? obj.reduce(iterator, memo) : obj.reduce(iterator);
     }
     each(obj, function(value, index, list) {
-      if (!initial && index === 0) {
+      if (!initial) {
         memo = value;
         initial = true;
       } else {
@@ -182,14 +182,14 @@
   // Delegates to **ECMAScript 5**'s native `some` if available.
   // Aliased as `any`.
   var any = _.some = _.any = function(obj, iterator, context) {
-    iterator || (iterator = _.identity);
+    iterator = iterator || _.identity;
     var result = false;
     if (obj == null) return result;
     if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context);
     each(obj, function(value, index, list) {
-      if (result = iterator.call(context, value, index, list)) return breaker;
+      if (result |= iterator.call(context, value, index, list)) return breaker;
     });
-    return result;
+    return !!result;
   };
 
   // Determine if a given value is included in the array or object using `===`.
@@ -327,23 +327,34 @@
 
   // Return a version of the array that does not contain the specified value(s).
   _.without = function(array) {
-    var values = slice.call(arguments, 1);
-    return _.filter(array, function(value){ return !_.include(values, value); });
+    return _.difference(array, slice.call(arguments, 1));
   };
 
   // Produce a duplicate-free version of the array. If the array has already
   // been sorted, you have the option of using a faster algorithm.
   // Aliased as `unique`.
-  _.uniq = _.unique = function(array, isSorted) {
-    return _.reduce(array, function(memo, el, i) {
-      if (0 == i || (isSorted === true ? _.last(memo) != el : !_.include(memo, el))) memo[memo.length] = el;
+  _.uniq = _.unique = function(array, isSorted, iterator) {
+    var initial = iterator ? _.map(array, iterator) : array;
+    var result = [];
+    _.reduce(initial, function(memo, el, i) {
+      if (0 == i || (isSorted === true ? _.last(memo) != el : !_.include(memo, el))) {
+        memo[memo.length] = el;
+        result[result.length] = array[i];
+      }
       return memo;
     }, []);
+    return result;
+  };
+
+  // Produce an array that contains the union: each distinct element from all of
+  // the passed-in arrays.
+  _.union = function() {
+    return _.uniq(_.flatten(arguments));
   };
 
   // Produce an array that contains every item shared between all the
-  // passed-in arrays.
-  _.intersect = function(array) {
+  // passed-in arrays. (Aliased as "intersect" for back-compat.)
+  _.intersection = _.intersect = function(array) {
     var rest = slice.call(arguments, 1);
     return _.filter(_.uniq(array), function(item) {
       return _.every(rest, function(other) {
@@ -352,6 +363,12 @@
     });
   };
 
+  // Take the difference between one array and another.
+  // Only the elements present in just the first array will remain.
+  _.difference = function(array, other) {
+    return _.filter(array, function(value){ return !_.include(other, value); });
+  };
+
   // Zip together multiple lists into a single array -- elements that share
   // an index go together.
   _.zip = function() {
@@ -548,7 +565,11 @@
   // Return a sorted list of the function names available on the object.
   // Aliased as `methods`
   _.functions = _.methods = function(obj) {
-    return _.filter(_.keys(obj), function(key){ return _.isFunction(obj[key]); }).sort();
+    var names = [];
+    for (var key in obj) {
+      if (_.isFunction(obj[key])) names.push(key);
+    }
+    return names.sort();
   };
 
   // Extend a given object with all the properties in passed-in object(s).

metadata

@@ -2,7 +2,7 @@
 name: rails-backbone
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Ryan Fitzgerald
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-08 00:00:00 -04:00
+date: 2011-08-07 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.rc4
+        version: 3.1.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -103,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4012719302354285017
+      hash: -2957060880255582041
       segments: 
       - 0
       version: "0"
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4012719302354285017
+      hash: -2957060880255582041
       segments: 
       - 0
       version: "0"