rails-backbone 0.5.2 → 0.5.3

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

@@ -1,6 +1,10 @@
+require 'generators/backbone/resource_helpers'
+
 module Backbone
   module Generators
     class InstallGenerator < Rails::Generators::Base
+      include Backbone::Generators::ResourceHelpers
+      
       source_root File.expand_path("../templates", __FILE__)
   
       desc "This generator installs backbone.js with a default folder layout in app/assets/javascripts/backbone"
@@ -10,7 +14,7 @@ module Backbone
                                       
       def inject_backbone
         inject_into_file "app/assets/javascripts/application.js", :before => "//= require_tree" do
-          "//= require underscore\n//= require backbone\n//= require backbone_rails_sync\n//= require backbone_datalink\n//= require backbone/#{application_name}\n"
+          "//= require underscore\n//= require backbone\n//= require backbone_rails_sync\n//= require backbone_datalink\n//= require backbone/#{application_name.underscore}\n"
         end
       end
     
@@ -22,17 +26,8 @@ module Backbone
       end
     
       def create_app_file
-        template "app.coffee", "app/assets/javascripts/backbone/#{application_name}.js.coffee"
+        template "app.coffee", "app/assets/javascripts/backbone/#{application_name.underscore}.js.coffee"
       end
-    
-      protected
-        def application_name
-          if defined?(Rails) && Rails.application
-            Rails.application.class.name.split('::').first
-          else
-            "application"
-          end
-        end
      
     end
   end

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

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

data/lib/generators/backbone/resource_helpers.rb

@@ -7,7 +7,7 @@ module Backbone
       end
       
       def model_namespace
-        [application_name.camelize, "Models", class_name].join(".")
+        [js_app_name, "Models", class_name].join(".")
       end
       
       def singular_model_name
@@ -19,21 +19,33 @@ module Backbone
       end
       
       def collection_namespace
-        [application_name.camelize, "Collections", plural_name.camelize].join(".")
+        [js_app_name, "Collections", plural_name.camelize].join(".")
       end
       
       def view_namespace
-        [application_name.camelize, "Views", plural_name.camelize].join(".")
+        [js_app_name, "Views", plural_name.camelize].join(".")
       end
       
       def router_namespace
-        [application_name.camelize, "Routers", plural_name.camelize].join(".")
+        [js_app_name, "Routers", plural_name.camelize].join(".")
       end
       
       def jst(action)
         "backbone/templates/#{plural_name}/#{action}"
       end
       
+      def js_app_name
+        application_name.camelize
+      end
+      
+      def application_name
+        if defined?(Rails) && Rails.application
+          Rails.application.class.name.split('::').first
+        else
+          "application"
+        end
+      end
+      
       def uncapitalize(str)
           str[0, 1].downcase + str[1..-1]
       end

data/lib/generators/backbone/router/router_generator.rb

@@ -38,9 +38,6 @@ module Backbone
            template "template.jst", @jst_path
          end
       end
-      
-      protected
-        
 
     end
   end

data/vendor/assets/javascripts/backbone.js

@@ -1,4 +1,4 @@
-//     Backbone.js 0.5.2
+//     Backbone.js 0.5.3
 //     (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.2';
+  Backbone.VERSION = '0.5.3';
 
   // Require Underscore, if we're on the server, and it's not already present.
   var _ = root._;
@@ -766,7 +766,7 @@
           fragment = window.location.hash;
         }
       }
-      return fragment.replace(hashStrip, '');
+      return decodeURIComponent(fragment.replace(hashStrip, ''));
     },
 
     // Start the hash change handling, returning `true` if the current URL matches
@@ -812,7 +812,10 @@
         this.fragment = loc.hash.replace(hashStrip, '');
         window.history.replaceState({}, document.title, loc.protocol + '//' + loc.host + this.options.root + this.fragment);
       }
-      return this.loadUrl();
+
+      if (!this.options.silent) {
+        return this.loadUrl();
+      }
     },
 
     // Add a route to be tested when the fragment changes. Routes added later may
@@ -1071,7 +1074,7 @@
     }
 
     // Don't process data on a non-GET request.
-    if (params.type !== 'GET' && ! Backbone.emulateJSON) {
+    if (params.type !== 'GET' && !Backbone.emulateJSON) {
       params.processData = false;
     }
 

metadata

@@ -2,7 +2,7 @@
 name: rails-backbone
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Ryan Fitzgerald
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-07 00:00:00 -04:00
+date: 2011-08-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2957060880255582041
+      hash: 2831200879708897934
       segments: 
       - 0
       version: "0"
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2957060880255582041
+      hash: 2831200879708897934
       segments: 
       - 0
       version: "0"