@@ -1,5 +1,3 @@ require 'resourceful/maker' -ActionController::Base.extend(Resourceful::Maker) -ActionController::Base.write_inheritable_attribute :resourceful_callbacks, {} -ActionController::Base.write_inheritable_attribute :resourceful_responses, {} +ActionController::Base.extend Resourceful::Maker init.rb @@ -10,7 +10,7 @@ require 'resourceful/default/responses' require 'resourceful/default/callbacks' module Resourceful::Base - include Resourceful::Default::Accessors - include Resourceful::Default::Responses - include Resourceful::Default::Callbacks + include Resourceful::Default::Accessors + include Resourceful::Default::Responses + include Resourceful::Default::Callbacks end lib/resourceful/base.rb @@ -28,7 +28,6 @@ module Resourceful kontroller.read_inheritable_attribute(:resourceful_callbacks).merge! @callbacks kontroller.read_inheritable_attribute(:resourceful_responses).merge! @responses - end def build(*available_actions) lib/resourceful/builder.rb @@ -3,12 +3,16 @@ require 'resourceful/base' module Resourceful module Maker + def self.extended(base) + base.write_inheritable_attribute :resourceful_callbacks, {} + base.write_inheritable_attribute :resourceful_responses, {} + end + def make_resourceful(*args, &block) include Resourceful::Base builder = Resourceful::Builder.new builder.instance_eval(&block) - Resourceful::Builder.register_format :html builder.apply(self) end end lib/resourceful/maker.rb @@ -1,8 +1,10 @@ require 'rubygems' require 'action_controller' require 'action_controller/test_process' -require 'resourceful/maker' require 'test/unit' + +require 'resourceful/maker' ActionController::Base.extend Resourceful::Maker + require 'test/mocks/simple_users_controller' require 'test/mocks/empty_users_controller' test/loader.rb d2090d9c8236c61430a3e093bdbaafb580e7b8eb nex3 nex3@c18eca5a-f828-0410-9317-b2e082e89db6 http://github.com/jcfischer/make_resourceful/commit/38b45a156b912937bc2d33a4f0805fe72f58942a 38b45a156b912937bc2d33a4f0805fe72f58942a 2007-05-22T23:40:55-07:00 2007-05-22T23:40:55-07:00 All tests pass! git-svn-id: http://svn.hamptoncatlin.com/make_resourceful/trunk@30 c18eca5a-f828-0410-9317-b2e082e89db6 23b024e158e2511b43f28d022a79a9f1800ded96 nex3 nex3@c18eca5a-f828-0410-9317-b2e082e89db6