js-routes 0.9.4 → 0.9.5

data/Readme.md

@@ -65,9 +65,14 @@ Available options:
   * Example: http[s]://example.com
   * Default: false
 
-You can generate routes files on the application side like this:
+### Very Advanced Setup
+
+In case you need multiple route files for different parts of your application, you can not use asset pipeline.
+
+You need to generate routes files on the application side like this:
 
 ``` ruby
+path = "app/assets/javascripts"
 JsRoutes.generate!("#{path}/app_routes.js", :namespace => "AppRoutes", :exclude => [/^admin_/, /^api_/])
 JsRoutes.generate!("#{path}/adm_routes.js", :namespace => "AdmRoutes", :include => /^admin_/)
 JsRoutes.generate!("#{path}/api_routes.js", :namespace => "ApiRoutes", :include => /^api_/, :default_url_options => {:format => "json"})

data/lib/js_routes/version.rb

@@ -1,3 +1,3 @@
 class JsRoutes
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

data/lib/routes.js

@@ -18,6 +18,7 @@
   Utils = {
     serialize: function(object, prefix) {
       var element, i, key, prop, result, s, _i, _len;
+
       if (prefix == null) {
         prefix = null;
       }
@@ -64,13 +65,15 @@
     },
     clean_path: function(path) {
       var last_index;
+
       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, "/");
       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) {
         part = optional_parts[i];
@@ -84,6 +87,7 @@
     },
     extract_anchor: function(options) {
       var anchor;
+
       anchor = "";
       if (options.hasOwnProperty("anchor")) {
         anchor = "#" + options.anchor;
@@ -92,15 +96,22 @@
       return anchor;
     },
     extract_options: function(number_of_params, args) {
-      var ret_value;
-      ret_value = {};
-      if (args.length > number_of_params) {
-        ret_value = args.pop();
+      var last_argument, type;
+
+      last_argument = args[args.length - 1];
+      type = this.get_object_type(last_argument);
+      if (args.length > number_of_params || (type === "object" && !this.look_like_serialized_model(last_argument))) {
+        return args.pop();
+      } else {
+        return {};
       }
-      return ret_value;
+    },
+    look_like_serialized_model: function(object) {
+      return "id" in object || "to_param" in object;
     },
     path_identifier: function(object) {
       var property;
+
       if (object === 0) {
         return "0";
       }
@@ -118,6 +129,7 @@
     },
     clone: function(obj) {
       var attr, copy, key;
+
       if ((obj == null) || "object" !== this.get_object_type(obj)) {
         return obj;
       }
@@ -131,15 +143,19 @@
     },
     prepare_parameters: function(required_parameters, actual_parameters, options) {
       var i, result, val, _i, _len;
+
       result = this.clone(options) || {};
       for (i = _i = 0, _len = required_parameters.length; _i < _len; i = ++_i) {
         val = required_parameters[i];
-        result[val] = actual_parameters[i];
+        if (i < actual_parameters.length) {
+          result[val] = actual_parameters[i];
+        }
       }
       return result;
     },
     build_path: function(required_parameters, optional_parts, route, args) {
       var anchor, opts, parameters, result, url, url_params;
+
       args = Array.prototype.slice.call(args);
       opts = this.extract_options(required_parameters.length, args);
       if (args.length > required_parameters.length) {
@@ -158,6 +174,7 @@
     },
     visit: function(route, parameters, optional) {
       var left, left_part, right, right_part, type, value;
+
       if (optional == null) {
         optional = false;
       }
@@ -196,6 +213,7 @@
     },
     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, "");
@@ -216,6 +234,7 @@
     },
     get_prefix: function() {
       var prefix;
+
       prefix = defaults.prefix;
       if (prefix !== "") {
         prefix = (prefix.match("/$") ? prefix : "" + prefix + "/");
@@ -225,6 +244,7 @@
     _classToTypeCache: null,
     _classToType: function() {
       var name, _i, _len, _ref;
+
       if (this._classToTypeCache != null) {
         return this._classToTypeCache;
       }
@@ -238,6 +258,7 @@
     },
     get_object_type: function(obj) {
       var strType;
+
       if (window.jQuery && (window.jQuery.type != null)) {
         return window.jQuery.type(obj);
       }
@@ -246,6 +267,7 @@
     },
     namespace: function(root, namespaceString) {
       var current, parts;
+
       parts = (namespaceString ? namespaceString.split(".") : []);
       if (!parts.length) {
         return;

data/lib/routes.js.coffee

@@ -36,7 +36,7 @@ Utils =
   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, "/")
     path.join "://"
 
   set_default_url_options: (optional_parts, options) ->
@@ -52,10 +52,17 @@ Utils =
     anchor
 
   extract_options: (number_of_params, args) ->
-    ret_value = {}
-    if args.length > number_of_params
-      ret_value = args.pop()
-    ret_value
+    last_argument = args[args.length - 1]
+    type = @get_object_type(last_argument)
+    if args.length > number_of_params or (type == "object" and !@look_like_serialized_model(last_argument))
+      args.pop()
+    else
+      {}
+
+  look_like_serialized_model: (object) ->
+    # consider object a model if it have a path identifier properties like id and to_param
+    "id" of object or "to_param" of object
+
 
   path_identifier: (object) ->
     return "0"  if object is 0
@@ -75,7 +82,9 @@ Utils =
 
   prepare_parameters: (required_parameters, actual_parameters, options) ->
     result = @clone(options) or {}
-    result[val] = actual_parameters[i] for val, i in required_parameters
+    for val, i in required_parameters
+      if i < actual_parameters.length
+        result[val] = actual_parameters[i]
     result
 
   build_path: (required_parameters, optional_parts, route, args) ->

data/spec/js_routes/rails_routes_compatibility_spec.rb

@@ -42,12 +42,17 @@ describe JsRoutes, "compatibility with Rails"  do
     expect(evaljs("Routes.inbox_path(1, {expanded: true, anchor: 'hello'})")).to eq(routes.inbox_path(1, :expanded => true, :anchor => "hello"))
   end
 
-  it "should support engine routes" do
-    expect(evaljs("Routes.blog_app_posts_path()")).to eq(blog_routes.posts_path())
-  end
+  context "with rails engines" do
+    it "should support simple route" do
+      expect(evaljs("Routes.blog_app_posts_path()")).to eq(blog_routes.posts_path())
+    end
 
-  it "should support engine routes with parameter" do
-    expect(evaljs("Routes.blog_app_post_path(1)")).to eq(blog_routes.post_path(1))
+    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 root path" do
+      expect(evaljs("Routes.blog_app_root_path()")).to eq(blog_routes.root_path)
+    end
   end
 
   it "shouldn't require the format" do
@@ -115,6 +120,10 @@ describe JsRoutes, "compatibility with Rails"  do
     it "should support routes globbing in book_title route as array with optional params" do
       expect(evaljs("Routes.book_title_path('john', ['thrillers', 'comedian'], {some_key: 'some_value'})")).to eq(routes.book_title_path('john', ['thrillers', 'comedian'], {:some_key => 'some_value'}))
     end
+
+    it "should support required paramters given as options hash" do
+      expect(evaljs("Routes.search_path({q: 'hello'})")).to eq(routes.search_path(:q => 'hello'))
+    end
   end
 
   context "when jQuery is present" do

data/spec/spec_helper.rb

@@ -58,6 +58,7 @@ end
 def draw_routes
 
   BlogEngine::Engine.routes.draw do
+    root to: "application#index"
     resources :posts
   end
   App.routes.draw do
@@ -94,6 +95,8 @@ def draw_routes
     get '/json_only' => "foo#foo", :format => true, :constraints => {:format => /json/}, :as => :json_only
 
     get '/привет' => "foo#foo", :as => :hello
+    get '(/o/:organization)/search/:q' => "foo#foo", as: :search
+    
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: js-routes
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -188,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2158756967123699365
+      hash: 2369940964485562575
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: