routing-filter 0.3.1 → 0.4.0.pre

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dae448fa20d77a3acbcc23bb63e5cb829b2cc3f8
+  data.tar.gz: e067c24c3c3644b82b5d62f1a373224ae3ef2276
+SHA512:
+  metadata.gz: a02a85cad0a7030297ac0db2c857d29718612b1ae8b86f055a40c98bc84e49c2006f0e6d20ce1fd09f4bbe698b391a6f70e1e5689bc1d50e0705b5d07c26cbba
+  data.tar.gz: 5ea13645e8d27fcc89b600f2fe76c8ba2eeb08f5bb55b43bb88f5cf9b9e7cc1c8ea7007a949d17f16a6b5a2d6eca8282905b0a0e7a5b7b6c5de0ebc6417099d5

data/README.markdown

@@ -1,5 +1,7 @@
 # Routing Filter
 
+[![Build Status](https://secure.travis-ci.org/svenfuchs/routing-filter.png)](http://travis-ci.org/svenfuchs/routing-filter)
+
 Routing filters wrap around the complex beast that the Rails routing system is
 to allow for unseen flexibility and power in Rails URL recognition and
 generation.
@@ -60,6 +62,17 @@ Filters can also accept options:
       filter :locale,    :exclude => /^\/admin/
     end
 
+### Testing
+
+RoutingFilter should not be enabled in functional tests by default since the Rails router gets
+bypassed for most testcases. Having RoutingFilter enabled in this setup can cause missing parameters
+in the test environment. Routing tests can/should re-enable RoutingFilter since the whole routing stack
+gets executed for these testcases.
+
+To disable RoutingFilter in your test suite add the following to your test_helper.rb / spec_helper.rb:
+
+    RoutingFilter.active = false
+
 ## Running the tests
 
 To run the tests against different dependencies [appraisal](https://github.com/thoughtbot/appraisal) is used.

data/lib/routing_filter/adapters/rails_4.rb

@@ -0,0 +1,44 @@
+require 'action_dispatch'
+require 'active_support/core_ext/module/aliasing'
+require 'active_support/core_ext/hash/reverse_merge'
+
+mappers = [ActionDispatch::Routing::Mapper]
+mappers << ActionDispatch::Routing::DeprecatedMapper if defined?(ActionDispatch::Routing::DeprecatedMapper)
+mappers.each do |mapper|
+  mapper.class_eval do
+    def filter(*args)
+      @set.add_filters(*args)
+    end
+  end
+end
+
+ActionDispatch::Routing::RouteSet.class_eval do
+  def filters
+    @set.filters if @set
+  end
+
+  def add_filters(*names)
+    options = names.extract_options!
+    names.each { |name| filters.unshift(RoutingFilter.build(name, options)) }
+  end
+
+  def generate_with_filtering(options, recall = {})
+    # `around_generate` is destructive method and it breaks url. To avoid this, `dup` is required.
+    filters.run(:around_generate, options, &lambda{ generate_without_filtering(options, recall).map(&:dup) })
+  end
+  alias_method_chain :generate, :filtering
+
+  def clear_with_filtering!
+    filters.clear if filters
+    clear_without_filtering!
+  end
+  alias_method_chain :clear!, :filtering
+end
+
+ActionDispatch::Journey::Routes.class_eval do
+  def filters
+    @filters || RoutingFilter::Chain.new.tap { |f| @filters = f unless frozen? }
+  end
+end
+
+require 'routing_filter/adapters/routers/journey'

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

@@ -1,15 +1,21 @@
-require 'journey/routes'
-require 'journey/router'
+if defined?(ActionDispatch::Journey) # rails 4
+  journey = ActionDispatch::Journey
+else # rails 3.2
+  require 'journey/routes'
+  require 'journey/router'
+  journey = Journey
+end
 
-Journey::Routes.class_eval do
+journey::Routes.class_eval do
   def filters
     @filters || RoutingFilter::Chain.new.tap { |f| @filters = f unless frozen? }
   end
 end
 
-Journey::Router.class_eval do
+journey::Router.class_eval do
   def find_routes_with_filtering env
     path, filter_parameters = env['PATH_INFO'], {}
+    original_path = path.dup
 
     @routes.filters.run(:around_recognize, path, env) do
       filter_parameters
@@ -17,6 +23,8 @@ Journey::Router.class_eval do
 
     find_routes_without_filtering(env).map do |match, parameters, route|
       [ match, parameters.merge(filter_parameters), route ]
+    end.tap do |match, parameters, route|
+      env['PATH_INFO'] = original_path # restore the original path
     end
   end
   alias_method_chain :find_routes, :filtering

data/lib/routing_filter/filters/pagination.rb

@@ -27,7 +27,7 @@ module RoutingFilter
     def around_recognize(path, env, &block)
       page = extract_segment!(PAGINATION_SEGMENT, path)
       yield.tap do |params|
-        params[:page] = page.to_i if page
+        params[:page] = page if page
       end
     end
 

data/lib/routing_filter/version.rb

@@ -1,3 +1,3 @@
 module RoutingFilter
-  VERSION = '0.3.1'
+  VERSION = '0.4.0.pre'
 end

metadata

@@ -1,60 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: routing-filter
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  version: 0.4.0.pre
 platform: ruby
 authors:
 - Sven Fuchs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-28 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &2156259340 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156259340
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &2156258620 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156258620
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2156257900 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156257900
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test_declarative
-  requirement: &2156273620 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156273620
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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.
@@ -67,42 +78,42 @@ files:
 - README.markdown
 - MIT-LICENSE
 - lib/routing/filter.rb
-- lib/routing-filter.rb
-- lib/routing_filter/adapters/rails_2.rb
-- lib/routing_filter/adapters/rails_3.rb
-- lib/routing_filter/adapters/routers/journey.rb
-- lib/routing_filter/adapters/routers/rack_mount.rb
 - lib/routing_filter/chain.rb
-- lib/routing_filter/filter.rb
-- lib/routing_filter/filters/extension.rb
 - lib/routing_filter/filters/locale.rb
-- lib/routing_filter/filters/pagination.rb
 - lib/routing_filter/filters/uuid.rb
+- lib/routing_filter/filters/pagination.rb
+- lib/routing_filter/filters/extension.rb
 - lib/routing_filter/version.rb
+- lib/routing_filter/filter.rb
+- lib/routing_filter/adapters/rails_3.rb
+- lib/routing_filter/adapters/rails_4.rb
+- lib/routing_filter/adapters/routers/journey.rb
+- lib/routing_filter/adapters/routers/rack_mount.rb
+- lib/routing_filter/adapters/rails_2.rb
 - lib/routing_filter.rb
+- lib/routing-filter.rb
 homepage: http://github.com/svenfuchs/routing-filter
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: ! '[none]'
-rubygems_version: 1.8.17
+rubyforge_project: '[none]'
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: 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
 test_files: []