js-routes 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82dc4e938c01969d6fa291afba76adbdc12106ce
-  data.tar.gz: ccab6107d6e2a86ab1529a2fa4ce06e4af50c820
+  metadata.gz: c68aed8760da61aa1ff4977b8d69f09cfc609f18
+  data.tar.gz: f4362dcdb29332048b5a19d3ed40dce4717b6bd9
 SHA512:
-  metadata.gz: 027362db5b8c3f3848cdea09fa9095364a3307e9f492ca5d871d9174e676e05492d5149818f76df989b53e15499465287c93644fa19b0b55117da8b1ed0db0b8
-  data.tar.gz: bbe7ac6a521322201322a01dcb847dcee803f8524dd1f190c17e5c99fe24fb5a6b57d27dd66644ff0b5be4c4fbc733dc69853d619cda8c975e7269f182daddcb
+  metadata.gz: cd44c50605191eda0663671b1d7bf46bcffa7e4e13705e8ca9177fc3c8ac332ea1abac89448a7dfc27e4e9eee5d98ad340f602fea6b082c0af144449e5e46c31
+  data.tar.gz: bc598e7e2a6c51477162b6e76d4d423e4e6bd6454247305593d343934abd04ae20a829301695e7707ed86bc38c8da7ce00a3c224f3b9e3e5e3b3e35e8ce2320c

data/.gitignore

@@ -53,4 +53,8 @@ pkg
 Gemfile.lock
 gemfiles/*.lock
 
-.DS_Store
+.DS_Store
+
+/spec/dummy/app/assets/javascripts/routes.js
+/spec/dummy/logs
+/spec/dummy/tmp

data/.travis.yml

@@ -15,6 +15,9 @@ gemfile:
   - gemfiles/rails40.gemfile
   - gemfiles/rails41.gemfile
   - gemfiles/rails42.gemfile
+  - gemfiles/rails40_sprockets3.gemfile
+  - gemfiles/rails41_sprockets3.gemfile
+  - gemfiles/rails42_sprockets3.gemfile
 
 sudo: false
 

data/Appraisals

@@ -3,14 +3,14 @@ appraise "rails32" do
   gem 'tzinfo'
 end
 
-appraise "rails40" do
-  gem "railties", "~> 4.0.5"
-end
-
-appraise "rails41" do
-  gem "railties", "~> 4.1.1"
-end
+{rails40: '4.0.5', rails41: '4.1.1', rails42: '4.2.0'}.each do |rails, version|
+  appraise "#{rails}" do
+    gem "railties", "~> #{version}"
+    gem "sprockets", "< 3"
+  end
 
-appraise "rails42" do
-  gem "railties", "~> 4.2.0"
+  appraise "#{rails}-sprockets3" do
+    gem "railties", "~> #{version}"
+    gem "sprockets", "~> 3.0"
+  end
 end

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 ## master
 
+## v1.0.0
+
  * Add the compact mode [#125](https://github.com/railsware/js-routes/pull/125)
  * Add support for host, protocol, and port configuration [#137](https://github.com/railsware/js-routes/pull/137)
  * Routes path specs [#135](https://github.com/railsware/js-routes/pull/135)

data/gemfiles/rails40.gemfile

@@ -3,5 +3,6 @@
 source "http://rubygems.org"
 
 gem "railties", "~> 4.0.5"
+gem "sprockets", "< 3"
 
 gemspec :path => "../"

data/gemfiles/rails40_sprockets3.gemfile

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

data/gemfiles/rails41.gemfile

@@ -3,5 +3,6 @@
 source "http://rubygems.org"
 
 gem "railties", "~> 4.1.1"
+gem "sprockets", "< 3"
 
 gemspec :path => "../"

data/gemfiles/rails41_sprockets3.gemfile

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

data/gemfiles/rails42.gemfile

@@ -3,5 +3,6 @@
 source "http://rubygems.org"
 
 gem "railties", "~> 4.2.0"
+gem "sprockets", "< 3"
 
 gemspec :path => "../"

data/gemfiles/rails42_sprockets3.gemfile

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

data/lib/js_routes.rb

@@ -156,8 +156,10 @@ class JsRoutes
   end
 
   def any_match?(route, parent_route, matchers)
+    full_route = [parent_route.try(:name), route.name].compact.join('_')
+    
     matchers = Array(matchers)
-    matchers.any? {|regex| [parent_route.try(:name), route.name].compact.join('_') =~ regex}
+    matchers.any? {|regex| full_route =~ regex}
   end
 
   def build_js(route, parent_route)

data/lib/js_routes/engine.rb

@@ -3,13 +3,19 @@ class JsRoutes
     JS_ROUTES_ASSET = 'js-routes'
 
     initializer 'js-routes.dependent_on_routes', after: "sprockets.environment" do
+      routes = Rails.root.join('config', 'routes.rb').to_s
+
       if Rails.application.assets.respond_to?(:register_preprocessor)
-        routes = Rails.root.join('config','routes.rb')
         Rails.application.assets.register_preprocessor 'application/javascript', :'js-routes_dependent_on_routes' do |ctx,data|
           ctx.depend_on(routes) if ctx.logical_path == JS_ROUTES_ASSET
           data
         end
       end
+
+      # only sprockets >= 3.0
+      if  Rails.application.assets.respond_to?(:depend_on)
+        Rails.application.assets.depend_on "file-digest://#{routes}"
+      end
     end
   end
 end

data/lib/js_routes/version.rb

@@ -1,3 +1,3 @@
 class JsRoutes
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/js_routes/generated_javascript_spec.rb

@@ -36,13 +36,17 @@ describe JsRoutes do
 
   describe ".generate!" do
 
-    let(:name) { "#{File.dirname(__FILE__)}/../routes.js" }
+    let(:name) { Rails.root.join('app', 'assets', 'javascripts', 'routes.js') }
 
     before(:each) do
       FileUtils.rm_f(name)
       JsRoutes.generate!({:file => name})
     end
 
+    after(:each) do
+      FileUtils.rm_f(name)
+    end
+
     after(:all) do
       FileUtils.rm_f("#{File.dirname(__FILE__)}/../routes.js") # let(:name) is not available here
     end

data/spec/js_routes/zzz_last_post_rails_init_spec.rb

@@ -6,17 +6,37 @@ require 'spec_helper'
 require "fileutils"
 
 describe "after Rails initialization" do
-  NAME = "#{File.dirname(__FILE__)}/../routes.js"
+  NAME = Rails.root.join('app', 'assets', 'javascripts', 'routes.js').to_s
 
-  before(:all) do
-    FileUtils.rm_f(NAME)
+  def sprockets_v3?
+    Sprockets::VERSION.to_i >= 3
+  end
+
+  def sprockets_context(environment, name, filename)
+    if sprockets_v3?
+      Sprockets::Context.new(environment: environment, name: name, filename: filename.to_s, metadata: {})
+    else
+      Sprockets::Context.new(environment, name, filename)
+    end
+  end
+
+  def evaluate(ctx, file)
+    if sprockets_v3?
+      ctx.load(ctx.environment.find_asset(file, pipeline: :default).uri).to_s
+    else
+      ctx.evaluate(file)
+    end
+  end
+
+  before(:each) do
+    FileUtils.rm_rf Rails.root.join('tmp/cache')
+    FileUtils.rm_f NAME
     JsRoutes.generate!(NAME)
-    Rails.configuration.eager_load = false
-    Rails.application.initialize!
   end
 
-  after(:all) do
-    FileUtils.rm_f(NAME)
+  before(:all) do
+    Rails.configuration.eager_load = false
+    Rails.application.initialize!
   end
 
   it "should generate routes file" do
@@ -38,21 +58,25 @@ describe "after Rails initialization" do
     it "should have registered a preprocessor" do
       pps = Rails.application.assets.preprocessors
       js_pps = pps['application/javascript']
-      expect(js_pps.map(&:name)).to include('Sprockets::Processor (js-routes_dependent_on_routes)')
+      klass = sprockets_v3? ? 'LegacyProcProcessor' : 'Processor'
+      expect(js_pps.map(&:to_s)).to include("Sprockets::#{klass} (js-routes_dependent_on_routes)")
     end
 
     context "the preprocessor" do
       before(:each) do
-        expect(ctx).to receive(:depend_on).with(Rails.root.join('config','routes.rb'))
+        if sprockets_v3?
+          expect_any_instance_of(Sprockets::Context).to receive(:depend_on).with(Rails.root.join('config','routes.rb').to_s)
+        else
+          expect(ctx).to receive(:depend_on).with(Rails.root.join('config','routes.rb').to_s)
+        end
       end
       let!(:ctx) do
-        Sprockets::Context.new(Rails.application.assets,
-                               'js-routes.js',
-                               Pathname.new('js-routes.js'))
-
+        sprockets_context(Rails.application.assets,
+                         'js-routes.js',
+                         Pathname.new('js-routes.js'))
       end
-      context "when dealing with js-routes.js" do
 
+      context "when dealing with js-routes.js" do
 
         context "with Rails" do
           context "and initialize on precompile" do
@@ -60,7 +84,7 @@ describe "after Rails initialization" do
               Rails.application.config.assets.initialize_on_precompile = true
             end
             it "should render some javascript" do
-              expect(ctx.evaluate('js-routes.js')).to match(/root\.Routes/)
+              expect(evaluate(ctx, 'js-routes.js')).to match(/root\.Routes/)
             end
           end
           context "and not initialize on precompile" do
@@ -69,9 +93,9 @@ describe "after Rails initialization" do
             end
             it "should raise an exception if 3 version" do
               if 3 == Rails::VERSION::MAJOR
-                expect { ctx.evaluate('js-routes.js') }.to raise_error(/Cannot precompile/)
+                expect { evaluate(ctx, 'js-routes.js') }.to raise_error(/Cannot precompile/)
               else
-                expect(ctx.evaluate('js-routes.js')).to match(/root\.Routes/)
+                expect(evaluate(ctx, 'js-routes.js')).to match(/root\.Routes/)
               end
             end
           end
@@ -83,11 +107,11 @@ describe "after Rails initialization" do
     end
     context "when not dealing with js-routes.js" do
       it "should not depend on routes.rb" do
-        ctx = Sprockets::Context.new(Rails.application.assets,
-                                     'test.js',
-                                     TEST_ASSET_PATH)
+        ctx = sprockets_context(Rails.application.assets,
+                                'test.js',
+                                TEST_ASSET_PATH)
         expect(ctx).not_to receive(:depend_on)
-        ctx.evaluate('test.js')
+        evaluate(ctx, 'test.js')
       end
     end
   end

data/spec/spec_helper.rb

@@ -62,6 +62,8 @@ class App < Rails::Application
   else
     config.paths['config/routes.rb'] << 'spec/config/routes.rb'
   end
+
+  config.root = File.expand_path('../dummy', __FILE__)
 end
 
 def draw_routes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js-routes
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -144,8 +144,11 @@ files:
 - app/assets/javascripts/js-routes.js.erb
 - gemfiles/rails32.gemfile
 - gemfiles/rails40.gemfile
+- gemfiles/rails40_sprockets3.gemfile
 - gemfiles/rails41.gemfile
+- gemfiles/rails41_sprockets3.gemfile
 - gemfiles/rails42.gemfile
+- gemfiles/rails42_sprockets3.gemfile
 - js-routes.gemspec
 - lib/js-routes.rb
 - lib/js_routes.rb
@@ -154,7 +157,8 @@ files:
 - lib/routes.js
 - lib/routes.js.coffee
 - lib/tasks/js_routes.rake
-- spec/config/routes.rb
+- spec/dummy/app/assets/javascripts/.gitkeep
+- spec/dummy/config/routes.rb
 - spec/js_routes/amd_compatibility_spec.rb
 - spec/js_routes/generated_javascript_spec.rb
 - spec/js_routes/options_spec.rb
@@ -182,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Brings Rails named routes to javascript