@@ -11,7 +11,6 @@ module ActiveRecord end def acts_as_taggable_on(*args) - puts "Registering #{args.inspect} with #{self.inspect}" for tag_type in args tag_type = tag_type.to_s self.class_eval do @@ -53,11 +52,10 @@ module ActiveRecord end if respond_to?(:tag_types) - puts "Appending #{args.inspect} onto #{tag_types.inspect}" - write_inheritable_attribute(:tag_types, tag_types + args) + write_inheritable_attribute( :tag_types, (tag_types + args).uniq ) else self.class_eval do - write_inheritable_attribute(:tag_types, args) + write_inheritable_attribute(:tag_types, args.uniq) class_inheritable_reader :tag_types has_many :taggings, :as => :taggable, :dependent => :destroy, :include => :tag lib/acts_as_taggable_on/acts_as_taggable_on.rb @@ -1,8 +1,9 @@ require File.dirname(__FILE__) + '/../spec_helper' -describe "acts_as_taggable_on" do +describe "Acts As Taggable On" do context "Taggable Method Generation" do before(:each) do + [TaggableModel, Tag, Tagging, TaggableUser].each(&:delete_all) @taggable = TaggableModel.new(:name => "Bob Jones") end @@ -33,7 +34,7 @@ describe "acts_as_taggable_on" do end end - context "inheritance" do + describe "Single Table Inheritance" do before do @taggable = TaggableModel.new(:name => "taggable") @inherited_same = InheritingTaggableModel.new(:name => "inherited same") @@ -50,7 +51,7 @@ describe "acts_as_taggable_on" do end end - context "reloading" do + describe "Reloading" do it "should save a model instantiated by Model.find" do taggable = TaggableModel.create!(:name => "Taggable") found_taggable = TaggableModel.find(taggable.id) @@ -58,7 +59,7 @@ describe "acts_as_taggable_on" do end end - context "related" do + describe "Related Objects" do it "should find related objects based on tag names on context" do taggable1 = TaggableModel.create!(:name => "Taggable 1") taggable2 = TaggableModel.create!(:name => "Taggable 2") @@ -77,4 +78,28 @@ describe "acts_as_taggable_on" do taggable1.find_related_tags.should_not include(taggable2) end end + + describe 'Tagging Contexts' do + context '#acts_as_taggable_on' do + before(:all) do + class Array + def freq + k=Hash.new(0) + self.each {|e| k[e]+=1} + k + end + end + end + + it 'should eliminate duplicate tagging contexts ' do + TaggableModel.acts_as_taggable_on(:skills, :skills) + TaggableModel.tag_types.freq[:skills].should_not == 3 + + end + after(:all) do + class Array; remove_method :freq; end + end + end + end + end \ No newline at end of file spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb @@ -2,6 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe "Taggable" do before(:each) do + [TaggableModel, Tag, Tagging, TaggableUser].each(&:delete_all) @taggable = TaggableModel.new(:name => "Bob Jones") end @@ -96,8 +97,9 @@ describe "Taggable" do TaggableModel.find_tagged_with("spinning", :on => :rotors).should_not be_empty end - context "inheritance" do + describe "Single Table Inheritance" do before do + [TaggableModel, Tag, Tagging, TaggableUser].each(&:delete_all) @taggable = TaggableModel.new(:name => "taggable") @inherited_same = InheritingTaggableModel.new(:name => "inherited same") @inherited_different = AlteredInheritingTaggableModel.new(:name => "inherited different") spec/acts_as_taggable_on/taggable_spec.rb @@ -2,6 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe "Tagger" do before(:each) do + [TaggableModel, Tag, Tagging, TaggableUser].each(&:delete_all) @user = TaggableUser.new @taggable = TaggableModel.new(:name => "Bob Jones") end spec/acts_as_taggable_on/tagger_spec.rb @@ -1,16 +1,19 @@ ActiveRecord::Schema.define :version => 0 do - create_table :tags, :force => true do |t| - t.column :name, :string + create_table "taggings", :force => true do |t| + t.integer "tag_id", :limit => 11 + t.integer "taggable_id", :limit => 11 + t.string "taggable_type" + t.string "context" + t.datetime "created_at" + t.integer "tagger_id", :limit => 11 + t.string "tagger_type" end - - create_table :taggings, :force => true do |t| - t.column :tag_id, :integer - t.column :taggable_id, :integer - t.column :taggable_type, :string - t.column :context, :string - t.column :created_at, :datetime - t.column :tagger_id, :integer - t.column :tagger_type, :string + + add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id" + add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context" + + create_table "tags", :force => true do |t| + t.string "name" end create_table :taggable_models, :force => true do |t| spec/schema.rb 8113f9a98747fee8c6d14eb788508ebf6bd1d5ea Michael Bleigh michael@intridea.com http://github.com/mbleigh/acts-as-taggable-on/commit/3723036492fb0f054486c73bbbf2167ee43c2c5c 3723036492fb0f054486c73bbbf2167ee43c2c5c 2008-06-11T11:41:34-07:00 2008-06-11T11:41:34-07:00 Applied Sinclair Bain's patch to disallow duplicate contexts. Also cleaned up the specs and dealt with some strange failures I've been getting intermittently. [#14 status:resolved] 60758ab0ecdf99c6dccad7542cd106e50ef22b01 Michael Bleigh michael@intridea.com