strikeroff-routing-filter 0.0.2 → 0.1.0

data/spec/pagination_extension_spec.rb

@@ -1,19 +1,19 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
-
-describe 'RoutingFilter::Pagination' do
-  include RoutingFilterHelpers
-
-  before :each do
-    setup_environment(:pagination)
-  end
-
-  describe 'url generation' do
-    it 'appends the segments /pages/:page to the generated path' do
-      section_path(1, :page => 2).should == '/sections/1/pages/2'
-    end
-
-    it 'appends the segments /pages/:page to the generated path excluding http get params' do
-      section_path(1, :page => 2, :foo => 'bar').should == '/sections/1/pages/2?foo=bar'
-    end
-  end
-end
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe 'RoutingFilter::Pagination' do
+  include RoutingFilterHelpers
+
+  before :each do
+    setup_environment(:pagination)
+  end
+
+  describe 'url generation' do
+    it 'appends the segments /pages/:page to the generated path' do
+      section_path(1, :page => 2).should == '/sections/1/pages/2'
+    end
+
+    it 'appends the segments /pages/:page to the generated path excluding http get params' do
+      section_path(1, :page => 2, :foo => 'bar').should == '/sections/1/pages/2?foo=bar'
+    end
+  end
+end

data/spec/recognition_spec.rb

@@ -1,76 +1,76 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
-
-describe 'RoutingFilter', 'url recognition' do
-  include RoutingFilterHelpers
-
-  before :each do
-    setup_environment :locale, :pagination
-  end
-
-  it 'recognizes the path /de/sections/1 and sets the :locale param' do
-    should_recognize_path '/de/sections/1', @section_params.update(:locale => 'de')
-  end
-
-  it 'recognizes the path /sections/1/pages/1 and sets the :page param' do
-    should_recognize_path '/sections/1/pages/1', @section_params.update(:page => 1)
-  end
-
-  it 'recognizes the path /de/sections/1/pages/1 and sets the :locale param' do
-    should_recognize_path '/de/sections/1/pages/1', @section_params.update(:locale => 'de', :page => 1)
-  end
-
-  it 'recognizes the path /sections/1/articles/1 and sets the :locale param' do
-    should_recognize_path '/sections/1/articles/1', @article_params
-  end
-
-  it 'recognizes the path /de/sections/1/articles/1 and sets the :locale param' do
-    should_recognize_path '/de/sections/1/articles/1', @article_params.update(:locale => 'de')
-  end
-
-  it 'recognizes the path /de/sections/1/articles/1/pages/1 and sets the :locale param' do
-    should_recognize_path '/de/sections/1/articles/1/pages/1', @article_params.update(:locale => 'de', :page => 1)
-  end
-
-  it 'recognizes the path /sections/1 and does not set a :locale param' do
-    should_recognize_path '/sections/1', @section_params
-  end
-
-  it 'recognizes the path /sections/1 and does not set a :page param' do
-    should_recognize_path '/sections/1', @section_params
-  end
-
-  # Test that routing errors are thrown for invalid locales
-  it 'does not recognizes the path /aa/sections/1 and does not set a :locale param' do
-    begin
-      should_recognize_path '/aa/sections/1', @section_params.update(:locale => 'aa')
-      false
-    rescue ActionController::RoutingError
-      true
-    end
-  end
-
-  it 'recognizes the path /en-US/sections/1 and sets a :locale param' do
-    should_recognize_path '/en-US/sections/1', @section_params.update(:locale => 'en-US')
-  end
-
-  it 'recognizes the path /sections/1/articles/1 and does not set a :locale param' do
-    should_recognize_path '/sections/1/articles/1', @article_params
-  end
-
-  it 'recognizes the path /sections/1/articles/1 and does not set a :page param' do
-    should_recognize_path '/sections/1/articles/1', @article_params
-  end
-
-  it 'invalid locale: does not recognize the path /aa/sections/1/articles/1 and does not set a :locale param' do
-    lambda { @set.recognize_path('/aa/sections/1/articles/1', {}) }.should raise_error(ActionController::RoutingError)
-  end
-
-  it 'recognizes the path /en-US/sections/1/articles/1 and sets a :locale param' do
-    should_recognize_path '/en-US/sections/1/articles/1', @article_params.update(:locale => 'en-US')
-  end
-
-  it 'unescapes the path for the filters' do
-    @set.should_receive(:recognize_path_without_filtering).with('/sections/motörhead', 'test')
-    @set.recognize_path('/sections/mot%C3%B6rhead', 'test')
-  end
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe 'RoutingFilter', 'url recognition' do
+  include RoutingFilterHelpers
+
+  before :each do
+    setup_environment :locale, :pagination
+  end
+
+  it 'recognizes the path /de/sections/1 and sets the :locale param' do
+    should_recognize_path '/de/sections/1', @section_params.update(:locale => 'de')
+  end
+
+  it 'recognizes the path /sections/1/pages/1 and sets the :page param' do
+    should_recognize_path '/sections/1/pages/1', @section_params.update(:page => 1)
+  end
+
+  it 'recognizes the path /de/sections/1/pages/1 and sets the :locale param' do
+    should_recognize_path '/de/sections/1/pages/1', @section_params.update(:locale => 'de', :page => 1)
+  end
+
+  it 'recognizes the path /sections/1/articles/1 and sets the :locale param' do
+    should_recognize_path '/sections/1/articles/1', @article_params
+  end
+
+  it 'recognizes the path /de/sections/1/articles/1 and sets the :locale param' do
+    should_recognize_path '/de/sections/1/articles/1', @article_params.update(:locale => 'de')
+  end
+
+  it 'recognizes the path /de/sections/1/articles/1/pages/1 and sets the :locale param' do
+    should_recognize_path '/de/sections/1/articles/1/pages/1', @article_params.update(:locale => 'de', :page => 1)
+  end
+
+  it 'recognizes the path /sections/1 and does not set a :locale param' do
+    should_recognize_path '/sections/1', @section_params
+  end
+
+  it 'recognizes the path /sections/1 and does not set a :page param' do
+    should_recognize_path '/sections/1', @section_params
+  end
+
+  # Test that routing errors are thrown for invalid locales
+  it 'does not recognizes the path /aa/sections/1 and does not set a :locale param' do
+    begin
+      should_recognize_path '/aa/sections/1', @section_params.update(:locale => 'aa')
+      false
+    rescue ActionController::RoutingError
+      true
+    end
+  end
+
+  it 'recognizes the path /en-US/sections/1 and sets a :locale param' do
+    should_recognize_path '/en-US/sections/1', @section_params.update(:locale => 'en-US')
+  end
+
+  it 'recognizes the path /sections/1/articles/1 and does not set a :locale param' do
+    should_recognize_path '/sections/1/articles/1', @article_params
+  end
+
+  it 'recognizes the path /sections/1/articles/1 and does not set a :page param' do
+    should_recognize_path '/sections/1/articles/1', @article_params
+  end
+
+  it 'invalid locale: does not recognize the path /aa/sections/1/articles/1 and does not set a :locale param' do
+    lambda { @set.recognize_path('/aa/sections/1/articles/1', {}) }.should raise_error(ActionController::RoutingError)
+  end
+
+  it 'recognizes the path /en-US/sections/1/articles/1 and sets a :locale param' do
+    should_recognize_path '/en-US/sections/1/articles/1', @article_params.update(:locale => 'en-US')
+  end
+
+  it 'unescapes the path for the filters' do
+    @set.should_receive(:recognize_path_without_filtering).with('/sections/motörhead', 'test')
+    @set.recognize_path('/sections/mot%C3%B6rhead', 'test')
+  end
 end

data/spec/routing_filter_spec.rb

@@ -1,114 +1,114 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
-
-describe 'RoutingFilter' do
-  include RoutingFilterHelpers
-
-  before :each do
-    setup_environment :locale, :pagination
-  end
-
-  def recognize_path(path = '/de/sections/1', options = {})
-    @set.recognize_path(path, options)
-  end
-
-  it 'installs filters to the route set' do
-    @locale_filter.should be_instance_of(RoutingFilter::Locale)
-    @pagination_filter.should be_instance_of(RoutingFilter::Pagination)
-  end
-
-  it 'calls the first filter for route recognition' do
-    @locale_filter.should_receive(:around_recognize).and_return :foo => :bar
-    recognize_path.should == { :foo => :bar }
-  end
-
-  it 'calls the second filter for route recognition' do
-    @pagination_filter.should_receive(:around_recognize).and_return :foo => :bar
-    recognize_path.should == { :foo => :bar, :locale => 'de' }
-  end
-
-  it 'calls the first filter for url generation' do
-    @locale_filter.should_receive(:around_generate).and_return '/en/sections/1?page=2'
-    url_for(:controller => 'sections', :action => 'show', :section_id => 1)
-  end
-
-  it 'calls the second filter for url generation' do
-    @pagination_filter.should_receive(:around_generate).and_return '/sections/1?page=2'
-    url_for(:controller => 'sections', :action => 'show', :section_id => 1)
-  end
-
-  it 'calls the first filter for named route url_helper' do
-    @locale_filter.should_receive(:around_generate).and_return '/en/sections/1'
-    section_path(:section_id => 1)
-  end
-
-  it 'calls the filter for named route url_helper with "optimized" generation blocks' do
-    # at_least(1) since the inline code comments in ActionController::Routing::RouteSet::NamedRouteCollection#define_url_helper also call us (as of http://github.com/rails/rails/commit/a2270ef2594b97891994848138614657363f2806)
-    @locale_filter.should_receive(:around_generate).at_least(1).and_return '/en/sections/1'
-    section_path(1)
-  end
-
-  it 'calls the filter for named route polymorphic_path' do
-    # at_least(1) since the inline code comments in ActionController::Routing::RouteSet::NamedRouteCollection#define_url_helper also call us (as of http://github.com/rails/rails/commit/a2270ef2594b97891994848138614657363f2806)
-    @locale_filter.should_receive(:around_generate).at_least(1).and_return '/en/sections/1'
-    section_path(Section.new)
-  end
-
-  # When filters are set up in the order:
-  #
-  #   map.filter :locale
-  #   map.filter :pagination
-  #
-  # Then #around_recognize should be first called on the locale filter and then
-  # on the pagination filter. Whereas #around_generate should be first called
-  # on the pagination filter and then on the locale filter. Right?
-
-  it 'calls #around_recognize in the expected order' do
-    params = { :id => "1", :page => 2, :controller => "sections", :action => "show" }
-    @pagination_filter.stub!(:around_recognize).and_return({ :page => 2, :controller => "sections", :action => "show" })
-
-    recognize_path('/de/sections/1/pages/2')[:locale].should == "de"
-    recognize_path('/de/sections/1/pages/2')[:page].should == 2
-  end
-
-  it 'calls #around_generate in the expected order' do
-    @locale_filter.stub!(:around_generate).and_return('de/sections/1')
-    section_path(1, :page => 2).should == "de/sections/1/pages/2"
-  end
-
-  it 'does not call deactivated filters' do
-    with_deactivated_filters(RoutingFilter::Locale) do
-      @locale_filter.should_not_receive(:around_generate)
-      section_path(Section.new)
-    end
-  end
-
-  it 'still calls successors of deactivated filters' do
-    with_deactivated_filters(RoutingFilter::Locale) do
-      @pagination_filter.should_receive(:around_recognize).and_return :foo => :bar
-      recognize_path('/sections/1').should == { :foo => :bar }
-    end
-  end
-
-  # chain
-
-  it 'adds filters in the order they are registered' do
-    @set.filters[0].should == @locale_filter
-    @set.filters[1].should == @pagination_filter
-  end
-
-  it 'returns the previous filter as a predecessor of a filter' do
-    @set.filters.predecessor(@pagination_filter).should == @locale_filter
-  end
-
-  it 'returns the nil as a predecessor of the first filter' do
-    @set.filters.successor(@pagination_filter).should be_nil
-  end
-
-  it 'returns the next filter as a successor of a filter' do
-    @set.filters.successor(@locale_filter).should == @pagination_filter
-  end
-
-  it 'returns the nil as a successor of the last filter' do
-    @set.filters.successor(@pagination_filter).should be_nil
-  end
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe 'RoutingFilter' do
+  include RoutingFilterHelpers
+
+  before :each do
+    setup_environment :locale, :pagination
+  end
+
+  def recognize_path(path = '/de/sections/1', options = {})
+    @set.recognize_path(path, options)
+  end
+
+  it 'installs filters to the route set' do
+    @locale_filter.should be_instance_of(RoutingFilter::Locale)
+    @pagination_filter.should be_instance_of(RoutingFilter::Pagination)
+  end
+
+  it 'calls the first filter for route recognition' do
+    @locale_filter.should_receive(:around_recognize).and_return :foo => :bar
+    recognize_path.should == { :foo => :bar }
+  end
+
+  it 'calls the second filter for route recognition' do
+    @pagination_filter.should_receive(:around_recognize).and_return :foo => :bar
+    recognize_path.should == { :foo => :bar, :locale => 'de' }
+  end
+
+  it 'calls the first filter for url generation' do
+    @locale_filter.should_receive(:around_generate).and_return '/en/sections/1?page=2'
+    url_for(:controller => 'sections', :action => 'show', :section_id => 1)
+  end
+
+  it 'calls the second filter for url generation' do
+    @pagination_filter.should_receive(:around_generate).and_return '/sections/1?page=2'
+    url_for(:controller => 'sections', :action => 'show', :section_id => 1)
+  end
+
+  it 'calls the first filter for named route url_helper' do
+    @locale_filter.should_receive(:around_generate).and_return '/en/sections/1'
+    section_path(:section_id => 1)
+  end
+
+  it 'calls the filter for named route url_helper with "optimized" generation blocks' do
+    # at_least(1) since the inline code comments in ActionController::Routing::RouteSet::NamedRouteCollection#define_url_helper also call us (as of http://github.com/rails/rails/commit/a2270ef2594b97891994848138614657363f2806)
+    @locale_filter.should_receive(:around_generate).at_least(1).and_return '/en/sections/1'
+    section_path(1)
+  end
+
+  it 'calls the filter for named route polymorphic_path' do
+    # at_least(1) since the inline code comments in ActionController::Routing::RouteSet::NamedRouteCollection#define_url_helper also call us (as of http://github.com/rails/rails/commit/a2270ef2594b97891994848138614657363f2806)
+    @locale_filter.should_receive(:around_generate).at_least(1).and_return '/en/sections/1'
+    section_path(Section.new)
+  end
+
+  # When filters are set up in the order:
+  #
+  #   map.filter :locale
+  #   map.filter :pagination
+  #
+  # Then #around_recognize should be first called on the locale filter and then
+  # on the pagination filter. Whereas #around_generate should be first called
+  # on the pagination filter and then on the locale filter. Right?
+
+  it 'calls #around_recognize in the expected order' do
+    params = { :id => "1", :page => 2, :controller => "sections", :action => "show" }
+    @pagination_filter.stub!(:around_recognize).and_return({ :page => 2, :controller => "sections", :action => "show" })
+
+    recognize_path('/de/sections/1/pages/2')[:locale].should == "de"
+    recognize_path('/de/sections/1/pages/2')[:page].should == 2
+  end
+
+  it 'calls #around_generate in the expected order' do
+    @locale_filter.stub!(:around_generate).and_return('de/sections/1')
+    section_path(1, :page => 2).should == "de/sections/1/pages/2"
+  end
+
+  it 'does not call deactivated filters' do
+    with_deactivated_filters(RoutingFilter::Locale) do
+      @locale_filter.should_not_receive(:around_generate)
+      section_path(Section.new)
+    end
+  end
+
+  it 'still calls successors of deactivated filters' do
+    with_deactivated_filters(RoutingFilter::Locale) do
+      @pagination_filter.should_receive(:around_recognize).and_return :foo => :bar
+      recognize_path('/sections/1').should == { :foo => :bar }
+    end
+  end
+
+  # chain
+
+  it 'adds filters in the order they are registered' do
+    @set.filters[0].should == @locale_filter
+    @set.filters[1].should == @pagination_filter
+  end
+
+  it 'returns the previous filter as a predecessor of a filter' do
+    @set.filters.predecessor(@pagination_filter).should == @locale_filter
+  end
+
+  it 'returns the nil as a predecessor of the first filter' do
+    @set.filters.successor(@pagination_filter).should be_nil
+  end
+
+  it 'returns the next filter as a successor of a filter' do
+    @set.filters.successor(@locale_filter).should == @pagination_filter
+  end
+
+  it 'returns the nil as a successor of the last filter' do
+    @set.filters.successor(@pagination_filter).should be_nil
+  end
 end

data/spec/spec.opts

@@ -1,4 +1,4 @@
---colour
---format progress
---loadby mtime
---reverse
+--colour
+--format progress
+--loadby mtime
+--reverse

data/spec/spec_helper.rb

@@ -1,108 +1,108 @@
-$: << File.dirname(__FILE__)
-$: << File.dirname(__FILE__) + '/../lib/'
-
-require 'rubygems'
-require 'actionpack'
-require 'activesupport'
-require 'action_controller'
-require 'action_controller/test_process'
-require 'active_support/vendor'
-require 'spec'
-
-require 'routing_filter'
-require 'routing_filter/locale'
-require 'routing_filter/pagination'
-
-class Site
-end
-
-class Section
-  def id; 1 end
-  alias :to_param :id
-  def type; 'Section' end
-  def path; 'section' end
-end
-
-class Article
-  def to_param; 1 end
-end
-
-module RoutingFilterHelpers
-  def draw_routes(&block)
-    set = returning ActionController::Routing::RouteSet.new do |set|
-      class << set; def clear!; end; end
-      set.draw &block
-      silence_warnings{ ActionController::Routing.const_set 'Routes', set }
-    end
-    set
-  end
-
-  def instantiate_controller(params)
-    returning ActionController::Base.new do |controller|
-      request = ActionController::TestRequest.new
-      url = ActionController::UrlRewriter.new(request, params)
-      controller.stub!(:request).and_return request
-      controller.instance_variable_set :@url, url
-      controller
-    end
-  end
-
-  def should_recognize_path(path, params)
-    @set.recognize_path(path, {}).should == params
-  end
-
-  def home_path(*args)
-    @controller.send :home_path, *args
-  end
-
-  def home_url(*args)
-    @controller.send :home_url, *args
-  end
-
-  def section_path(*args)
-    @controller.send :section_path, *args
-  end
-
-  def section_article_path(*args)
-    @controller.send :section_article_path, *args
-  end
-
-  def admin_articles_path(*args)
-    @controller.send :admin_articles_path, *args
-  end
-
-  def url_for(*args)
-    @controller.send :url_for, *args
-  end
-
-  def setup_environment(*filters)
-    RoutingFilter::Locale.locales = [:en, 'en-US', :de, :fi, 'en-UK']
-    RoutingFilter::Locale.include_default_locale = true
-    I18n.default_locale = :en
-    I18n.locale = :en
-
-    @controller = instantiate_controller :locale => 'de', :id => 1
-    @set = draw_routes do |map|
-      yield map if block_given?
-      filters.each { |filter| map.filter filter }
-      map.section 'sections/:id.:format', :controller => 'sections', :action => "show"
-      map.section_article 'sections/:section_id/articles/:id', :controller => 'articles', :action => "show"
-      map.admin_articles 'admin/articles/:id', :controller => 'admin/articles', :action => "index"
-      map.home '/', :controller => 'home', :action => 'index'
-    end
-
-    @section_params = {:controller => 'sections', :action => "show", :id => "1"}
-    @article_params = {:controller => 'articles', :action => "show", :section_id => "1", :id => "1"}
-    @locale_filter = @set.filters.first
-    @pagination_filter = @set.filters.last
-  end
-  
-  def with_deactivated_filters(*filters, &block)
-    states = filters.inject({}) do |states, filter| 
-      states[filter], filter.active = filter.active, false
-      states
-    end
-    yield
-    states.each { |filter, state| filter.active = state }
-  end
+$: << File.dirname(__FILE__)
+$: << File.dirname(__FILE__) + '/../lib/'
+
+require 'rubygems'
+require 'actionpack'
+require 'activesupport'
+require 'action_controller'
+require 'action_controller/test_process'
+require 'active_support/vendor'
+require 'spec'
+
+require 'routing_filter'
+require 'routing_filter/locale'
+require 'routing_filter/pagination'
+
+class Site
+end
+
+class Section
+  def id; 1 end
+  alias :to_param :id
+  def type; 'Section' end
+  def path; 'section' end
+end
+
+class Article
+  def to_param; 1 end
+end
+
+module RoutingFilterHelpers
+  def draw_routes(&block)
+    set = returning ActionController::Routing::RouteSet.new do |set|
+      class << set; def clear!; end; end
+      set.draw &block
+      silence_warnings{ ActionController::Routing.const_set 'Routes', set }
+    end
+    set
+  end
+
+  def instantiate_controller(params)
+    returning ActionController::Base.new do |controller|
+      request = ActionController::TestRequest.new
+      url = ActionController::UrlRewriter.new(request, params)
+      controller.stub!(:request).and_return request
+      controller.instance_variable_set :@url, url
+      controller
+    end
+  end
+
+  def should_recognize_path(path, params)
+    @set.recognize_path(path, {}).should == params
+  end
+
+  def home_path(*args)
+    @controller.send :home_path, *args
+  end
+
+  def home_url(*args)
+    @controller.send :home_url, *args
+  end
+
+  def section_path(*args)
+    @controller.send :section_path, *args
+  end
+
+  def section_article_path(*args)
+    @controller.send :section_article_path, *args
+  end
+
+  def admin_articles_path(*args)
+    @controller.send :admin_articles_path, *args
+  end
+
+  def url_for(*args)
+    @controller.send :url_for, *args
+  end
+
+  def setup_environment(*filters)
+    RoutingFilter::Locale.locales = [:en, 'en-US', :de, :fi, 'en-UK']
+    RoutingFilter::Locale.include_default_locale = true
+    I18n.default_locale = :en
+    I18n.locale = :en
+
+    @controller = instantiate_controller :locale => 'de', :id => 1
+    @set = draw_routes do |map|
+      yield map if block_given?
+      filters.each { |filter| map.filter filter }
+      map.section 'sections/:id.:format', :controller => 'sections', :action => "show"
+      map.section_article 'sections/:section_id/articles/:id', :controller => 'articles', :action => "show"
+      map.admin_articles 'admin/articles/:id', :controller => 'admin/articles', :action => "index"
+      map.home '/', :controller => 'home', :action => 'index'
+    end
+
+    @section_params = {:controller => 'sections', :action => "show", :id => "1"}
+    @article_params = {:controller => 'articles', :action => "show", :section_id => "1", :id => "1"}
+    @locale_filter = @set.filters.first
+    @pagination_filter = @set.filters.last
+  end
+  
+  def with_deactivated_filters(*filters, &block)
+    states = filters.inject({}) do |states, filter| 
+      states[filter], filter.active = filter.active, false
+      states
+    end
+    yield
+    states.each { |filter, state| filter.active = state }
+  end
 end