js-routes 0.8.5 → 0.8.6

data/Rakefile

@@ -13,7 +13,6 @@ require 'rake'
 
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "js-routes"
   gem.homepage = "http://github.com/railsware/js-routes"
   gem.license = "MIT"

data/Readme.md

@@ -20,7 +20,19 @@ Require js routes file in `application.js` or other bundle
 */
 ```
 
-**Optional**: If you need to customize routes file create initializer, like `config/initializers/jsroutes.rb`:
+Also in order to flush asset pipeline cache sometimes you might need to run:
+
+``` sh
+rake tmp:cache:clear
+```
+
+This cache is not flushed on server restart in development environment. 
+
+**Important:** If routes.js file is not updated after some configuration change you need to run this command again.
+
+### Advanced Setup
+
+If you need to customize routes file create initializer, like `config/initializers/jsroutes.rb`:
 
 ``` ruby
 JsRoutes.setup do |config|
@@ -41,8 +53,6 @@ Available options:
   * Example: `http://yourdomain.com`. This will cause route helpers to generate full path only. 
 
 
-### Advanced Setup
-
 You can generate routes files on the application side like this:
 
 ``` ruby

data/VERSION

@@ -1 +1 @@
-0.8.5
+0.8.6

data/js-routes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "js-routes"
-  s.version = "0.8.5"
+  s.version = "0.8.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2013-01-04"
+  s.date = "2013-01-24"
   s.description = "Generates javascript file that defines all Rails named routes as javascript helpers"
   s.email = "agresso@gmail.com"
   s.extra_rdoc_files = [

data/lib/routes.js

@@ -41,7 +41,7 @@
 
     clean_path: function(path) {
       path = path.split("://");
-      last_index = path.length - 1;
+      var last_index = path.length - 1;
       path[last_index] = path[last_index].replace(/\/+/g, "/").replace(/\/$/m, '');
       return path.join("://");
     },
@@ -65,9 +65,14 @@
     },
 
     path_identifier: function(object) {
-      if (!object) {
-        return "";
+      if (object === 0) {
+	return '0';
       }
+
+      if (! object) { // null, undefined, false or ''
+	return '';
+      }
+
       if (typeof(object) == "object") {
         var property = object.to_param || object.id || object;
         if (typeof(property) == "function") {
@@ -109,7 +114,7 @@
         throw new Error("Too many parameters provided for path");
       }
 
-      parameters = this.prepare_parameters(required_parameters, args, opts);
+      var parameters = this.prepare_parameters(required_parameters, args, opts);
       // Array#indexOf is not supported by IE <= 8, so we use custom method
       if (Utils.smartIndexOf(optional_parts, 'format') !== -1) {
         this.set_default_format(parameters);
@@ -127,23 +132,42 @@
      * and parsed route binary tree.
      * Binary tree is serialized in the following way:
      * [node type, left node, right node ]
+     *
+     *@param  {Boolean} optional  Marks the currently visited branch as optional. If set to `true`, this method will not throw when encountering a missing parameter (used in recursive calls).
      */
-    visit: function(route, options) {
+    visit: function(route, options, optional) {
       var type = route[0];
       var left = route[1];
       var right = route[2];
       switch (type) {
         case NodeTypes.GROUP:
-          return this.visit_group(left, options)
+          return this.visit(left, options, true)
         case NodeTypes.STAR:
-          return this.visit_group(left, options)
+          return this.visit(left, options, true)
         case NodeTypes.CAT:
-          return this.visit(left, options) + this.visit(right, options);
+          var leftPart = this.visit(left, options, optional),
+              rightPart = this.visit(right, options, optional);
+
+          if (optional && ! (leftPart && rightPart))
+            return '';
+
+          return leftPart + rightPart;
+        case NodeTypes.LITERAL:
+          return left;
+        case NodeTypes.SLASH:
+          return left;
+        case NodeTypes.DOT:
+          return left;
         case NodeTypes.SYMBOL:
           var value = options[left];
-          if (value) {
+
+          if (value || value === 0) {
             delete options[left];
-            return this.path_identifier(value); 
+            return this.path_identifier(value);
+          }
+
+          if (optional) {
+            return '';  // missing parameter
           } else {
             throw new ParameterMissing("Route parameter missing: " + left);
           }
@@ -152,28 +176,9 @@
          * Please send your PR if you do
          */
         //case NodeTypes.OR:
-        case NodeTypes.LITERAL:
-          return left;
-        case NodeTypes.SLASH:
-          return left;
-        case NodeTypes.DOT:
-          return left;
         default:
           throw new Error("Unknown Rails node type");
       }
-      
-    },
-
-    visit_group: function(left, options) {
-      try {
-        return this.visit(left, options);
-      } catch(e) {
-        if (e instanceof ParameterMissing) {
-          return "";
-        } else {
-          throw e;
-        }
-      }
     },
 
     get_prefix: function(){

data/spec/js_routes/rails_routes_compatibility_spec.rb

@@ -15,6 +15,10 @@ describe JsRoutes, "compatibility with Rails"  do
     evaljs("Routes.inbox_path(1)").should == routes.inbox_path(1)
   end
 
+  it "should support 0 as a member parameter" do
+    evaljs("Routes.inbox_path(0)").should == routes.inbox_path(0)
+  end
+
   it "should generate nested routing with one parameter" do
     evaljs("Routes.inbox_messages_path(1)").should == routes.inbox_messages_path(1)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: js-routes
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -135,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2174231102950156016
+      hash: -2317376881540244004
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: