generators/scaffold_resource/templates/rspec/functional_spec.rb generators/scaffold_resource/templates/rspec/helper_spec.rb generators/scaffold_resource/templates/rspec/routing_spec.rb generators/scaffold_resource/templates/rspec/unit_spec.rb generators/scaffold_resource/templates/rspec/views/edit_spec.rb generators/scaffold_resource/templates/rspec/views/index_spec.rb generators/scaffold_resource/templates/rspec/views/new_spec.rb generators/scaffold_resource/templates/rspec/views/show_spec.rb @@ -4,6 +4,8 @@ module ResourceController NAME_ACCESSORS = [:model_name, :route_name, :object_name] module ActionControllerExtension + unloadable + def resource_controller(*args) include ResourceController::Controller @@ -12,4 +14,4 @@ module ResourceController end end end -end \ No newline at end of file +end lib/resource_controller.rb @@ -42,7 +42,8 @@ module ResourceController # :nodoc: def reader_writer(accessor_name) class_eval <<-"end_eval", __FILE__, __LINE__ - def #{accessor_name}(*args) + def #{accessor_name}(*args, &block) + args << block unless block.nil? @#{accessor_name} = args.first unless args.empty? @#{accessor_name} end lib/resource_controller/accessors.rb @@ -3,6 +3,8 @@ module ResourceController extend ResourceController::Accessors reader_writer :flash + reader_writer :flash_now + block_accessor :after, :before def initialize @@ -28,9 +30,10 @@ module ResourceController def dup returning self.class.new do |duplicate| duplicate.instance_variable_set(:@collector, wants.dup) - duplicate.instance_variable_set(:@before, before.dup) unless before.nil? - duplicate.instance_variable_set(:@after, after.dup) unless after.nil? - duplicate.instance_variable_set(:@flash, flash.dup) unless flash.nil? + duplicate.instance_variable_set(:@before, before.dup) unless before.nil? + duplicate.instance_variable_set(:@after, after.dup) unless after.nil? + duplicate.instance_variable_set(:@flash, flash.dup) unless flash.nil? + duplicate.instance_variable_set(:@flash_now, flash_now.dup) unless flash_now.nil? end end end lib/resource_controller/action_options.rb @@ -15,8 +15,8 @@ module ResourceController end self.helper_method :object_url, :edit_object_url, :new_object_url, :collection_url, :object, :collection, - :parent, :parent_type, :parent_object, :model_name, :model, :object_path, :edit_object_path, - :new_object_path, :collection_path, :hash_for_collection_path, :hash_for_object_path, + :parent, :parent_type, :parent_object, :parent_model, :model_name, :model, :object_path, + :edit_object_path, :new_object_path, :collection_path, :hash_for_collection_path, :hash_for_object_path, :hash_for_edit_object_path, :hash_for_new_object_path, :hash_for_collection_url, :hash_for_object_url, :hash_for_edit_object_url, :hash_for_new_object_url, :parent?, :collection_url_options, :object_url_options, :new_object_url_options lib/resource_controller/controller.rb @@ -12,7 +12,7 @@ module ResourceController @fails = ActionOptions.new end - delegate :flash, :after, :response, :wants, :to => :success + delegate :flash, :flash_now, :after, :response, :wants, :to => :success def dup returning self.class.new do |duplicate| lib/resource_controller/failable_action_options.rb @@ -30,10 +30,27 @@ module ResourceController::Helpers::Internal invoke_callbacks *self.class.send(action).before end - # Sets the flash for the action, if it is present. + # Sets the flash and flash_now for the action, if it is present. # def set_flash(action) - flash[:notice] = options_for(action).flash if options_for(action).flash + set_normal_flash(action) + set_flash_now(action) + end + + # Sets the regular flash (i.e. flash[:notice] = '...') + # + def set_normal_flash(action) + if f = options_for(action).flash + flash[:notice] = f.is_a?(Proc) ? instance_eval(&f) : options_for(action).flash + end + end + + # Sets the flash.now (i.e. flash.now[:notice] = '...') + # + def set_flash_now(action) + if f = options_for(action).flash_now + flash.now[:notice] = f.is_a?(Proc) ? instance_eval(&f) : options_for(action).flash_now + end end # Returns the options for an action, which is a symbol. lib/resource_controller/helpers/internal.rb @@ -1,2 +1,3 @@ class Cms::ProductsController < ResourceController::Base + create.flash 'something' end test/app/controllers/cms/products_controller.rb @@ -2,6 +2,7 @@ class PhotosController < ResourceController::Base actions :all, :except => :update belongs_to :user + create.flash { "#{@photo.title} was created!" } private def parent_model test/app/controllers/photos_controller.rb @@ -18,5 +18,6 @@ class Cms::ProductsControllerTest < Test::Unit::TestCase resource.update.redirect = 'cms_product_path(@product)' resource.destroy.redirect = 'cms_products_path' resource.create.redirect = 'cms_product_path(@product)' + resource.create.flash = /something/i end end test/test/functional/cms/products_controller_test.rb @@ -19,9 +19,11 @@ class PhotosControllerTest < Test::Unit::TestCase end should_be_restful do |resource| - resource.formats = [:html] + resource.formats = [:html] - resource.actions = [:index, :new, :create, :destroy, :show, :edit] + resource.actions = [:index, :new, :create, :destroy, :show, :edit] + resource.create.params = {:title => 'Some Photo Title'} + resource.create.flash = "Some Photo Title was created!" end context "with user as parent" do test/test/functional/photos_controller_test.rb @@ -88,4 +88,23 @@ class AccessorsTest < Test::Unit::TestCase assert @controller.something[2].is_a?(Proc) end end + + context "reader writer" do + setup do + PostsController.class_eval do + reader_writer :rw + end + + @controller = PostsController.new + end + + should "store blocks" do + @controller.rw do + "asdf" + end + + assert @controller.rw.is_a?(Proc), @controller.rw + end + end + end \ No newline at end of file test/test/unit/accessors_test.rb @@ -2,14 +2,19 @@ require File.dirname(__FILE__)+'/../test_helper' class ActionOptionsTest < Test::Unit::TestCase def setup - @controller = PostsController.new - @create = ResourceController::ActionOptions.new + @controller = PostsController.new + @create = ResourceController::ActionOptions.new end should "have attr accessor for flash" do @create.flash "Successfully created." assert_equal "Successfully created.", @create.flash end + + should "have attr accessor for flash_now" do + @create.flash_now "Successfully created." + assert_equal "Successfully created.", @create.flash_now + end %w(before after).each do |accessor| should "have a block accessor for #{accessor}" do @@ -68,9 +73,10 @@ class ActionOptionsTest < Test::Unit::TestCase setup do @opts = ResourceController::ActionOptions.new @opts.wants.js - @opts.after {} - @opts.before {} - @opts.flash '' + @opts.after {} + @opts.before {} + @opts.flash '' + @opts.flash_now '' @dup = @opts.dup end @@ -93,6 +99,11 @@ class ActionOptionsTest < Test::Unit::TestCase assert !@opts.flash.equal?(@dup.flash) assert @dup.flash end + + should "duplicate the flash_now" do + assert !@opts.flash_now.equal?(@dup.flash_now) + assert @dup.flash_now + end end end test/test/unit/action_options_test.rb @@ -85,4 +85,22 @@ class Helpers::InternalTest < Test::Unit::TestCase assert_equal @new_action, @controller.send(:options_for, :new_action) end end + + context "flash now helper" do + setup do + klass = Class.new do + include ResourceController::Helpers::Internal + end + + @c = klass.new + @c.stubs(:options_for).returns(stub(:flash_now => 'something')) + flash_now = mock() + flash_now.expects(:[]=).with(:notice, 'something') + @c.stubs(:flash).returns(stub(:now => flash_now)) + end + + should "set the flash_now" do + @c.send :set_flash_now, :new + end + end end test/test/unit/helpers/internal_test.rb 31b278f4ae4ef0e33eab91f97f318dfb44553b75 84a75ea5260b4c8cb4b7b75ac83f80d61d8a1a17 James Golick james@giraffesoft.ca http://github.com/mattswell/resource_controller/commit/df29959181e1a4140ce0d0f8a50d81ffbe7b17b6 df29959181e1a4140ce0d0f8a50d81ffbe7b17b6 2008-06-24T09:59:06-07:00 2008-06-24T09:59:06-07:00 merge back from master e68c68521489f6e3bf8eb2eeed2cad45d2d523af James Golick james@giraffesoft.ca