Revert repeat includes

lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb

@@ -10,7 +10,6 @@ module ClassMethods
       def initialize_acts_as_taggable_on_dirty
         tag_types.map(&:to_s).each do |tags_type|
           tag_type         = tags_type.to_s.singularize
-          context_tags     = tags_type.to_sym
 
           class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def #{tag_type}_list_changed?
@@ -32,6 +31,11 @@ def #{tag_type}_list_changes
 
         end
       end
+
+      def acts_as_taggable_on(*args)
+        super(*args)
+        initialize_acts_as_taggable_on_dirty
+      end
     end
   end
 end

lib/acts_as_taggable_on/acts_as_taggable_on/related.rb

@@ -34,8 +34,10 @@ def find_matching_contexts_for(klass, search_context, result_context, options =
         end
       end
 
-      def acts_as_taggable_on(*args)
-        super(*args)
+      private
+
+      def taggable_on(ordered, *tag_types)
+        super(ordered, *tag_types)
         initialize_acts_as_taggable_on_related
       end
     end

lib/acts_as_taggable_on/taggable.rb

@@ -88,17 +88,14 @@ def self.taggable?
             end
 
             include ActsAsTaggableOn::Utils
+            include ActsAsTaggableOn::Taggable::Core
+            include ActsAsTaggableOn::Taggable::Collection
+            include ActsAsTaggableOn::Taggable::Cache
+            include ActsAsTaggableOn::Taggable::Ownership
+            include ActsAsTaggableOn::Taggable::Related
+            include ActsAsTaggableOn::Taggable::Dirty
           end
         end
-
-        # each of these add context-specific methods and must be
-        # called on each call of taggable_on
-        include ActsAsTaggableOn::Taggable::Core
-        include ActsAsTaggableOn::Taggable::Collection
-        include ActsAsTaggableOn::Taggable::Cache
-        include ActsAsTaggableOn::Taggable::Ownership
-        include ActsAsTaggableOn::Taggable::Related
-        include ActsAsTaggableOn::Taggable::Dirty
       end
 
   end