rails_or 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb04bc9b28a161af5935120a35ed5a27a34293cb
-  data.tar.gz: 43af4e319dd0f7d77b00c7c7f25ec5444b4ea0b3
+  metadata.gz: 05147cdcf1a684a704627693759fb86d989e1cc8
+  data.tar.gz: f06041991f7a191226e14f35dd79a2af3346e9c8
 SHA512:
-  metadata.gz: 2326a06c3c6cbab54864b790018f736818abdff7a0a8b9975e801fe1fef4e7ec40caee235fa3642c484c9096eaefc208400e7a37fa1761d81562b1b7a9fc44ec
-  data.tar.gz: d40665dcdbddd2886d4eba9bfbefb42b39b81b186652811c49e09a77beaaa30e1ed741e6eeba1a3f20a92c2ffdf3dca036965a2525d36d2e042fd6d8bd954261
+  metadata.gz: d970283a0d626ede46ad5be249dcb26f04faec42a744a954f61c972a8c43128a6e1169ea0df8108838c15b3990dbba885c16e2c88b0b3abdbb5a321d4da6873b
+  data.tar.gz: a715f7250ac45adf48d1cc85fabb6360002be6d2ce7d1a5656ab8be8cee657905c9bb2ae2f34ffceb93992dc96e2660b8596b61ebd75c0fa41db77e1b301d643

data/.travis.yml

@@ -1,13 +1,17 @@
 language: ruby
 rvm:
-  - 2.2.4
-before_install: gem install bundler -v 1.11.2
-
+  - 2.2
+  - 2.3
+sudo: required
+dist: trusty
+before_install: 
+  - gem install bundler
+  - gem update --system
+  - gem --version
 gemfile:
   - gemfiles/3.2.gemfile
   - gemfiles/4.2.gemfile
   - gemfiles/5.0.gemfile
-
 addons:
     code_climate:
         repo_token: 4be4fd5792acf886a179e8ebff97d155dc19858816d7179f2bf5002bae874818

data/lib/rails_or.rb

@@ -18,11 +18,7 @@ class ActiveRecord::Relation
       mine         = left_values - common
       theirs       = right_values - common
       if mine.any? && theirs.any?
-        mine.map!{|x| String === x ? Arel.sql(x) : x }
-        theirs.map!{ |x| String === x ? Arel.sql(x) : x }
-        mine = [Arel::Nodes::And.new(mine)] if mine.size > 1
-        theirs = [Arel::Nodes::And.new(theirs)] if theirs.size > 1
-        common << Arel::Nodes::Or.new(mine.first, theirs.first)
+        common << Arel::Nodes::Or.new(rails_or_values_to_arel(mine), rails_or_values_to_arel(theirs))
       end
       relation = rails_or_get_current_scope
       relation.send("#{combining}_values=", common)
@@ -38,6 +34,14 @@ class ActiveRecord::Relation
     self.or(klass.having(*args))
   end
 private
+  def rails_or_values_to_arel(values)
+    values.map!{|x| rails_or_wrap_arel(x) }
+    return (values.size > 1 ? Arel::Nodes::And.new(values) : values)
+  end
+  def rails_or_wrap_arel(node)
+    return node if Arel::Nodes::Equality === node
+    return Arel::Nodes::Grouping.new(String === node ? Arel.sql(node) : node)
+  end
   def rails_or_parse_parameter(*other)
     other = other.first if other.size == 1
     case other

data/lib/rails_or/version.rb

@@ -1,3 +1,3 @@
 module RailsOr
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_or
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler