js-routes 1.4.5 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e5ccc1ef3fef13c8d626f32e06cf99593acef814a7777aea3fb3d1452e1a92c
-  data.tar.gz: 2a68dec293c58cd47939b8260da2a5038334d36fb72c3d967ec05088c46e039f
+  metadata.gz: e210567d580be40825a39c8fd5e13b15509f304f46e22909d6462e5fc1a1b817
+  data.tar.gz: 8c63da6abc92f0bc0478b3dba504151c42322253edf32c264137633d6469ccce
 SHA512:
-  metadata.gz: '098b77abe8a1b7ade8c19b9adca75d51fef15d0ba17908e1f950b664a44cf5aa95bb12f3eea26c7e7112992db559ad1cb489116e47fe0728fc7f729d8788a96a'
-  data.tar.gz: 492dec4811ae13841cd9a433bd313cd5677f2a31d941eea2463e940832067f2f744d79e080d8dba7e9effbe92f06b70641757919fc994118972690bff9fd2823
+  metadata.gz: f1515a6cd44bebc46459df4b404e4e839724aa5c5b8b4ded487f74a794592cef776666ed496dafdf4444c6cf9c672060efe44ed40c718952683dc748fd72c903
+  data.tar.gz: bd9e6b90de5410d71b1a98c490237962f25de377680994afdbfa0c27c19ce36ac049fc9d4a250a71a279517edb5b90a27fb75e3f4b0618ca5a42773612f17c3f

data/.travis.yml

@@ -9,9 +9,8 @@ rvm:
   - 2.4.1
   - 2.5.3
   - 2.6.0
-  - jruby-19mode
   - ruby-head
-  - jruby-head
+  - jruby
 
 gemfile:
   - gemfiles/rails40_sprockets_2.gemfile
@@ -22,8 +21,10 @@ gemfile:
   - gemfiles/rails42_sprockets_3.gemfile
   - gemfiles/rails50_sprockets_3.gemfile
   - gemfiles/rails51_sprockets_3.gemfile
+  - gemfiles/rails52_sprockets_3.gemfile
 
 sudo: false
+dist: xenial
 
 notifications:
   email:
@@ -34,10 +35,10 @@ branches:
     - master
 
 matrix:
+  fast_finish: true
   allow_failures:
-    - rvm: jruby-19mode
     - rvm: ruby-head
-    - rvm: jruby-head
+    - rvm: jruby
   exclude:
     - rvm: 2.6.0
       gemfile: gemfiles/rails40_sprockets_2.gemfile # Segmentation fault

data/Appraisals

@@ -12,7 +12,8 @@ end
   [:rails41, '4.1.16', [2, 3]],
   [:rails42, '4.2.9',  [2, 3]],
   [:rails50, '5.0.5',  [3]],
-  [:rails51, '5.1.3',  [3]]
+  [:rails51, '5.1.3',  [3]],
+  [:rails52, '5.2.3',  [3]]
 ].each do |name, version, sprockets|
   define_appraisal(name, version, sprockets)
 end

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## master
 
+## v1.4.6
+
+* Fix regression of #244 in #243
+
 ## v1.4.5
 
 * Fix escaping inside route parameters and globbing #244

data/gemfiles/rails52_sprockets_3.gemfile

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

data/js-routes.gemspec

@@ -31,6 +31,6 @@ Gem::Specification.new do |s|
   else
     s.add_development_dependency(%q<byebug>)
     s.add_development_dependency(%q<pry-byebug>)
-    s.add_development_dependency(%q<therubyracer>, [">= 0.12.3"])
+    s.add_development_dependency(%q<mini_racer>, [">= 0.2.4"])
   end
 end

data/lib/js_routes/version.rb

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

data/lib/routes.js

@@ -4,7 +4,7 @@ Based on Rails RAILS_VERSION routes of APP_CLASS
  */
 
 (function() {
-  var DeprecatedGlobbingBehavior, NodeTypes, ParameterMissing, ReservedOptions, SpecialOptionsKey, Utils, root,
+  var DeprecatedGlobbingBehavior, NodeTypes, ParameterMissing, ReservedOptions, SpecialOptionsKey, UriEncoderSegmentRegex, Utils, root,
     hasProp = {}.hasOwnProperty,
     slice = [].slice;
 
@@ -45,6 +45,8 @@ Based on Rails RAILS_VERSION routes of APP_CLASS
 
   SpecialOptionsKey = SPECIAL_OPTIONS_KEY;
 
+  UriEncoderSegmentRegex = /[^a-zA-Z0-9\-\._~!\$&'\(\)\*\+,;=:@]/g;
+
   ReservedOptions = ['anchor', 'trailing_slash', 'subdomain', 'host', 'port', 'protocol'];
 
   Utils = {
@@ -283,7 +285,7 @@ Based on Rails RAILS_VERSION routes of APP_CLASS
           value = parameters[left];
           delete parameters[left];
           if (value != null) {
-            return encodeURIComponent(this.path_identifier(value));
+            return this.encode_segment(this.path_identifier(value));
           }
           if (optional) {
             return "";
@@ -295,6 +297,11 @@ Based on Rails RAILS_VERSION routes of APP_CLASS
           throw new Error("Unknown Rails node type");
       }
     },
+    encode_segment: function(segment) {
+      return segment.replace(UriEncoderSegmentRegex, function(str) {
+        return encodeURIComponent(str);
+      });
+    },
     is_optional_node: function(node) {
       return this.indexOf([NodeTypes.STAR, NodeTypes.SYMBOL, NodeTypes.CAT], node) >= 0;
     },

data/lib/routes.js.coffee

@@ -29,6 +29,7 @@ else
 NodeTypes = NODE_TYPES
 DeprecatedGlobbingBehavior = DEPRECATED_GLOBBING_BEHAVIOR
 SpecialOptionsKey = SPECIAL_OPTIONS_KEY
+UriEncoderSegmentRegex = /[^a-zA-Z0-9\-\._~!\$&'\(\)\*\+,;=:@]/g # this is ActionDispatch::Journey::Router::Utils::UriEncoder::SEGMENT
 
 ReservedOptions = [
   'anchor'
@@ -212,7 +213,7 @@ Utils =
         value = parameters[left]
         delete parameters[left]
         if value?
-          return encodeURIComponent(@path_identifier(value))
+          return @encode_segment(@path_identifier(value))
         if optional
           "" # missing parameter
         else
@@ -225,6 +226,7 @@ Utils =
       else
         throw new Error("Unknown Rails node type")
 
+  encode_segment: (segment) -> segment.replace(UriEncoderSegmentRegex, (str) -> encodeURIComponent(str))
 
   is_optional_node: (node) -> @indexOf([NodeTypes.STAR, NodeTypes.SYMBOL, NodeTypes.CAT], node) >= 0
 
@@ -401,7 +403,7 @@ Utils =
     routes.default_serializer = (object, prefix) ->
       Utils.default_serializer(object, prefix)
     Utils.namespace(root, NAMESPACE, routes)
-  
+
 # Set up Routes appropriately for the environment.
 if typeof define is "function" and define.amd
   # AMD

data/spec/js_routes/rails_routes_compatibility_spec.rb

@@ -14,15 +14,15 @@ describe JsRoutes, "compatibility with Rails"  do
     expect(evaljs("Routes.inbox_path(1)")).to eq(test_routes.inbox_path(1))
   end
 
-  it "should raise error if required argument is not passed" do
+  it "should raise error if required argument is not passed", :aggregate_failures do
     expect { evaljs("Routes.thing_path()") }
-      .to raise_error('Route parameter missing: id')
+      .to raise_error(/Route parameter missing: id/)
     expect { evaljs("Routes.search_path()") }
-      .to raise_error('Route parameter missing: q')
+      .to raise_error(/Route parameter missing: q/)
     expect { evaljs("Routes.book_path()") }
-      .to raise_error('Route parameter missing: title')
+      .to raise_error(/Route parameter missing: title/)
     expect { evaljs("Routes.book_title_path()") }
-      .to raise_error('Route parameter missing: title')
+      .to raise_error(/Route parameter missing: title/)
   end
 
   it "should produce error stacktraces including function names" do
@@ -81,6 +81,16 @@ describe JsRoutes, "compatibility with Rails"  do
     expect(evaljs("Routes.budgie_descendents_path(1)")).to eq(test_routes.budgie_descendents_path(1))
   end
 
+  it "should support route with parameters containing symbols that need URI-encoding", :aggregate_failures do
+    expect(evaljs("Routes.inbox_path('#hello')")).to eq(test_routes.inbox_path('#hello'))
+    expect(evaljs("Routes.inbox_path('some param')")).to eq(test_routes.inbox_path('some param'))
+    expect(evaljs("Routes.inbox_path('some param with more & more encode symbols')")).to eq(test_routes.inbox_path('some param with more & more encode symbols'))
+  end
+  it "should support route with parameters containing symbols not need URI-encoding", :aggregate_failures do
+    expect(evaljs("Routes.inbox_path(':some_id')")).to eq(test_routes.inbox_path(':some_id'))
+    expect(evaljs("Routes.inbox_path('.+')")).to eq(test_routes.inbox_path('.+'))
+  end
+
   describe "when route has defaults" do
     it "should support route default format" do
       expect(evaljs("Routes.api_purchases_path()")).to eq(test_routes.api_purchases_path)
@@ -115,9 +125,6 @@ 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
@@ -228,7 +235,7 @@ describe JsRoutes, "compatibility with Rails"  do
 
       it "should raise error when passing non-full list of arguments and some query params" do
         expect { evaljs("Routes.thing_path(5, {q: 'hello'})") }
-          .to raise_error('Route parameter missing: id')
+          .to raise_error(/Route parameter missing: id/)
       end
 
       it "should treat null as non-given optional part" do
@@ -246,7 +253,7 @@ describe JsRoutes, "compatibility with Rails"  do
 
     context "and including them" do
       it "should fail when insufficient arguments are given" do
-        expect { evaljs("Routes.thing_deep_path(2)") }.to raise_error('Route parameter missing: third_required')
+        expect { evaljs("Routes.thing_deep_path(2)") }.to raise_error(/Route parameter missing: third_required/)
       end
 
       it "should include the optional parts" do

data/spec/spec_helper.rb

@@ -12,8 +12,8 @@ if defined?(JRUBY_VERSION)
   require 'rhino'
   JS_LIB_CLASS = Rhino
 else
-  require 'v8'
-  JS_LIB_CLASS = V8
+  require 'mini_racer'
+  JS_LIB_CLASS = MiniRacer
 end
 
 def jscontext(force = false)
@@ -25,7 +25,11 @@ def jscontext(force = false)
 end
 
 def js_error_class
-  JS_LIB_CLASS::JSError
+  if defined?(JRUBY_VERSION)
+    JS_LIB_CLASS::JSError
+  else
+    JS_LIB_CLASS::Error
+  end
 end
 
 def evaljs(string, force = false)
@@ -89,25 +93,14 @@ RSpec.configure do |config|
   config.before :each do
     evaljs("var window = this;", true)
 
-    def inspectify(value)
-      case value
-      when V8::Array
-        value.map do |v|
-          inspectify(v)
-        end
-      when V8::Object
-        value.to_h.map do |k,v|
-          [k, inspectify(v)]
-        end.to_h
-      when String, nil, Integer, FalseClass, TrueClass
-        value
-      else
-        raise "wtf #{value.class}?"
+    if defined?(JRUBY_VERSION)
+      jscontext[:log] = lambda do |context, value|
+        puts value
       end
-
-    end
-    jscontext[:log] = lambda do |context, value|
-      puts inspectify(value).to_json
+    else
+      jscontext.attach("log", proc do |value|
+        puts value
+      end)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js-routes
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -123,19 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: therubyracer
+  name: mini_racer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: 0.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: 0.2.4
 description: Generates javascript file that defines all Rails named routes as javascript
   helpers
 email: agresso@gmail.com
@@ -163,6 +163,7 @@ files:
 - gemfiles/rails42_sprockets_3.gemfile
 - gemfiles/rails50_sprockets_3.gemfile
 - gemfiles/rails51_sprockets_3.gemfile
+- gemfiles/rails52_sprockets_3.gemfile
 - js-routes.gemspec
 - lib/js-routes.rb
 - lib/js_routes.rb