@@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.name = %q{dm-is-taggable} - s.version = "0.1.5" + s.version = "0.1.6" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Aaron Qian, Maxime Guilbot"] dm-is-taggable.gemspec @@ -55,12 +55,16 @@ module DataMapper return rv end - query = { taggable_class.tags.tag.name => tag_list.to_a, + query = { + taggable_class.tags.tag.name => tag_list.to_a, Tagging.properties[:taggable_type] => taggable_class.to_s, - :unique => true - } - query.merge!(Tagging.properties[:tagger_type] => tagger_class) if tagger_class - query.merge!(Tagging.properties[:tagger_id] => tagger_obj.id) if tagger_obj + :unique => true + } + query.merge!(Tagging.properties[:tagger_type] => tagger_class) if tagger_class + query.merge!(Tagging.properties[:tagger_id] => tagger_obj.id) if tagger_obj + (options.keys - [:match]).each do |key| + query[key] = options[key] + end unless options[:match] == :any conditions = "SELECT COUNT(DISTINCT(tag_id)) FROM taggings INNER JOIN tags ON taggings.tag_id = tags.id WHERE " @@ -186,4 +190,4 @@ module DataMapper end # InstanceMethods end end -end \ No newline at end of file +end lib/dm-is-taggable/is/tag.rb @@ -51,8 +51,8 @@ module DataMapper def taggable_class;self;end def find(options) - tagger, taggable, tags, options = extract_options(options) - options.merge!(:on => self, :by =>tagger, :with => tags) + tagger, taggable, tags, options = extract_options(options) + options.merge!(:on => self, :by =>tagger, :with => tags) Tag.find_taggables(options) end lib/dm-is-taggable/is/taggable.rb @@ -1,7 +1,7 @@ module DataMapper module Is module Taggable - VERSION = "0.1.5" + VERSION = "0.1.6" DEPENDENCY_VERSION = ">= 0.9.6" end end lib/dm-is-taggable/is/version.rb @@ -297,5 +297,10 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES item[1].should be_a(Integer) end end + + it "should be able to specify conditions over find method" do + result = Picture.find(:with => 'tag1', :id.not => [1]) + result.map(&:id).should_not be_include(1) + end end end spec/integration/taggable_spec.rb eb14d9d07ad3068d12b259e3d0cf7f62c80505ca takiuchi genki@s21g.com http://github.com/aq1018/dm-is-taggable/commit/13817db925101749a0036a2447832acb8d785593 13817db925101749a0036a2447832acb8d785593 2009-05-08T19:47:26-07:00 2009-05-08T19:47:26-07:00 Changed the find method to accept options for conditions 4c800b71f09fb3b1cefaac5dca877d8ac2c2d3b3 takiuchi genki@s21g.com