js-routes 0.7.1 → 0.7.2

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/app/assets/javascripts/js-routes.js.erb

@@ -1 +1 @@
-<%= JsRoutes.generate %>
+<%= JsRoutes.assert_usable_configuration! && JsRoutes.generate %>

data/js-routes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{js-routes}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = %q{2011-10-06}
+  s.date = %q{2011-11-05}
   s.description = %q{Generates javascript file that defines all Rails named routes as javascript helpers}
   s.email = %q{agresso@gmail.com}
   s.extra_rdoc_files = [

data/lib/js_routes.rb

@@ -47,6 +47,16 @@ class JsRoutes
     def generate!(opts = {})
       new(opts).generate!
     end
+
+    # Under rails 3.1.1 and higher, perform a check to ensure that the
+    # full environment will be available during asset compilation.
+    # This is required to ensure routes are loaded.
+    def assert_usable_configuration!
+      if Rails.version > "3.1.0" && !Rails.application.config.assets.initialize_on_precompile 
+        raise("Cannot precompile js-routes unless environment is initialized. Please set config.assets.initialize_on_precompile to true.")
+      end
+      true
+    end
   end
 
   #

data/lib/routes.js

@@ -40,6 +40,12 @@
       return format ? "." + format : "";
     },
 
+    extract_anchor: function(options) {
+      var anchor = options.hasOwnProperty("anchor") ? options.anchor : null;
+      delete options.anchor;
+      return anchor ? "#" + anchor : "";
+    },
+
     extract_options: function(number_of_params, args) {
       if (args.length > number_of_params) {
         return typeof(args[args.length-1]) == "object" ?  args.pop() : {};
@@ -64,7 +70,7 @@
       var result = Utils.get_prefix();
       var opts = Utils.extract_options(number_of_params, args);
       if (args.length > number_of_params) {
-        throw new Error("Too many parameters provided for path")
+        throw new Error("Too many parameters provided for path");
       }
       var params_count = 0, optional_params_count = 0;
       for (var i=0; i < parts.length; i++) {
@@ -86,13 +92,14 @@
             if (Utils.specified(value)) {
               result += Utils.path_identifier(value);
             } else {
-              throw new Error("Insufficient parameters to build path")
+              throw new Error("Insufficient parameters to build path");
             }
           }
         }
       }
       var format = Utils.extract_format(opts);
-      return Utils.clean_path(result + format) + Utils.serialize(opts);
+      var anchor = Utils.extract_anchor(opts);
+      return Utils.clean_path(result + format + anchor) + Utils.serialize(opts);
     },
 
     specified: function(value) {

data/spec/js_routes_spec.rb

@@ -47,6 +47,10 @@ describe JsRoutes do
     it "should support routes with reserved javascript words as parameters" do
       evaljs("Routes.object_path(1, 2)").should == routes.object_path(1,2)
     end
+
+    it "should support url anchor given as parameter" do
+      evaljs("Routes.inbox_path(1, {anchor: 'hello'})").should == routes.inbox_path(1, :anchor => "hello")
+    end
   end
 
   context "when wrong parameters given" do

data/spec/post_rails_init_spec.rb

@@ -15,10 +15,10 @@ describe "after Rails initialization" do
   after(:all) do
     FileUtils.rm_f(name)
   end
-  
+
   context '.generate!' do
     it "should generate routes file" do
-      File.exists?(name).should be_true 
+      File.exists?(name).should be_true
     end
   end
 
@@ -45,26 +45,62 @@ describe "after Rails initialization" do
       end
 
       context "the preprocessor" do
+        before(:each) do
+          ctx.should_receive(:depend_on).with(Rails.root.join('config','routes.rb'))
+        end
+        let!(:ctx) do
+          Sprockets::Context.new(Rails.application.assets,
+                                 'js-routes.js',
+                                 Pathname.new('js-routes.js'))
+
+        end
         context "when dealing with js-routes.js" do
-          it "should depend on routes.rb" do
-            ctx = Sprockets::Context.new(Rails.application.assets,
-                                         'js-routes.js',
-                                         Pathname.new('js-routes.js'))
-            ctx.should_receive(:depend_on).with(Rails.root.join('config','routes.rb'))
-            ctx.evaluate('js-routes.js')
+
+          #TODO: check why doesn't work with let callbacks
+          context 'with Rails 3.1.0' do
+            before(:each) do
+              Rails.stub!("version").and_return("3.1.0")
+            end
+
+            it "should render some javascript" do
+              ctx.evaluate('js-routes.js').should =~ /window\.Routes/
+            end
           end
-        end
 
-        context "when not dealing with js-routes.js" do
-          it "should not depend on routes.rb" do
-            ctx = Sprockets::Context.new(Rails.application.assets,
-                                         'test.js',
-                                         test_asset_path)
-            ctx.should_not_receive(:depend_on)
-            ctx.evaluate('test.js')
+          context "with Rails 3.1.1" do
+            before(:each) do
+              Rails.stub!("version").and_return("3.1.1")
+            end
+            context "and initialize on precompile" do
+              before(:each) do
+                Rails.application.config.assets.initialize_on_precompile = true
+              end
+              it "should render some javascript" do
+                ctx.evaluate('js-routes.js').should =~ /window\.Routes/
+              end
+            end
+            context "and not initialize on precompile" do
+              before(:each) do
+                Rails.application.config.assets.initialize_on_precompile = false
+              end
+              it "should raise an exception" do
+                lambda { ctx.evaluate('js-routes.js') }.should raise_error(/Cannot precompile/)
+              end
+            end
+
           end
         end
 
+
+      end
+      context "when not dealing with js-routes.js" do
+        it "should not depend on routes.rb" do
+          ctx = Sprockets::Context.new(Rails.application.assets,
+                                       'test.js',
+                                       test_asset_path)
+          ctx.should_not_receive(:depend_on)
+          ctx.evaluate('test.js')
+        end
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: js-routes
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - Bogdan Gusiev
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-06 00:00:00 +03:00
+date: 2011-11-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency