js-routes 0.9.0 → 0.9.1

data/Readme.md

@@ -48,11 +48,11 @@ Available options:
   * Example: {:format => "json"}
   * Default: {}
 * `exclude` - Array of regexps to exclude from js routes.
-  * Note that regexp applied to **named route** not to *URL*
   * 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.
-  * Note that regexp applied to **named route** not to *URL*
   * 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.
   * Supports nested namespace like `MyProject.routes`
   * Default: `Routes`

data/js-routes.gemspec

@@ -29,5 +29,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<guard>, [">= 0"])
   s.add_development_dependency(%q<rb-fsevent>, [">= 0"])
   s.add_development_dependency(%q<guard-coffeescript>, [">= 0"])
+  if RUBY_VERSION >= "1.9"
+    s.add_development_dependency(%q<debugger>, [">= 0"])
+  end
 end
 

data/lib/js_routes/version.rb

@@ -1,3 +1,3 @@
 class JsRoutes
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/lib/js_routes.rb

@@ -160,7 +160,6 @@ class JsRoutes
     _ = <<-JS.strip!
   // #{name.join('.')} => #{parent_spec}#{route.path.spec}
   #{route_name}: function(#{build_params(required_parts)}) {
-  if (!#{LAST_OPTIONS_KEY}){ #{LAST_OPTIONS_KEY} = {}; }
   return Utils.build_path(#{json(required_parts)}, #{json(optional_parts)}, #{json(serialize(route.path.spec, parent_spec))}, arguments);
   }#{",\n" + url_link if url_link.length > 0}
   JS

data/lib/routes.js

@@ -16,30 +16,47 @@
   NodeTypes = NODE_TYPES;
 
   Utils = {
-    serialize: function(obj) {
-      var i, key, prop, result, s, val, _i, _len;
+    serialize: function(object, prefix) {
+      var element, i, key, prop, result, s, _i, _len;
 
-      if (!obj) {
+      if (prefix == null) {
+        prefix = null;
+      }
+      if (!object) {
         return "";
       }
+      if (!prefix && !(this.get_object_type(object) === "object")) {
+        throw new Error("Url parameters should be a javascript hash");
+      }
       if (window.jQuery) {
-        result = window.jQuery.param(obj);
+        result = window.jQuery.param(object);
         return (!result ? "" : result);
       }
       s = [];
-      for (key in obj) {
-        if (!__hasProp.call(obj, key)) continue;
-        prop = obj[key];
-        if (prop != null) {
-          if (this.getObjectType(prop) === "array") {
-            for (i = _i = 0, _len = prop.length; _i < _len; i = ++_i) {
-              val = prop[i];
-              s.push("" + key + (encodeURIComponent("[]")) + "=" + (encodeURIComponent(val.toString())));
+      switch (this.get_object_type(object)) {
+        case "array":
+          for (i = _i = 0, _len = object.length; _i < _len; i = ++_i) {
+            element = object[i];
+            s.push(this.serialize(element, prefix + "[]"));
+          }
+          break;
+        case "object":
+          for (key in object) {
+            if (!__hasProp.call(object, key)) continue;
+            prop = object[key];
+            if (!(prop != null)) {
+              continue;
             }
-          } else {
-            s.push("" + key + "=" + (encodeURIComponent(prop.toString())));
+            if (prefix != null) {
+              key = "" + prefix + "[" + key + "]";
+            }
+            s.push(this.serialize(prop, key));
+          }
+          break;
+        default:
+          if (object) {
+            s.push("" + (encodeURIComponent(prefix.toString())) + "=" + (encodeURIComponent(object.toString())));
           }
-        }
       }
       if (!s.length) {
         return "";
@@ -51,7 +68,7 @@
 
       path = path.split("://");
       last_index = path.length - 1;
-      path[last_index] = path[last_index].replace(/\/+/g, "/").replace(/\/$/m, "");
+      path[last_index] = path[last_index].replace(/\/+/g, "/").replace(/.\/$/m, "");
       return path.join("://");
     },
     set_default_url_options: function(optional_parts, options) {
@@ -82,7 +99,7 @@
       var ret_value;
 
       ret_value = {};
-      if (args.length > number_of_params && this.getObjectType(args[args.length - 1]) === "object") {
+      if (args.length > number_of_params) {
         ret_value = args.pop();
       }
       return ret_value;
@@ -97,9 +114,9 @@
         return "";
       }
       property = object;
-      if (this.getObjectType(object) === "object") {
+      if (this.get_object_type(object) === "object") {
         property = object.to_param || object.id || object;
-        if (this.getObjectType(property) === "function") {
+        if (this.get_object_type(property) === "function") {
           property = property.call(object);
         }
       }
@@ -108,7 +125,7 @@
     clone: function(obj) {
       var attr, copy, key;
 
-      if ((obj == null) || "object" !== this.getObjectType(obj)) {
+      if ((obj == null) || "object" !== this.get_object_type(obj)) {
         return obj;
       }
       copy = obj.constructor();
@@ -194,7 +211,7 @@
         return this.visit(route, parameters, optional);
       }
       parameters[left] = (function() {
-        switch (this.getObjectType(value)) {
+        switch (this.get_object_type(value)) {
           case "array":
             return value.join("/");
           default:
@@ -227,7 +244,7 @@
       }
       return this._classToTypeCache;
     },
-    getObjectType: function(obj) {
+    get_object_type: function(obj) {
       var strType;
 
       if (window.jQuery && (window.jQuery.type != null)) {

data/lib/routes.js.coffee

@@ -5,27 +5,38 @@ defaults =
   default_url_options: DEFAULT_URL_OPTIONS
 
 NodeTypes = NODE_TYPES
+
 Utils =
 
-  serialize: (obj) ->
-    return ""  unless obj
+  serialize: (object, prefix = null) ->
+    return ""  unless object
+    if !prefix and !(@get_object_type(object) is "object")
+      throw new Error("Url parameters should be a javascript hash")
+
     if window.jQuery
-      result = window.jQuery.param(obj)
+      result = window.jQuery.param(object)
       return (if not result then "" else result)
+
     s = []
-    for own key, prop of obj when prop?
-      if @getObjectType(prop) is "array"
-        for val, i in prop
-          s.push "#{key}#{encodeURIComponent("[]")}=#{encodeURIComponent(val.toString())}"
+    switch @get_object_type(object)
+      when "array"
+        for element, i in object
+          s.push @serialize(element, prefix + "[]")
+      when "object"
+        for own key, prop of object when prop?
+          key = "#{prefix}[#{key}]" if prefix?
+          s.push @serialize(prop, key)
       else
-        s.push "#{key}=#{encodeURIComponent(prop.toString())}"
+        if object
+          s.push "#{encodeURIComponent(prefix.toString())}=#{encodeURIComponent(object.toString())}"
+
     return "" unless s.length
     s.join("&")
 
   clean_path: (path) ->
     path = path.split("://")
     last_index = path.length - 1
-    path[last_index] = path[last_index].replace(/\/+/g, "/").replace(/\/$/m, "")
+    path[last_index] = path[last_index].replace(/\/+/g, "/").replace(/.\/$/m, "")
     path.join "://"
 
   set_default_url_options: (optional_parts, options) ->
@@ -42,7 +53,7 @@ Utils =
 
   extract_options: (number_of_params, args) ->
     ret_value = {}
-    if args.length > number_of_params and @getObjectType(args[args.length - 1]) is "object"
+    if args.length > number_of_params
       ret_value = args.pop()
     ret_value
 
@@ -51,13 +62,13 @@ Utils =
     # null, undefined, false or ''
     return ""  unless object
     property = object
-    if @getObjectType(object) is "object"
+    if @get_object_type(object) is "object"
       property = object.to_param or object.id or object
-      property = property.call(object) if @getObjectType(property) is "function"
+      property = property.call(object) if @get_object_type(property) is "function"
     property.toString()
 
   clone: (obj) ->
-    return obj if !obj? or "object" isnt @getObjectType(obj)
+    return obj if !obj? or "object" isnt @get_object_type(obj)
     copy = obj.constructor()
     copy[key] = attr for own key, attr of obj
     copy
@@ -70,7 +81,9 @@ Utils =
   build_path: (required_parameters, optional_parts, route, args) ->
     args = Array::slice.call(args)
     opts = @extract_options(required_parameters.length, args)
-    throw new Error("Too many parameters provided for path") if args.length > required_parameters.length
+
+    if args.length > required_parameters.length
+      throw new Error("Too many parameters provided for path")
     parameters = @prepare_parameters(required_parameters, args, opts)
     @set_default_url_options optional_parts, parameters
     result = "#{@get_prefix()}#{@visit(route, parameters)}"
@@ -126,7 +139,7 @@ Utils =
     [type, left, right] = route
     value = parameters[left]
     return @visit(route, parameters, optional) unless value?
-    parameters[left] = switch @getObjectType(value)
+    parameters[left] = switch @get_object_type(value)
       when "array"
         value.join("/")
       else
@@ -173,7 +186,7 @@ Utils =
     for name in "Boolean Number String Function Array Date RegExp Undefined Null".split(" ")
       @_classToTypeCache["[object " + name + "]"] = name.toLowerCase()
     @_classToTypeCache
-  getObjectType: (obj) ->
+  get_object_type: (obj) ->
     return window.jQuery.type(obj) if window.jQuery and window.jQuery.type?
     strType = Object::toString.call(obj)
     @_classToType()[strType] or "object"

data/spec/js_routes/rails_routes_compatibility_spec.rb

@@ -39,6 +39,11 @@ describe JsRoutes, "compatibility with Rails"  do
     evaljs("Routes.inbox_path(1, {hello: ['world', 'mars']})").should == routes.inbox_path(1, :hello => [:world, :mars])
   end
 
+  it "should support nested get parameters" do
+    evaljs("Routes.inbox_path(1, {format: 'json', env: 'test', search: { category_ids: [2,5], q: 'hello'}})").should == 
+      routes.inbox_path(1, :env => 'test', :search => {:category_ids => [2,5], :q => "hello"}, :format => "json")
+  end
+
   it "should support null and undefined parameters" do
     evaljs("Routes.inboxes_path({uri: null, key: undefined})").should == routes.inboxes_path(:uri => nil, :key => nil)
   end
@@ -71,6 +76,10 @@ describe JsRoutes, "compatibility with Rails"  do
     evaljs("Routes.hello_path()").should == routes.hello_path
   end
 
+  it "should support root_path" do
+    evaljs("Routes.root_path()").should == routes.root_path
+  end
+
   context "routes globbing" do
     it "should be supported as parameters" do
       evaljs("Routes.book_path('thrillers', 1)").should == routes.book_path('thrillers', 1)

data/spec/spec_helper.rb

@@ -52,6 +52,8 @@ def draw_routes
       end
     end
 
+    root :to => "inboxes#index" 
+
     namespace :admin do
       resources :users
     end
@@ -95,7 +97,7 @@ RSpec.configure do |config|
     # No need to replace native V8 functions for now
     #jscontext[:cgi] = CGI
     #evaljs("function encodeURIComponent(string) {return cgi.escape(string);}")
-    jscontext[:log] = lambda {|arg| puts arg.inspect}
+    jscontext[:log] = lambda {|context, value| puts value.inspect}
   end
   config.before(:all) do
     # compile all js files begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: js-routes
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -123,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Generates javascript file that defines all Rails named routes as javascript
   helpers
 email: agresso@gmail.com
@@ -169,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1949067975122087130
+      hash: 3670636352927995574
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -178,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Brings Rails named routes to javascript