genki-dm-is-taggable 0.1.5 → 0.1.6

data/lib/dm-is-taggable/is/tag.rb

@@ -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
+end

data/lib/dm-is-taggable/is/taggable.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
 

data/lib/dm-is-taggable/is/version.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

data/spec/integration/taggable_spec.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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: genki-dm-is-taggable
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Aaron Qian, Maxime Guilbot