Merge branch 'master' of github.com:lifo/docrails

Conflicts:
	railties/guides/source/getting_started.textile

1 files changed, 8 insertions, 5 deletions

diff --git a/railties/guides/source/plugins.textile b/railties/guides/source/plugins.textile
index 07fd95c825..97b4eca779 100644
--- a/railties/guides/source/plugins.textile
+++ b/railties/guides/source/plugins.textile
@@ -176,11 +176,11 @@ require 'test_helper'
 class ActsAsYaffleTest < Test::Unit::TestCase
 
   def test_a_hickwalls_yaffle_text_field_should_be_last_squawk
-    assert_equal "last_squawk", Hickwall.yaffle_text_field
+    assert_equal :last_squawk, Hickwall.yaffle_text_field
   end
 
   def test_a_wickwalls_yaffle_text_field_should_be_last_tweet
-    assert_equal "last_tweet", Wickwall.yaffle_text_field
+    assert_equal :last_tweet, Wickwall.yaffle_text_field
   end
 
 end
@@ -362,13 +362,16 @@ module Yaffle
       def acts_as_yaffle(options = {})
         cattr_accessor :yaffle_text_field
         self.yaffle_text_field = (options[:yaffle_text_field] || :last_squawk).to_s
+
+        include Yaffle::ActsAsYaffle::LocalInstanceMethods
       end
     end
 
-    def squawk(string)
-      write_attribute(self.class.yaffle_text_field, string.to_squawk)
+    module LocalInstanceMethods
+      def squawk(string)
+        write_attribute(self.class.yaffle_text_field, string.to_squawk)
+      end
     end
-
   end
 end