js-routes 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e61c1a78d1a68a39e174a3459048f939ac1a5491
-  data.tar.gz: 2690497a175312cb4fd282626eae3adf87718cbb
+  metadata.gz: fdc29ff3518fbfff23264671cc315d039bb101a6
+  data.tar.gz: 2769ad304c13cf6ea12301e6d1cf5dd3e7c7f8af
 SHA512:
-  metadata.gz: 1698494469561e6a34ae36c1f38ae74da0b2a94ecb6e6a4531e25725021772e852f9d1d55f3be7eb9b373c00ad63d57ef67f909c6bbe4ed4dc843096bbc53250
-  data.tar.gz: 04cc89d4715e92eb63c32ff6bd0498c1164d271cab2c976de65a3da3731a6f565691d169f3f1a8dfbf2c336ab6534ce4bdd60bf94cb848753a4082198ede0609
+  metadata.gz: 063dc04137909b02008460ae82ff1098485b1607a6c3d25222b9fd870b6391fae334dc42610dd591956ba5e97131637692eac2c4088cb1f784e9c7d964c18111
+  data.tar.gz: 432a56cb935312ab939dfe7840e4b4e174efd2135f330c25ca9e3e0c64e762a27e1eb3b5adf31cff928347480dec4b6b6ab89913125bf54f469d31e5d7d7c7da

data/.travis.yml

@@ -30,12 +30,7 @@ branches:
     - master
 
 matrix:
-  include:
-    - gemfile: gemfiles/rails_edge.gemfile
-      rvm: 2.2
   allow_failures:
     - rvm: jruby-19mode
     - rvm: ruby-head
     - rvm: jruby-head
-    - gemfile: gemfiles/rails_edge.gemfile
-      rvm: 2.2

data/Appraisals

@@ -13,9 +13,4 @@ end
     gem "railties", "~> #{version}"
     gem "sprockets", "~> 3.0"
   end
-end
-
-appraise "rails-edge" do
-  gem "railties", github: 'rails/rails'
-  gem "sprockets", "~> 3.0"
 end

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## master
 
+## v1.2.1
+
+* Fixes for Rails 5
+
 ## v1.2.0
 
 * Support host, port and protocol inline parameters

data/Readme.md

@@ -11,7 +11,7 @@ Your Rails Gemfile:
 gem "js-routes"
 ```
 
-### Basic Setup (Asset Pipeline)
+### Basic Setup
 
 Require js routes file in `application.js` or other bundle
 
@@ -192,8 +192,9 @@ This should just work.
 There are some alternatives available. Most of them has only basic feature and don't reach the level of quality I accept.
 Advantages of this one are:
 
-* Rails3 & Rails4 support
+* Rails 3-5 support
 * Rich options set
+* Full rails compatibility
 * Support Rails `#to_param` convention for seo optimized paths
 * Well tested
 

data/js-routes.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Brings Rails named routes to javascript}
 
   s.add_runtime_dependency(%q<railties>, [">= 3.2"])
-  s.add_runtime_dependency(%q<sprockets-rails>)
+  s.add_runtime_dependency(%q<sprockets-rails>, ["< 3"])
   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"])

data/lib/js_routes.rb

@@ -59,7 +59,7 @@ class JsRoutes
 
     def generate(opts = {})
       # Ensure routes are loaded. If they're not, load them.
-      if Rails.application.routes.named_routes.routes.keys.empty?
+      if Rails.application.routes.named_routes.to_a.empty?
         Rails.application.reload_routes!
       end
 
@@ -98,15 +98,18 @@ class JsRoutes
   end
 
   def generate
-    js = File.read(File.dirname(__FILE__) + "/routes.js")
-    js.gsub!("GEM_VERSION", JsRoutes::VERSION)
-    js.gsub!("APP_CLASS", Rails.application.class.to_s)
-    js.gsub!("NAMESPACE", @options[:namespace])
-    js.gsub!("DEFAULT_URL_OPTIONS", json(@options[:default_url_options].merge(deprecated_default_format)))
-    js.gsub!("PREFIX", @options[:prefix] || "")
-    js.gsub!("NODE_TYPES", json(NODE_TYPES))
-    js.gsub!("SERIALIZER", @options[:serializer] || "null")
-    js.gsub!("ROUTES", js_routes)
+    {
+      "GEM_VERSION"         => JsRoutes::VERSION,
+      "APP_CLASS"           => Rails.application.class.to_s,
+      "NAMESPACE"           => @options[:namespace],
+      "DEFAULT_URL_OPTIONS" => json(@options[:default_url_options].merge(deprecated_default_format)),
+      "PREFIX"              => @options[:prefix] || "",
+      "NODE_TYPES"          => json(NODE_TYPES),
+      "SERIALIZER"          => @options[:serializer] || "null",
+      "ROUTES"              => js_routes,
+    }.inject(File.read(File.dirname(__FILE__) + "/routes.js")) do |js, (key, value)|
+      js.gsub!(key, value)
+    end
   end
 
   def deprecated_default_format
@@ -133,7 +136,7 @@ class JsRoutes
   protected
 
   def js_routes
-    js_routes = Rails.application.routes.named_routes.routes.sort_by(&:to_s).flat_map do |_, route|
+    js_routes = Rails.application.routes.named_routes.to_a.sort_by(&:to_s).flat_map do |_, route|
       rails_engine_app = get_app_from_route(route)
       if rails_engine_app.respond_to?(:superclass) && rails_engine_app.superclass == Rails::Engine && !route.path.anchored
         rails_engine_app.routes.named_routes.map do |_, engine_route|
@@ -185,9 +188,11 @@ class JsRoutes
   end
 
   def route_js_arguments(route, parent_spec)
-    required_parts, optional_parts = route.required_parts.clone, (route.parts-route.required_parts)
-    optional_parts.push(required_parts.delete :format) if required_parts.include?(:format)
-    [json(required_parts), json(optional_parts), json(serialize(route.path.spec, parent_spec))].join(", ")
+    required_parts = route.required_parts.clone
+    optional_parts = route.parts - required_parts
+    [required_parts, optional_parts, serialize(route.path.spec, parent_spec)].map do |argument|
+      json(argument)
+    end.join(", ")
   end
 
   def generate_url_link(name, route_name, route_arguments, route)
@@ -201,7 +206,7 @@ class JsRoutes
   def deprecated_base_url
     ActiveSupport::Deprecation.warn('js-routes url_links config value must be a boolean. Use default_url_options for specifying a default host.')
 
-    
+
     raise "invalid URL format in url_links (ex: http[s]://example.com)" if @options[:url_links].match(URI::Parser.new.make_regexp(%w(http https))).nil?
     uri = URI.parse(@options[:url_links])
     default_port = uri.scheme == "https" ? 443 : 80

data/lib/js_routes/version.rb

@@ -1,3 +1,3 @@
 class JsRoutes
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/js_routes/rails_routes_compatibility_spec.rb

@@ -54,6 +54,13 @@ 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 use irregular ActiveSupport pluralizations" do
+    expect(evaljs("Routes.budgies_path()")).to eq(routes.budgies_path)
+    expect(evaljs("Routes.budgie_path(1)")).to eq(routes.budgie_path(1))
+    expect(evaljs("Routes.budgy_path")).to eq(nil)
+    expect(evaljs("Routes.budgie_descendents_path(1)")).to eq(routes.budgie_descendents_path(1))
+  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())
@@ -284,7 +291,7 @@ describe JsRoutes, "compatibility with Rails"  do
     end
   end
 
-  context "when params" do
+  describe "required_params" do
     it "should show inbox spec" do
       expect(evaljs("Routes.inbox_path.required_params").to_a).to eq(["id"])
     end
@@ -293,4 +300,6 @@ describe JsRoutes, "compatibility with Rails"  do
       expect(evaljs("Routes.inbox_message_path.required_params").to_a).to eq(["inbox_id", "id"])
     end
   end
+
+
 end

data/spec/spec_helper.rb

@@ -42,6 +42,10 @@ def blog_routes
   BlogEngine::Engine.routes.url_helpers
 end
 
+ActiveSupport::Inflector.inflections do |inflect|
+  inflect.irregular "budgie", "budgies"
+end
+
 
 module BlogEngine
   class Engine < Rails::Engine
@@ -118,6 +122,11 @@ def draw_routes
     get '/' => 'sso#login', host: 'sso.example.com', as: :sso
 
     resources :portals, :port => 8080
+
+    resources :budgies do
+      get "descendents"
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js-routes
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -28,16 +28,16 @@ dependencies:
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +163,6 @@ files:
 - gemfiles/rails41_sprockets3.gemfile
 - gemfiles/rails42.gemfile
 - gemfiles/rails42_sprockets3.gemfile
-- gemfiles/rails_edge.gemfile
 - js-routes.gemspec
 - lib/js-routes.rb
 - lib/js_routes.rb

data/gemfiles/rails_edge.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "railties", :github => "rails/rails"
-gem "sprockets", "~> 3.0"
-
-gemspec :path => "../"