history.txt @@ -7,21 +7,18 @@ module PagedScopes resources_without_paged(*(entities.dup << options), &block) paged_options = {} unless paged_options.is_a? Hash - paged_as = paged_options.delete(:as) paged_name = paged_options.delete(:name) if paged_options.empty? - if (options[:only] && options[:only].include?(:index)) || !(options[:except] && options[:except].include?(:index)) - paged_options.merge! :index => true + unless (options[:only] && ![ options[:only] ].flatten.include?(:index)) || (options[:except] && [ options[:except] ].flatten.include?(:index)) + paged_options[:index] = true end - options[:collection].each { |collection, methods| paged_options[collection] = true if [ methods ].flatten.include? :get } if options[:collection] end paged_options.each_pair do |action, page_options| page_options = {} unless page_options.is_a? Hash - page_options.reverse_merge! :name => paged_name unless paged_name.blank? page_options.reverse_merge! :as => paged_as unless paged_as.blank? page_options.merge! :only => :none lib/paged_scopes/resources.rb @@ -17,6 +17,16 @@ describe "Resources" do drawing_routes { |map| map.resources :articles, :paged => true }.should change { number_of_routes }.by(7+1) end + it "should not add a paged index route if the index action is excluded by an :only option" do + drawing_routes { |map| map.resources :articles, :paged => true, :only => :show }.should change { number_of_routes }.by(1+0) + drawing_routes { |map| map.resources :memberships, :paged => true, :only => [ :show, :edit ] }.should change { number_of_routes }.by(2+0) + end + + it "should not add a paged index route if the index action is excluded by an :except option" do + drawing_routes { |map| map.resources :articles, :paged => true, :except => :index }.should change { number_of_routes }.by(6+0) + drawing_routes { |map| map.resources :memberships, :paged => true, :except => [ :index, :new ] }.should change { number_of_routes }.by(5+0) + end + context "with a :paged options" do it "should map a paged index route for GET only" do draw_routes { |map| map.resources :articles, :paged => true } spec/resources_spec.rb 2e00d25e94a3190c22428257ce7d5a678a483d61 Matthew Hollingworth mdholling@gmail.com http://github.com/mholling/paged_scopes/commit/0292df4dcf3675c85bbbed662c1053796e01b3fd 0292df4dcf3675c85bbbed662c1053796e01b3fd 2009-10-22T17:01:04-07:00 2009-10-22T17:01:04-07:00 Fixed bug in which :only and :except options for paged resource routes weren't observed properly. de4d37579b193910b9ff432fcb3a85c79187e09e Matthew Hollingworth mdholling@gmail.com