js-routes 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b2b15773ea1f4c5fd8870ccda544a7386e28108
-  data.tar.gz: ffd6b967fd16e89a1d976098da3fa00109924319
+  metadata.gz: ea60a5a1b545228955e4b886562999449511cd91
+  data.tar.gz: 72c3ef411752b3ae5f674a82df98ee09879f8ab9
 SHA512:
-  metadata.gz: 6e5b2c94c2c60924ab690669b61c95075e7bcc3ef576cd8284ee1a7d30aa63427a8826079eece47629cfe31bcafbde00ee63bae5b9f0d39f91a505ae4561c2f6
-  data.tar.gz: 69f1daf6f674da744d13dd6440af0a70399cfdfe3ecd29a3203c6ec9447e5367baaad19b998c85403c982cfbc6dc04e61f16a55ce796f493c47d69a43932265f
+  metadata.gz: 7a8a4432e8eaf2dd39aaa4276adbba282b1d982f72646dd5693bfa1627f03c753d1c1b920489f7c42f5ff431957f3509fbefe3626e877a1779586ba611514e3b
+  data.tar.gz: a31e1fb5b3e7b66f1ed4f1f2712dc3f9e583db041bd60813090de72a909eb881bc2df425ae435c9bebb232208b674f0f86000ac099b670e6281b106f0338d2e2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## master
 
+## v1.3.0
+
+* Introduce the special _options key. Fixes #86
+
 ## v1.2.9
 
 * Fixed deprecation varning on Sprockets 3.7

data/lib/js_routes/engine.rb

@@ -42,28 +42,34 @@ 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) }
-        if Rails.application.assets.respond_to?(:register_preprocessor)
-          routes = Rails.root.join('config', 'routes.rb').to_s
-          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'
-            data
-          end
-        end
-      when -> (v) { v3.match?('', v) }
+      when  -> (v) { v2.match?('', v) },
+            -> (v) { v3.match?('', v) },
+            -> (v) { v37.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(
+          "application/javascript",
+          JsRoutesSprocketsExtension,
+        )
+      else
+        # Other rails version, assumed newer
         Rails.application.config.assets.configure do |config|
-          routes = Rails.root.join('config', 'routes.rb').to_s
-          config.register_preprocessor 'application/javascript', :'js-routes_dependent_on_routes' do |ctx, data|
-            ctx.depend_on(routes) if ctx.logical_path == 'js-routes'
-            data
-          end
+          config.register_preprocessor(
+            "application/javascript",
+            JsRoutesSprocketsExtension,
+          )
         end
-      when -> (v) { v37.match?('', v) }
-        Sprockets.register_preprocessor 'application/javascript', JsRoutesSprocketsExtension
-      else
-        raise StandardError, "Sprockets version #{sprockets_version} is not supported"
+      end
+    else
+      raise StandardError, "Sprockets version #{sprockets_version} is not supported"
     end
   end
 end

data/lib/js_routes/version.rb

@@ -1,3 +1,3 @@
 class JsRoutes
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/lib/routes.js

@@ -112,8 +112,14 @@ Based on Rails routes of APP_CLASS
       property = object;
       if (this.get_object_type(object) === "object") {
         if ("to_param" in object) {
+          if (object.to_param == null) {
+            throw new ParameterMissing("Route parameter missing: to_param");
+          }
           property = object.to_param;
         } else if ("id" in object) {
+          if (object.id == null) {
+            throw new ParameterMissing("Route parameter missing: id");
+          }
           property = object.id;
         } else {
           property = object;

data/lib/routes.js.coffee

@@ -64,7 +64,7 @@ Utils =
 
   extract_options: (number_of_params, args) ->
     last_el = args[args.length - 1]
-    if (args.length > number_of_params and last_el == undefined) or(last_el? and "object" is @get_object_type(last_el) and !@looks_like_serialized_model(last_el))
+    if (args.length > number_of_params and last_el == undefined) or (last_el? and "object" is @get_object_type(last_el) and !@looks_like_serialized_model(last_el))
       options = args.pop() || {}
       delete options[SpecialOptionsKey]
       options
@@ -82,8 +82,10 @@ Utils =
     property = object
     if @get_object_type(object) is "object"
       if "to_param" of object
+        throw new ParameterMissing("Route parameter missing: to_param") unless object.to_param?
         property = object.to_param
       else if "id" of object
+        throw new ParameterMissing("Route parameter missing: id") unless object.id?
         property = object.id
       else
         property = object

data/spec/js_routes/rails_routes_compatibility_spec.rb

@@ -61,7 +61,7 @@ describe JsRoutes, "compatibility with Rails"  do
     it 'should support route default subdomain' do
       # root inside namespace is broken
       # https://github.com/rails/rails/pull/23235
-      pending if Rails.version == '5.0.0'
+      pending if Rails.version >= '5.0.0' && Rails.version <= "5.0.1"
       expect(evaljs("Routes.backend_root_path()")).to eq(routes.backend_root_path)
     end
 
@@ -207,8 +207,11 @@ describe JsRoutes, "compatibility with Rails"  do
       end
 
       context "on nested optional parts" do
-        it "should include everything that is not optional" do
-          expect(evaljs("Routes.classic_path({controller: 'classic', action: 'edit'})")).to eq(routes.classic_path(controller: :classic, action: :edit))
+        if Rails.version <= "5.0.0"
+          # this type of routing is deprecated
+          it "should include everything that is not optional" do
+            expect(evaljs("Routes.classic_path({controller: 'classic', action: 'edit'})")).to eq(routes.classic_path(controller: :classic, action: :edit))
+          end
         end
       end
     end
@@ -232,6 +235,18 @@ describe JsRoutes, "compatibility with Rails"  do
         evaljs("Routes.inbox_path(1,2)")
       }.to raise_error(js_error_class)
     end
+
+    it "should throw Exceptions if when pass id with null" do
+      expect {
+        evaljs("Routes.inbox_path({id: null})")
+      }.to raise_error(js_error_class)
+    end
+
+    it "should throw Exceptions if when pass to_param with null" do
+      expect {
+        evaljs("Routes.inbox_path({to_param: null})")
+      }.to raise_error(js_error_class)
+    end
   end
 
   context "when javascript engine without Array#indexOf is used" do

data/spec/support/routes.rb

@@ -29,7 +29,9 @@ def draw_routes
       resources :things
     end
 
-    get "/:controller(/:action(/:id))" => "classic#classic", :as => :classic
+    if Rails.version < "5.0.0"
+      get "/:controller(/:action(/:id))" => "classic#classic", :as => :classic
+    end
 
     get "/other_optional/(:optional_id)" => "foo#foo", :as => :foo
     get '/other_optional(/*optional_id)' => 'foo#foo', :as => :foo_all

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js-routes
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Brings Rails named routes to javascript