js-routes 0.7.5 → 0.8.0

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "rails", ">= 3.0"
+gem "rails", ">= 3.2"
 
 group :development do
   gem "therubyracer"

data/Gemfile.lock

@@ -1,37 +1,34 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.0)
-      actionpack (= 3.1.0)
-      mail (~> 2.3.0)
-    actionpack (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
+    actionmailer (3.2.1)
+      actionpack (= 3.2.1)
+      mail (~> 2.4.0)
+    actionpack (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.2)
-      rack-cache (~> 1.0.3)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.1)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.0)
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-      arel (~> 2.2.1)
+    activerecord (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+      arel (~> 3.0.0)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-    activesupport (3.1.0)
+    activeresource (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+    activesupport (3.2.1)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.1)
-    bcrypt-ruby (3.0.1)
+    arel (3.0.0)
     builder (3.0.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
@@ -42,41 +39,42 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    journey (1.0.1)
+    json (1.6.5)
     libv8 (3.3.10.4)
-    mail (2.3.0)
+    mail (2.4.1)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    multi_json (1.0.3)
-    polyglot (0.3.2)
-    rack (1.3.3)
-    rack-cache (1.0.3)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.1)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.0)
-      actionmailer (= 3.1.0)
-      actionpack (= 3.1.0)
-      activerecord (= 3.1.0)
-      activeresource (= 3.1.0)
-      activesupport (= 3.1.0)
+    rails (3.2.1)
+      actionmailer (= 3.2.1)
+      actionpack (= 3.2.1)
+      activerecord (= 3.2.1)
+      activeresource (= 3.2.1)
+      activesupport (= 3.2.1)
       bundler (~> 1.0)
-      railties (= 3.1.0)
-    railties (3.1.0)
-      actionpack (= 3.1.0)
-      activesupport (= 3.1.0)
+      railties (= 3.2.1)
+    railties (3.2.1)
+      actionpack (= 3.2.1)
+      activesupport (= 3.2.1)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2)
     rcov (0.9.9)
-    rdoc (3.9.4)
+    rdoc (3.12)
+      json (~> 1.4)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
       rspec-expectations (~> 2.7.0)
@@ -85,7 +83,7 @@ GEM
     rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.7.0)
-    sprockets (2.0.0)
+    sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -96,7 +94,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
+    tzinfo (0.3.31)
 
 PLATFORMS
   ruby
@@ -104,7 +102,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.2)
-  rails (>= 3.0)
+  rails (>= 3.2)
   rcov
   rspec (~> 2.7.0)
   therubyracer

data/Readme.md

@@ -1,8 +1,8 @@
-## JsRoutes
+# JsRoutes
 
 Generates javascript file that defines all Rails named routes as javascript helpers
 
-### Intallation
+## Intallation
 
 Your Rails Gemfile:
 
@@ -10,44 +10,53 @@ Your Rails Gemfile:
 gem "js-routes"
 ```
 
-Your application initializer, like `config/initializers/jsroutes.rb`:
+### Basic Setup (Asset Pipeline)
+
+Require js routes file in `application.js` or other bundle
+
+``` js
+/*
+= require js-routes
+*/
+```
+
+**Optional**: If you need to customize routes file create initializer, like `config/initializers/jsroutes.rb`:
 
 ``` ruby
-JsRoutes.generate!({
- #options
+JsRoutes.setup do |config|
+  config.option = value
 })
 ```
 
 Available options:
 
-* `:file` - the file to generate the routes. Default: 
-  * `#{Rails.root}/app/assets/javascripts/routes.js` for Rails >= 3.1
-  * `#{Rails.root}/public/javascripts/routes.js` for Rails < 3.1
-* `:default_format` - Format to append to urls. Default: blank
-* `:exclude` - Array of regexps to exclude from js routes. Default: []
+* `default_format` - Format to append to urls. Default: blank
+* `exclude` - Array of regexps to exclude from js routes. Default: []
   * Note that regexp applied to **named route** not to *URL*
-* `:include` - Array of regexps to include in js routes. Default: []
+* `include` - Array of regexps to include in js routes. Default: []
   * Note that regexp applied to **named route** not to *URL*
-* `:namespace` - global object used to access routes. Default: `Routes`
+* `namespace` - global object used to access routes. Default: `Routes`
   * Supports nested namespace like `MyProject.routes`
-* `:prefix` - String representing a url path to prepend to all paths
-  * `Should be specified via :prefix => "/myprefix"`
+* `prefix` - String representing a url path to prepend to all paths. Default: blank
+
+
+### Advanced Setup
 
-This is how you can generate separated routes files for different parts of application:
+You can generate routes files on the application side like this:
 
 ``` ruby
-JsRoutes.generate!(:file => "#{path}/app_routes.js", :namespace => "AppRoutes", :exclude => /^admin_/, :default_format => "json")
-JsRoutes.generate!(:file => "#{path}/adm_routes.js", :namespace => "AdmRoutes", :include => /^admin_/, :default_format => "json")
+JsRoutes.generate!("#{path}/app_routes.js", :namespace => "AppRoutes", :exclude => /^admin_/, :default_format => "json")
+JsRoutes.generate!("#{path}/adm_routes.js", :namespace => "AdmRoutes", :include => /^admin_/, :default_format => "json")
 ```
 
-In order to generate routes to string and manipulate them yourself use:
+In order to generate javascript to string and manipulate them yourself use:
 Like:
 
 ``` ruby
 routes_js = JsRoutes.generate(options)
 ```
 
-### Usage
+## Usage
 
 Configuration above will create a nice javascript file with `Routes` object that has all the rails routes available:
 
@@ -75,13 +84,13 @@ In order to make routes helpers available globally:
 jQuery.extend(window, Routes)
 ```
 
-### What about security?
+## What about security?
 
 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_/`
 
-### Spork
+## Spork
 
 When using Spork and `Spork.trap_method(Rails::Application::RoutesReloader, :reload!)` you should also do:
 
@@ -89,7 +98,7 @@ When using Spork and `Spork.trap_method(Rails::Application::RoutesReloader, :rel
 Spork.trap_method(JsRoutes, :generate!)
 ```
 
-### Advantages over alternatives
+## 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:

data/VERSION

@@ -1 +1 @@
-0.7.5
+0.8.0

data/js-routes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "js-routes"
-  s.version = "0.7.5"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2012-02-13"
+  s.date = "2012-03-02"
   s.description = "Generates javascript file that defines all Rails named routes as javascript helpers"
   s.email = "agresso@gmail.com"
   s.extra_rdoc_files = [
@@ -46,14 +46,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.0"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.2"])
       s.add_development_dependency(%q<therubyracer>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.7.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 3.0"])
+      s.add_dependency(%q<rails>, [">= 3.2"])
       s.add_dependency(%q<therubyracer>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.7.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -61,7 +61,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.0"])
+    s.add_dependency(%q<rails>, [">= 3.2"])
     s.add_dependency(%q<therubyracer>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.7.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/lib/js_routes.rb

@@ -4,11 +4,7 @@ class JsRoutes
   # OPTIONS
   #
 
-  DEFAULT_PATH = if Rails.version >= "3.1"
-                   File.join('app','assets','javascripts','routes.js')
-                 else
-                   File.join('public','javascripts','routes.js')
-                 end
+  DEFAULT_PATH = File.join('app','assets','javascripts','routes.js')
 
   DEFAULTS = {
     :namespace => "Routes",
@@ -19,6 +15,18 @@ class JsRoutes
     :prefix => ""
   }
 
+  # We encode node symbols as integer to reduce the routes.js file size
+  NODE_TYPES = {
+    :GROUP => 1,
+    :CAT => 2,
+    :SYMBOL => 3,
+    :OR => 4,
+    :STAR => 5,
+    :LITERAL => 6,
+    :SLASH => 7,
+    :DOT => 8
+  }
+
   class Options < Struct.new(*DEFAULTS.keys)
     def to_hash
       Hash[*members.zip(values).flatten(1)].symbolize_keys
@@ -44,19 +52,27 @@ class JsRoutes
       new(opts).generate
     end
 
-    def generate!(opts = {})
-      new(opts).generate!
+    def generate!(file_name, opts = {})
+      if file_name.is_a?(Hash)
+        opts = file_name
+        file_name = opts[:file]
+      end
+      new(opts).generate!(file_name)
     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 
+      unless 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
+
+    def json(string)
+      ActiveSupport::JSON.encode(string)
+    end
   end
 
   #
@@ -72,15 +88,16 @@ class JsRoutes
     js.gsub!("NAMESPACE", @options[:namespace])
     js.gsub!("DEFAULT_FORMAT", @options[:default_format].to_s)
     js.gsub!("PREFIX", @options[:prefix])
+    js.gsub!("NODE_TYPES", json(NODE_TYPES))
     js.gsub!("ROUTES", js_routes)
   end
 
-  def generate!
+  def generate!(file_name)
     # Some libraries like Devise do not yet loaded their routes so we will wait
     # until initialization process finish
     # https://github.com/railsware/js-routes/issues/7
     Rails.configuration.after_initialize do
-      File.open(Rails.root.join(@options[:file]), 'w') do |f|
+      File.open(Rails.root.join(file_name || DEFAULT_PATH), 'w') do |f|
         f.write generate
       end
     end
@@ -107,68 +124,38 @@ class JsRoutes
   end
 
   def build_js(route)
-    params = build_params route
     _ = <<-JS.strip!
-  // #{route.name} => #{route_spec(route)}
-  #{route.name}_path: function(#{(params + ["options"]).join(", ")}) {
-  return Utils.build_path(#{params.size}, #{path_parts(route).inspect}, #{optional_params(route).inspect}, arguments)
+  // #{route.name} => #{route.path.spec}
+  #{route.name}_path: function(#{build_params(route)}) {
+  return Utils.build_path(#{json(route.required_parts)}, #{json(serialize(route.path.spec))}, arguments)
   }
   JS
   end
 
-  # TODO: might be possible to simplify this to use route.path
-  # instead of all this path_info.source madness
-  def optional_params(route)
-    if Rails.version >= "3.2.0"
-      return route.optional_parts.map(&:to_s)
-    end
-    path_info = route.conditions[:path_info]
-    path_info_source = path_info.source
-    if RUBY_VERSION >= '1.9.2'
-      optional_named_captures_regexp = /\?\:.+?\(\?\<(.+?)\>/
-      path_info_source.scan(optional_named_captures_regexp).flatten
-    else
-      re = Regexp.escape("([^/.?]+)")
-      optional_named_captures_regexp = /#{re}|\(\?\:.+?\)\?/
-      captures = path_info_source.scan(optional_named_captures_regexp).flatten
-      named_captures = path_info.named_captures.to_a.sort_by {|cap|cap.last.first} 
-      captures.zip(named_captures).map do |type, (name, pos)|
-        name unless type == '([^/.?]+)'
-      end.compact
-    end
+  def json(string)
+    self.class.json(string)
   end
 
   def build_params route
-    required_params(route).map do |name|
+    params = route.required_parts.map do |name|
       # prepending each parameter name with underscore
       # to prevent conflict with JS reserved words
       "_" + name.to_s
-    end
-  end
-
-
-  def path_parts route
-    route_spec(route).gsub(/\(\.:format\)$/, "").split(/:[a-z\-_]+/)
+    end << "options"
+    params.join(", ")
   end
 
-  def route_spec route
-    if Rails.version >= "3.2.0"
-      route.path.spec
-    else
-      route.path
-    end.to_s
-  end
-
-  def required_params(route)
-    if Rails.version >= "3.2.0"
-      return route.required_parts.map(&:to_s)
-    end # if
-    optional_named_captures = optional_params(route)
-    route.conditions[:path_info].named_captures.to_a.sort_by do |cap1|
-      # Hash is not ordered in Ruby 1.8.7
-      cap1.last.first
-    end.map(&:first).reject do |name|
-      optional_named_captures.include?(name.to_s)
-    end
+  # This function serializes Journey route into JSON structure
+  # We do not use Hash for human readable serialization
+  # And preffer Array serialization because it is shorter.
+  # Routes.js file will be smaller.
+  def serialize(spec)
+    return nil unless spec
+    return spec.tr(':', '') if spec.is_a?(String)
+    [      
+      NODE_TYPES[spec.type],
+      serialize(spec.left),
+      spec.respond_to?(:right) && serialize(spec.right)
+    ]
   end
 end

data/lib/js_routes/engine.rb

@@ -1,4 +1,4 @@
-if defined?(Rails) && Rails.version >= "3.1"
+if defined?(Rails)
   class JsRoutes
     class Engine < Rails::Engine
       JS_ROUTES_ASSET = 'js-routes'

data/lib/routes.js

@@ -1,9 +1,16 @@
 (function(){
 
+  function ParameterMissing(message) {
+   this.message = message;
+  }
+  ParameterMissing.prototype = new Error(); 
+
   var defaults = {
     prefix: 'PREFIX',
     format: 'DEFAULT_FORMAT'
   };
+
+  var NodeTypes = NODE_TYPES
   
   var Utils = {
 
@@ -32,21 +39,8 @@
       return path.replace(/\/+/g, "/").replace(/[\)\(]/g, "").replace(/\.$/m, '').replace(/\/$/m, '');
     },
 
-    extract: function(name, options) {
-      var o = undefined;
-      if (options.hasOwnProperty(name)) {
-        o = options[name];
-        delete options[name];
-      } else if (defaults.hasOwnProperty(name)) {
-        o = defaults[name];
-      }
-      return o;
-    },
-
-    extract_format: function(options) {
-      var format = options.hasOwnProperty("format") ? options.format : defaults.format;
-      delete options.format;
-      return format ? "." + format : "";
+    set_default_format: function(options) {
+      if (!options.hasOwnProperty("format")) options.format = defaults.format;
     },
 
     extract_anchor: function(options) {
@@ -74,49 +68,87 @@
       }
     },
 
-    build_path: function(number_of_params, parts, optional_params, args) {
+    clone: function (obj) {
+      if (null == obj || "object" != typeof obj) return obj;
+      var copy = obj.constructor();
+      for (var attr in obj) {
+        if (obj.hasOwnProperty(attr)) copy[attr] = obj[attr];
+      }
+      return copy;
+    },
+
+    prepare_parameters: function(required_parameters, actual_parameters, options) {
+      var result = this.clone(options);
+      for (var i=0; i < required_parameters.length; i++) {
+        result[required_parameters[i]] = actual_parameters[i];
+      }
+      return result;
+    },
+
+    build_path: function(required_parameters, route, args) {
       args = Array.prototype.slice.call(args);
-      var result = Utils.get_prefix();
-      var opts = Utils.extract_options(number_of_params, args);
-      if (args.length > number_of_params) {
+      var opts = this.extract_options(required_parameters.length, args);
+      if (args.length > required_parameters.length) {
         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++) {
-        var part = parts[i];
-        if (Utils.optional_part(part)) {
-          var name = optional_params[optional_params_count];
-          optional_params_count++;
-          // try and find the option in opts
-          var optional = Utils.extract(name, opts);
-          if (Utils.specified(optional)) {
-            result += part;
-            result += Utils.path_identifier(optional);
-          }
-        } else {
-          result += part;
-          if (params_count < number_of_params) {
-            params_count++;
-            var value = args.shift();
-            if (Utils.specified(value)) {
-              result += Utils.path_identifier(value);
+
+      parameters = this.prepare_parameters(required_parameters, args, opts);
+      this.set_default_format(parameters);
+      var result = Utils.get_prefix();
+      var anchor = Utils.extract_anchor(parameters);
+
+      result += this.visit(route, parameters)
+      return Utils.clean_path(result + anchor) + Utils.serialize(parameters);
+    },
+
+    /*
+     * This function is JavaScript impelementation of the
+     * Journey::Visitors::Formatter that builds route by given parameters
+     * and parsed route binary tree.
+     * Binary tree is serialized in the following way:
+     * [node type, left node, right node ]
+     */
+    visit: function(route, options) {
+      var type = route[0];
+      var left = route[1];
+      var right = route[2];
+      switch (type) {
+        case NodeTypes.GROUP:
+          try {
+            return this.visit(left, options);
+          } catch(e) {
+            if (e instanceof ParameterMissing) {
+              return "";
             } else {
-              throw new Error("Insufficient parameters to build path");
+              throw e;
             }
           }
-        }
+        case NodeTypes.CAT:
+          return this.visit(left, options) + this.visit(right, options);
+        case NodeTypes.SYMBOL:
+          var value = options[left];
+          if (value) {
+            delete options[left];
+            return this.path_identifier(value); 
+          } else {
+            throw new ParameterMissing("Route parameter missing: " + left);
+          }
+        /*
+         * I don't know what are these node types
+         * Please send your PR if you do
+         */
+        //case NodeTypes.OR:
+        //case NodeTypes.STAR:
+        case NodeTypes.LITERAL:
+          return left;
+        case NodeTypes.SLASH:
+          return left;
+        case NodeTypes.DOT:
+          return left;
+        default:
+          throw new Error("Unknown Rails node type");
       }
-      var format = Utils.extract_format(opts);
-      var anchor = Utils.extract_anchor(opts);
-      return Utils.clean_path(result + format + anchor) + Utils.serialize(opts);
-    },
-
-    specified: function(value) {
-      return !(value === undefined || value === null);
-    },
-
-    optional_part: function(part) {
-      return part.match(/\(/);
+      
     },
 
     get_prefix: function(){

data/spec/js_routes_spec.rb

@@ -193,6 +193,12 @@ describe JsRoutes do
   end
 
   context "using optional path fragments" do
+  	context "including not optional parts" do
+  		it "should include everything that is not optional" do
+      	evaljs("Routes.foo_path()").should == routes.foo_path
+  		end
+  	end
+
     context "but not including them" do
       it "should not include the optional parts" do
         evaljs("Routes.things_path()").should == routes.things_path

data/spec/post_rails_init_spec.rb

@@ -7,7 +7,8 @@ describe "after Rails initialization" do
   before(:all) do
 
     FileUtils.rm_f(name)
-    JsRoutes.generate!({:file => name})
+    JsRoutes.generate!(name)
+
 
     Rails.application.initialize!
   end
@@ -16,91 +17,74 @@ describe "after Rails initialization" do
     FileUtils.rm_f(name)
   end
 
-  context '.generate!' do
-    it "should generate routes file" do
-      File.exists?(name).should be_true
-    end
+  it "should generate routes file" do
+    File.exists?(name).should be_true
   end
 
-  if Rails.version >= "3.1"
-    context "JsRoutes::Engine" do
+  context "JsRoutes::Engine" do
 
-      let(:test_asset_path) {
-        Rails.root.join('app','assets','javascripts','test.js')
-      }
+    let(:test_asset_path) {
+      Rails.root.join('app','assets','javascripts','test.js')
+    }
 
-      before(:all) do
-        File.open(test_asset_path,'w') do |f|
-          f.puts "function() {}"
-        end
-      end
-      after(:all) do
-        FileUtils.rm_f(test_asset_path)
+    before(:all) do
+      File.open(test_asset_path,'w') do |f|
+        f.puts "function() {}"
       end
+    end
+    after(:all) do
+      FileUtils.rm_f(test_asset_path)
+    end
+
+    it "should have registered a preprocessor" do
+      pps = Rails.application.assets.preprocessors
+      js_pps = pps['application/javascript']
+      js_pps.map(&:name).should include('Sprockets::Processor (js-routes_dependent_on_routes)')
+    end
 
-      it "should have registered a preprocessor" do
-        pps = Rails.application.assets.preprocessors
-        js_pps = pps['application/javascript']
-        js_pps.map(&:name).should include('Sprockets::Processor (js-routes_dependent_on_routes)')
+    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'))
 
-      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
 
-        end
-        context "when dealing with js-routes.js" do
 
-          #TODO: check why doesn't work with let callbacks
-          context 'with Rails 3.1.0' do
+        context "with Rails 3.1.1" do
+          context "and initialize on precompile" do
             before(:each) do
-              Rails.stub!("version").and_return("3.1.0")
+              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 "with Rails 3.1.1" do
+          context "and not initialize on precompile" do
             before(:each) do
-              Rails.stub!("version").and_return("3.1.1")
+              Rails.application.config.assets.initialize_on_precompile = false
             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
+            it "should raise an exception" do
+              lambda { ctx.evaluate('js-routes.js') }.should raise_error(/Cannot precompile/)
             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
 
 
-      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
+    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

data/spec/spec_helper.rb

@@ -20,10 +20,8 @@ end
 
 
 class App < Rails::Application
-  if Rails.version >= '3.1'
-    # Enable the asset pipeline
-    config.assets.enabled = true
-  end
+  # Enable the asset pipeline
+  config.assets.enabled = true
 
   self.routes.draw do 
     resources :inboxes do
@@ -44,6 +42,8 @@ class App < Rails::Application
     scope "(/optional/:optional_id)" do
       resources :things
     end
+    
+    match "/other_optional/(:optional_id)" => "foo#foo", :as => :foo
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: js-routes
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000 Z
+date: 2012-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &20189100 !ruby/object:Gem::Requirement
+  requirement: &85230710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *20189100
+  version_requirements: *85230710
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &20199080 !ruby/object:Gem::Requirement
+  requirement: &85229560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20199080
+  version_requirements: *85229560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20194300 !ruby/object:Gem::Requirement
+  requirement: &85245130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *20194300
+  version_requirements: *85245130
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &20205180 !ruby/object:Gem::Requirement
+  requirement: &85244440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *20205180
+  version_requirements: *85244440
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &20213600 !ruby/object:Gem::Requirement
+  requirement: &85243690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *20213600
+  version_requirements: *85243690
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &20219180 !ruby/object:Gem::Requirement
+  requirement: &85242750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20219180
+  version_requirements: *85242750
 description: Generates javascript file that defines all Rails named routes as javascript
   helpers
 email: agresso@gmail.com
@@ -119,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2245053018798616872
+      hash: -314330307
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: