routing-filter 0.2.2 → 0.2.3

data/Gemfile

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

data/Gemfile.lock

@@ -1,9 +1,3 @@
-PATH
-  remote: .
-  specs:
-    routing-filter (0.2.0)
-      actionpack
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -36,9 +30,11 @@ GEM
     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)
@@ -65,7 +61,12 @@ GEM
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
-    test_declarative (0.0.4)
+    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)
@@ -75,8 +76,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack
   i18n
-  rails
-  routing-filter!
+  rails (~> 3.0)
+  ruby-debug
   test_declarative

data/README.markdown

@@ -59,6 +59,20 @@ Filters can also accept options:
       filter :extension, :exclude => %r(^admin/)
     end
 
+## 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.
+
+Running the tests with Rails 3.x:
+
+    $ bundle install
+    $ ruby -Itest -Ilib test/all.rb
+
+Running the tests with Rails 2.3.x:
+
+    $ BUNDLE_GEMFILE=ci/Gemfile.rails-2.3.x bundle install
+    $ BUNDLE_GEMFILE=ci/Gemfile.rails-2.3.x ruby -Itest -Ilib test/all.rb
+
 ## Filter order
 
 You can picture the way routing-filter wraps filters around your application as a russian puppet pattern. Your application sits in the center and is wrapped by a number of filters. An incoming request's path will be past through these layers of filters from the outside in until it is passed to the regular application routes set. When you generate URLs on the other hand then the filters will be run from the inside out.

data/lib/routing_filter/adapters/rails_2.rb

@@ -58,7 +58,7 @@ ActionController::Routing::RouteSet.class_eval do
   # TODO move this ... where?
   alias_method :extract_request_environment_without_host, :extract_request_environment unless method_defined? :extract_request_environment_without_host
   def extract_request_environment(request)
-    returning extract_request_environment_without_host(request) do |env|
+    extract_request_environment_without_host(request).tap do |env|
       env.merge! :host => request.host,
                  :port => request.port,
                  :host_with_port => request.host_with_port,

data/lib/routing_filter/adapters/rails_3.rb

@@ -2,7 +2,9 @@ require 'action_dispatch'
 require 'active_support/core_ext/module/aliasing'
 require 'active_support/core_ext/hash/reverse_merge'
 
-[ActionDispatch::Routing::Mapper, ActionDispatch::Routing::DeprecatedMapper].each do |mapper|
+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)
@@ -11,9 +13,13 @@ require 'active_support/core_ext/hash/reverse_merge'
 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| @set.filters.unshift(RoutingFilter.build(name, options)) }
+    names.each { |name| filters.unshift(RoutingFilter.build(name, options)) }
   end
 
   # def recognize_path_with_filtering(path, env = {})
@@ -22,12 +28,12 @@ ActionDispatch::Routing::RouteSet.class_eval do
   # alias_method_chain :recognize_path, :filtering
 
   def generate_with_filtering(options, recall = {}, extras = false)
-    @set.filters.run(:around_generate, options, &lambda{ generate_without_filtering(options, recall, extras) })
+    filters.run(:around_generate, options, &lambda{ generate_without_filtering(options, recall, extras) })
   end
   alias_method_chain :generate, :filtering
 
   def clear_with_filtering!
-    @set.filters.clear if @set
+    filters.clear if filters
     clear_without_filtering!
   end
   alias_method_chain :clear!, :filtering

data/lib/routing_filter/filter.rb

@@ -7,7 +7,7 @@ module RoutingFilter
     end
 
     def run(method, *args, &block)
-      _next = self.next ? lambda { self.next.run(method, *args, &block) } : block
+      _next = self.next ? proc {|path, env| self.next.run(method, *args, &block) } : block
       RoutingFilter.active? ? send(method, *args, &_next) : _next.call(*args)
     end
 

data/lib/routing_filter/filters/locale.rb

@@ -52,11 +52,15 @@ module RoutingFilter
       end
     end
 
-    def around_generate(params, &block)
+    def around_generate(*args, &block)
+      params = args.extract_options!                              # this is because we might get a call like forum_topics_path(forum, topic, :locale => :en)
+
       locale = params.delete(:locale)                             # extract the passed :locale option
       locale = I18n.locale if locale.nil?                         # default to I18n.locale when locale is nil (could also be false)
       locale = nil unless valid_locale?(locale)                   # reset to no locale when locale is not valid
 
+      args << params
+
       yield.tap do |result|
         prepend_segment!(result, locale) if prepend_locale?(locale)
       end

data/lib/routing_filter/version.rb

@@ -1,3 +1,3 @@
 module RoutingFilter
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/test/blocks.rb

@@ -0,0 +1,33 @@
+# def foo
+#   f = Proc.new { return "return from foo from inside proc" }
+#   f.call # control leaves foo here
+#   return "return from foo"
+# end
+#
+# def bar
+#   f = lambda { return "return from lambda" }
+#   f.call # control does not leave bar here
+#   return "return from bar"
+# end
+#
+# puts foo # prints "return from foo from inside proc"
+# puts bar # prints "return from bar"
+
+
+class RouteSet
+  def call
+    recognize &Proc.new { return 'return from recognize block' }
+    p "KEKSE"
+    # recognize do
+    #   return 'return from recognize block'
+    # end
+  end
+
+  def recognize
+    yield
+    p "KEKSE"
+  end
+end
+
+
+puts RouteSet.new.call

data/test/rails_test.rb

@@ -0,0 +1,92 @@
+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

@@ -18,7 +18,7 @@ class RoutesTest < Test::Unit::TestCase
   end
 
   test "routes.filter instantiates and registers a filter" do
-    assert routes.instance_variable_get(:@set).filters.first.is_a?(RoutingFilter::Test)
+    assert routes.filters.first.is_a?(RoutingFilter::Test)
   end
 
   # test "filter.around_recognize is being called" do

data/test/test_adapters/rails_2.rb

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,28 @@
+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,7 +1,6 @@
 ENV['RAILS_ENV'] = 'test'
 
 require 'rubygems'
-# gem 'actionpack', '~> 2.3' if ENV['RAILS_2']
 require 'test/unit'
 require 'bundler/setup'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: routing-filter
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-26 00:00:00 +01:00
+date: 2011-01-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,6 +95,7 @@ files:
 - lib/routing_filter/version.rb
 - lib/routing_filter.rb
 - test/all.rb
+- test/blocks.rb
 - test/filters/all_filters/generation.rb
 - test/filters/all_filters/recognition.rb
 - test/filters/all_filters_test.rb
@@ -102,9 +103,11 @@ files:
 - test/filters/locale_test.rb
 - test/filters/pagination_test.rb
 - test/filters/uuid_test.rb
-- test/rails_3_test.rb
+- test/rails_test.rb
 - test/routes_test.rb
 - test/routing_filter_test.rb
+- test/test_adapters/rails_2.rb
+- test/test_adapters/rails_3.rb
 - test/test_helper.rb
 - Gemfile
 - Gemfile.lock
@@ -140,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: "[none]"
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 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

data/test/rails_3_test.rb

@@ -1,73 +0,0 @@
-require 'test_helper'
-
-if ActionPack::VERSION::MAJOR == 3
-  require "rails"
-  require 'rack/test'
-
-  class Rails3Test < Test::Unit::TestCase
-    include ::Rack::Test::Methods
-
-    I18n.available_locales = [:en, :de]
-
-    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 "/" => "rails3_test/tests#index"
-        filter :uuid, :pagination ,:locale, :extension
-      end
-      app.initialize!
-    end
-
-    class TestsController < ActionController::Base
-      include Rails.application.routes.url_helpers
-
-      def index
-        url = url_for(params.merge(:only_path => true))
-        render :text => params.merge(:url => url).inspect
-      end
-    end
-
-    def app
-      APP
-    end
-
-    def params
-      last_response.status == 200 ? eval(last_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 /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 /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 /: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
-  end
-end