routing-filter 0.2.4 → 0.3.0.beta

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 0.3.0 (Not yet released)
+
+* Make `routing-filter` compatible with the new journey router in rails 3.2.

data/README.markdown

@@ -61,17 +61,19 @@ Filters can also accept options:
 
 ## Running the tests
 
-There are two Gemfiles in the `ci` directory in order to run the tests against different dependencies. The Rails 3 Gemfile is symlinked to the root folder, so it will be used by default.
+To run the tests against different dependencies [appraisal](https://github.com/thoughtbot/appraisal) is used.
 
-Running the tests with Rails 3.x:
+Running the tests for all supported Rails versions:
 
     $ bundle install
-    $ ruby -Itest -Ilib test/all.rb
+    $ bundle exec rake all
 
-Running the tests with Rails 2.3.x:
+Running the tests for a single version, for example Rails 3.1:
 
-    $ BUNDLE_GEMFILE=ci/Gemfile.rails-2.3.x bundle install
-    $ BUNDLE_GEMFILE=ci/Gemfile.rails-2.3.x ruby -Itest -Ilib test/all.rb
+    $ bundle install
+    $ bundle exec rake appraisal:rails-3.1 test
+
+Valid appraisal targets include rails-2.3, rails-3.0, rails-3.1 and rails-3.2
 
 ## Filter order
 

data/lib/routing/filter.rb

@@ -0,0 +1 @@
+require 'routing_filter'

data/lib/routing_filter/adapters/rails_3.rb

@@ -39,39 +39,9 @@ ActionDispatch::Routing::RouteSet.class_eval do
   alias_method_chain :clear!, :filtering
 end
 
-require 'rack/mount/route_set'
-require 'rack/mount/code_generation'
-
-Rack::Mount::RouteSet.class_eval do
-  def filters
-    @filters || RoutingFilter::Chain.new.tap { |f| @filters = f unless frozen? }
-  end
+case ActionPack::VERSION::MINOR
+when 2
+  require 'routing_filter/adapters/routers/journey'
+when 0,1
+  require 'routing_filter/adapters/routers/rack_mount'
 end
-
-# gah. so who's hoped monkeypatching optimized code wouldn't be necessary with rails 3 anymore?
-Rack::Mount::CodeGeneration.class_eval do
-  def optimize_recognize_with_filtering!
-    optimize_recognize_without_filtering!
-    (class << self; self; end).class_eval do
-      alias_method_chain :recognize, :filtering
-    end
-  end
-  alias :optimize_recognize_without_filtering! :optimize_recognize!
-  alias :optimize_recognize! :optimize_recognize_with_filtering!
-
-  # note: if you overly and unnecessarily use blocks in your lowlevel libraries you make it fricking
-  # hard for your users to hook in anywhere
-  def recognize_with_filtering(request, &block)
-    path, route, matches, params = request.env['PATH_INFO'], nil, nil, nil
-    original_path = path.dup
-
-    filters.run(:around_recognize, path, request.env) do
-      route, matches, params = recognize_without_filtering(request)
-      params || {}
-    end
-
-    request.env['PATH_INFO'] = original_path # hmm ...
-    block.call(route, matches, params) if route
-  end
-end
-

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

@@ -0,0 +1,23 @@
+require 'journey/routes'
+require 'journey/router'
+
+Journey::Routes.class_eval do
+  def filters
+    @filters || RoutingFilter::Chain.new.tap { |f| @filters = f unless frozen? }
+  end
+end
+
+Journey::Router.class_eval do
+  def find_routes_with_filtering env
+    path, filter_parameters = env['PATH_INFO'], {}
+
+    @routes.filters.run(:around_recognize, path, env) do
+      filter_parameters
+    end
+
+    find_routes_without_filtering(env).map do |match, parameters, route|
+      [ match, parameters.merge(filter_parameters), route ]
+    end
+  end
+  alias_method_chain :find_routes, :filtering
+end

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

@@ -0,0 +1,42 @@
+require 'action_dispatch'
+require 'rack/mount/route_set'
+require 'rack/mount/code_generation'
+
+Rack::Mount::RouteSet.class_eval do
+  def filters
+    @filters || RoutingFilter::Chain.new.tap { |f| @filters = f unless frozen? }
+  end
+end
+
+# gah. so who's hoped monkeypatching optimized code wouldn't be necessary with rails 3 anymore?
+Rack::Mount::CodeGeneration.class_eval do
+  def optimize_recognize_with_filtering!
+    optimize_recognize_without_filtering!
+    (class << self; self; end).class_eval do
+      alias_method_chain :recognize, :filtering
+    end
+  end
+  alias :optimize_recognize_without_filtering! :optimize_recognize!
+  alias :optimize_recognize! :optimize_recognize_with_filtering!
+
+  # note: if you overly and unnecessarily use blocks in your lowlevel libraries you make it fricking
+  # hard for your users to hook in anywhere
+  def recognize_with_filtering(request, &block)
+    path, route, matches, params = request.env['PATH_INFO'], nil, nil, nil
+    original_path = path.dup
+
+    filters.run(:around_recognize, path, request.env) do
+      route, matches, params = recognize_without_filtering(request)
+      params || {}
+    end
+
+    request.env['PATH_INFO'] = original_path # hmm ...
+    return nil unless route
+
+    if block_given?
+      return block.call(route, matches, params)
+    else
+      return route, matches, params
+    end
+  end
+end

data/lib/routing_filter/filters/extension.rb

@@ -2,22 +2,16 @@
 # recognized path. When a path is generated the filter re-adds the extension 
 # to the path accordingly.
 # 
-#   incoming url: /de/products/page/1
-#   filtered url: /de/products
-#   params:       params[:locale] = 'de'
+#   incoming url: /products.xml
+#   filtered url: /products
+#   generated url: /products.xml
 # 
 # You can install the filter like this:
 #
 #   # in config/routes.rb
 #   Rails.application.routes.draw do
-#     filter :locale
+#     filter :extension
 #   end
-#
-# To make your named_route helpers or url_for add the pagination segments you 
-# can use:
-#
-#   products_path(:locale => 'de')
-#   url_for(:products, :locale => 'de'))
 
 module RoutingFilter
   class Extension < Filter
@@ -31,7 +25,7 @@ module RoutingFilter
 
     def around_recognize(path, env, &block)
       extract_extension!(path) unless excluded?(path)
-      yield(path, env)
+      yield
     end
 
     def around_generate(params, &block)
@@ -73,4 +67,4 @@ module RoutingFilter
         url =~ /\.#{Mime::EXTENSION_LOOKUP.keys.join('|')}(\?|$)/
       end
   end
-end
+end

data/lib/routing_filter/filters/locale.rb

@@ -1,10 +1,10 @@
 # The Locale filter extracts segments matching /:locale from the beginning of
-# the recognized path and exposes the page parameter as params[:page]. When a
+# the recognized path and exposes the page parameter as params[:locale]. When a
 # path is generated the filter adds the segments to the path accordingly if
 # the page parameter is passed to the url helper.
 #
-#   incoming url: /de/products/page/1
-#   filtered url: /de/products
+#   incoming url: /de/products
+#   filtered url: /products
 #   params:       params[:locale] = 'de'
 #
 # You can install the filter like this:
@@ -14,14 +14,12 @@
 #     filter :locale
 #   end
 #
-# To make your named_route helpers or url_for add the pagination segments you
+# To make your named_route helpers or url_for add the locale segments you
 # can use:
 #
 #   products_path(:locale => 'de')
 #   url_for(:products, :locale => 'de'))
 
-require 'i18n'
-
 module RoutingFilter
   class Locale < Filter
     @@include_default_locale = true

data/lib/routing_filter/filters/pagination.rb

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

data/lib/routing_filter/filters/uuid.rb

@@ -3,8 +3,8 @@
 # the filter adds the segments to the path accordingly if the page parameter is
 # passed to the url helper.
 #
-#   incoming url: /d00fbbd1-82b6-4c1a-a57d-098d529d6854/product/1
-#   filtered url: /product/1
+#   incoming url: /d00fbbd1-82b6-4c1a-a57d-098d529d6854/products
+#   filtered url: /products
 #   params:       params[:uuid] = 'd00fbbd1-82b6-4c1a-a57d-098d529d6854'
 #
 # You can install the filter like this:
@@ -16,8 +16,8 @@
 #
 # To make your named_route helpers or url_for add the uuid segment you can use:
 #
-#   product_path(:uuid => uuid)
-#   url_for(product, :uuid => uuid)
+#   products_path(:uuid => uuid)
+#   url_for(:products, :uuid => uuid)
 
 module RoutingFilter
   class Uuid < Filter
@@ -37,4 +37,4 @@ module RoutingFilter
       end
     end
   end
-end
+end

data/lib/routing_filter/version.rb

@@ -1,3 +1,3 @@
 module RoutingFilter
-  VERSION = '0.2.4'
+  VERSION = '0.3.0.beta'
 end

metadata

@@ -1,149 +1,108 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: routing-filter
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 4
-  version: 0.2.4
+version: !ruby/object:Gem::Version
+  version: 0.3.0.beta
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Sven Fuchs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-12 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: actionpack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &11358960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *11358960
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: &11358420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *11358420
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &11357860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: test_declarative
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *11357860
+- !ruby/object:Gem::Dependency
+  name: test_declarative
+  requirement: &11284300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-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.
+  prerelease: false
+  version_requirements: *11284300
+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.
 email: svenfuchs@artweb-design.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/routing_filter/adapters/rails_2.rb
-- lib/routing_filter/adapters/rails_3.rb
-- lib/routing_filter/filter.rb
+files:
+- CHANGELOG.md
+- README.markdown
+- MIT-LICENSE
+- lib/routing/filter.rb
 - lib/routing_filter/chain.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.rb
+- lib/routing_filter/filter.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/adapters/rails_2.rb
 - lib/routing_filter.rb
-- test/all.rb
-- test/rails_test.rb
-- test/routes_test.rb
-- test/test_adapters/rails_2.rb
-- test/test_adapters/rails_3.rb
-- test/routing_filter_test.rb
-- test/test_helper.rb
-- test/filters/locale_test.rb
-- test/filters/all_filters_test.rb
-- test/filters/pagination_test.rb
-- test/filters/all_filters/generation.rb
-- test/filters/all_filters/recognition.rb
-- test/filters/uuid_test.rb
-- test/filters/extension_test.rb
-- Gemfile.lock
-- MIT-LICENSE
-- Rakefile
-- Gemfile
-- README.markdown
+- lib/routing-filter.rb
 homepage: http://github.com/svenfuchs/routing-filter
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
-rubyforge_project: "[none]"
-rubygems_version: 1.8.5
+rubyforge_project: ! '[none]'
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-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
+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: []
-

data/Gemfile

@@ -1,8 +0,0 @@
-source :rubygems
-
-group :test do
-  gem 'rails', '~> 3.0'
-  gem 'i18n'
-  gem 'test_declarative'
-  gem 'ruby-debug'
-end

data/Gemfile.lock

@@ -1,82 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.6)
-    builder (2.1.2)
-    columnize (0.3.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
-    linecache (0.43)
-    mail (2.2.12)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-test (0.5.6)
-      rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
-      bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    test_declarative (0.0.5)
-    thor (0.14.6)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  i18n
-  rails (~> 3.0)
-  ruby-debug
-  test_declarative

data/Rakefile

@@ -1,11 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-
-Rake::TestTask.new do |t|
-  t.libs << 'lib' << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-task :default => :test
-

data/test/all.rb

@@ -1 +0,0 @@
-Dir[File.expand_path('../**/*_test.rb', __FILE__)].each { |file| require file }

data/test/filters/all_filters/generation.rb

@@ -1,42 +0,0 @@
-module Generation
-  test 'generates the path /some.html (extension)' do
-    params = self.params
-    assert_equal '/some.html', routes.generate(params)
-  end
-  
-  # extension with any
-  
-  test 'generates the path /de/some (extension, locale)' do
-    params = self.params.merge(:locale => 'de')
-    assert_equal '/de/some.html', routes.generate(params)
-  end
-
-  test 'generates the path /some/page/2 (extension, pagination)' do
-    params = self.params.merge(:page => 2)
-    assert_equal '/some/page/2.html', routes.generate(params)
-  end
-
-  test 'generates the path /:uuid/some (extension, uuid)' do
-    params = self.params.merge(:uuid => uuid)
-    assert_equal "/#{uuid}/some.html", routes.generate(params)
-  end
-  
-  # extension, locale with any
-  
-  test 'generates the path /de/some/page/2 (extension, locale, pagination)' do
-    params = self.params.merge(:locale => 'de', :page => 2)
-    assert_equal '/de/some/page/2.html', routes.generate(params)
-  end
-  
-  test 'generates the path /de/:uuid/some (extension, locale, uuid)' do
-    params = self.params.merge(:locale => 'de', :uuid => uuid)
-    assert_equal "/de/#{uuid}/some.html", routes.generate(params)
-  end
-  
-  # all
-  
-  test 'generates the path /de/some/page/2 (extension, pagination, uuid)' do
-    params = self.params.merge(:locale => 'de', :page => 2, :uuid => uuid)
-    assert_equal "/de/#{uuid}/some/page/2.html", routes.generate(params)
-  end
-end

data/test/filters/all_filters/recognition.rb

@@ -1,92 +0,0 @@
-module Recognition
-  # 1 filter
-
-  test 'recognizes the path /some.html (extension)' do
-    params = self.params
-    assert_equal params, routes.recognize_path('/some.html')
-  end
-
-  test 'recognizes the path /de/some (locale)' do
-    params = self.params.merge(:locale => 'de')
-    assert_equal params, routes.recognize_path('/de/some')
-  end
-
-  test 'recognizes the path /some/page/2 (pagination)' do
-    params = self.params.merge(:page => 2)
-    assert_equal params, routes.recognize_path('/some/page/2')
-  end
-
-  test 'recognizes the path /:uuid/some (uuid)' do
-    params = self.params.merge(:uuid => uuid)
-    assert_equal params, routes.recognize_path("/#{uuid}/some")
-  end
-  
-  # extension with any
-
-  test 'recognizes the path /de/some.html (extension, locale)' do
-    params = self.params.merge(:locale => 'de')
-    assert_equal params, routes.recognize_path('/de/some.html')
-  end
-
-  test 'recognizes the path /some/page/2.html (extension, pagination)' do
-    params = self.params.merge(:page => 2)
-    assert_equal params, routes.recognize_path('/some/page/2.html')
-  end
-
-  test 'recognizes the path /:uuid/some.html (extension, uuid)' do
-    params = self.params.merge(:uuid => uuid)
-    assert_equal params, routes.recognize_path("/#{uuid}/some.html")
-  end
-
-  # locale with any
-
-  test 'recognizes the path /de/some/page/2 (locale, pagination)' do
-    params = self.params.merge(:locale => 'de', :page => 2)
-    assert_equal params, routes.recognize_path('/de/some/page/2')
-  end
-
-  test 'recognizes the path /de/:uuid/some (locale, uuid)' do
-    params = self.params.merge(:locale => 'de', :uuid => uuid)
-    assert_equal params, routes.recognize_path("/de/#{uuid}/some")
-  end
-
-  # pagination with any
-
-  test 'recognizes the path /:uuid/some/page/2 (pagination, uuid)' do
-    params = self.params.merge(:page => 2, :uuid => uuid)
-    assert_equal params, routes.recognize_path("/#{uuid}/some/page/2")
-  end
-
-  # extension, locale with any
-
-  test 'recognizes the path /de/some/page/2.html (extension, locale, pagination)' do
-    params = self.params.merge(:locale => 'de', :page => 2)
-    assert_equal params, routes.recognize_path("/de/some/page/2.html")
-  end
-
-  test 'recognizes the path /de/:uuid/some.html (extension, locale, uuid)' do
-    params = self.params.merge(:locale => 'de', :uuid => uuid)
-    assert_equal params, routes.recognize_path("/de/#{uuid}/some.html")
-  end
-  
-  # extension, pagination with any
-
-  test 'recognizes the path /some/page/2.html (extension, pagination, uuid)' do
-    params = self.params.merge(:page => 2, :uuid => uuid)
-    assert_equal params, routes.recognize_path("/#{uuid}/some/page/2.html")
-  end
-  
-  # locale, pagination with any
-
-  test 'recognizes the path /de/some/page/2 (locale, pagination, uuid)' do
-    params = self.params.merge(:locale => 'de', :page => 2, :uuid => uuid)
-    assert_equal params, routes.recognize_path("/de/#{uuid}/some/page/2")
-  end
-  
-  # all
-
-  test 'recognizes the path /de/:uuid/some/page/2.html (extension, locale, pagination, uuid)' do
-    params = self.params.merge(:locale => 'de', :page => 2, :uuid => uuid)
-    assert_equal params, routes.recognize_path("/de/#{uuid}/some/page/2.html")
-  end
-end

data/test/filters/all_filters_test.rb

@@ -1,25 +0,0 @@
-require 'test_helper'
-require 'filters/all_filters/generation'
-require 'filters/all_filters/recognition'
-
-class AllFiltersTest < Test::Unit::TestCase
-  attr_reader :routes, :params, :uuid
-
-  def setup
-    I18n.locale = nil
-    I18n.default_locale = :en
-    I18n.available_locales = %w(de en)
-
-    RoutingFilter::Locale.include_default_locale = false
-
-    @params = { :controller => 'some', :action => 'index' }
-    @uuid   = 'd00fbbd1-82b6-4c1a-a57d-098d529d6854'
-
-    @routes = draw_routes do
-      filter :uuid, :pagination ,:locale, :extension
-      match 'some', :to => 'some#index'
-    end
-  end
-
-  include Recognition, Generation
-end

data/test/filters/extension_test.rb

@@ -1,54 +0,0 @@
-require 'test_helper'
-
-class ForceExtensionTest < Test::Unit::TestCase
-  attr_reader :routes, :params
-
-  def setup
-    @routes = draw_routes do
-      filter :extension, :exclude => %r(^/(admin|$))
-      match '/',                  :to => 'some#index'
-      match 'some/:id(.:format)', :to => 'some#show'
-      match '/admin/some/new',    :to => 'some#new'
-    end
-    @params = { :controller => 'some', :action => 'show', :id => '1' }
-  end
-
-  test 'recognizes the path some/1.html and strips the extension' do
-    assert_nil routes.recognize_path('/some/1.html')[:format]
-  end
-
-  test 'recognizes the path some/1.xml but does not strip the extension' do
-    assert 'xml', routes.recognize_path('/some/1.xml')[:format]
-  end
-
-  test 'appends the extension .html to the generated path' do
-    assert_equal '/some/1.html', routes.generate(params)
-  end
-
-  test 'does not touch existing extensions in generated paths' do
-    assert_equal '/some/1.xml', routes.generate(params.merge(:format => 'xml'))
-  end
-
-  test 'does not touch url query params in generated paths' do
-    assert_equal '/some/1.html?foo=bar', routes.generate(params.merge(:foo => 'bar'))
-  end
-
-  test 'excludes / by default' do
-    assert_equal '/', routes.generate(:controller => 'some', :action => 'index')
-  end
-
-  test 'excludes / by default (with url query params)' do
-    assert_equal '/?foo=bar', routes.generate(:controller => 'some', :action => 'index', :foo => 'bar')
-  end
-
-  test 'excludes with custom regexp' do
-    assert_equal '/admin/some/new', routes.generate(:controller => 'some', :action => 'new')
-  end
-
-  # TODO - why would anyone want to have this?
-  #
-  # test 'does not exclude / when :exclude => false was passed' do
-  #   routes.filters.first.instance_variable_set(:@exclude, false)
-  #   assert_equal '/.html', routes.generate(:controller => 'some', :action => 'index')
-  # end
-end

data/test/filters/locale_test.rb

@@ -1,69 +0,0 @@
-require 'test_helper'
-
-class LocaleTest < Test::Unit::TestCase
-  attr_reader :routes, :show_params, :index_params
-
-  def setup
-    I18n.locale = nil
-    I18n.default_locale = :en
-    I18n.available_locales = %w(de en)
-
-    RoutingFilter::Locale.include_default_locale = true
-
-    @index_params = { :controller => 'some', :action => 'index' }
-    @show_params  = { :controller => 'some', :action => 'show', :id => '1' }
-
-    @routes = draw_routes do
-      filter :locale
-      match 'products/:id', :to => 'some#show'
-      match '/', :to => 'some#index'
-    end
-  end
-
-  test 'recognizes the path /en' do
-    assert_equal index_params.merge(:locale => 'en'), routes.recognize_path('/en')
-  end
-
-  test 'recognizes the path /en/' do
-    assert_equal index_params.merge(:locale => 'en'), routes.recognize_path('/en/')
-  end
-
-  test 'recognizes the path /en/products/1' do
-    assert_equal show_params.merge(:locale => 'en'), routes.recognize_path('/en/products/1')
-  end
-
-  test 'recognizes the path /de/products/1' do
-    assert_equal show_params.merge(:locale => 'de'), routes.recognize_path('/de/products/1')
-  end
-
-
-  test 'prepends the segments /:locale to the generated path / if the current locale is not the default locale' do
-    I18n.locale = 'de'
-    assert_equal '/de', routes.generate(index_params)
-  end
-
-  test 'prepends the segments /:locale to the generated path /products/1 if the current locale is not the default locale' do
-    I18n.locale = 'de'
-    assert_equal '/de/products/1', routes.generate(show_params)
-  end
-
-  test 'prepends the segments /:locale to the generated path if it was passed as a param' do
-    assert_equal '/de/products/1', routes.generate(show_params.merge(:locale => 'de'))
-  end
-
-  test 'prepends the segments /:locale if the given locale is the default_locale and include_default_locale is true' do
-    assert RoutingFilter::Locale.include_default_locale?
-    assert_equal '/en/products/1', routes.generate(show_params.merge(:locale => 'en'))
-  end
-
-  test 'does not prepend the segments /:locale if the current locale is the default_locale and include_default_locale is false' do
-    I18n.locale = 'en'
-    RoutingFilter::Locale.include_default_locale = false
-    assert_equal '/products/1', routes.generate(show_params)
-  end
-
-  test 'does not prepend the segments /:locale if the given locale is the default_locale and include_default_locale is false' do
-    RoutingFilter::Locale.include_default_locale = false
-    assert_equal '/products/1', routes.generate(show_params.merge(:locale => I18n.default_locale))
-  end
-end

data/test/filters/pagination_test.rb

@@ -1,29 +0,0 @@
-require 'test_helper'
-
-class PaginationTest < Test::Unit::TestCase
-  attr_reader :routes, :params
-
-  def setup
-    @routes = draw_routes do
-      filter :pagination
-      match 'some', :to => 'some#index'
-    end
-    @params = { :controller => 'some', :action => 'index', :page => 2 }
-  end
-
-  test 'recognizes the path some/page/2' do
-    assert_equal params, routes.recognize_path('/some/page/2')
-  end
-
-  test 'appends the segments /page/:page to the generated path if the passed :page param does not equal 1' do
-    assert_equal '/some/page/2', routes.generate(params)
-  end
-
-  test 'does not append anything to the generated path if the passed :page param equals 1' do
-    assert_equal '/some', routes.generate(params.merge(:page => 1))
-  end
-
-  test 'appends the segments /page/:page to the generated path but respects url query params' do
-    assert_equal '/some/page/2?foo=bar', routes.generate(params.merge(:foo => 'bar'))
-  end
-end

data/test/filters/uuid_test.rb

@@ -1,40 +0,0 @@
-require 'test_helper'
-
-class UuidTest < Test::Unit::TestCase
-  attr_reader :routes, :uuid, :params
-
-  def setup
-    @routes = draw_routes do
-      filter :uuid
-      match 'some/:id', :to => 'some#show'
-    end
-    @uuid   = 'd00fbbd1-82b6-4c1a-a57d-098d529d6854'
-    @params = { :controller => 'some', :action => 'show', :id => '1', :uuid => uuid }
-  end
-
-  test 'recognizes the path :uuid/product/1' do
-    assert_equal params, routes.recognize_path("/#{uuid}/some/1")
-  end
-
-  test 'prepends the :uuid segment to the generated path if passed as a param' do
-    assert_equal "/#{uuid}/some/1", routes.generate(params)
-  end
-
-  test 'matches uuid segments' do
-    pattern = Uuid::UUID_SEGMENT
-    uuids = %w(
-      d00fbbd1-82b6-4c1a-a57d-098d529d6854 cdb33760-94da-11df-981c-0800200c9a66
-      0c65a6ec-6491-4316-a137-0021cf4e6471 cbbd44c3-c195-48e5-be04-3cc8a6578f51
-    )
-    uuids.each { |uuid| assert pattern.match("/#{uuid}/"), "does not match /#{uuid}/ but should" }
-  end
-
-  test 'does not match non-uuid segments' do
-    pattern = Uuid::UUID_SEGMENT
-    uuids = %w(
-      !aaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa aaaa-aaaaaaaa-aaaa-aaaa-aaaaaaaaaaaa
-      aaaaaaaa_aaaa_aaaa_aaaa_aaaaaaaaaaaa aaaaaaaa-aaaa-aaaa-aaaaaaaaaaaa
-    )
-    uuids.each { |uuid| assert !pattern.match("/#{uuid}/"), "matches /#{uuid}/ but shouldn't" }
-  end
-end

data/test/rails_test.rb

@@ -1,92 +0,0 @@
-require 'test_helper'
-require "test_adapters/rails_#{ActionPack::VERSION::MAJOR}"
-
-class RailsTest < Test::Unit::TestCase
-  include TestRailsAdapter
-
-  I18n.available_locales = [:en, :de]
-
-  class TestsController < ActionController::Base
-    include Rails.application.routes.url_helpers if defined?(Rails)
-
-    def index
-      url = url_for(params.merge(:only_path => true))
-      render :text => params.merge(:url => url).inspect
-    end
-
-    def show
-      url = foo_path(params)
-      render :text => params.merge(:url => url).inspect
-    end
-  end
-
-  def params
-    response.status.to_s.include?('200') ? eval(response.body).symbolize_keys : {}
-  end
-
-  test "get to /" do
-    get '/'
-    assert_nil params[:locale]
-    assert_nil params[:page]
-    assert_nil params[:uuid]
-    assert_equal '/en.html', params[:url]
-  end
-
-  test "get to /foo/1" do
-    get '/foo/1'
-    assert_nil params[:locale]
-    assert_nil params[:page]
-    assert_nil params[:uuid]
-    assert_equal '/en/foo/1.html', params[:url]
-  end
-
-  test "get to /de" do
-    get '/de'
-    assert_equal 'de', params[:locale]
-    assert_nil params[:page]
-    assert_nil params[:uuid]
-    assert_equal '/de.html', params[:url]
-  end
-
-  test "get to /de/foo/1" do
-    get '/de/foo/1'
-    assert_equal 'de', params[:locale]
-    assert_nil params[:page]
-    assert_nil params[:uuid]
-    assert_equal '/de/foo/1.html', params[:url]
-  end
-
-  test "get to /page/2" do
-    get '/page/2'
-    assert_nil params[:locale]
-    assert_equal 2, params[:page]
-    assert_nil params[:uuid]
-    assert_equal '/en/page/2.html', params[:url]
-  end
-
-  test "get to /foo/1/page/2" do
-    get '/foo/1/page/2'
-    assert_nil params[:locale]
-    assert_equal 2, params[:page]
-    assert_nil params[:uuid]
-    assert_equal '/en/foo/1/page/2.html', params[:url]
-  end
-
-  test "get to /:uuid" do
-    uuid = 'd00fbbd1-82b6-4c1a-a57d-098d529d6854'
-    get "/#{uuid}"
-    assert_nil params[:locale]
-    assert_nil params[:page]
-    assert_equal uuid, params[:uuid]
-    assert_equal "/en/#{uuid}.html", params[:url]
-  end
-
-  test "get to /foo/1/:uuid" do
-    uuid = 'd00fbbd1-82b6-4c1a-a57d-098d529d6854'
-    get "/#{uuid}/foo/1"
-    assert_nil params[:locale]
-    assert_nil params[:page]
-    assert_equal uuid, params[:uuid]
-    assert_equal "/en/#{uuid}/foo/1.html", params[:url]
-  end
-end

data/test/routes_test.rb

@@ -1,31 +0,0 @@
-require 'test_helper'
-
-class RoutesTest < Test::Unit::TestCase
-  class RoutingFilter::Test < Filter
-    def around_recognize(path, env, &block)
-      'recognized'
-    end
-
-    def around_generate(*args, &block)
-      'generated'
-    end
-  end
-
-  attr_reader :routes
-
-  def setup
-    @routes = draw_routes { |set| set.filter :test }
-  end
-
-  test "routes.filter instantiates and registers a filter" do
-    assert routes.filters.first.is_a?(RoutingFilter::Test)
-  end
-
-  # test "filter.around_recognize is being called" do
-  #   assert_equal 'recognized', routes.recognize_path('/')
-  # end
-
-  test "filter.around_generate is being called" do
-    assert_equal 'generated', routes.generate({})
-  end
-end

data/test/routing_filter_test.rb

@@ -1,47 +0,0 @@
-require 'test_helper'
-
-include RoutingFilter
-
-class RoutingFilterTest < Test::Unit::TestCase
-  class FooFilter < Filter
-    attr_reader :name
-
-    def initialize(name)
-      @name = name
-    end
-
-    def foo(log, &block)
-      log << name
-      yield
-    end
-  end
-
-  attr_reader :chain
-
-  def setup
-    @chain = Chain.new
-    @chain.unshift FooFilter.new('custom filter')
-    @chain.unshift FooFilter.new('common filter')
-  end
-
-  test "filter.previous is nil for the first filter in the chain" do
-    assert_nil chain.first.previous
-  end
-
-  test "filter.previous returns the previous filter in the chain" do
-    assert_equal chain.first, chain.last.previous
-  end
-
-  test "filter.next is nil for the last filter in the chain" do
-    assert_nil chain.last.next
-  end
-
-  test "filter.next returns the next filter in the chain" do
-    assert_equal chain.last, chain.first.next
-  end
-
-  test "chain.run calls the given method on registered filters in reverse order" do
-    log = []
-    assert_equal 'common filter, custom filter, finalizer', chain.run(:foo, log, &lambda { log << 'finalizer' }).join(', ')
-  end
-end

data/test/test_adapters/rails_2.rb

@@ -1,17 +0,0 @@
-require 'test_helper'
-
-module TestRailsAdapter
-  routes = ActionController::Routing::Routes = ActionController::Routing::RouteSet.new
-  routes.draw do |map|
-    map.connect '/', :controller => 'rails_test/tests', :action => 'index'
-    map.foo '/foo/:id', :controller => 'rails_test/tests', :action => 'show'
-    map.filter :uuid, :pagination ,:locale, :extension
-  end
-
-  attr_reader :session
-  delegate :get, :response, :to => :session
-
-  def setup
-    @session = ActionController::Integration::Session.new(lambda { |env| ActionController::Routing::Routes.call(env) })
-  end
-end

data/test/test_adapters/rails_3.rb

@@ -1,28 +0,0 @@
-require 'test_helper'
-
-require "rails"
-require 'rack/test'
-
-module TestRailsAdapter
-  include ::Rack::Test::Methods
-
-  APP = Class.new(Rails::Application).tap do |app|
-    app.config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"
-    app.config.session_store :cookie_store, :key => "_myapp_session"
-    app.config.active_support.deprecation = :log
-    app.routes.draw do
-      match "/" => "rails_test/tests#index"
-      match "/foo/:id" => "rails_test/tests#show", :as => 'foo'
-      filter :uuid, :pagination ,:locale, :extension
-    end
-    app.initialize!
-  end
-
-  def app
-    APP
-  end
-
-  def response
-    last_response
-  end
-end

data/test/test_helper.rb

@@ -1,41 +0,0 @@
-ENV['RAILS_ENV'] = 'test'
-
-require 'rubygems'
-require 'test/unit'
-require 'bundler/setup'
-
-require 'i18n'
-require 'action_pack'
-require 'active_support'
-require 'action_controller'
-require 'active_support/core_ext/enumerable.rb'
-require 'test_declarative'
-require 'routing_filter'
-
-include RoutingFilter
-
-class SomeController < ActionController::Base
-end
-
-class Test::Unit::TestCase
-  def draw_routes(&block)
-    normalized_block = rails_2? ? lambda { |set| set.instance_eval(&block) } : block
-    klass = rails_2? ? ActionController::Routing::RouteSet : ActionDispatch::Routing::RouteSet
-    klass.new.tap { |set| set.draw(&normalized_block) }
-  end
-
-  def rails_2?
-    ActionPack::VERSION::MAJOR == 2
-  end
-end
-
-if ActionPack::VERSION::MAJOR == 2
-  ActionController::Routing::RouteSet::Mapper.class_eval do
-    def match(pattern, options)
-      pattern.gsub!('(.:format)', '.:format')
-      controller, action = options.delete(:to).split('#')
-      options.merge!(:controller => controller, :action => action)
-      connect(pattern, options)
-    end
-  end
-end