tagtical 1.4.6 → 1.4.7

data/VERSION

@@ -1 +1 @@
-1.4.6
+1.4.7

data/lib/tagtical/tag.rb

@@ -248,15 +248,17 @@ module Tagtical
         sql = args[-1].is_a?(Hash) && args[-1].delete(:sql)
 
         sti_column = Tagtical::Tag.arel_table[Tagtical::Tag.inheritance_column]
-        condition = expand_tag_types(*args).map { |x| x.klass.sti_name }.inject(nil) do |conds, sti_name|
-          cond = sti_column.eq(sti_name)
-          conds.nil? ? cond : conds.or(cond)
-        end
+        sti_names = expand_tag_types(*args).map { |x| x.klass.sti_name }
 
+        condition = sti_column.eq(sti_names.delete(nil)) if sti_names.include?(nil)
+        sti_names_condition = sti_column.in(sti_names)
+        condition = condition ? condition.or(sti_names_condition) : sti_names_condition
+        
         if condition && sql
           condition = condition.to_sql
           condition.insert(0, " AND ") if sql==:append
         end
+        
         condition
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tagtical
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-07-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2172678160 !ruby/object:Gem::Requirement
+  requirement: &2165894820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2172678160
+  version_requirements: *2165894820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2172677680 !ruby/object:Gem::Requirement
+  requirement: &2165894340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <=
@@ -32,10 +32,10 @@ dependencies:
         version: 2.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2172677680
+  version_requirements: *2165894340
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2172677200 !ruby/object:Gem::Requirement
+  requirement: &2165893860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2172677200
+  version_requirements: *2165893860
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &2172676720 !ruby/object:Gem::Requirement
+  requirement: &2165893380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2172676720
+  version_requirements: *2165893380
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2172676240 !ruby/object:Gem::Requirement
+  requirement: &2165892900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2172676240
+  version_requirements: *2165892900
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2172675760 !ruby/object:Gem::Requirement
+  requirement: &2165892420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2172675760
+  version_requirements: *2165892420
 description: Tagtical allows you do create subclasses for Tag and add additional functionality
   in an STI fashion. For example. You could do Tag::Color.find_by_name('blue').to_rgb.
   It also supports storing weights or relevance on the taggings.