@@ -16,7 +16,9 @@ module DataMapper def has_tags_on(*args) args.flatten! args.uniq! - + + self.extend(DataMapper::Tags::SingletonMethods) + args.map{|arg| arg.to_sym}.each do |arg| class_eval <<-RUBY property :frozen_#{arg.to_s.singular}_list, String @@ -55,20 +57,8 @@ module DataMapper end RUBY end - class_eval do - class << self - def taggable? - true - end - end - end end - # Class Methods - def tagged_with(string) - Tag.first(:name => string).taggables - end - def has_tags(*args) has_tags_on :tags end @@ -78,6 +68,17 @@ module DataMapper end end +module SingletonMethods + # Class Methods + def tagged_with(string) + Tag.first(:name => string).taggables + end + + def taggable? + true + end +end + module InstanceMethods def taggable? self.class.taggable? lib/dm_tags/dm_tags.rb @@ -7,7 +7,6 @@ libs = " -r irb/completion" # libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}" libs << " -r dm-core" libs << " -r #{File.dirname(__FILE__) + '/../lib/dm-tags.rb'}" -libs << " -r #{File.dirname(__FILE__) + '/../spec/classes.rb'}" libs << " -r #{File.dirname(__FILE__) + '/../spec/dm-setup.rb'}" puts "Loading dm-tags gem" exec "#{irb} #{libs} --simple-prompt" \ No newline at end of file script/console @@ -63,6 +63,7 @@ describe "Taggable" do taggable.tag_list = 'tag1, goat, fish' taggable.save DefaultTaggedModel.tagged_with('tag1').sort_by{|t| t.id}.to_a.should == [@taggable, taggable] + UntaggedModel.should_not respond_to(:tagged_with) end it "should have a class method .taggable? which returns true if tagging is defined, and false otherwise" do spec/dm_tags/taggable_spec.rb d5415153cb7081efe44cbdb5bf621cb67f900fea bobby bobby_calderwood@mac.com http://github.com/bobby/dm-tags/commit/f9f69227001ee3490bf60c59ee8eccb283b81e52 f9f69227001ee3490bf60c59ee8eccb283b81e52 2008-07-29T15:44:54-07:00 2008-07-29T15:44:54-07:00 Fixed .tagged_with bug. 81cbf25112eba1344c9c9f6e1081f0125db8aaa9 bobby bobby_calderwood@mac.com