rails_or 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33fb9ef79a69db4693d2590261c370ffac5acfc2
-  data.tar.gz: 89fea4ac9e53427e18a19ed1e32c841f8e03db0b
+  metadata.gz: 0434d1cac1c04acacf74b933dff00a190162cdd9
+  data.tar.gz: 8af3108d409a281eb8cab6955eedc4ddb11c76de
 SHA512:
-  metadata.gz: 5beeb32b071652b09fcfad2a597a2c3d77d9e27d92d35e1a2f11fb823ffd172d0f78e83c0c9f3afd278b23e16f9b6fe4cad5bdb54ce9be98bef9a4d699c9fcc1
-  data.tar.gz: f4818b6c585c1ea8a4339c6d8a11d155911e5d00b23cabfc3279aae7e70bab8c776cb07107de9240538be969f2022082ff3a811d5c6b7caa3e597dc877149139
+  metadata.gz: f422a1b8d235ddad25daf0beb82882569b4742bda3ab521b6f802d956d0dbdf889f7d1156882c3cf2b80113eb48bdaaa5e7ee33cf2299c293ac72c90112098d0
+  data.tar.gz: 5c5e512521f05cb1fdd817005adc14439b0caa413b41d82db300d9928eb0853c8cf066c10fa21dc088ea96a12cf32c1ca4cc511c765a70175f126d4d85a40331

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 ### RailsOr [Unreleased] 
 
 - No changes.
+
+### RailsOr [1.1.5] - (June 21, 2017)
+
+- Fix bind values mismatch after merging common where values. [[#19](https://github.com/khiav223577/rails_or/pull/19)] @khiav223577
 <br><br>
 
 ### RailsOr [1.1.4] - (April 1, 2017)
@@ -46,7 +50,8 @@
 - Add #or method [[#1](https://github.com/khiav223577/rails_or/pull/1)] @khiav223577
 <br><br>
 
-[Unreleased]: https://github.com/khiav223577/rails_or/compare/v1.1.4...HEAD
+[Unreleased]: https://github.com/khiav223577/rails_or/compare/v1.1.5...HEAD
+[1.1.5]: https://github.com/khiav223577/rails_or/compare/v1.1.4...v1.1.5
 [1.1.4]: https://github.com/khiav223577/rails_or/compare/v1.1.3...v1.1.4
 [1.1.3]: https://github.com/khiav223577/rails_or/compare/v1.1.2...v1.1.3
 [1.1.2]: https://github.com/khiav223577/rails_or/compare/v1.1.1...v1.1.2

data/README.md

@@ -63,7 +63,24 @@ Person.where(name: 'Pearl').or('age = ?', 24)
 Person.where(name: 'Pearl').or('age = 24')
 ```
 
+### Other convenient methods
 
+#### or_not
+(Only supports in Rails 4+)
+```rb
+Company.where.not(logo_image1: nil)
+       .or_not(logo_image2: nil)
+       .or_not(logo_image3: nil)
+       .or_not(logo_image4: nil)
+```
+
+#### or_having
+
+```rb
+Order.group('user_id')
+     .having('SUM(price) > 1000')
+     .or_having('COUNT(*) > 10')
+```
 
 ## Development
 

data/lib/rails_or.rb

@@ -1,4 +1,5 @@
 require "rails_or/version"
+require "rails_or/where_binding_mixs"
 require 'active_record'
 
 class ActiveRecord::Relation
@@ -12,17 +13,24 @@ class ActiveRecord::Relation
     def or(*other)
       other        = rails_or_parse_parameter(*other)
       combining    = group_values.any? ? :having : :where
-      left_values  = send("#{combining}_values")
-      right_values = other.send("#{combining}_values")
-      common       = left_values & right_values
-      mine         = left_values - common
-      theirs       = right_values - common
-      if mine.any? && theirs.any?
-        common << Arel::Nodes::Or.new(rails_or_values_to_arel(mine), rails_or_values_to_arel(theirs))
+      left  = RailsOr::WhereBindingMixs.new(self.send("#{combining}_values"), self.bind_values)
+      right = RailsOr::WhereBindingMixs.new(other.send("#{combining}_values"), other.bind_values)
+      common = left & right
+
+      left  -= common
+      right -= common
+      
+      if left.where_values.any? && right.where_values.any?
+        arel_or = Arel::Nodes::Or.new(
+          rails_or_values_to_arel(left.where_values),
+          rails_or_values_to_arel(right.where_values),
+        )
+        common += RailsOr::WhereBindingMixs.new([arel_or], left.bind_values + right.bind_values)
       end
+
       relation = rails_or_get_current_scope
-      relation.send("#{combining}_values=", common)
-      relation.bind_values = self.bind_values + other.bind_values
+      relation.send("#{combining}_values=", common.where_values)
+      relation.bind_values = common.bind_values
       return relation  
     end
   end
@@ -33,7 +41,9 @@ class ActiveRecord::Relation
   def or_having(*args)
     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)

data/lib/rails_or/version.rb

@@ -1,3 +1,3 @@
 module RailsOr
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

data/lib/rails_or/where_binding_mixs.rb

@@ -0,0 +1,38 @@
+class RailsOr::WhereBindingMixs
+  attr_reader :where_values
+  attr_reader :bind_values
+
+  def initialize(where_values, bind_values)
+    @where_values = where_values
+    @bind_values = bind_values
+  end
+
+  def +(other)
+    self.class.new(@where_values + other.where_values, @bind_values + other.bind_values)
+  end
+
+  def -(other)
+    self.select{|node| !other.where_values.include?(node) }
+  end
+
+  def &(other)
+    common_where_values = @where_values & other.where_values
+    return self.select{|node| common_where_values.include?(node) }
+  end
+
+  def select
+    binds_index = 0
+    new_bind_values = []
+    new_where_values = @where_values.select do |node|
+      flag = yield(node)
+      if not node.is_a?(String)
+        binds_contains = node.grep(Arel::Nodes::BindParam).size
+        pre_binds_index = binds_index
+        binds_index += binds_contains
+        (pre_binds_index...binds_index).each{|i| new_bind_values << @bind_values[i] } if flag
+      end
+      next flag
+    end
+    return self.class.new(new_where_values, new_bind_values)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_or
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-02 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,7 @@ files:
 - gemfiles/5.0.gemfile
 - lib/rails_or.rb
 - lib/rails_or/version.rb
+- lib/rails_or/where_binding_mixs.rb
 - rails_or.gemspec
 homepage: https://github.com/khiav223577/rails_or
 licenses: