js-routes 0.9.6 → 0.9.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0679713957b418ac64b8142276b2bb2cf48a900e
+  data.tar.gz: c2bd638c7208846f489be27cc1e693c10a62d7d8
+SHA512:
+  metadata.gz: 90c22e0cd0bbde579a3357f420debc30c6c945e8de1d75b172e3cdd36e501c495f24c9069979fa6ef0cde11955903cb7f8bbe55a4977304e608ae07fb8b53002
+  data.tar.gz: 6febf43c926e12c4a61e3bfa4fea545a6cab98ee7da29fb0a74fbaa04821412e981b4f19013677e9156d91702832debcb815b7d7086e4c3ce1e32c9b85b2fb58

data/Appraisals

@@ -1,10 +1,9 @@
 appraise "rails32" do
-  gem "rails", "~> 3.2.14"
-  gem "js-routes", :path => "../"
+  gem "railties", "~> 3.2.16"
+  gem 'tzinfo'
 end
 
 appraise "rails40" do
-  gem "rails", "4.0.0"
+  gem "railties", "~> 4.0.2"
   gem "minitest", "~> 4.0"
-  gem "js-routes", :path => "../"
 end

data/gemfiles/rails32.gemfile

@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 3.2.14"
-gem "js-routes", :path=>"../"
+gem "railties", "~> 3.2.16"
+gem "tzinfo"
 
 gemspec :path=>"../"

data/gemfiles/rails40.gemfile

@@ -2,8 +2,8 @@
 
 source "http://rubygems.org"
 
-gem "rails", "4.0.0"
+gem "railties", "~> 4.0.2"
+gem "tzinfo"
 gem "minitest", "~> 4.0"
-gem "js-routes", :path=>"../"
 
 gemspec :path=>"../"

data/js-routes.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.6.0}
   s.summary = %q{Brings Rails named routes to javascript}
 
-  s.add_runtime_dependency(%q<rails>, [">= 3.2"])
+  s.add_runtime_dependency(%q<railties>, [">= 3.2"])
+  s.add_runtime_dependency(%q<sprockets-rails>)
   s.add_development_dependency(%q<rspec>, [">= 2.14.0"])
   s.add_development_dependency(%q<bundler>, [">= 1.1.0"])
   s.add_development_dependency(%q<guard>, [">= 0"])
@@ -31,7 +32,7 @@ Gem::Specification.new do |s|
   if defined?(JRUBY_VERSION)
     s.add_development_dependency(%q<therubyrhino>, [">= 0"])
   else
-    s.add_development_dependency(%q<debugger>, [">= 0"])
+    s.add_development_dependency(%q<debugger>, [">= 0"]) if RUBY_VERSION =~ /\A2\.0/
     s.add_development_dependency(%q<therubyracer>, [">= 0"])
   end
 end

data/lib/js_routes.rb

@@ -20,7 +20,6 @@ class JsRoutes
     default_url_options: {}
   }
 
-  # We encode node symbols as integer to reduce the routes.js file size
   NODE_TYPES = {
     GROUP: 1,
     CAT: 2,
@@ -123,7 +122,6 @@ class JsRoutes
   protected
 
   def js_routes
-    Rails.application.reload_routes!
     js_routes = Rails.application.routes.named_routes.routes.sort_by(&:to_s).map do |_, route|
       if route.app.respond_to?(:superclass) && route.app.superclass == Rails::Engine && !route.path.anchored
         route.app.routes.named_routes.map do |_, engine_route|
@@ -203,6 +201,8 @@ class JsRoutes
     result = serialize_spec(spec, parent_spec)
     if parent_spec && result[1].is_a?(String)
       result = [
+        # We encode node symbols as integer 
+        # to reduce the routes.js file size
         NODE_TYPES[:CAT],
         serialize_spec(parent_spec),
         result

data/lib/js_routes/version.rb

@@ -1,3 +1,3 @@
 class JsRoutes
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

data/lib/routes.js

@@ -79,8 +79,6 @@
         part = optional_parts[i];
         if (!options.hasOwnProperty(part) && defaults.default_url_options.hasOwnProperty(part)) {
           _results.push(options[part] = defaults.default_url_options[part]);
-        } else {
-          _results.push(void 0);
         }
       }
       return _results;
@@ -96,11 +94,10 @@
       return anchor;
     },
     extract_options: function(number_of_params, args) {
-      var last_argument, type;
+      var last_el;
 
-      last_argument = args[args.length - 1];
-      type = this.get_object_type(last_argument);
-      if (args.length > number_of_params || (type === "object" && !this.look_like_serialized_model(last_argument))) {
+      last_el = args[args.length - 1];
+      if (args.length > number_of_params || ((last_el != null) && "object" === this.get_object_type(last_el) && !this.look_like_serialized_model(last_el))) {
         return args.pop();
       } else {
         return {};
@@ -120,7 +117,13 @@
       }
       property = object;
       if (this.get_object_type(object) === "object") {
-        property = object.to_param || object.id || object;
+        if ("to_param" in object) {
+          property = object.to_param;
+        } else if ("id" in object) {
+          property = object.id;
+        } else {
+          property = object;
+        }
         if (this.get_object_type(property) === "function") {
           property = property.call(object);
         }
@@ -249,7 +252,7 @@
         return this._classToTypeCache;
       }
       this._classToTypeCache = {};
-      _ref = "Boolean Number String Function Array Date RegExp Undefined Null".split(" ");
+      _ref = "Boolean Number String Function Array Date RegExp Object Error".split(" ");
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         name = _ref[_i];
         this._classToTypeCache["[object " + name + "]"] = name.toLowerCase();
@@ -257,13 +260,17 @@
       return this._classToTypeCache;
     },
     get_object_type: function(obj) {
-      var strType;
-
       if (window.jQuery && (window.jQuery.type != null)) {
         return window.jQuery.type(obj);
       }
-      strType = Object.prototype.toString.call(obj);
-      return this._classToType()[strType] || "object";
+      if (obj == null) {
+        return "" + obj;
+      }
+      if (typeof obj === "object" || typeof obj === "function") {
+        return this._classToType()[Object.prototype.toString.call(obj)] || "object";
+      } else {
+        return typeof obj;
+      }
     },
     namespace: function(root, namespaceString) {
       var current, parts;

data/lib/routes.js.coffee

@@ -40,9 +40,8 @@ Utils =
     path.join "://"
 
   set_default_url_options: (optional_parts, options) ->
-    for part, i in optional_parts
-      if not options.hasOwnProperty(part) and defaults.default_url_options.hasOwnProperty(part)
-        options[part] = defaults.default_url_options[part]
+    for part, i in optional_parts when (not options.hasOwnProperty(part) and defaults.default_url_options.hasOwnProperty(part))
+      options[part] = defaults.default_url_options[part]
 
   extract_anchor: (options) ->
     anchor = ""
@@ -52,9 +51,8 @@ Utils =
     anchor
 
   extract_options: (number_of_params, args) ->
-    last_argument = args[args.length - 1]
-    type = @get_object_type(last_argument)
-    if args.length > number_of_params or (type == "object" and !@look_like_serialized_model(last_argument))
+    last_el = args[args.length - 1]
+    if args.length > number_of_params or (last_el? and "object" is @get_object_type(last_el) and !@look_like_serialized_model(last_el))
       args.pop()
     else
       {}
@@ -67,10 +65,16 @@ Utils =
   path_identifier: (object) ->
     return "0"  if object is 0
     # null, undefined, false or ''
-    return ""  unless object
+    return "" unless object
     property = object
     if @get_object_type(object) is "object"
-      property = object.to_param or object.id or object
+      if "to_param" of object
+        property = object.to_param
+      else if "id" of object
+        property = object.id
+      else
+        property = object
+
       property = property.call(object) if @get_object_type(property) is "function"
     property.toString()
 
@@ -82,9 +86,8 @@ Utils =
 
   prepare_parameters: (required_parameters, actual_parameters, options) ->
     result = @clone(options) or {}
-    for val, i in required_parameters
-      if i < actual_parameters.length
-        result[val] = actual_parameters[i]
+    for val, i in required_parameters when i < actual_parameters.length
+      result[val] = actual_parameters[i]
     result
 
   build_path: (required_parameters, optional_parts, route, args) ->
@@ -198,13 +201,13 @@ Utils =
   _classToType: ->
     return @_classToTypeCache if @_classToTypeCache?
     @_classToTypeCache = {}
-    for name in "Boolean Number String Function Array Date RegExp Undefined Null".split(" ")
-      @_classToTypeCache["[object " + name + "]"] = name.toLowerCase()
+    for name in "Boolean Number String Function Array Date RegExp Object Error".split(" ")
+      @_classToTypeCache["[object #{name}]"] = name.toLowerCase()
     @_classToTypeCache
   get_object_type: (obj) ->
     return window.jQuery.type(obj) if window.jQuery and window.jQuery.type?
-    strType = Object::toString.call(obj)
-    @_classToType()[strType] or "object"
+    return "#{obj}" unless obj?
+    (if typeof obj is "object" or typeof obj is "function" then @_classToType()[Object::toString.call(obj)] or "object" else typeof obj)
 
   namespace: (root, namespaceString) ->
     parts = (if namespaceString then namespaceString.split(".") else [])

data/spec/config/routes.rb

@@ -0,0 +1,55 @@
+App.routes.draw do
+  resource "3df1b2d050ae5a96eac8565c9daef37a"
+  resource "341f9e69e3db1c344de2fc6551885711"
+  resource "0e1bcb2dc1ce4d80ec15cae9140fb99a"
+  resource "15b91c612530bfc69c70d121c8713da4"
+  resource "49e12936168a64dce4d4ec148104fb5a"
+  resource "d878104611f88952aba49965c1d2d573"
+  resource "0e94bfc3c8aaee5ea09579fe73cbdaff"
+  resource "e1c2dd2ea9c63b380eb0947a0e1f49aa"
+  resource "587c6e26ad7f9a6aa09f81add77b16f5"
+  resource "8e00bfffebe0c874d6dad1c7b8c7cd6b"
+  resource "394482d3515e7e49989a8496afa7d367"
+  resource "4ab9c701622cba87eae50795564abe1c"
+  resource "af4b4a2ea501fefbdb8367eb108b2e14"
+  resource "116d17a93932a9a3e5bd2750665582f9"
+  resource "315f0a62063288cd56373c8a00870596"
+  resource "d5357ec6df4589f81ca8689cf0231667"
+  resource "560a3b8cf807e873843cd889400cd52b"
+  resource "361de6041f545e67db1aeaa6206c8ac7"
+  resource "28b0a54de4a0884386f1e324edc13194"
+  resource "ab77f21a956d956295187806cdf38cd1"
+  resource "0b8a362fd486247fb7c41898709b9815"
+  resource "5efa0a96733bc027b3309ffb54d1d1d0"
+  resource "70a3ee535c59fcf59c58b6d39178833c"
+  resource "5095fc05868c673ce450524f78cd28d3"
+  resource "79b994cfbc79432d644a3b83804f4924"
+  resource "e25125c477cd451fd74a76eaaebc9165"
+  resource "672fbfb432687e2fee7d0e799cc10ea4"
+  resource "2eb8350243305659082eb92b2e5b702c"
+  resource "08c9973b624e10b10dc7235659c81346"
+  resource "fee0d4b123529a2c652bef0ec0116ef2"
+  resource "8422445d2aa176b7733473164c461a2e"
+  resource "c24b8252b235431ca3df21a6ac119062"
+  resource "c08c66c7fc40e9937ff84a86f6c6d18a"
+  resource "964851acca72064d861188150e848d55"
+  resource "d02927a4fd37b37c03dbad5d3c7a4753"
+  resource "2a69df680ff9bd8d3855d9ce5a4e51f7"
+  resource "d8daed677f9a9a6926005afbdeebcf73"
+  resource "83d4db872f5f148e9ead108d483fec78"
+  resource "09f9fb4250595d26f4149b76fcfa957d"
+  resource "956cdb4d3cbf36bb9ccb7c7fcc36a602"
+  resource "02816449a6c929f55f8bad958f25d25a"
+  resource "2dd7ae38bd72f7e8b26aafb5f002d634"
+  resource "c7c9aaa3f7131f1e7dbc9325b3426d3e"
+  resource "7556e7d17c2a26acbad7d5fa86e6e640"
+  resource "d03081ef427a227a808c708282fdc86b"
+  resource "8f610d21e6e499c1eea98ca08191c05f"
+  resource "b6b412ae8a369f6bfc7f312245eacc8c"
+  resource "e9bcda8b00879c49bd7f05afee59a28e"
+  resource "6e89f4baddd4044b42be7c2d3b382567"
+  resource "5959c376d15a609f2e74f4f351d0a565"
+  resource "3b7e418511c305c78f2d2c292a3a1289"
+  resource "87acf6bf6e8191ff8900f420b33d5268"
+  resource "648a9b17078423f29f42aa2ecac1cc7d"
+end

data/spec/js_routes/options_spec.rb

@@ -85,6 +85,10 @@ describe JsRoutes, "options" do
       expect(evaljs("Routes.inbox_path(1)")).to eq(routes.inbox_path(1, :format => "json"))
     end
 
+    it "should render routing with default_format and zero object" do
+      expect(evaljs("Routes.inbox_path(0)")).to eq(routes.inbox_path(0, :format => "json"))
+    end
+
     it "should override default_format when spefified implicitly" do
       expect(evaljs("Routes.inbox_path(1, {format: 'xml'})")).to eq(routes.inbox_path(1, :format => "xml"))
     end

data/spec/js_routes/rails_routes_compatibility_spec.rb

@@ -18,6 +18,14 @@ describe JsRoutes, "compatibility with Rails"  do
     expect(evaljs("Routes.inbox_path(0)")).to eq(routes.inbox_path(0))
   end
 
+  it "should support 0 as a to_param option" do
+    expect(evaljs("Routes.inbox_path({to_param: 0})")).to eq(routes.inbox_path(0))
+  end
+
+  it "should support 0 as an id option" do
+    expect(evaljs("Routes.inbox_path({id: 0})")).to eq(routes.inbox_path(0))
+  end
+
   it "should generate nested routing with one parameter" do
     expect(evaljs("Routes.inbox_messages_path(1)")).to eq(routes.inbox_messages_path(1))
   end
@@ -92,6 +100,7 @@ describe JsRoutes, "compatibility with Rails"  do
     it "should escape get parameters" do
       expect(evaljs("Routes.inboxes_path({uri: 'http://example.com'})")).to eq(routes.inboxes_path(:uri => 'http://example.com'))
     end
+
   end
 
 
@@ -127,6 +136,11 @@ describe JsRoutes, "compatibility with Rails"  do
     it "should support required paramters given as options hash" do
       expect(evaljs("Routes.search_path({q: 'hello'})")).to eq(routes.search_path(:q => 'hello'))
     end
+
+    it "should ignore null parameters" do
+      pending
+      expect(evaljs("Routes.inboxes_path({hello: {world: null}})")).to eq(routes.inboxes_path(:hello => {world: nil}))
+    end
   end
 
   context "when jQuery is present" do
@@ -149,6 +163,12 @@ describe JsRoutes, "compatibility with Rails"  do
       end
       it_should_behave_like 'serialization'
     end
+    context "when parameters is null" do
+      let(:_value) do
+        {:hello => {world: nil}}
+      end
+      it_should_behave_like 'serialization'
+    end
     context "when parameters is null" do
       let(:_value) do
         nil

data/spec/js_routes/zzz_last_post_rails_init_spec.rb

@@ -1,7 +1,7 @@
-
 # we need to run post_rails_init_spec as the latest
 # because it cause unrevertable changes to runtime
 # what is why I added "zzz_last" in the beginning
+
 require 'spec_helper'
 require "fileutils"
 
@@ -11,6 +11,7 @@ describe "after Rails initialization" do
   before(:all) do
     FileUtils.rm_f(NAME)
     JsRoutes.generate!(NAME)
+    Rails.configuration.eager_load = false
     Rails.application.initialize!
   end
 
@@ -91,3 +92,26 @@ describe "after Rails initialization" do
     end
   end
 end
+
+describe "JSRoutes thread safety" do
+  before do
+    begin
+      Rails.application.initialize!
+    rescue
+    end
+  end
+
+  it "can produce the routes from multiple threads" do
+    threads = 2.times.map do
+      Thread.start do
+        10.times {
+          expect { JsRoutes.generate }.to_not raise_error
+        }
+      end
+    end
+
+    threads.each do |thread|
+      thread.join
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -53,6 +53,12 @@ class App < Rails::Application
   config.assets.enabled = true
   # initialize_on_precompile
   config.assets.initialize_on_precompile = true
+
+  if 3 == Rails::VERSION::MAJOR
+    config.paths['config/routes'] << 'spec/config/routes.rb'
+  else
+    config.paths['config/routes.rb'] << 'spec/config/routes.rb'
+  end
 end
 
 def draw_routes

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: js-routes
 version: !ruby/object:Gem::Version
-  version: 0.9.6
-  prerelease: 
+  version: 0.9.7
 platform: ruby
 authors:
 - Bogdan Gusiev
@@ -12,131 +11,129 @@ cert_chain: []
 date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: sprockets-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-coffeescript
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Generates javascript file that defines all Rails named routes as javascript
@@ -168,6 +165,7 @@ files:
 - lib/routes.js
 - lib/routes.js.coffee
 - lib/tasks/js_routes.rake
+- spec/config/routes.rb
 - spec/js_routes/generated_javascript_spec.rb
 - spec/js_routes/options_spec.rb
 - spec/js_routes/rails_routes_compatibility_spec.rb
@@ -177,29 +175,25 @@ files:
 homepage: http://github.com/railsware/js-routes
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1200992096390296436
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Brings Rails named routes to javascript
 test_files: []