routing-filter 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ed5b0fd6b37f434639ed4dc815e078904dbbe97
-  data.tar.gz: 7fbc04ecd600c259d4c11418b2c26f6662396eae
+  metadata.gz: c0d3095bce449432d012c141626f8138f80ffa03
+  data.tar.gz: 028e2cf381be48361c999ce9cd04ccdbbf16e8b2
 SHA512:
-  metadata.gz: 3050e4f205b0acf5e6487c8b26c4c5a7c5c684d458f4741250bd1165a5441728a20ddfc9722e1211c99d1a95318fd14a78a1b67d4fc04f0f48ac26da25fff41f
-  data.tar.gz: 1634aa93348c90c23e3f259fd1dd9824953dc34ada977e88706ed331c1175b11eb9d9d133cc6c762f50a2819d1891c811278197c4b3ad7412ae6868ce23f681e
+  metadata.gz: 2e3a3a7038fbccd2913b2d585d81874b6b672a2e6dad839d47e3efa76f85391f0c9701e02543ff032986fbc89f1acac94e6d38258869db64c4cd08755065fe98
+  data.tar.gz: 3ed295112a78c5d5d59d833b56480c2b6a9ea1fdc565d5f9ce5540ebe369ffdacc3408f021baaefa2f3891436c31489673dd269ad69d24ea8c8dd6c3da0f32ab

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.0
+
+* Rails 5.0 support
+
 ## 0.5.1
 
 * Handle env as Hash and object at the same time in journey overrides.

data/README.markdown

@@ -22,7 +22,7 @@ implement custom ones. Maybe the most popular one is the Locale routing filter:
 
 ## Requirements
 
-Latest routing-filter (~> 0.5.0) currently only works with Rails 4.2. It should not be all too hard
+Latest routing-filter (~> 0.5.0) currently only works with Rails 5.0 and 4.2. It should not be all too hard
 to get it working with plain Rack::Mount but I haven't had that usecase, yet.
 
 For older Rails use `0-4-stable` branch.

data/lib/routing_filter/adapters/rails.rb

@@ -12,7 +12,7 @@ mappers.each do |mapper|
   end
 end
 
-ActionDispatch::Routing::RouteSet.class_eval do
+module ActionDispatchRoutingRouteSetWithFiltering
   def filters
     @set.filters if @set
   end
@@ -22,26 +22,27 @@ ActionDispatch::Routing::RouteSet.class_eval do
     names.each { |name| filters.unshift(RoutingFilter.build(name, options)) }
   end
 
-  def generate_with_filtering(route_key, options, recall = {})
+  def generate(route_key, options, recall = {})
     options = options.symbolize_keys
 
     # `around_generate` is destructive method and it breaks url. To avoid this, `dup` is required.
     filters.run(:around_generate, options, &lambda{
-      generate_without_filtering(route_key, options, recall).map(&:dup)
+      super(route_key, options, recall).map(&:dup)
     })
   end
-  alias_method_chain :generate, :filtering
 
-  def clear_with_filtering!
+  def clear!
     filters.clear if filters
-    clear_without_filtering!
+    super
   end
-  alias_method_chain :clear!, :filtering
 end
 
+ActionDispatch::Routing::RouteSet.send(:prepend, ActionDispatchRoutingRouteSetWithFiltering)
+
+
 ActionDispatch::Journey::Routes.class_eval do
   def filters
-    @filters || RoutingFilter::Chain.new.tap { |f| @filters = f unless frozen? }
+    @filters ||= RoutingFilter::Chain.new.tap { |f| @filters = f unless frozen? }
   end
 end
 

data/lib/routing_filter/adapters/routers/journey.rb

@@ -1,11 +1,5 @@
-ActionDispatch::Journey::Routes.class_eval do
-  def filters
-    @filters || RoutingFilter::Chain.new.tap { |f| @filters = f unless frozen? }
-  end
-end
-
-ActionDispatch::Journey::Router.class_eval do
-  def find_routes_with_filtering(env)
+module ActionDispatchJourneyRouterWithFiltering
+  def find_routes(env)
     path = env.is_a?(Hash) ? env['PATH_INFO'] : env.path_info
     filter_parameters = {}
     original_path = path.dup
@@ -14,7 +8,7 @@ ActionDispatch::Journey::Router.class_eval do
       filter_parameters
     end
 
-    find_routes_without_filtering(env).map do |match, parameters, route|
+    super(env).map do |match, parameters, route|
       [ match, parameters.merge(filter_parameters), route ]
     end.tap do |match, parameters, route|
       # restore the original path
@@ -25,5 +19,6 @@ ActionDispatch::Journey::Router.class_eval do
       end
     end
   end
-  alias_method_chain :find_routes, :filtering
 end
+
+ActionDispatch::Journey::Router.send(:prepend, ActionDispatchJourneyRouterWithFiltering)

data/lib/routing_filter/version.rb

@@ -1,3 +1,3 @@
 module RoutingFilter
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,43 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: routing-filter
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Sven Fuchs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +96,22 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 description: Routing filters wraps around the complex beast that the Rails routing
   system is, allowing for unseen flexibility and power in Rails URL recognition and
   generation.
@@ -129,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -137,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: "[none]"
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Routing filters wraps around the complex beast that the Rails routing system