@@ -11,21 +11,7 @@ module ActiveRecord end def acts_as_taggable_on(*args) - self.class_eval do - @tag_types = args - def self.tag_types - @tag_types - end - - has_many :taggings, :as => :taggable, :dependent => :destroy, :include => :tag - has_many :base_tags, :class_name => "Tag", :through => :taggings, :source => :tag - - attr_writer :custom_contexts - - before_save :save_cached_tag_list - after_save :save_tags - end - + puts "Registering #{args.inspect} with #{self.inspect}" for tag_type in args tag_type = tag_type.to_s self.class_eval do @@ -34,8 +20,6 @@ module ActiveRecord has_many "#{tag_type}".to_sym, :through => "#{tag_type.singularize}_taggings".to_sym, :source => :tag end - include ActiveRecord::Acts::TaggableOn::InstanceMethods - self.class_eval <<-RUBY def self.caching_#{tag_type.singularize}_list? caching_tag_list_on?("#{tag_type}") @@ -64,12 +48,31 @@ module ActiveRecord def find_related_#{tag_type}(options = {}) related_tags_on('#{tag_type}',options) end + alias_method :find_related_on_#{tag_type}, :find_related_#{tag_type} RUBY - end - - extend ActiveRecord::Acts::TaggableOn::SingletonMethods + end - alias_method_chain :reload, :tag_list + if respond_to?(:tag_types) + puts "Appending #{args.inspect} onto #{tag_types.inspect}" + write_inheritable_attribute(:tag_types, tag_types + args) + else + self.class_eval do + write_inheritable_attribute(:tag_types, args) + class_inheritable_reader :tag_types + + has_many :taggings, :as => :taggable, :dependent => :destroy, :include => :tag + has_many :base_tags, :class_name => "Tag", :through => :taggings, :source => :tag + + attr_writer :custom_contexts + + before_save :save_cached_tag_list + after_save :save_tags + end + + include ActiveRecord::Acts::TaggableOn::InstanceMethods + extend ActiveRecord::Acts::TaggableOn::SingletonMethods + alias_method_chain :reload, :tag_list + end end def is_taggable? lib/active_record/acts/taggable_on.rb @@ -33,6 +33,23 @@ describe "acts_as_taggable_on" do end end + context "inheritance" do + before do + @taggable = TaggableModel.new(:name => "taggable") + @inherited_same = InheritingTaggableModel.new(:name => "inherited same") + @inherited_different = AlteredInheritingTaggableModel.new(:name => "inherited different") + end + + it "should pass on tag contexts to STI-inherited models" do + @inherited_same.should respond_to(:tag_list, :skill_list, :language_list) + @inherited_different.should respond_to(:tag_list, :skill_list, :language_list) + end + + it "should have tag contexts added in altered STI models" do + @inherited_different.should respond_to(:part_list) + end + end + context "reloading" do it "should save a model instantiated by Model.find" do taggable = TaggableModel.create!(:name => "Taggable") spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb @@ -88,4 +88,31 @@ describe "Taggable" do bob.save TaggableModel.find_tagged_with("spinning", :on => :rotors).should_not be_empty end + + context "inheritance" do + before do + @taggable = TaggableModel.new(:name => "taggable") + @inherited_same = InheritingTaggableModel.new(:name => "inherited same") + @inherited_different = AlteredInheritingTaggableModel.new(:name => "inherited different") + end + + it "should be able to save tags for inherited models" do + @inherited_same.tag_list = "bob, kelso" + @inherited_same.save + InheritingTaggableModel.find_tagged_with("bob").first.should == @inherited_same + end + + it "should find STI tagged models on the superclass" do + @inherited_same.tag_list = "bob, kelso" + @inherited_same.save + TaggableModel.find_tagged_with("bob").first.should == @inherited_same + end + + it "should be able to add on contexts only to some subclasses" do + @inherited_different.part_list = "fork, spoon" + @inherited_different.save + InheritingTaggableModel.find_tagged_with("fork", :on => :parts).should be_empty + AlteredInheritingTaggableModel.find_tagged_with("fork", :on => :parts).first.should == @inherited_different + end + end end \ No newline at end of file spec/acts_as_taggable_on/taggable_spec.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe "Tagger" do before(:each) do - @user = User.new + @user = TaggableUser.new @taggable = TaggableModel.new(:name => "Bob Jones") end spec/acts_as_taggable_on/tagger_spec.rb @@ -15,9 +15,10 @@ ActiveRecord::Schema.define :version => 0 do create_table :taggable_models, :force => true do |t| t.column :name, :string + t.column :type, :string #t.column :cached_tag_list, :string end - create_table :users, :force => true do |t| + create_table :taggable_users, :force => true do |t| t.column :name, :string end end spec/schema.rb @@ -6,9 +6,17 @@ ActiveRecord::Base.logger = Logger.new(plugin_spec_dir + "/debug.log") load(File.dirname(__FILE__) + '/schema.rb') class TaggableModel < ActiveRecord::Base - acts_as_taggable_on :tags, :languages, :skills + acts_as_taggable_on :tags, :languages + acts_as_taggable_on :skills end -class User < ActiveRecord::Base +class InheritingTaggableModel < TaggableModel +end + +class AlteredInheritingTaggableModel < TaggableModel + acts_as_taggable_on :parts +end + +class TaggableUser < ActiveRecord::Base acts_as_tagger end \ No newline at end of file spec/spec_helper.rb e488a0040ec1def0b6406ae2afb11f18e14ab6b6 Michael Bleigh michael@intridea.com http://github.com/mbleigh/acts-as-taggable-on/commit/1bedda907e62d6574a7c2bc6ee73558b7ac078f6 1bedda907e62d6574a7c2bc6ee73558b7ac078f6 2008-06-09T12:04:15-07:00 2008-06-09T12:04:15-07:00 Added support and specs for Single Table Inheritance. Thanks to slainer68 for the patch! [#5 status:resolved] 309aa2ff9a467db1e17cfae267a3ed49c1a4f833 Michael Bleigh michael@intridea.com