js-routes 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ac6b282ffedbbc45d553d26dfc28a36aa02539b3
-  data.tar.gz: a229d137f55ca50b7871b43a0e39564b0824d0ab
+SHA256:
+  metadata.gz: 1e5ccc1ef3fef13c8d626f32e06cf99593acef814a7777aea3fb3d1452e1a92c
+  data.tar.gz: 2a68dec293c58cd47939b8260da2a5038334d36fb72c3d967ec05088c46e039f
 SHA512:
-  metadata.gz: 620e07c9d22b14a9ae1a5a1008eb3336e4e72d83d29033b8f29fa6a737429661637d4fdb01e21ab42599b8698eae79233153acab6ef3d6c8d17ed359b02f435b
-  data.tar.gz: 7fb670b7f0dd3970681afcc8d33fd96687a5a0ff1f9a4e7b8c4f3deca8e197c2abb889eb0a58afcda0f36c391d86a51c7f27bc33df6d884611350937bf5437e3
+  metadata.gz: '098b77abe8a1b7ade8c19b9adca75d51fef15d0ba17908e1f950b664a44cf5aa95bb12f3eea26c7e7112992db559ad1cb489116e47fe0728fc7f729d8788a96a'
+  data.tar.gz: 492dec4811ae13841cd9a433bd313cd5677f2a31d941eea2463e940832067f2f744d79e080d8dba7e9effbe92f06b70641757919fc994118972690bff9fd2823

data/.travis.yml

@@ -5,17 +5,15 @@ before_install:
   - gem install bundler # need for jruby and ruby-head
 
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2.5
   - 2.3.1
   - 2.4.1
+  - 2.5.3
+  - 2.6.0
   - jruby-19mode
   - ruby-head
   - jruby-head
 
 gemfile:
-  - gemfiles/rails32.gemfile
   - gemfiles/rails40_sprockets_2.gemfile
   - gemfiles/rails40_sprockets_3.gemfile
   - gemfiles/rails41_sprockets_2.gemfile
@@ -41,19 +39,27 @@ matrix:
     - rvm: ruby-head
     - rvm: jruby-head
   exclude:
-    - rvm: 2.0
-      gemfile: gemfiles/rails50_sprockets_3.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails50_sprockets_3.gemfile
-    - rvm: 2.0
-      gemfile: gemfiles/rails51_sprockets_3.gemfile
-    - rvm: 2.1
-      gemfile: gemfiles/rails51_sprockets_3.gemfile
+    - rvm: 2.6.0
+      gemfile: gemfiles/rails40_sprockets_2.gemfile # Segmentation fault
+    - rvm: 2.6.0
+      gemfile: gemfiles/rails40_sprockets_3.gemfile # Segmentation fault
+    - rvm: 2.6.0
+      gemfile: gemfiles/rails41_sprockets_2.gemfile # Segmentation fault
+    - rvm: 2.6.0
+      gemfile: gemfiles/rails41_sprockets_3.gemfile # Segmentation fault
+    - rvm: 2.5.3
+      gemfile: gemfiles/rails40_sprockets_2.gemfile # Segmentation fault
+    - rvm: 2.5.3
+      gemfile: gemfiles/rails40_sprockets_3.gemfile # Segmentation fault
+    - rvm: 2.5.3
+      gemfile: gemfiles/rails41_sprockets_2.gemfile # Segmentation fault
+    - rvm: 2.5.3
+      gemfile: gemfiles/rails41_sprockets_3.gemfile # Segmentation fault
     - rvm: 2.4.1
-      gemfile: gemfiles/rails40_sprockets_2.gemfile # Segmentation fault (core dumped) for 2.4
+      gemfile: gemfiles/rails40_sprockets_2.gemfile # Segmentation fault
     - rvm: 2.4.1
-      gemfile: gemfiles/rails40_sprockets_3.gemfile # Segmentation fault (core dumped) for 2.4
+      gemfile: gemfiles/rails40_sprockets_3.gemfile # Segmentation fault
     - rvm: 2.4.1
-      gemfile: gemfiles/rails41_sprockets_2.gemfile # Segmentation fault (core dumped) for 2.4
+      gemfile: gemfiles/rails41_sprockets_2.gemfile # Segmentation fault
     - rvm: 2.4.1
-      gemfile: gemfiles/rails41_sprockets_3.gemfile # Segmentation fault (core dumped) for 2.4
+      gemfile: gemfiles/rails41_sprockets_3.gemfile # Segmentation fault

data/Appraisals

@@ -1,8 +1,3 @@
-appraise "rails32" do
-  gem "railties", "~> 3.2.22.5"
-  gem 'tzinfo'
-end
-
 def define_appraisal(rails, version, sprockets)
   sprockets.each do |sprocket|
     appraise "#{rails}-sprockets-#{sprocket}" do

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## master
 
+## v1.4.5
+
+* Fix escaping inside route parameters and globbing #244
+
+## v1.4.4
+
 * More informative stack trace for ParameterMissing error #235
 
 ## v1.4.3

data/Readme.md

@@ -14,7 +14,7 @@ gem "js-routes"
 
 ### Basic Setup
 
-Require js routes file in `application.js` or other bundle
+Require JsRoutes in `application.js` or other bundle
 
 ``` js
 //= require js-routes
@@ -30,9 +30,9 @@ 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 rake task again.
 
-### Advanced Setup
+### Configuration
 
-If you need to customize routes file create initializer, like `config/initializers/jsroutes.rb`:
+You can configure JsRoutes in two main ways. Either with an initializer (e.g. `config/initializers/jsroutes.rb`):
 
 ``` ruby
 JsRoutes.setup do |config|
@@ -40,7 +40,7 @@ JsRoutes.setup do |config|
 end
 ```
 
-Or make a more dynamic configuration in JavaScript, but only specific options support the possibility of such configuration(see the list below):
+Or dynamically in JavaScript, although not all configuration options are supported:
 
 ``` js
 Routes.configure({
@@ -55,10 +55,10 @@ Available options:
   * Option is configurable at JS level with `Routes.configure()`
   * Example: {:format => "json", :trailing\_slash => true, :protocol => "https", :subdomain => "api", :host => "example.com", :port => 3000}
   * Default: {}
-* `exclude` - Array of regexps to exclude from js routes.
+* `exclude` - Array of regexps to exclude from routes.
   * Default: []
   * The regexp applies only to the name before the `_path` suffix, eg: you want to match exactly `settings_path`, the regexp should be `/^settings$/`
-* `include` - Array of regexps to include in js routes.
+* `include` - Array of regexps to include in routes.
   * Default: []
   * The regexp applies only to the name before the `_path` suffix, eg: you want to match exactly `settings_path`, the regexp should be `/^settings$/`
 * `namespace` - global object used to access routes.
@@ -83,7 +83,7 @@ Available options:
   * Example: `jQuery.param` - use jQuery's serializer algorithm. You can attach serialize function from your favorite AJAX framework.
   * Example: `MyApp.custom_serialize` - use completely custom serializer of your application.
 
-* `special_options_key` - a special key that helps js-routes to destinguish serialized model from options hash
+* `special_options_key` - a special key that helps JsRoutes to destinguish serialized model from options hash
   * This option is required because JS doesn't provide a difference between an object and a hash
   * Option is configurable at JS level with `Routes.configure()`
   * Default: `_options`
@@ -189,39 +189,30 @@ Routes.user_path.required_params // => ['id']
 ```
 
 
-## Rails Compatibilities
+## Rails Compatibility
 
-JsRoutes ties to be as close as possible to rails behaviour in all aspects of routing API.
-Please make and issue in case of any incomtibilities found outside of described below.
+JsRoutes tries to replicate the Rails routing API as closely as possible. If you find any incompatibilities (outside of what is described below), please [open an issue](https://github.com/railsware/js-routes/issues/new).
 
 ### Object and Hash distinction issue
 
-Sometimes the destinction between JS Hash and Object can not be found by js-routes.
+Sometimes the destinction between JS Hash and Object can not be found by JsRoutes.
 In this case you would need to pass a special key to help:
 
 ``` js
-Routes.company_project_path({company_id: 1, id: 2}) // => Not Enough parameters
+Routes.company_project_path({company_id: 1, id: 2}) // => Not enough parameters
 Routes.company_project_path({company_id: 1, id: 2, _options: true}) // => "/companies/1/projects/2"
 ```
 
 
 ## What about security?
 
-js-routes itself do not have security holes. It makes URLs
+JsRoutes 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
+## JsRoutes and Heroku
 
-When using Spork and `Spork.trap_method(Rails::Application::RoutesReloader, :reload!)` you should also do:
-
-``` ruby
-Spork.trap_method(JsRoutes, :generate!)
-```
-
-## JS-Routes and heroku
-
-Heroku environment has a specific problems with setup. It is impossible to use asset pipeline in this environment. You should use "Very Advanced Setup" schema in this case.
+When using this setup on Heroku, it is impossible to use the asset pipeline. You should use the "Very Advanced Setup" schema in this case.
 
 For example create routes.js.erb in assets folder with needed content:
 
@@ -236,16 +227,16 @@ This should just work.
 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:
 
-* Rails 3-5 support
+* Rails 4,5,6 support
 * Rich options set
 * Full rails compatibility
 * Support Rails `#to_param` convention for seo optimized paths
 * Well tested
 
-#### Thanks to [Contributors](https://github.com/railsware/js-routes/contributors)
+#### Thanks to [contributors](https://github.com/railsware/js-routes/contributors)
 
 #### Have fun
 
 
 ## License
-[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Frailsware%2Fjs-routes.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Frailsware%2Fjs-routes?ref=badge_large)
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Frailsware%2Fjs-routes.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Frailsware%2Fjs-routes?ref=badge_large)

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

@@ -1,2 +1,2 @@
 <%# encoding: UTF-8 %>
-<%= JsRoutes.assert_usable_configuration! && JsRoutes.generate %>
+<%= JsRoutes.generate %>

data/js-routes.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.summary = %q{Brings Rails named routes to javascript}
 
-  s.add_runtime_dependency(%q<railties>, [">= 3.2"])
+  s.add_runtime_dependency(%q<railties>, [">= 4"])
   s.add_runtime_dependency(%q<sprockets-rails>)
   s.add_development_dependency(%q<rspec>, [">= 3.0.0"])
   s.add_development_dependency(%q<bundler>, [">= 1.1.0"])

data/lib/js_routes.rb

@@ -98,16 +98,6 @@ class JsRoutes
       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 3 == Rails::VERSION::MAJOR && !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
@@ -130,8 +120,9 @@ class JsRoutes
     {
       "GEM_VERSION"         => JsRoutes::VERSION,
       "ROUTES"              => js_routes,
-      "DEPRECATED_BEHAVIOR" => Rails.version < "4",
       "NODE_TYPES"          => json(NODE_TYPES),
+      "RAILS_VERSION"       => ActionPack.version,
+      "DEPRECATED_GLOBBING_BEHAVIOR" => ActionPack::VERSION::MAJOR == 4 && ActionPack::VERSION::MINOR == 0,
 
       "APP_CLASS"           => application.class.to_s,
       "NAMESPACE"           => json(@configuration.namespace),
@@ -150,8 +141,15 @@ class JsRoutes
     # https://github.com/railsware/js-routes/issues/7
     Rails.configuration.after_initialize do
       file_name ||= self.class.configuration['file']
-      File.open(Rails.root.join(file_name), 'w') do |f|
-        f.write generate
+      file_path = Rails.root.join(file_name)
+      js_content = generate
+
+      # We don't need to rewrite file if it already exist and have same content.
+      # It helps asset pipeline or webpack understand that file wasn't changed.
+      return if File.exist?(file_path) && File.read(file_path) == js_content
+
+      File.open(file_path, 'w') do |f|
+        f.write js_content
       end
     end
   end

data/lib/js_routes/engine.rb

@@ -42,30 +42,17 @@ class Engine < ::Rails::Engine
                           raise StandardError, "Sprockets version #{sprockets_version} is not supported"
                       end
 
-  is_running_rails = defined?(Rails) && Rails.respond_to?(:version)
-  is_running_rails_32 = is_running_rails && Rails.version.match(/3\.2/)
-
   initializer 'js-routes.dependent_on_routes', initializer_args do
     case sprockets_version
       when  -> (v) { v2.match?('', v) },
             -> (v) { vgte3.match?('', v) }
 
-      # It seems rails 3.2 is not working if
-      # `Rails.application.config.assets.configure` is used for
-      # registering preprocessor
-      if is_running_rails_32
-        Rails.application.assets.register_preprocessor(
+      # Other rails version, assumed newer
+      Rails.application.config.assets.configure do |config|
+        config.register_preprocessor(
           "application/javascript",
           SprocketsExtension,
         )
-      else
-        # Other rails version, assumed newer
-        Rails.application.config.assets.configure do |config|
-          config.register_preprocessor(
-            "application/javascript",
-            SprocketsExtension,
-          )
-        end
       end
     else
       raise StandardError, "Sprockets version #{sprockets_version} is not supported"

data/lib/js_routes/version.rb

@@ -1,3 +1,3 @@
 class JsRoutes
-  VERSION = "1.4.4"
+  VERSION = "1.4.5"
 end

data/lib/routes.js

@@ -1,18 +1,19 @@
 /*
 File generated by js-routes GEM_VERSION
-Based on Rails routes of APP_CLASS
+Based on Rails RAILS_VERSION routes of APP_CLASS
  */
 
 (function() {
-  var DeprecatedBehavior, NodeTypes, ParameterMissing, ReservedOptions, SpecialOptionsKey, Utils, root,
+  var DeprecatedGlobbingBehavior, NodeTypes, ParameterMissing, ReservedOptions, SpecialOptionsKey, Utils, root,
     hasProp = {}.hasOwnProperty,
     slice = [].slice;
 
   root = typeof exports !== "undefined" && exports !== null ? exports : this;
 
-  function ParameterMissing(message, fileName, lineNumber) {
-    var instance = new Error(message, fileName, lineNumber);
-    if(Object.setPrototypeOf) {
+  ParameterMissing = function(message, fileName, lineNumber) {
+    var instance;
+    instance = new Error(message, fileName, lineNumber);
+    if (Object.setPrototypeOf) {
       Object.setPrototypeOf(instance, Object.getPrototypeOf(this));
     } else {
       instance.__proto__ = this.__proto__;
@@ -21,7 +22,7 @@ Based on Rails routes of APP_CLASS
       Error.captureStackTrace(instance, ParameterMissing);
     }
     return instance;
-  }
+  };
 
   ParameterMissing.prototype = Object.create(Error.prototype, {
     constructor: {
@@ -32,7 +33,7 @@ Based on Rails routes of APP_CLASS
     }
   });
 
-  if (Object.setPrototypeOf){
+  if (Object.setPrototypeOf) {
     Object.setPrototypeOf(ParameterMissing, Error);
   } else {
     ParameterMissing.__proto__ = Error;
@@ -40,9 +41,9 @@ Based on Rails routes of APP_CLASS
 
   NodeTypes = NODE_TYPES;
 
-  SpecialOptionsKey = SPECIAL_OPTIONS_KEY;
+  DeprecatedGlobbingBehavior = DEPRECATED_GLOBBING_BEHAVIOR;
 
-  DeprecatedBehavior = DEPRECATED_BEHAVIOR;
+  SpecialOptionsKey = SPECIAL_OPTIONS_KEY;
 
   ReservedOptions = ['anchor', 'trailing_slash', 'subdomain', 'host', 'port', 'protocol'];
 
@@ -202,7 +203,7 @@ Based on Rails routes of APP_CLASS
       if (actual_parameters.length > parts.length) {
         throw new Error("Too many parameters provided for path");
       }
-      use_all_parts = DeprecatedBehavior || actual_parameters.length > required_parts.length;
+      use_all_parts = actual_parameters.length > required_parts.length;
       parts_options = {};
       for (key in options) {
         if (!hasProp.call(options, key)) continue;
@@ -280,9 +281,9 @@ Based on Rails routes of APP_CLASS
           return "" + left_part + right_part;
         case NodeTypes.SYMBOL:
           value = parameters[left];
+          delete parameters[left];
           if (value != null) {
-            delete parameters[left];
-            return this.path_identifier(value);
+            return encodeURIComponent(this.path_identifier(value));
           }
           if (optional) {
             return "";
@@ -332,10 +333,11 @@ Based on Rails routes of APP_CLASS
         route[1] = left = left.replace(/^\*/i, "");
       }
       value = parameters[left];
+      delete parameters[left];
       if (value == null) {
         return this.visit(route, parameters, optional);
       }
-      parameters[left] = (function() {
+      value = (function() {
         switch (this.get_object_type(value)) {
           case "array":
             return value.join("/");
@@ -343,7 +345,11 @@ Based on Rails routes of APP_CLASS
             return value;
         }
       }).call(this);
-      return this.visit(route, parameters, optional);
+      if (DeprecatedGlobbingBehavior) {
+        return this.path_identifier(value);
+      } else {
+        return encodeURI(this.path_identifier(value));
+      }
     },
     get_prefix: function() {
       var prefix;

data/lib/routes.js.coffee

@@ -1,8 +1,7 @@
 ###
 File generated by js-routes GEM_VERSION
-Based on Rails routes of APP_CLASS
+Based on Rails RAILS_VERSION routes of APP_CLASS
 ###
-# root is this
 root = (exports ? this)
 
 ParameterMissing = (message, fileName, lineNumber) ->
@@ -28,8 +27,8 @@ else
   ParameterMissing.__proto__ = Error
 
 NodeTypes = NODE_TYPES
+DeprecatedGlobbingBehavior = DEPRECATED_GLOBBING_BEHAVIOR
 SpecialOptionsKey = SPECIAL_OPTIONS_KEY
-DeprecatedBehavior = DEPRECATED_BEHAVIOR
 
 ReservedOptions = [
   'anchor'
@@ -135,7 +134,7 @@ Utils =
     if actual_parameters.length > parts.length
       throw new Error("Too many parameters provided for path")
 
-    use_all_parts = DeprecatedBehavior or actual_parameters.length > required_parts.length
+    use_all_parts = actual_parameters.length > required_parts.length
     parts_options = {}
 
     for own key of options
@@ -211,9 +210,9 @@ Utils =
         "#{left_part}#{right_part}"
       when NodeTypes.SYMBOL
         value = parameters[left]
+        delete parameters[left]
         if value?
-          delete parameters[left]
-          return @path_identifier(value)
+          return encodeURIComponent(@path_identifier(value))
         if optional
           "" # missing parameter
         else
@@ -260,13 +259,18 @@ Utils =
     # fix for rails 4 globbing
     route[1] = left = left.replace(/^\*/i, "") if left.replace(/^\*/i, "") isnt left
     value = parameters[left]
+    delete parameters[left]
     return @visit(route, parameters, optional) unless value?
-    parameters[left] = switch @get_object_type(value)
+    value = switch @get_object_type(value)
       when "array"
         value.join("/")
       else
         value
-    @visit route, parameters, optional
+
+    if DeprecatedGlobbingBehavior
+      @path_identifier(value)
+    else
+      encodeURI(@path_identifier(value))
 
   #
   # This method check and return prefix from options

data/spec/js_routes/generated_javascript_spec.rb

@@ -14,7 +14,7 @@ describe JsRoutes do
       app_class = "App"
 
       is_expected.to include("File generated by js-routes #{JsRoutes::VERSION}")
-      is_expected.to include("Based on Rails routes of #{app_class}")
+      is_expected.to include("Based on Rails #{ActionPack.version} routes of #{app_class}")
     end
 
     it "should call route function for each route" do

data/spec/js_routes/options_spec.rb

@@ -6,9 +6,14 @@ describe JsRoutes, "options" do
     evaljs(_presetup) if _presetup
     with_warnings(_warnings) do
       evaljs(JsRoutes.generate(_options))
+      App.routes.default_url_options = _options[:default_url_options] || {}
     end
   end
 
+  after(:each) do
+    App.routes.default_url_options = {}
+  end
+
   let(:_presetup) { nil }
   let(:_options) { {} }
   let(:_warnings) { true }
@@ -134,12 +139,14 @@ describe JsRoutes, "options" do
     let(:_options) { {:default_url_options => {format: "json"}} }
     let(:_warnings) { nil }
 
-    it "should render routing with default_format" do
-      expect(evaljs("Routes.inbox_path(1)")).to eq(test_routes.inbox_path(1, :format => "json"))
-    end
+    if Rails.version >= "5"
+      it "should render routing with default_format" do
+        expect(evaljs("Routes.inbox_path(1)")).to eq(test_routes.inbox_path(1))
+      end
 
-    it "should render routing with default_format and zero object" do
-      expect(evaljs("Routes.inbox_path(0)")).to eq(test_routes.inbox_path(0, :format => "json"))
+      it "should render routing with default_format and zero object" do
+        expect(evaljs("Routes.inbox_path(0)")).to eq(test_routes.inbox_path(0))
+      end
     end
 
     it "should override default_format when spefified implicitly" do
@@ -147,13 +154,11 @@ describe JsRoutes, "options" do
     end
 
     it "should override nullify implicitly when specified implicitly" do
-      expect(evaljs("Routes.inbox_path(1, {format: null})")).to eq(test_routes.inbox_path(1))
+      expect(evaljs("Routes.inbox_path(1, {format: null})")).to eq(test_routes.inbox_path(1, format: nil))
     end
 
-
     it "shouldn't require the format" do
-      pending if Rails.version < "4.0"
-      expect(evaljs("Routes.json_only_path()")).to eq(test_routes.json_only_path(:format => 'json'))
+      expect(evaljs("Routes.json_only_path()")).to eq(test_routes.json_only_path)
     end
   end
 
@@ -201,14 +206,14 @@ describe JsRoutes, "options" do
       context "provided" do
         let(:_options) { { :default_url_options => { :optional_id => "12", :format => "json" } } }
         it "should use this opions to fill optional parameters" do
-          expect(evaljs("Routes.things_path()")).to eq(test_routes.things_path(:optional_id => 12, :format => "json"))
+          expect(evaljs("Routes.things_path()")).to eq(test_routes.things_path)
         end
       end
 
       context "not provided" do
         let(:_options) { { :default_url_options => { :format => "json" } } }
         it "breaks" do
-          expect(evaljs("Routes.foo_all_path()")).to eq(test_routes.foo_all_path(:format => "json"))
+          expect(evaljs("Routes.foo_all_path()")).to eq(test_routes.foo_all_path)
         end
       end
     end
@@ -216,7 +221,7 @@ describe JsRoutes, "options" do
     context "with required route parts" do
       let(:_options) { {:default_url_options => {:inbox_id => "12"}} }
       it "should use this opions to fill optional parameters" do
-        expect(evaljs("Routes.inbox_messages_path()")).to eq(test_routes.inbox_messages_path(:inbox_id => 12))
+        expect(evaljs("Routes.inbox_messages_path()")).to eq(test_routes.inbox_messages_path)
       end
     end
 
@@ -248,7 +253,7 @@ describe JsRoutes, "options" do
       end
 
       it "should remove it by params" do
-        expect(evaljs("Routes.inbox_path(1, {trailing_slash: false})")).to eq(test_routes.inbox_path(1))
+        expect(evaljs("Routes.inbox_path(1, {trailing_slash: false})")).to eq(test_routes.inbox_path(1, trailing_slash: false))
       end
     end
 

data/spec/js_routes/rails_routes_compatibility_spec.rb

@@ -70,6 +70,10 @@ describe JsRoutes, "compatibility with Rails"  do
     expect(evaljs("Routes.inbox_path(1, {expanded: true, anchor: 'hello'})")).to eq(test_routes.inbox_path(1, :expanded => true, :anchor => "hello"))
   end
 
+  it "should support required paramters given as options hash" do
+    expect(evaljs("Routes.search_path({q: 'hello'})")).to eq(test_routes.search_path(:q => 'hello'))
+  end
+
   it "should use irregular ActiveSupport pluralizations" do
     expect(evaljs("Routes.budgies_path()")).to eq(test_routes.budgies_path)
     expect(evaljs("Routes.budgie_path(1)")).to eq(test_routes.budgie_path(1))
@@ -111,6 +115,9 @@ describe JsRoutes, "compatibility with Rails"  do
     it "should support route with parameters" do
       expect(evaljs("Routes.blog_app_post_path(1)")).to eq(blog_routes.post_path(1))
     end
+    it "should support route with parameters containing symbols that need URI-encoding" do
+      expect(evaljs("Routes.blog_app_post_path('#hello')")).to eq(blog_routes.post_path('#hello'))
+    end
     it "should support root path" do
       expect(evaljs("Routes.blog_app_root_path()")).to eq(blog_routes.root_path)
     end
@@ -158,6 +165,9 @@ describe JsRoutes, "compatibility with Rails"  do
       expect(evaljs("Routes.inboxes_path({uri: 'http://example.com'})")).to eq(test_routes.inboxes_path(:uri => 'http://example.com'))
     end
 
+    it "should support nested object null parameters" do
+      expect(evaljs("Routes.inboxes_path({hello: {world: null}})")).to eq(test_routes.inboxes_path(:hello => {:world => nil}))
+    end
   end
 
 
@@ -170,14 +180,18 @@ describe JsRoutes, "compatibility with Rails"  do
       expect(evaljs("Routes.book_path(['thrillers'], 1)")).to eq(test_routes.book_path(['thrillers'], 1))
     end
 
-    it "should bee support routes globbing as array" do
+    it "should support routes globbing as array" do
       expect(evaljs("Routes.book_path([1, 2, 3], 1)")).to eq(test_routes.book_path([1, 2, 3], 1))
     end
 
-    it "should bee support routes globbing as hash" do
+    it "should support routes globbing with slash" do
       expect(evaljs("Routes.book_path('a_test/b_test/c_test', 1)")).to eq(test_routes.book_path('a_test/b_test/c_test', 1))
     end
 
+    it "should support routes globbing as hash" do
+      expect(evaljs("Routes.book_path('a%b', 1)")).to eq(test_routes.book_path('a%b', 1))
+    end
+
     it "should support routes globbing as array with optional params" do
       expect(evaljs("Routes.book_path([1, 2, 3, 5], 1, {c: '1'})")).to eq(test_routes.book_path([1, 2, 3, 5], 1, { :c => "1" }))
     end
@@ -189,14 +203,6 @@ describe JsRoutes, "compatibility with Rails"  do
     it "should support routes globbing in book_title route as array with optional params" do
       expect(evaljs("Routes.book_title_path('john', ['thrillers', 'comedian'], {some_key: 'some_value'})")).to eq(test_routes.book_title_path('john', ['thrillers', 'comedian'], {:some_key => 'some_value'}))
     end
-
-    it "should support required paramters given as options hash" do
-      expect(evaljs("Routes.search_path({q: 'hello'})")).to eq(test_routes.search_path(:q => 'hello'))
-    end
-
-    it "should support nested object null parameters" do
-      expect(evaljs("Routes.inboxes_path({hello: {world: null}})")).to eq(test_routes.inboxes_path(:hello => {:world => nil}))
-    end
   end
 
   context "using optional path fragments" do
@@ -234,19 +240,13 @@ describe JsRoutes, "compatibility with Rails"  do
       end
 
       it "should skip leading and trailing optional parts" do
-        skip if Rails.version < '4'
         expect(evaljs("Routes.thing_deep_path(1, 2)")).to eq(test_routes.thing_deep_path(1, 2))
       end
     end
 
     context "and including them" do
-      if Rails.version < '4'
-        it "should fail when insufficient arguments are given" do
-          expect { evaljs("Routes.thing_deep_path(1)")}
-            .to raise_error('Route parameter missing: second_required')
-          expect { evaljs("Routes.thing_deep_path(1,2)")}
-            .to raise_error('Route parameter missing: third_required')
-        end
+      it "should fail when insufficient arguments are given" do
+        expect { evaljs("Routes.thing_deep_path(2)") }.to raise_error('Route parameter missing: third_required')
       end
 
       it "should include the optional parts" do
@@ -258,6 +258,7 @@ describe JsRoutes, "compatibility with Rails"  do
         expect(evaljs("Routes.thing_deep_path(3, { first_optional: 1, second_required: 2 })")).to eq(test_routes.thing_deep_path(3, first_optional: 1, second_required: 2))
         expect(evaljs("Routes.thing_deep_path(3, { first_optional: 1, second_required: 2, forth_optional: 4 })")).to eq(test_routes.thing_deep_path(3, first_optional: 1, second_required: 2, forth_optional: 4))
         expect(evaljs("Routes.thing_deep_path(4, { first_optional: 1, second_required: 2, third_required: 3 })")).to eq(test_routes.thing_deep_path(4, first_optional: 1, second_required: 2, third_required: 3))
+        expect(evaljs("Routes.thing_deep_path(2, 3)")).to eq(test_routes.thing_deep_path(2, 3))
         expect(evaljs("Routes.thing_deep_path(1, 2, { third_required: 3 })")).to eq(test_routes.thing_deep_path(1, 2, third_required: 3))
         expect(evaljs("Routes.thing_deep_path(1,2, {third_required: 3, q: 'bogdan'})")).to eq(test_routes.thing_deep_path(1,2, {third_required: 3, q: 'bogdan'}))
         expect(evaljs("Routes.thing_deep_path(1, 2, { forth_optional: 4, third_required: 3 })")).to eq(test_routes.thing_deep_path(1, 2, forth_optional: 4, third_required: 3))

data/spec/js_routes/zzz_last_post_rails_init_spec.rb

@@ -43,6 +43,21 @@ describe "after Rails initialization" do
     expect(File.exists?(NAME)).to be_truthy
   end
 
+  it "should not rewrite routes file if nothing changed" do
+    routes_file_mtime = File.mtime(NAME)
+    JsRoutes.generate!(NAME)
+    expect(File.mtime(NAME)).to eq(routes_file_mtime)
+  end
+
+  it "should rewrite routes file if file content changed" do
+    # Change content of existed routes file (add space to the end of file).
+    File.open(NAME, 'a') { |f| f << ' ' }
+    routes_file_mtime = File.mtime(NAME)
+    sleep(1)
+    JsRoutes.generate!(NAME)
+    expect(File.mtime(NAME)).not_to eq(routes_file_mtime)
+  end
+
   context "JsRoutes::Engine" do
     TEST_ASSET_PATH = Rails.root.join('app','assets','javascripts','test.js')
 
@@ -86,11 +101,7 @@ describe "after Rails initialization" do
               Rails.application.config.assets.initialize_on_precompile = false
             end
             it "should raise an exception if 3 version" do
-              if 3 == Rails::VERSION::MAJOR
-                expect { evaluate(ctx, 'js-routes.js') }.to raise_error(/Cannot precompile/)
-              else
-                expect(evaluate(ctx, 'js-routes.js')).to match(/routes = /)
-              end
+              expect(evaluate(ctx, 'js-routes.js')).to match(/routes = /)
             end
           end
 

data/spec/spec_helper.rb

@@ -7,8 +7,6 @@ require 'rails/all'
 require 'js-routes'
 require 'active_support/core_ext/hash/slice'
 require 'coffee-script'
-# fix ends_with? error for rails 3.2
-require 'active_support/core_ext/string/starts_ends_with' if 3 == Rails::VERSION::MAJOR
 
 if defined?(JRUBY_VERSION)
   require 'rhino'
@@ -60,13 +58,7 @@ 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
-
+  config.paths['config/routes.rb'] << 'spec/config/routes.rb'
   config.root = File.expand_path('../dummy', __FILE__)
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js-routes
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2019-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +155,6 @@ files:
 - Rakefile
 - Readme.md
 - app/assets/javascripts/js-routes.js.erb
-- gemfiles/rails32.gemfile
 - gemfiles/rails40_sprockets_2.gemfile
 - gemfiles/rails40_sprockets_3.gemfile
 - gemfiles/rails41_sprockets_2.gemfile
@@ -202,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Brings Rails named routes to javascript

data/gemfiles/rails32.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "railties", "~> 3.2.22.5"
-gem "tzinfo"
-
-gemspec :path => "../"