@@ -1,2 +1,2 @@ require 'tumblr4_rails' -ActionController::Base.send(:include, Tumblr4Rails) \ No newline at end of file +ActionController::Base.send(:include, Tumblr4Rails::ControllerMethods) \ No newline at end of file init.rb @@ -1,9 +1,5 @@ module Tumblr4Rails - def self.included(klazz) - klazz.extend(ClassMethods) - end - def self.configure(&block) @@tumblr_config = nil raise ArgumentError.new("A block is required.") unless block_given? @@ -26,11 +22,30 @@ module Tumblr4Rails def self.configuration @@tumblr_config ||= Tumblr4Rails::Config.new end - - module ClassMethods - - def use_tumblr - include Tumblr4Rails + + module ControllerMethods + + def self.included(klazz) + klazz.extend(ClassMethods) + end + + module ClassMethods + + private + + def use_tumblr + include InstanceMethods + end + + end + + module InstanceMethods + + private + + def tumblr + Tumblr4Rails::Tumblr + end end end lib/tumblr4rails/tumblr4rails.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe Tumblr4Rails do - include Tumblr4Rails + include Tumblr4Rails::ControllerMethods describe "the module itself" do @@ -124,21 +124,13 @@ describe Tumblr4Rails do end end - - describe "including the module" do - - it "should provide a class method called use_tumblr" do - self.class.should respond_to(:use_tumblr) - end - - end - + describe "after telling it to use_tumblr" do use_tumblr - it "have Tumblr4Rails included" do - self.class.included_modules.should be_include(Tumblr4Rails) + it "have Tumblr4Rails::ControllerMethods::InstanceMethods included" do + self.class.included_modules.should be_include(Tumblr4Rails::ControllerMethods::InstanceMethods) end end spec/tumblr4Rails/tumblr4_rails_spec.rb 34db1bca5b1cd8b0977f6483df040c0804ec1f77 matt paynmatt@gmail.com http://github.com/mattapayne/tumblr4rails/commit/936256ab6de54cf90a291fd27ded348766187527 936256ab6de54cf90a291fd27ded348766187527 2008-07-11T14:02:38-07:00 2008-07-11T14:02:38-07:00 Altered the way that stuff gets included into controllers. 4e9e9b2bb4f4827cf3cfa98f1c288bef7b37d4b5 matt paynmatt@gmail.com