activerecord-where-any-of 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0e626da34af089d9f92dcf9ee6d5b97395ffdb4
-  data.tar.gz: 891e420029939a94032a74d6f937caddf6177dc2
+  metadata.gz: fef5ed54bad29379534fe78509785670884e727a
+  data.tar.gz: 20680a21436a675196da93736f5a3ee737547d84
 SHA512:
-  metadata.gz: 75c4e9ad19c7ab0132add54522a76d2815143ef36059b340f5f181c8d0a0d55989bfbc38aba429bcfb5ab95cbee685739538bd95f56c3528cc4aa096e55cea06
-  data.tar.gz: 784d559cd7de12e7a60599eed0ecaeb5c3cf95c2b448bb19537ef07260cdfad17f5db4e7bdd9aecaab2e523f6bc685626e54973f369396d5de177aaff7ca8396
+  metadata.gz: cbe1832d8d6b711ce196c91808edc0c34fe6384d959b4d39f6d1943e99dfa69b6d2878f63cfe2e82b76881f968e3fd2f3c17b1ea3def9731f7c1786ca0ce3551
+  data.tar.gz: 0637588ca5ed891adb966c8dafc45c4ad9adf650569463e73f776fbe33a79f0cf4d35fc8603bd47a63b04bc5ee656358bd1d3e934aefe774d8d1f742be5d9660

data/activerecord-where-any-of.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = 'activerecord-where-any-of'
-  s.version = '1.0.5'
+  s.version = '1.0.6'
   s.license = 'MIT'
-  s.date = '2014-07-24'
+  s.date = '2015-12-28'
   s.summary = 'A simple mixin to ActiveRecord::Base that allows use of OR arel relations.'
   s.description = '...'
   s.description = File.read(File.expand_path('../README.md', __FILE__))[/Description:\n-+\s*(.*?)\n\n/m, 1]

data/lib/active_record/where-any-of-mixin.rb

@@ -8,10 +8,21 @@ module ActiveRecord
         if c.is_a? Symbol or c.is_a? String
           c = self.unscoped.send(c)
         end
-        c.where_values.reduce(:and)
+        __convert_string_wheres(c.where_values).reduce(:and)
       end
       where(conditions.reduce(:or))
     end
 
+    def __convert_string_wheres(wheres)
+      wheres.map do |w|
+        if w.is_a?(Arel::Nodes::Equality)
+          w
+        else
+          w = Arel.sql(w) if String === w
+          Arel::Nodes::Grouping.new(w)
+        end
+      end
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-where-any-of
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - David McCullars
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord