js-routes 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d01616a12162f3955743143d09ce4e4e0297284a
-  data.tar.gz: b515223e7fa4122852861fbe5e6cddbe927aadec
+  metadata.gz: 7f0198d8ff6f861e2cee2326141e2bb1cbfd974c
+  data.tar.gz: 1052236ee191127a860aae5a71d22a1b0c7b8613
 SHA512:
-  metadata.gz: 847807d48bf2c431609b98eeb940d0c8da008bbebf8a04d5c857b02aeab54e9c3648c3d7039bfcdc508a367ae05be86d77db153950270ccce0f68461d7a30ad7
-  data.tar.gz: d72dc26e1a9a7ac2cfeb1795cad81567a7a3885ed9ad9f6e6f9121cf444fa2371a77da7cd2505994010e9f0521be78a55033f9bd9ec1858a871d42545646ba93
+  metadata.gz: 6894424f650a910ba90b4a8ff1700bf564b320cfe7d124dfe3026a67c988d07ce06e745f8861de83e6c1add80a5bb71a91ecfa329e6523cfff13a344873253d2
+  data.tar.gz: af3bd894e3936bc2cf1621e0f4b19980887df8d8a3ee3dab99949290328d02ab70b845ea2e09021df951c299ce0d26110e9309fd7bb017497b8702b3574ab52c

data/lib/js_routes/version.rb

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

data/lib/routes.js

@@ -1,12 +1,11 @@
 /*
 File generated by js-routes GEM_VERSION
 Based on Rails routes of APP_CLASS
-*/
-
+ */
 
 (function() {
   var NodeTypes, ParameterMissing, Utils, createGlobalJsRoutesObject, defaults, root,
-    __hasProp = {}.hasOwnProperty;
+    hasProp = {}.hasOwnProperty;
 
   root = typeof exports !== "undefined" && exports !== null ? exports : this;
 
@@ -25,12 +24,11 @@ Based on Rails routes of APP_CLASS
 
   Utils = {
     default_serializer: function(object, prefix) {
-      var element, i, key, prop, s, _i, _len;
-
+      var element, i, j, key, len, prop, s;
       if (prefix == null) {
         prefix = null;
       }
-      if (!object) {
+      if (object == null) {
         return "";
       }
       if (!prefix && !(this.get_object_type(object) === "object")) {
@@ -39,27 +37,27 @@ Based on Rails routes of APP_CLASS
       s = [];
       switch (this.get_object_type(object)) {
         case "array":
-          for (i = _i = 0, _len = object.length; _i < _len; i = ++_i) {
+          for (i = j = 0, len = object.length; j < len; i = ++j) {
             element = object[i];
             s.push(this.default_serializer(element, prefix + "[]"));
           }
           break;
         case "object":
           for (key in object) {
-            if (!__hasProp.call(object, key)) continue;
+            if (!hasProp.call(object, key)) continue;
             prop = object[key];
             if (!(prop != null)) {
               continue;
             }
             if (prefix != null) {
-              key = "" + prefix + "[" + key + "]";
+              key = prefix + "[" + key + "]";
             }
             s.push(this.default_serializer(prop, key));
           }
           break;
         default:
-          if (object) {
-            s.push("" + (encodeURIComponent(prefix.toString())) + "=" + (encodeURIComponent(object.toString())));
+          if (object != null) {
+            s.push((encodeURIComponent(prefix.toString())) + "=" + (encodeURIComponent(object.toString())));
           }
       }
       if (!s.length) {
@@ -67,39 +65,34 @@ Based on Rails routes of APP_CLASS
       }
       return s.join("&");
     },
+    custom_serializer: SERIALIZER,
     serialize: function(object) {
-      var custom_serializer;
-
-      custom_serializer = SERIALIZER;
-      if (custom_serializer) {
-        return custom_serializer(object);
+      if ((this.custom_serializer != null) && this.get_object_type(this.custom_serializer) === "function") {
+        return this.custom_serializer(object);
       } else {
         return this.default_serializer(object);
       }
     },
     clean_path: function(path) {
       var last_index;
-
       path = path.split("://");
       last_index = path.length - 1;
       path[last_index] = path[last_index].replace(/\/+/g, "/");
       return path.join("://");
     },
     set_default_url_options: function(optional_parts, options) {
-      var i, part, _i, _len, _results;
-
-      _results = [];
-      for (i = _i = 0, _len = optional_parts.length; _i < _len; i = ++_i) {
+      var i, j, len, part, results;
+      results = [];
+      for (i = j = 0, len = optional_parts.length; j < len; i = ++j) {
         part = optional_parts[i];
         if (!options.hasOwnProperty(part) && defaults.default_url_options.hasOwnProperty(part)) {
-          _results.push(options[part] = defaults.default_url_options[part]);
+          results.push(options[part] = defaults.default_url_options[part]);
         }
       }
-      return _results;
+      return results;
     },
     extract_anchor: function(options) {
       var anchor;
-
       anchor = "";
       if (options.hasOwnProperty("anchor")) {
         anchor = "#" + options.anchor;
@@ -109,7 +102,6 @@ Based on Rails routes of APP_CLASS
     },
     extract_trailing_slash: function(options) {
       var trailing_slash;
-
       trailing_slash = false;
       if (defaults.default_url_options.hasOwnProperty("trailing_slash")) {
         trailing_slash = defaults.default_url_options.trailing_slash;
@@ -122,7 +114,6 @@ Based on Rails routes of APP_CLASS
     },
     extract_options: function(number_of_params, args) {
       var last_el;
-
       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();
@@ -135,7 +126,6 @@ Based on Rails routes of APP_CLASS
     },
     path_identifier: function(object) {
       var property;
-
       if (object === 0) {
         return "0";
       }
@@ -159,23 +149,21 @@ Based on Rails routes of APP_CLASS
     },
     clone: function(obj) {
       var attr, copy, key;
-
       if ((obj == null) || "object" !== this.get_object_type(obj)) {
         return obj;
       }
       copy = obj.constructor();
       for (key in obj) {
-        if (!__hasProp.call(obj, key)) continue;
+        if (!hasProp.call(obj, key)) continue;
         attr = obj[key];
         copy[key] = attr;
       }
       return copy;
     },
     prepare_parameters: function(required_parameters, actual_parameters, options) {
-      var i, result, val, _i, _len;
-
+      var i, j, len, result, val;
       result = this.clone(options) || {};
-      for (i = _i = 0, _len = required_parameters.length; _i < _len; i = ++_i) {
+      for (i = j = 0, len = required_parameters.length; j < len; i = ++j) {
         val = required_parameters[i];
         if (i < actual_parameters.length) {
           result[val] = actual_parameters[i];
@@ -185,7 +173,6 @@ Based on Rails routes of APP_CLASS
     },
     build_path: function(required_parameters, optional_parts, route, args) {
       var anchor, opts, parameters, result, trailing_slash, url, url_params;
-
       args = Array.prototype.slice.call(args);
       opts = this.extract_options(required_parameters.length, args);
       if (args.length > required_parameters.length) {
@@ -208,7 +195,6 @@ Based on Rails routes of APP_CLASS
     },
     visit: function(route, parameters, optional) {
       var left, left_part, right, right_part, type, value;
-
       if (optional == null) {
         optional = false;
       }
@@ -247,7 +233,6 @@ Based on Rails routes of APP_CLASS
     },
     build_path_spec: function(route, wildcard) {
       var left, right, type;
-
       if (wildcard == null) {
         wildcard = false;
       }
@@ -276,7 +261,6 @@ Based on Rails routes of APP_CLASS
     },
     visit_globbing: function(route, parameters, optional) {
       var left, right, type, value;
-
       type = route[0], left = route[1], right = route[2];
       if (left.replace(/^\*/i, "") !== left) {
         route[1] = left = left.replace(/^\*/i, "");
@@ -297,16 +281,14 @@ Based on Rails routes of APP_CLASS
     },
     get_prefix: function() {
       var prefix;
-
       prefix = defaults.prefix;
       if (prefix !== "") {
-        prefix = (prefix.match("/$") ? prefix : "" + prefix + "/");
+        prefix = (prefix.match("/$") ? prefix : prefix + "/");
       }
       return prefix;
     },
     route: function(required_parts, optional_parts, route_spec) {
       var path_fn;
-
       path_fn = function() {
         return Utils.build_path(required_parts, optional_parts, route_spec, arguments);
       };
@@ -318,15 +300,14 @@ Based on Rails routes of APP_CLASS
     },
     _classToTypeCache: null,
     _classToType: function() {
-      var name, _i, _len, _ref;
-
+      var j, len, name, ref;
       if (this._classToTypeCache != null) {
         return this._classToTypeCache;
       }
       this._classToTypeCache = {};
-      _ref = "Boolean Number String Function Array Date RegExp Object Error".split(" ");
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        name = _ref[_i];
+      ref = "Boolean Number String Function Array Date RegExp Object Error".split(" ");
+      for (j = 0, len = ref.length; j < len; j++) {
+        name = ref[j];
         this._classToTypeCache["[object " + name + "]"] = name.toLowerCase();
       }
       return this._classToTypeCache;
@@ -348,10 +329,8 @@ Based on Rails routes of APP_CLASS
 
   createGlobalJsRoutesObject = function() {
     var namespace;
-
     namespace = function(mainRoot, namespaceString) {
       var current, parts;
-
       parts = (namespaceString ? namespaceString.split(".") : []);
       if (!parts.length) {
         return;

data/lib/routes.js.coffee

@@ -16,7 +16,7 @@ NodeTypes = NODE_TYPES
 Utils =
 
   default_serializer: (object, prefix = null) ->
-    return ""  unless object
+    return "" unless object?
     if !prefix and !(@get_object_type(object) is "object")
       throw new Error("Url parameters should be a javascript hash")
 
@@ -30,16 +30,16 @@ Utils =
           key = "#{prefix}[#{key}]" if prefix?
           s.push @default_serializer(prop, key)
       else
-        if object
+        if object?
           s.push "#{encodeURIComponent(prefix.toString())}=#{encodeURIComponent(object.toString())}"
 
     return "" unless s.length
     s.join("&")
 
+  custom_serializer: SERIALIZER
   serialize: (object) ->
-    custom_serializer = SERIALIZER
-    if custom_serializer
-      custom_serializer(object)
+    if @custom_serializer? and @get_object_type(@custom_serializer) is "function"
+      @custom_serializer(object)
     else
       @default_serializer(object)
 

data/spec/js_routes/default_serializer_spec.rb

@@ -5,8 +5,8 @@ describe JsRoutes, "#default_serializer" do
   end
 
   it "should provide this method" do
-    expect(evaljs("Routes.default_serializer({a: 1, b: [2,3], c: {d: 4, e: 5}})")).to eq(
-      "a=1&b%5B%5D=2&b%5B%5D=3&c%5Bd%5D=4&c%5Be%5D=5"
+    expect(evaljs("Routes.default_serializer({a: 1, b: [2,3], c: {d: 4, e: 5}, f: ''})")).to eq(
+      "a=1&b%5B%5D=2&b%5B%5D=3&c%5Bd%5D=4&c%5Be%5D=5&f="
     )
   end
 

data/spec/js_routes/generated_javascript_spec.rb

@@ -11,7 +11,7 @@ describe JsRoutes do
     subject { JsRoutes.generate }
 
     it "should set the default serializer when none is configured" do
-      is_expected.to match(%r(serialize: function\(object\) {\s+var custom_serializer;\s+custom_serializer = null;\s+if \(custom_serializer\) {\s+return custom_serializer\(object\);\s+} else {\s+return this.default_serializer\(object\);\s+}\s+},))
+      is_expected.to match(%r(custom_serializer: null,\s+serialize: function\(object\) {\s+if \(\(this\.custom_serializer != null\) && this.get_object_type\(this\.custom_serializer\) === \"function\"\) {\s+return this\.custom_serializer\(object\);\s+} else {\s+return this\.default_serializer\(object\);\s+}\s+},))
     end
 
     it "should include a comment in the header" do

data/spec/js_routes/options_spec.rb

@@ -14,20 +14,29 @@ describe JsRoutes, "options" do
   let(:_warnings) { true }
 
   context "when serializer is specified" do
+    # define custom serializer
+    # this is a nonsense serializer, which always returns foo=bar
+    # for all inputs
+    let(:_presetup){ %q(function myCustomSerializer(object, prefix) { return "foo=bar"; }) }
     let(:_options) { {:serializer => "myCustomSerializer"} }
 
     it "should set configurable serializer" do
-      # define custom serializer
-      # this is a nonsense serializer, which always returns foo=bar
-      # for all inputs
-      evaljs(%q(function myCustomSerializer(object, prefix) { return "foo=bar"; }))
-
       # expect the nonsense serializer above to have appened foo=bar
       # to the end of the path
       expect(evaljs(%q(Routes.inboxes_path()))).to eql("/inboxes?foo=bar")
     end
   end
 
+  context "when serializer is specified, but not function" do
+    let(:_presetup){ %q(var myCustomSerializer = 1) }
+    let(:_options) { {:serializer => "myCustomSerializer"} }
+
+    it "should set configurable serializer" do
+      # expect to use default
+      expect(evaljs(%q(Routes.inboxes_path({a: 1})))).to eql("/inboxes?a=1")
+    end
+  end
+
   context "when exclude is specified" do
 
     let(:_options) { {:exclude => /^admin_/} }

data/spec/js_routes/rails_routes_compatibility_spec.rb

@@ -74,6 +74,10 @@ describe JsRoutes, "compatibility with Rails"  do
     expect(evaljs("Routes.json_only_path({format: 'json'})")).to eq(routes.json_only_path(:format => 'json'))
   end
 
+  it "should serialize object with empty string value" do
+    expect(evaljs("Routes.inboxes_path({a: '', b: 1})")).to eq(routes.inboxes_path(:a => '', :b => 1))
+  end
+
   it "should support utf-8 route" do
     expect(evaljs("Routes.hello_path()")).to eq(routes.hello_path)
   end

metadata

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