@@ -5,9 +5,14 @@ module StaticActions end def static_action(controller, action) - path = (action.to_s == 'index' ? controller.to_s : "#{controller}/#{action}") - send("#{controller}_#{action}", path, :controller => controller.to_s, :action => action.to_s) - send("#{controller}_#{action}_with_format", "#{path}.:format", :controller => controller.to_s, :action => action.to_s) unless VERSION >= '2.3' + if Rails::VERSION::STRING < '2.3' + path = (action.to_s == 'index' ? controller.to_s : "#{controller}/#{action}") + send("#{controller}_#{action}", path, :controller => controller.to_s, :action => action.to_s) + send("#{controller}_#{action}_with_format", "#{path}.:format", :controller => controller.to_s, :action => action.to_s) + else + path = (action.to_s == 'index' ? controller.to_s : "#{controller}/#{action}") + send("#{controller}_#{action}", "#{path}.:format", :controller => controller.to_s, :action => action.to_s) + end end def root_static_actions(controller, actions) @@ -18,8 +23,12 @@ module StaticActions if action.to_s == 'index' root :controller => controller.to_s else - send("#{action}", action.to_s, :controller => controller.to_s, :action => action.to_s) - send("#{action}_with_format", "#{action.to_s}.:format", :controller => controller.to_s, :action => action.to_s) unless VERSION >= '2.3' + if Rails::VERSION::STRING < '2.3' + send("#{action}", action.to_s, :controller => controller.to_s, :action => action.to_s) + send("#{action}_with_format", "#{action.to_s}.:format", :controller => controller.to_s, :action => action.to_s) + else + send("#{action}", "#{action.to_s}.:format", :controller => controller.to_s, :action => action.to_s) + end end end end lib/static_actions/map_additions.rb @@ -4,6 +4,7 @@ require 'active_support' require 'active_record' require 'action_controller' require 'action_view' +require 'rails/version' require File.dirname(__FILE__) + '/../lib/static_actions.rb' Spec::Runner.configure do |config| spec/spec_helper.rb @@ -10,23 +10,36 @@ describe StaticActions::MapAdditions do end it "should call foo_bar on @map when passing foo as controller and bar as action" do - @map.expects(:foo_bar).with('foo/bar', :controller => 'foo', :action => 'bar') + if Rails::VERSION::STRING < '2.3' + @map.expects(:foo_bar).with('foo/bar', :controller => 'foo', :action => 'bar') + else + @map.expects(:foo_bar).with('foo/bar.:format', :controller => 'foo', :action => 'bar') + end @map.static_actions :foo, [:bar] end it "should be able to pass multiple actions" do - @map.expects(:foo_bar).with('foo/bar', :controller => 'foo', :action => 'bar') - @map.expects(:foo_blah).with('foo/blah', :controller => 'foo', :action => 'blah') + if Rails::VERSION::STRING < '2.3' + @map.expects(:foo_bar).with('foo/bar', :controller => 'foo', :action => 'bar') + @map.expects(:foo_blah).with('foo/blah', :controller => 'foo', :action => 'blah') + else + @map.expects(:foo_bar).with('foo/bar.:format', :controller => 'foo', :action => 'bar') + @map.expects(:foo_blah).with('foo/blah.:format', :controller => 'foo', :action => 'blah') + end @map.static_actions :foo, [:bar, :blah] end it "should not display index action in path" do - @map.expects(:foo_index).with('foo', :controller => 'foo', :action => 'index') + if Rails::VERSION::STRING < '2.3' + @map.expects(:foo_index).with('foo', :controller => 'foo', :action => 'index') + else + @map.expects(:foo_index).with('foo.:format', :controller => 'foo', :action => 'index') + end @map.static_actions :foo, [:index] end it "should include format path for each action for Rails < 2.3" do - if VERSION < '2.3' + if Rails::VERSION::STRING < '2.3' @map.expects(:foo_index_with_format).with('foo.:format', :controller => 'foo', :action => 'index') @map.expects(:foo_bar_with_format).with('foo/bar.:format', :controller => 'foo', :action => 'bar') @map.static_actions :foo, [:index, :bar] @@ -38,13 +51,21 @@ describe StaticActions::MapAdditions do end it "should have a single static_action method which doesn't require an array" do - @map.expects(:foo_bar).with('foo/bar', :controller => 'foo', :action => 'bar') + if Rails::VERSION::STRING < '2.3' + @map.expects(:foo_bar).with('foo/bar', :controller => 'foo', :action => 'bar') + else + @map.expects(:foo_bar).with('foo/bar.:format', :controller => 'foo', :action => 'bar') + end @map.static_action :foo, :bar end it "should be able to make a root action which doesn't include controller name" do - @map.expects(:bar).with('bar', :controller => 'foo', :action => 'bar') - @map.expects(:bar_with_format).with('bar.:format', :controller => 'foo', :action => 'bar') if VERSION < '2.3' + if Rails::VERSION::STRING < '2.3' + @map.expects(:bar).with('bar', :controller => 'foo', :action => 'bar') + @map.expects(:bar_with_format).with('bar.:format', :controller => 'foo', :action => 'bar') + else + @map.expects(:bar).with('bar.:format', :controller => 'foo', :action => 'bar') + end @map.root_static_action :foo, :bar end @@ -55,8 +76,12 @@ describe StaticActions::MapAdditions do it "should be able to specify multiple root actions" do @map.expects(:root).with(:controller => 'foo') - @map.expects(:bar).with('bar', :controller => 'foo', :action => 'bar') - @map.expects(:bar_with_format).with('bar.:format', :controller => 'foo', :action => 'bar') if VERSION < '2.3' + if Rails::VERSION::STRING < '2.3' + @map.expects(:bar).with('bar', :controller => 'foo', :action => 'bar') + @map.expects(:bar_with_format).with('bar.:format', :controller => 'foo', :action => 'bar') + else + @map.expects(:bar).with('bar.:format', :controller => 'foo', :action => 'bar') + end @map.root_static_actions :foo, [:index, :bar] end end spec/static_actions/map_additions_spec.rb 7486df590ac767a3d0c9b30252f668e3059fa612 Tim Gossett tim@mrgossett.com http://github.com/MrGossett/static_actions/commit/ece097a7e2c3aa7235a478a0992856226cd03fbe ece097a7e2c3aa7235a478a0992856226cd03fbe 2009-06-05T07:31:13-07:00 2009-06-05T07:31:13-07:00 using Rails::VERSION::STRING to check for Rails >= 2.3 6579897737154f9c27e5e5a304d835e98914cc76 Tim Gossett tim@mrgossett.com