js-routes 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 673824b92c317dcd831dba31a576e63c057569fc
-  data.tar.gz: 3bde0b614cb515193e7b2166adeb6be99e8d0bf8
+  metadata.gz: fd742d686437361f2d20fe7644ec39eeca842321
+  data.tar.gz: 625e04e1a36df51e96b8f9afe10dbe72390071a0
 SHA512:
-  metadata.gz: 999966b93d59c45104dfd2a24d9ebd7d891df7924430cb7fb2d4a1438e84e229a901043cf4b27ab1da279f74ae33a2c09b1b6c68005a72d33be76ac8430ea9b0
-  data.tar.gz: a2ece0a5892d4762c26a5a74f130806c90d82a1c04ec2f528b42f2e3f15172033fa1073b99852bb9b897e21af4d3964e76133128448e23f84372121b6b5801d2
+  metadata.gz: 356d2bf3c489cff5c3de2ef37ecd41e6c5f0ebd5e08bb5ab3b1e9c415440de07ac101a1e20d15253c61b1692df18c3b9df14357754204427651ff1f65b60c5f5
+  data.tar.gz: 5138a17eced6dbf6f0f6e634e78a6eb5f4377bd10f0ce15109f3d2230686ba8e46c8a9567bb534fe8a11e1b317fcaabc54b81aa76242ba2c1a6846f7698855e0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## master
 
+## v1.2.8
+
+* Bugfix warning on Sprockets 4.0 #202
+
 ## v1.2.7
 
 * Drop support 1.9.3

data/Rakefile

@@ -12,9 +12,22 @@ require 'bundler/gem_tasks'
 require 'rspec/core'
 require 'rspec/core/rake_task'
 require 'appraisal'
+load "rails/tasks/routes.rake"
 
 RSpec::Core::RakeTask.new(:spec)
 
 task :test_all => :appraisal # test all rails
 
-task :default => :spec
+task :default => :spec
+
+
+namespace :spec do
+  task :routes do
+    require './spec/spec_helper'
+    require 'action_dispatch/routing/inspector'
+    draw_routes
+    all_routes = Rails.application.routes.routes
+    inspector = ActionDispatch::Routing::RoutesInspector.new(all_routes)
+    puts inspector.format(ActionDispatch::Routing::ConsoleFormatter.new, ENV['CONTROLLER'])
+  end
+end

data/Readme.md

@@ -16,9 +16,7 @@ gem "js-routes"
 Require js routes file in `application.js` or other bundle
 
 ``` js
-/*
-= require js-routes
-*/
+//= require js-routes
 ```
 
 Also in order to flush asset pipeline cache sometimes you might need to run:

data/lib/js_routes/engine.rb

@@ -1,30 +1,69 @@
-require 'sprockets/version'
+class JsRoutesSprocketsExtension
+  def initialize(filename, &block)
+    @filename = filename
+    @source   = block.call
+  end
 
-class JsRoutes
-  SPROCKETS3 = Gem::Version.new(Sprockets::VERSION) >= Gem::Version.new('3.0.0')
-  class Engine < ::Rails::Engine
+  def render(context, empty_hash_wtf)
+    self.class.run(@filename, @source, context)
+  end
 
-    if SPROCKETS3
-      initializer 'js-routes.dependent_on_routes', after: :engines_blank_point, before: :finisher_hook do
-        Rails.application.config.assets.configure do |config|
+  def self.run(filename, source, context)
+    if context.logical_path == 'js-routes'
+      routes = Rails.root.join('config', 'routes.rb').to_s
+      context.depend_on(routes)
+    end
+    source
+  end
+
+  def self.call(input)
+    filename = input[:filename]
+    source   = input[:data]
+    context  = input[:environment].context_class.new(input)
+
+    result = run(filename, source, context)
+    context.metadata.merge(data: result)
+  end
+end
+
+
+class Engine < ::Rails::Engine
+  require 'sprockets/version'
+  v2                = Gem::Dependency.new('', ' ~> 2')
+  v3                = Gem::Dependency.new('', ' ~> 3')
+  v4                = Gem::Dependency.new('', ' >= 4')
+  sprockets_version = Gem::Version.new(Sprockets::VERSION).release
+  initializer_args  = case sprockets_version
+                        when -> (v) { v2.match?('', v) }
+                          { after: "sprockets.environment" }
+                        when -> (v) { v3.match?('', v) || v4.match?('', v) }
+                          { after: :engines_blank_point, before: :finisher_hook }
+                        else
+                          raise StandardError, "Sprockets version #{sprockets_version} is not supported"
+                      end
+
+  initializer 'js-routes.dependent_on_routes', initializer_args do
+    case sprockets_version
+      when -> (v) { v2.match?('', v) }
+        if Rails.application.assets.respond_to?(:register_preprocessor)
           routes = Rails.root.join('config', 'routes.rb').to_s
-          config.register_preprocessor 'application/javascript', :'js-routes_dependent_on_routes' do |ctx,data|
+          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'
             data
           end
         end
-      end
-    else
-      initializer 'js-routes.dependent_on_routes', after: "sprockets.environment" do
-
-        if Rails.application.assets.respond_to?(:register_preprocessor)
+      when -> (v) { v3.match?('', v) }
+        Rails.application.config.assets.configure do |config|
           routes = Rails.root.join('config', 'routes.rb').to_s
-          Rails.application.assets.register_preprocessor 'application/javascript', :'js-routes_dependent_on_routes' do |ctx,data|
+          config.register_preprocessor 'application/javascript', :'js-routes_dependent_on_routes' do |ctx, data|
             ctx.depend_on(routes) if ctx.logical_path == 'js-routes'
             data
           end
         end
-      end
+      when -> (v) { v4.match?('', v) }
+        Sprockets.register_preprocessor 'application/javascript', JsRoutesSprocketsExtension
+      else
+        raise StandardError, "Sprockets version #{sprockets_version} is not supported"
     end
   end
-end
+end

data/lib/js_routes/version.rb

@@ -1,3 +1,3 @@
 class JsRoutes
-  VERSION = "1.2.7"
+  VERSION = "1.2.8"
 end

data/spec/spec_helper.rb

@@ -70,77 +70,6 @@ class App < Rails::Application
   config.root = File.expand_path('../dummy', __FILE__)
 end
 
-def draw_routes
-
-  BlogEngine::Engine.routes.draw do
-    root to: "application#index"
-    resources :posts
-  end
-  App.routes.draw do
-
-    get 'support(/page/:page)', to: BlogEngine::Engine, as: 'support'
-
-    resources :inboxes do
-      resources :messages do
-        resources :attachments
-      end
-    end
-
-    root :to => "inboxes#index"
-
-    namespace :admin do
-      resources :users
-    end
-
-    scope "/returns/:return" do
-      resources :objects
-    end
-    resources :returns
-
-    scope "(/optional/:optional_id)" do
-      resources :things
-    end
-
-    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
-
-    mount BlogEngine::Engine => "/blog", :as => :blog_app
-
-    get '/no_format' => "foo#foo", :format => false, :as => :no_format
-
-    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
-
-    resources :sessions, :only => [:new, :create, :destroy], :protocol => 'https'
-
-    get '/' => 'sso#login', host: 'sso.example.com', as: :sso
-
-    resources :portals, :port => 8080
-
-    get '/with_defaults' => 'foo#foo', defaults: { bar: 'tested', format: :json }, format: :true
-
-    namespace :api, format: true, defaults: {format: 'json'} do
-      get "/purchases" => "purchases#index"
-    end
-
-    resources :budgies do
-      get "descendents"
-    end
-
-    namespace :backend, path: '', constraints: {subdomain: 'backend'} do
-      root to: 'backend#index'
-    end
-
-  end
-
-end
 
 # prevent warning
 Rails.configuration.active_support.deprecation = :log

data/spec/support/routes.rb

@@ -0,0 +1,71 @@
+def draw_routes
+
+  BlogEngine::Engine.routes.draw do
+    root to: "application#index"
+    resources :posts
+  end
+  App.routes.draw do
+
+    get 'support(/page/:page)', to: BlogEngine::Engine, as: 'support'
+
+    resources :inboxes do
+      resources :messages do
+        resources :attachments
+      end
+    end
+
+    root :to => "inboxes#index"
+
+    namespace :admin do
+      resources :users
+    end
+
+    scope "/returns/:return" do
+      resources :objects
+    end
+    resources :returns
+
+    scope "(/optional/:optional_id)" do
+      resources :things
+    end
+
+    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
+
+    mount BlogEngine::Engine => "/blog", :as => :blog_app
+
+    get '/no_format' => "foo#foo", :format => false, :as => :no_format
+
+    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
+
+    resources :sessions, :only => [:new, :create, :destroy], :protocol => 'https'
+
+    get '/' => 'sso#login', host: 'sso.example.com', as: :sso
+
+    resources :portals, :port => 8080
+
+    get '/with_defaults' => 'foo#foo', defaults: { bar: 'tested', format: :json }, format: :true
+
+    namespace :api, format: true, defaults: {format: 'json'} do
+      get "/purchases" => "purchases#index"
+    end
+
+    resources :budgies do
+      get "descendents"
+    end
+
+    namespace :backend, path: '', constraints: {subdomain: 'backend'} do
+      root to: 'backend#index'
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: js-routes
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -167,6 +167,7 @@ files:
 - spec/js_routes/rails_routes_compatibility_spec.rb
 - spec/js_routes/zzz_last_post_rails_init_spec.rb
 - spec/spec_helper.rb
+- spec/support/routes.rb
 homepage: http://github.com/railsware/js-routes
 licenses:
 - MIT