js-routes 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f0198d8ff6f861e2cee2326141e2bb1cbfd974c
-  data.tar.gz: 1052236ee191127a860aae5a71d22a1b0c7b8613
+  metadata.gz: 3c2993fd7d6c758d98b5f7024ab7c21e2be8f600
+  data.tar.gz: d89427d56039f4f6922d4b508672fccd2aaf1497
 SHA512:
-  metadata.gz: 6894424f650a910ba90b4a8ff1700bf564b320cfe7d124dfe3026a67c988d07ce06e745f8861de83e6c1add80a5bb71a91ecfa329e6523cfff13a344873253d2
-  data.tar.gz: af3bd894e3936bc2cf1621e0f4b19980887df8d8a3ee3dab99949290328d02ab70b845ea2e09021df951c299ce0d26110e9309fd7bb017497b8702b3574ab52c
+  metadata.gz: 85c514ad1542f4d924611c822475b8e667bc4fcc851ddc0239af229bdab77a99c0a625a452af0900050dd90d517cb3696de9e6c26539ba7701f51d960df3b68e
+  data.tar.gz: ee8810fec35db2da1c0f025663d994eea6d700e45cd4fb3a7c32ac9da2ab68719614dd9cdbccbad6f5ed4e8ebf9a7d9b6fdcc2175b474861387c8d48473ff564

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## master
 
+## v1.1.1
+
+* Bugfix regression in serialisation on blank strings caused by [#155](https://github.com/railsware/js-routes/pull/155/files)
+
 ## v1.1.0
 
 * Ensure routes are loaded, prior to generating them [#148](https://github.com/railsware/js-routes/pull/148)

data/lib/js_routes/version.rb

@@ -1,3 +1,3 @@
 class JsRoutes
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/lib/routes.js

@@ -46,13 +46,15 @@ Based on Rails routes of APP_CLASS
           for (key in object) {
             if (!hasProp.call(object, key)) continue;
             prop = object[key];
-            if (!(prop != null)) {
-              continue;
+            if ((prop == null) && (prefix != null)) {
+              prop = "";
             }
-            if (prefix != null) {
-              key = prefix + "[" + key + "]";
+            if (prop != null) {
+              if (prefix != null) {
+                key = prefix + "[" + key + "]";
+              }
+              s.push(this.default_serializer(prop, key));
             }
-            s.push(this.default_serializer(prop, key));
           }
           break;
         default:
@@ -211,7 +213,7 @@ Based on Rails routes of APP_CLASS
         case NodeTypes.CAT:
           left_part = this.visit(left, parameters, optional);
           right_part = this.visit(right, parameters, optional);
-          if (optional && !(left_part && right_part)) {
+          if (optional && (((left[0] === NodeTypes.SYMBOL || left[0] === NodeTypes.CAT) && !left_part) || ((right[0] === NodeTypes.SYMBOL || right[0] === NodeTypes.CAT) && !right_part))) {
             return "";
           }
           return "" + left_part + right_part;

data/lib/routes.js.coffee

@@ -26,9 +26,13 @@ Utils =
         for element, i in object
           s.push @default_serializer(element, prefix + "[]")
       when "object"
-        for own key, prop of object when prop?
-          key = "#{prefix}[#{key}]" if prefix?
-          s.push @default_serializer(prop, key)
+        for own key, prop of object
+          if !prop? and prefix?
+            prop = ""
+
+          if prop?
+            key = "#{prefix}[#{key}]" if prefix?
+            s.push @default_serializer(prop, key)
       else
         if object?
           s.push "#{encodeURIComponent(prefix.toString())}=#{encodeURIComponent(object.toString())}"
@@ -155,7 +159,8 @@ Utils =
       when NodeTypes.CAT
         left_part = @visit(left, parameters, optional)
         right_part = @visit(right, parameters, optional)
-        return "" if optional and not (left_part and right_part)
+        return "" if optional and (((left[0]  == NodeTypes.SYMBOL or left[0]  == NodeTypes.CAT) and not left_part) or
+                                   ((right[0] == NodeTypes.SYMBOL or right[0] == NodeTypes.CAT) and not right_part))
         "#{left_part}#{right_part}"
       when NodeTypes.SYMBOL
         value = parameters[left]

data/spec/js_routes/rails_routes_compatibility_spec.rb

@@ -145,9 +145,8 @@ describe JsRoutes, "compatibility with Rails"  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}))
+    it "should support nested object null parameters" do
+      expect(evaljs("Routes.inboxes_path({hello: {world: null}})")).to eq(routes.inboxes_path(:hello => {:world => nil}))
     end
   end
 
@@ -183,6 +182,11 @@ describe JsRoutes, "compatibility with Rails"  do
         expect(evaljs("Routes.things_path({optional_id: 5})")).to eq(routes.things_path(:optional_id => 5))
       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))
+        end
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -97,6 +97,8 @@ def draw_routes
       resources :things
     end
 
+    get "/:controller(/:action(/:id))" => "classic#classic", :as => :classic
+
     get "/other_optional/(:optional_id)" => "foo#foo", :as => :foo
 
     get 'books/*section/:title' => 'books#show', :as => :book

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js-routes
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties