js-routes 0.6.0 → 0.6.1

data/Readme.md

@@ -7,7 +7,7 @@ Generates javascript file that defines all Rails named routes as javascript help
 Your Rails Gemfile:
 
 ``` ruby
-gem "js-routes"
+gem "js-routes", :require => 'js_routes'
 ```
 
 Your application initializer, like `config/initializers/jsroutes.rb`:
@@ -72,9 +72,17 @@ In order to make routes helpers available globally:
 jQuery.extend(window, Routes)
 ```
 
-### Alternative
+### What about security?
 
-There are some alternatives available. Advantages of this one are:
+js-routes itself do not have security holes. It makes URLs 
+without access protection more reachable by potential attacker.
+In order to prevent this use `:exclude` option for sensitive urls like `/admin_/`
+
+
+### Advantages over alternatives
+
+There are some alternatives available. Most of them has only basic feature and don't reach the level of quality I accept. 
+Advantages of this one are:
 
 * Rails3 support
 * Rich options set

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/js-routes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{js-routes}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = %q{2011-08-22}
+  s.date = %q{2011-09-12}
   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/routes.js

@@ -17,7 +17,7 @@
     },
 
     clean_path: function(path) {
-      return path.replace(/\.$/m, '').replace(/\/$/m, '');
+      return path.replace(/\/+/g, "/").replace(/[\)\(]/g, "").replace(/\.$/m, '').replace(/\/$/m, '');
     },
 
     extract_format: function(options) {
@@ -50,13 +50,29 @@
       result = "";
       var opts = Utils.extract_options(number_of_params, args);
       for (var i=0; i < parts.length; i++) {
+        value = args.shift();
         part = parts[i];
-        result += part;
-        result += Utils.path_identifier(args.shift());
+        if (Utils.specified(value)) {
+          result += part;
+          result += Utils.path_identifier(value);
+        } else if (!Utils.optional_part(part)) {
+          //TODO: make it strict
+          //throw new Error("Can not build path: required parameter is null or undefined.");
+          result += part;
+        }
       }
       var format = Utils.extract_format(opts);
       return Utils.clean_path(result + format) + Utils.serialize(opts);
+    },
+
+    specified: function(value) {
+      return !(value === undefined || value === null);
+    },
+
+    optional_part: function(part) {
+      return part.match(/\(/);
     }
+
   };
 
   window.NAMESPACE = ROUTES;

data/spec/js_routes_spec.rb

@@ -38,10 +38,7 @@ describe JsRoutes do
   end
 
   it "should support routes with reserved javascript words as parameters" do
-    #TODO: this doesn't actually test what it should test 
-    #because the parameter name is return_id
-    #need to find the real way to test
-    evaljs("Routes.return_path(1)").should == "/returns/1"
+    evaljs("Routes.object_path(1, 2)").should == "/returns/1/objects/2"
   end
 
   context "when exclude is specified" do
@@ -100,23 +97,44 @@ describe JsRoutes do
     it "should use this name space for routing" do
       evaljs("PHM.Routes.inbox_path").should_not be_nil
     end
-    
   end
 
   context "when arguments are objects" do
-    it "should use id property of the object" do
+    it "should use id property of the object in path" do
       evaljs("Routes.inbox_path({id: 1})").should == "/inboxes/1"
     end
 
-    it "should use prefer to_param property over id property" do
+    it "should prefer to_param property over id property" do
       evaljs("Routes.inbox_path({id: 1, to_param: 'my'})").should == "/inboxes/my"
     end
 
-    it "should support still support options argument" do
+    it "should support options argument" do
       evaljs("Routes.inbox_message_path({id:1, to_param: 'my'}, {id:2}, {custom: true, format: 'json'})").should == "/inboxes/my/messages/2.json?custom=true"
     end
   end
 
+  context "using optional path fragments" do
+    context "but not including them" do
+      it "should not include the optional parts" do
+        evaljs("Routes.things_path()").should == "/things"
+      end
+
+      it "should treat undefined as non-given optional part" do
+        evaljs("Routes.thing_path(undefined, 5)").should == "/things/5"
+      end
+
+      it "should treat null as non-given optional part" do
+        evaljs("Routes.thing_path(null, 5)").should == "/things/5"
+      end
+    end
+
+    context "and including them" do
+      it "should include the optional parts" do
+        evaljs("Routes.things_path(5)").should == "/optional/5/things"
+      end
+    end
+  end
+
   describe "generated js" do
     subject { JsRoutes.generate }
     it "should have correct function without arguments signature" do

data/spec/spec_helper.rb

@@ -24,7 +24,14 @@ class App < Rails::Application
       resources :users
     end
 
+    scope "/returns/:return" do
+      resources :objects
+    end
     resources :returns
+
+    scope "(/optional/:optional_id)" do
+      resources :things
+    end
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: js-routes
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Bogdan Gusiev
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 +03:00
+date: 2011-09-12 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency