js-routes 0.6.2 → 0.7.1

data/Gemfile.lock

@@ -1,74 +1,82 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.9)
-      actionpack (= 3.0.9)
-      mail (~> 2.2.19)
-    actionpack (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-    activesupport (3.0.9)
-    arel (2.0.10)
-    builder (2.1.2)
+    actionmailer (3.1.0)
+      actionpack (= 3.1.0)
+      mail (~> 2.3.0)
+    actionpack (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      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)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.0)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    bcrypt-ruby (3.0.1)
+    builder (3.0.0)
     diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
+    erubis (2.7.0)
     git (1.2.5)
-    i18n (0.5.0)
+    hike (1.2.1)
+    i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     libv8 (3.3.10.2)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    mail (2.3.0)
       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.2.3)
-    rack-mount (0.6.14)
+    rack (1.3.3)
+    rack-cache (1.0.3)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.9)
-      actionmailer (= 3.0.9)
-      actionpack (= 3.0.9)
-      activerecord (= 3.0.9)
-      activeresource (= 3.0.9)
-      activesupport (= 3.0.9)
+    rails (3.1.0)
+      actionmailer (= 3.1.0)
+      actionpack (= 3.1.0)
+      activerecord (= 3.1.0)
+      activeresource (= 3.1.0)
+      activesupport (= 3.1.0)
       bundler (~> 1.0)
-      railties (= 3.0.9)
-    railties (3.0.9)
-      actionpack (= 3.0.9)
-      activesupport (= 3.0.9)
+      railties (= 3.1.0)
+    railties (3.1.0)
+      actionpack (= 3.1.0)
+      activesupport (= 3.1.0)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
+      thor (~> 0.14.6)
     rake (0.9.2)
     rcov (0.9.9)
-    rdoc (3.9.1)
+    rdoc (3.9.4)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
@@ -77,9 +85,14 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
+    sprockets (2.0.0)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     therubyracer (0.9.2)
       libv8 (~> 3.3.10)
     thor (0.14.6)
+    tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.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", :require => 'js_routes'
+gem "js-routes"
 ```
 
 Your application initializer, like `config/initializers/jsroutes.rb`:
@@ -91,4 +91,6 @@ Advantages of this one are:
 * Support Rails `#to_param` convention for seo optimized paths
 * Well tested
 
+#### Thanks to [Contributors](https://github.com/railsware/js-routes/contributors)
+
 #### Have fun 

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.7.1

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

@@ -0,0 +1 @@
+<%= JsRoutes.generate %>

data/js-routes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{js-routes}
-  s.version = "0.6.2"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = %q{2011-09-21}
+  s.date = %q{2011-10-06}
   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 = [
@@ -24,12 +24,15 @@ Gem::Specification.new do |s|
     "Rakefile",
     "Readme.md",
     "VERSION",
+    "app/assets/javascripts/js-routes.js.erb",
     "js-routes.gemspec",
+    "lib/js-routes.rb",
     "lib/js_routes.rb",
-    "lib/jsroutes.rb",
+    "lib/js_routes/engine.rb",
     "lib/routes.js",
     "lib/tasks/js_routes.rake",
     "spec/js_routes_spec.rb",
+    "spec/post_rails_init_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/railsware/js-routes}

data/lib/js-routes.rb

@@ -0,0 +1,2 @@
+require 'js_routes'
+require 'js_routes/engine'

data/lib/js_routes/engine.rb

@@ -0,0 +1,15 @@
+if defined?(Rails) && Rails.version >= "3.1"
+  class JsRoutes
+    class Engine < Rails::Engine
+      JS_ROUTES_ASSET = 'js-routes'
+
+      initializer 'js-routes.dependent_on_routes', :after => "sprockets.environment" do
+        routes = Rails.root.join('config','routes.rb')
+        Rails.application.assets.register_preprocessor 'application/javascript', :'js-routes_dependent_on_routes' do |ctx,data|
+          ctx.depend_on(routes) if ctx.logical_path == JS_ROUTES_ASSET
+          data
+        end
+      end
+    end
+  end
+end

data/lib/js_routes.rb

@@ -1,15 +1,52 @@
 class JsRoutes
 
   #
-  # API
+  # OPTIONS
   #
 
-  def self.generate(options = {})
-    self.new(options).generate
+  DEFAULT_PATH = if Rails.version >= "3.1"
+                   File.join('app','assets','javascripts','routes.js')
+                 else
+                   File.join('public','javascripts','routes.js')
+                 end
+
+  DEFAULTS = {
+    :namespace => "Routes",
+    :default_format => "",
+    :exclude => [],
+    :include => //,
+    :file => DEFAULT_PATH,
+    :prefix => ""
+  }
+
+  class Options < Struct.new(*DEFAULTS.keys)
+    def to_hash
+      Hash[*members.zip(values).flatten(1)].symbolize_keys
+    end
   end
 
-  def self.generate!(options = {})
-    self.new(options).generate!
+  #
+  # API
+  #
+
+  class << self
+    def setup(&block)
+      options.tap(&block) if block
+    end
+
+    def options
+      @options ||= Options.new.tap do |opts|
+        DEFAULTS.each_pair {|k,v| opts[k] = v}
+      end
+    end
+
+    def generate(opts = {})
+      new(opts).generate
+    end
+
+    def generate!(opts = {})
+      new(opts).generate!
+    end
   end
 
   #
@@ -17,7 +54,7 @@ class JsRoutes
   #
 
   def initialize(options = {})
-    @options = default_options.merge(options)
+    @options = self.class.options.to_hash.merge(options)
   end
 
   def generate
@@ -29,11 +66,11 @@ class JsRoutes
   end
 
   def generate!
-    # Some libraries like devise do yet load their routes so we will wait
+    # 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(@options[:file], 'w') do |f|
+      File.open(Rails.root.join(@options[:file]), 'w') do |f|
         f.write generate
       end
     end
@@ -63,20 +100,39 @@ class JsRoutes
     params = build_params route
     _ = <<-JS.strip!
   // #{route.name} => #{route.path}
-  #{route.name}_path: function(#{params.<<("options").join(", ")}) {
-  return Utils.build_path(#{params.size}, #{path_parts(route).inspect}, arguments)
+  #{route.name}_path: function(#{(params + ["options"]).join(", ")}) {
+  return Utils.build_path(#{params.size}, #{path_parts(route).inspect}, #{optional_params(route).inspect}, 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 RUBY_VERSION >= '1.9.2'
+      optional_named_captures_regexp = /\?\:.+?\(\?\<(.+?)\>/
+      path_info = route.conditions[:path_info]
+      path_info.source.scan(optional_named_captures_regexp).flatten
+    else
+      re = Regexp.escape("([^/.?]+)")
+      optional_named_captures_regexp = /#{re}|\(\?\:.+?\)\?/
+      path_info = route.conditions[:path_info]
+      captures = path_info.source.scan(optional_named_captures_regexp).flatten
+      named_captures = path_info.named_captures.to_a.sort {|a,b|a.last.first<=>b.last.first} 
+      captures.zip(named_captures).map do |type, (name, pos)|
+        name unless type == '([^/.?]+)'
+      end.compact
+    end
+  end
 
   def build_params route
+    optional_named_captures = optional_params(route)
     route.conditions[:path_info].named_captures.to_a.sort do |cap1, cap2|
       # Hash is not ordered in Ruby 1.8.7
       cap1.last.first <=> cap2.last.first
     end.map do |cap|
       name = cap.first
-      if !(name.to_s == "format")
+        if !(optional_named_captures.include?(name.to_s))
         # prepending each parameter name with underscore
         # to prevent conflict with JS reserved words
         "_" + name.to_s.gsub(/^:/, '')
@@ -88,24 +144,4 @@ class JsRoutes
   def path_parts route
     route.path.gsub(/\(\.:format\)$/, "").split(/:[a-z\-_]+/)
   end
-
-  def default_options 
-    {
-      :namespace => "Routes",
-      :default_format => "",
-      :exclude => [],
-      :include => //,
-      :file => default_file,
-      :prefix => ""
-    }
-  end
-
-  def default_file
-    if Rails.version >= "3.1"
-      "#{Rails.root}/app/assets/javascripts/routes.js"
-    else
-      "#{Rails.root}/public/javascripts/routes.js"
-    end
-  end
-
 end

data/lib/routes.js

@@ -1,12 +1,17 @@
 (function(){
 
+  var defaults = {
+    prefix: 'PREFIX',
+    format: 'DEFAULT_FORMAT'
+  };
+  
   var Utils = {
 
     serialize: function(obj){
       if (obj === null) {return '';}
       var s = [];
       for (prop in obj){
-        s.push(prop + "=" + obj[prop]);
+        s.push(prop + "=" + encodeURIComponent(obj[prop].toString()));
       }
       if (s.length === 0) {
         return '';
@@ -18,14 +23,25 @@
       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 : window.NAMESPACE.options.default_format;
+      var format = options.hasOwnProperty("format") ? options.format : defaults.format;
       delete options.format;
       return format ? "." + format : "";
     },
 
     extract_options: function(number_of_params, args) {
-      if (args.length >= number_of_params) {
+      if (args.length > number_of_params) {
         return typeof(args[args.length-1]) == "object" ?  args.pop() : {};
       } else {
         return {};
@@ -37,26 +53,42 @@
         return "";
       }
       if (typeof(object) == "object") {
-        return (object.to_param || object.id).toString();
+        return (object.to_param || object.id || object).toString();
       } else {
         return object.toString();
       }
     },
 
-    build_path: function(number_of_params, parts, args) {
+    build_path: function(number_of_params, parts, optional_params, args) {
       args = Array.prototype.slice.call(args);
-      result = Utils.get_prefix();
+      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")
+      }
+      var params_count = 0, optional_params_count = 0;
       for (var i=0; i < parts.length; i++) {
-        value = args.shift();
-        part = parts[i];
-        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.");
+        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);
+            } else {
+              throw new Error("Insufficient parameters to build path")
+            }
+          }
         }
       }
       var format = Utils.extract_format(opts);
@@ -72,7 +104,7 @@
     },
 
     get_prefix: function(){
-      var prefix = window.NAMESPACE.options.prefix;
+      var prefix = defaults.prefix;
 
       if( prefix !== "" ){
         prefix = prefix.match('\/$') ? prefix : ( prefix + '/');
@@ -84,11 +116,5 @@
   };
 
   window.NAMESPACE = ROUTES;
-  
-  window.NAMESPACE.options = {
-    prefix: 'PREFIX',
-    default_format: 'DEFAULT_FORMAT',
-  };
-
-
+  window.NAMESPACE.options = defaults;
 })();

data/spec/js_routes_spec.rb

@@ -5,7 +5,6 @@ require "fileutils"
 describe JsRoutes do
   before(:each) do
     Rails.application.stub!(:reload_routes!).and_return(true)
-    evaljs("var window = this;")
     evaljs(_presetup)
     evaljs(JsRoutes.generate(_options))
   end
@@ -13,32 +12,61 @@ describe JsRoutes do
   let(:_presetup) { "this;" }
   let(:_options) { {} }
 
-  it "should generate collection routing" do
-    evaljs("Routes.inboxes_path()").should == "/inboxes"
-  end
+  let(:routes) { App.routes.url_helpers }
 
-  it "should generate member routing" do
-    evaljs("Routes.inbox_path(1)").should == "/inboxes/1"
-  end
+  describe "compatibility with Rails routes" do
 
-  it "should generate nested routing with one parameter" do
-    evaljs("Routes.inbox_message_path(1)").should == "/inboxes/1/messages"
-  end
+    it "should generate collection routing" do
+      evaljs("Routes.inboxes_path()").should == routes.inboxes_path()
+    end
 
-  it "should generate nested routing" do
-    evaljs("Routes.inbox_message_path(1,2)").should == "/inboxes/1/messages/2"
-  end
+    it "should generate member routing" do
+      evaljs("Routes.inbox_path(1)").should == routes.inbox_path(1)
+    end
 
-  it "should generate routing with format" do
-    evaljs("Routes.inbox_path(1, {format: 'json'})").should == "/inboxes/1.json"
-  end
+    it "should generate nested routing with one parameter" do
+      evaljs("Routes.inbox_messages_path(1)").should == routes.inbox_messages_path(1)
+    end
+
+    it "should generate nested routing" do
+      evaljs("Routes.inbox_message_path(1,2)").should == routes.inbox_message_path(1, 2)
+    end
+
+    it "should generate routing with format" do
+      evaljs("Routes.inbox_path(1, {format: 'json'})").should == routes.inbox_path(1, :format => "json")
+    end
+
+    it "should support get parameters" do
+      evaljs("Routes.inbox_path(1, {format: 'json', lang: 'ua', q: 'hello'})").should == routes.inbox_path(1, :lang => "ua", :q => "hello", :format => "json")
+    end
+
+    it "should escape get parameters" do
+      evaljs("Routes.inboxes_path({uri: 'http://example.com'})").should == routes.inboxes_path(:uri => 'http://example.com')
+    end
 
-  it "should support get parameters" do
-    evaljs("Routes.inbox_path(1, {format: 'json', q: 'hello', lang: 'ua'})").should == "/inboxes/1.json?q=hello&lang=ua"
+    it "should support routes with reserved javascript words as parameters" do
+      evaljs("Routes.object_path(1, 2)").should == routes.object_path(1,2)
+    end
   end
 
-  it "should support routes with reserved javascript words as parameters" do
-    evaljs("Routes.object_path(1, 2)").should == "/returns/1/objects/2"
+  context "when wrong parameters given" do
+    
+    it "should throw Exception if not enough parameters" do
+      lambda {
+        evaljs("Routes.inbox_path()")
+      }.should raise_error(V8::JSError)
+    end
+    it "should throw Exception if required parameter is not defined" do
+      lambda {
+        evaljs("Routes.inbox_path(null)")
+      }.should raise_error(V8::JSError)
+    end
+
+    it "should throw Exceptions if when there is too many parameters" do
+      lambda {
+        evaljs("Routes.inbox_path(1,2)")
+      }.should raise_error(V8::JSError)
+    end
   end
 
   context "when exclude is specified" do
@@ -71,12 +99,12 @@ describe JsRoutes do
     let(:_options) { {:prefix => "/myprefix/" } }
 
     it "should render routing with prefix" do
-        evaljs("Routes.inbox_path(1)").should == "/myprefix/inboxes/1"
+        evaljs("Routes.inbox_path(1)").should == "/myprefix#{routes.inbox_path(1)}"
     end
 
     it "should render routing with prefix set in JavaScript" do
       evaljs("Routes.options.prefix = '/newprefix/'")
-      evaljs("Routes.inbox_path(1)").should == "/newprefix/inboxes/1"
+      evaljs("Routes.inbox_path(1)").should == "/newprefix#{routes.inbox_path(1)}"
     end
 
   end
@@ -86,12 +114,12 @@ describe JsRoutes do
     let(:_options) { {:prefix => "/myprefix" } }
 
     it "should render routing with prefix" do
-      evaljs("Routes.inbox_path(1)").should == "/myprefix/inboxes/1"
+      evaljs("Routes.inbox_path(1)").should == "/myprefix#{routes.inbox_path(1)}"
     end
     
     it "should render routing with prefix set in JavaScript" do
       evaljs("Routes.options.prefix = '/newprefix'")
-      evaljs("Routes.inbox_path(1)").should == "/newprefix/inboxes/1"
+      evaljs("Routes.inbox_path(1)").should == "/newprefix#{routes.inbox_path(1)}"
     end
 
   end
@@ -100,15 +128,15 @@ describe JsRoutes do
     let(:_options) { {:default_format => "json"} }
     
     it "should render routing with default_format" do
-      evaljs("Routes.inbox_path(1)").should == "/inboxes/1.json"
+      evaljs("Routes.inbox_path(1)").should == routes.inbox_path(1, :format => "json")
     end
 
     it "should override default_format when spefified implicitly" do
-      evaljs("Routes.inbox_path(1, {format: 'xml'})").should == "/inboxes/1.xml"
+      evaljs("Routes.inbox_path(1, {format: 'xml'})").should == routes.inbox_path(1, :format => "xml")
     end
 
     it "should override nullify implicitly when specified implicitly" do
-      evaljs("Routes.inbox_path(1, {format: null})").should == "/inboxes/1"
+      evaljs("Routes.inbox_path(1, {format: null})").should == routes.inbox_path(1)
     end
 
   end
@@ -130,37 +158,46 @@ describe JsRoutes do
   end
 
   context "when arguments are objects" do
+
+    let(:inbox) {Struct.new(:id, :to_param).new(1,"my")}
+
     it "should use id property of the object in path" do
-      evaljs("Routes.inbox_path({id: 1})").should == "/inboxes/1"
+      evaljs("Routes.inbox_path({id: 1})").should == routes.inbox_path(1)
     end
 
     it "should prefer to_param property over id property" do
-      evaljs("Routes.inbox_path({id: 1, to_param: 'my'})").should == "/inboxes/my"
+      evaljs("Routes.inbox_path({id: 1, to_param: 'my'})").should == routes.inbox_path(inbox)
     end
 
     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"
+      evaljs(
+        "Routes.inbox_message_path({id:1, to_param: 'my'}, {id:2}, {custom: true, format: 'json'})"
+      ).should == routes.inbox_message_path(inbox, 2, :custom => true, :format => "json")
     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"
+        evaljs("Routes.things_path()").should == routes.things_path
+      end
+
+      it "should not require the optional parts as arguments" do
+        evaljs("Routes.thing_path(5)").should == routes.thing_path(nil, 5)
       end
 
       it "should treat undefined as non-given optional part" do
-        evaljs("Routes.thing_path(undefined, 5)").should == "/things/5"
+        evaljs("Routes.thing_path(5, {optional_id: undefined})").should == routes.thing_path(5, :optional_id => nil)
       end
 
       it "should treat null as non-given optional part" do
-        evaljs("Routes.thing_path(null, 5)").should == "/things/5"
+        evaljs("Routes.thing_path(5, {optional_id: null})").should == routes.thing_path(5, :optional_id => nil)
       end
     end
 
     context "and including them" do
       it "should include the optional parts" do
-        evaljs("Routes.things_path(5)").should == "/optional/5/things"
+        evaljs("Routes.things_path({optional_id: 5})").should == routes.things_path(:optional_id => 5)
       end
     end
   end
@@ -183,29 +220,16 @@ describe JsRoutes do
     let(:name) {  "#{File.dirname(__FILE__)}/../routes.js" }
 
     before(:each) do
-      # prevent warning
-      Rails.configuration.active_support.deprecation = :log
-
       FileUtils.rm_f(name)
       JsRoutes.generate!({:file => name})
     end
 
-    it "should not generate file at once" do
+    it "should not generate file before initialization" do
       File.exists?(name).should be_false
     end
 
-    context "after Rails initialization" do
-      before(:each) do
-        Rails.application.initialize!
-      end
-      it "should generate routes file only after rails initialization" do
-        File.exists?(name).should be_true 
-      end
-    end
-
     after(:all) do
       FileUtils.rm_f(name)
     end
   end
-
 end

data/spec/post_rails_init_spec.rb

@@ -0,0 +1,71 @@
+require 'spec_helper'
+require "fileutils"
+
+describe "after Rails initialization" do
+  let(:name) {  "#{File.dirname(__FILE__)}/../routes.js" }
+
+  before(:all) do
+
+    FileUtils.rm_f(name)
+    JsRoutes.generate!({:file => name})
+
+    Rails.application.initialize!
+  end
+
+  after(:all) do
+    FileUtils.rm_f(name)
+  end
+  
+  context '.generate!' do
+    it "should generate routes file" do
+      File.exists?(name).should be_true 
+    end
+  end
+
+  if Rails.version >= "3.1"
+    context "JsRoutes::Engine" do
+
+      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)
+      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
+
+      context "the preprocessor" do
+        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')
+          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
+  end
+end

data/spec/spec_helper.rb

@@ -1,18 +1,30 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
-require 'jsroutes'
-require 'rails'
+require 'rails/all'
+require 'js-routes'
 require "v8"
+require "cgi"
 require "active_support/core_ext/hash/slice"
 
-def evaljs(string)
+def jscontext
   @context ||= V8::Context.new
-  @context.eval(string)
 end
 
+def evaljs(string)
+  jscontext.eval(string)
+end
+
+
+
+
 
 class App < Rails::Application
+  if Rails.version >= '3.1'
+    # Enable the asset pipeline
+    config.assets.enabled = true
+  end
+
   self.routes.draw do 
     resources :inboxes do
       resources :messages do
@@ -33,8 +45,11 @@ class App < Rails::Application
       resources :things
     end
   end
+
 end
 
+# prevent warning
+Rails.configuration.active_support.deprecation = :log
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
@@ -42,4 +57,9 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
   
+  config.before(:each) do
+    evaljs("var window = this;")
+    jscontext[:cgi] = CGI
+    evaljs("function encodeURIComponent(string) {return cgi.escape(string);}")
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: js-routes
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 2
-  version: 0.6.2
+  - 7
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Bogdan Gusiev
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-21 00:00:00 +03:00
+date: 2011-10-06 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -126,12 +126,15 @@ files:
 - Rakefile
 - Readme.md
 - VERSION
+- app/assets/javascripts/js-routes.js.erb
 - js-routes.gemspec
+- lib/js-routes.rb
 - lib/js_routes.rb
-- lib/jsroutes.rb
+- lib/js_routes/engine.rb
 - lib/routes.js
 - lib/tasks/js_routes.rake
 - spec/js_routes_spec.rb
+- spec/post_rails_init_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/railsware/js-routes

data/lib/jsroutes.rb

@@ -1 +0,0 @@
-require "js_routes"