js-routes 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eea4ced1f8ac4696d7203ac13d2037055a1283d
-  data.tar.gz: bbe6a004e246ca056ac0f0ec1a48562a6c20f5cb
+  metadata.gz: 547d8dc7d5bb050616b71bb10d414aeddb9fcb6a
+  data.tar.gz: 35c567ffb95027338b01162db20daa8e312adc32
 SHA512:
-  metadata.gz: aaead3fa492158178fc38c904142129862c698e4f58547915e8ed139d398971ad396ba5bdf4b609a267dd7498062ea7abcc714a80046cdfadd879780a26abd44
-  data.tar.gz: ff5e478c5a8c4791fd4f967b790698799d04cbaf424886c40d923ee94a742d98266480c8e9df1902d7b84c921d4e5306fb19c56d65bfbb4327e7962a00753560
+  metadata.gz: bece2fc2356916ecf50103bdbd4fcff15d2dbaa024d7bfdc24e4f521f6ca513eb47a1c4938370dd04bdcbe4563b80fe0b3ff5506f2b7507ce6a83688557ad03c
+  data.tar.gz: a89e298a614595691c1a5a0f9e91fed8ee6a934645a6e7a26f6785ba970499dd1de5be8a140a4b90b1dcf3dc3e231614379da4e7e4b5483e0f76a713c0c7ec52

data/.travis.yml

@@ -6,6 +6,7 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - 2.3.1
   - jruby-19mode
   - ruby-head
   - jruby-head

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## master
 
+## v1.2.6
+
+* Use default prefix from `Rails.application.config.relative_url_root` #186
+* Bugfix route globbing with optional fragments bug #191
+
 ## v1.2.5
 
 * Bugfix subdomain default parameter in routes #184

data/Readme.md

@@ -58,7 +58,7 @@ Available options:
   * Default: `Routes`
 * `prefix` - String representing a url path to prepend to all paths.
   * Example: `http://yourdomain.com`. This will cause route helpers to generate full path only.
-  * Default: blank
+  * Default: Rails.application.config.relative_url_root
 * `camel_case` (version >= 0.8.8) - Generate camel case route names.
   * Default: false
 * `url_links` (version >= 0.8.9) - Generate `*_url` helpers (in addition to the default `*_path` helpers).
@@ -109,6 +109,15 @@ JsRoutes.generate!("#{path}/adm_routes.js", :namespace => "AdmRoutes", :include
 JsRoutes.generate!("#{path}/api_routes.js", :namespace => "ApiRoutes", :include => /^api_/, :default_url_options => {:format => "json"})
 ```
 
+### Rails relative URL root
+
+If you've installed your application in a sub-path or sub-URI of your server instead of at the root, you need to set the `RAILS_RELATIVE_URL_ROOT` environment variable to the correct path prefix for your application when you precompile assets. Eg., if your application's base URL is "https://appl.example.com/Application1", the command to precompile assets would be:
+```
+RAILS_RELATIVE_URL_ROOT=/Application1 RAILS_ENV=production bundle exec rake assets:precompile
+```
+The environment variable is only needed for precompilation of assets, at any other time (eg. when assets are compiled on-the-fly as in the development environment) Rails will set the relative URL root correctly on it's own.
+
+
 ## Usage
 
 Configuration above will create a nice javascript file with `Routes` object that has all the rails routes available:

data/js-routes.gemspec

@@ -24,8 +24,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<sprockets-rails>)
   s.add_development_dependency(%q<rspec>, [">= 3.0.0"])
   s.add_development_dependency(%q<bundler>, [">= 1.1.0"])
-  s.add_development_dependency(%q<guard>, [">= 0"])
-  s.add_development_dependency(%q<guard-coffeescript>, [">= 0"])
+  s.add_development_dependency(%q<coffee-script>, [">= 0"])
   s.add_development_dependency(%q<appraisal>, [">= 0.5.2"])
   if defined?(JRUBY_VERSION)
     s.add_development_dependency(%q<therubyrhino>, [">= 2.0.4"])

data/lib/js_routes/version.rb

@@ -1,3 +1,3 @@
 class JsRoutes
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

data/lib/js_routes.rb

@@ -104,7 +104,7 @@ class JsRoutes
       "APP_CLASS"           => Rails.application.class.to_s,
       "NAMESPACE"           => @options[:namespace],
       "DEFAULT_URL_OPTIONS" => json(@options[:default_url_options].merge(deprecate_url_options)),
-      "PREFIX"              => @options[:prefix] || "",
+      "PREFIX"              => @options[:prefix] || Rails.application.config.relative_url_root || "",
       "NODE_TYPES"          => json(NODE_TYPES),
       "SERIALIZER"          => @options[:serializer] || "null",
       "ROUTES"              => js_routes,

data/lib/routes.js

@@ -193,7 +193,7 @@ Based on Rails routes of APP_CLASS
       options = this.normalize_options(default_parts, required_parameters, optional_parts, args);
       parameters = options['url_parameters'];
       result = "" + (this.get_prefix()) + (this.visit(route, parameters));
-      url = Utils.clean_path("" + result);
+      url = Utils.clean_path(result);
       if (options['trailing_slash'] === true) {
         url = url.replace(/(.*?)[\/]?$/, "$1/");
       }
@@ -224,7 +224,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[0] === NodeTypes.SYMBOL || left[0] === NodeTypes.CAT) && !left_part) || ((right[0] === NodeTypes.SYMBOL || right[0] === NodeTypes.CAT) && !right_part))) {
+          if (optional && ((this.is_optional_node(left[0]) && !left_part) || ((this.is_optional_node(right[0])) && !right_part))) {
             return "";
           }
           return "" + left_part + right_part;
@@ -244,6 +244,9 @@ Based on Rails routes of APP_CLASS
           throw new Error("Unknown Rails node type");
       }
     },
+    is_optional_node: function(node) {
+      return node === NodeTypes.STAR || node === NodeTypes.SYMBOL || node === NodeTypes.CAT;
+    },
     build_path_spec: function(route, wildcard) {
       var left, right, type;
       if (wildcard == null) {

data/lib/routes.js.coffee

@@ -126,7 +126,7 @@ Utils =
 
     # path
     result = "#{@get_prefix()}#{@visit(route, parameters)}"
-    url = Utils.clean_path("#{result}")
+    url = Utils.clean_path(result)
     # set trailing_slash
     url = url.replace(/(.*?)[\/]?$/, "$1/") if options['trailing_slash'] is true
     # set additional url params
@@ -161,8 +161,9 @@ Utils =
       when NodeTypes.CAT
         left_part = @visit(left, parameters, optional)
         right_part = @visit(right, parameters, optional)
-        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))
+        if optional and ((@is_optional_node(left[0]) and not left_part) or
+                                     ((@is_optional_node(right[0])) and not right_part))
+          return ""
         "#{left_part}#{right_part}"
       when NodeTypes.SYMBOL
         value = parameters[left]
@@ -181,6 +182,10 @@ Utils =
       else
         throw new Error("Unknown Rails node type")
 
+
+  is_optional_node: (node) ->
+    node == NodeTypes.STAR or node == NodeTypes.SYMBOL or node == NodeTypes.CAT
+
   #
   # This method build spec for route
   #

data/spec/js_routes/options_spec.rb

@@ -186,9 +186,18 @@ describe JsRoutes, "options" do
 
   describe "default_url_options" do
     context "with optional route parts" do
-      let(:_options) { {:default_url_options => {:optional_id => "12", :format => "json"}}}
-      it "should use this opions to fill optional parameters" do
-        expect(evaljs("Routes.things_path()")).to eq(routes.things_path(:optional_id => 12, :format => "json"))
+      context "provided" do
+        let(:_options) { { :default_url_options => { :optional_id => "12", :format => "json" } } }
+        it "should use this opions to fill optional parameters" do
+          expect(evaljs("Routes.things_path()")).to eq(routes.things_path(:optional_id => 12, :format => "json"))
+        end
+      end
+
+      context "not provided" do
+        let(:_options) { { :default_url_options => { :format => "json" } } }
+        it "breaks" do
+          expect(evaljs("Routes.foo_all_path()")).to eq(routes.foo_all_path(:format => "json"))
+        end
       end
     end
 

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ $:.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'rails/all'
 require 'js-routes'
-require "active_support/core_ext/hash/slice"
+require 'active_support/core_ext/hash/slice'
 require 'coffee-script'
 # fix ends_with? error for rails 3.2
 require 'active_support/core_ext/string/starts_ends_with' if 3 == Rails::VERSION::MAJOR
@@ -104,6 +104,7 @@ def draw_routes
     get "/:controller(/:action(/:id))" => "classic#classic", :as => :classic
 
     get "/other_optional/(:optional_id)" => "foo#foo", :as => :foo
+    get '/other_optional(/*optional_id)' => 'foo#foo', :as => :foo_all
 
     get 'books/*section/:title' => 'books#show', :as => :book
     get 'books/:title/*section' => 'books#show', :as => :book_title
@@ -167,11 +168,16 @@ RSpec.configure do |config|
 
     def inspectify(value)
       case value
+      when V8::Array
+        value.map do |v|
+          inspectify(v)
+        end
       when V8::Object
+        require 'byebug'; byebug
         value.to_h.map do |k,v|
           [k, inspectify(v)]
         end.to_h
-      when String, nil
+      when String, nil, Fixnum, FalseClass, TrueClass
         value
       else
         raise "wtf #{value.class}?"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js-routes
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -67,21 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-coffeescript
+  name: coffee-script
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +137,6 @@ files:
 - Appraisals
 - CHANGELOG.md
 - Gemfile
-- Guardfile
 - LICENSE.txt
 - Rakefile
 - Readme.md
@@ -180,7 +165,6 @@ files:
 - spec/js_routes/rails_routes_compatibility_spec.rb
 - spec/js_routes/zzz_last_post_rails_init_spec.rb
 - spec/spec_helper.rb
-- temp
 homepage: http://github.com/railsware/js-routes
 licenses:
 - MIT
@@ -201,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Brings Rails named routes to javascript

data/Guardfile

@@ -1,3 +0,0 @@
-guard 'coffeescript', :output => 'lib', :all_on_start => true do
-  watch(%r{^lib/(.+\.coffee)$})
-end

data/temp

@@ -1,2 +0,0 @@
-#<ActionDispatch::Journey::Route:0x007f8c4bdba798 @name="blog_app", @app=BlogEngine::Engine, @path=#<ActionDispatch::Journey::Path::Pattern:0x007f8c4bdbb120 @anchored=false, @spec=/blog, @requirements={},                           @separators="/.?", @names=[],                 @optional_names=[],                 @required_names=[], @re=nil, @offsets=nil>, @dispatcher=false, @constraints={:required_defaults=>[]},                           @defaults={}, @required_defaults=nil, @required_parts=[], @parts=[],               @decorated_ast=nil, @precedence=61>
-#<ActionDispatch::Journey::Route:0x007f8c4a861658 @name="support",  @app=BlogEngine::Engine, @path=#<ActionDispatch::Journey::Path::Pattern:0x007f8c4a85c838 @anchored=true,  @spec=/support(/page/:page)(.:format), @requirements={}, @separators="/.?", @names=["page", "format"], @optional_names=["page", "format"], @required_names=[], @re=nil, @offsets=nil>, @dispatcher=false, @constraints={:required_defaults=>[], :request_method=>/^GET$/}, @defaults={}, @required_defaults=nil, @required_parts=[], @parts=[:page, :format], @decorated_ast=nil, @precedence=0>