rails_or 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0434d1cac1c04acacf74b933dff00a190162cdd9
-  data.tar.gz: 8af3108d409a281eb8cab6955eedc4ddb11c76de
+  metadata.gz: 8f9c88ae5f5c4ed9ac8fb2cfc64dbe22be904da8
+  data.tar.gz: 639ff10eb8da02ab73d0a5701b75c2fa5a438b08
 SHA512:
-  metadata.gz: f422a1b8d235ddad25daf0beb82882569b4742bda3ab521b6f802d956d0dbdf889f7d1156882c3cf2b80113eb48bdaaa5e7ee33cf2299c293ac72c90112098d0
-  data.tar.gz: 5c5e512521f05cb1fdd817005adc14439b0caa413b41d82db300d9928eb0853c8cf066c10fa21dc088ea96a12cf32c1ca4cc511c765a70175f126d4d85a40331
+  metadata.gz: 22dabe94aee61e0c55067c1249b1e247069d0d63ea3273360148408ba6614fcf30cc7ea64ca38edca4d22e092461884a6fa3fe3b0f656543859b035a5a8cf75a
+  data.tar.gz: a4ad1799eb864d973f8fa0bdc8581e2e71792104a53c155c5729fc6d66277dedb4355064ba63260076ce8887a3509cc17468ec46b690e7b89d457fd7dcb0067a

data/README.md

@@ -63,9 +63,9 @@ Person.where(name: 'Pearl').or('age = ?', 24)
 Person.where(name: 'Pearl').or('age = 24')
 ```
 
-### Other convenient methods
+## Other convenient methods
 
-#### or_not
+### or_not
 (Only supports in Rails 4+)
 ```rb
 Company.where.not(logo_image1: nil)
@@ -74,7 +74,7 @@ Company.where.not(logo_image1: nil)
        .or_not(logo_image4: nil)
 ```
 
-#### or_having
+### or_having
 
 ```rb
 Order.group('user_id')
@@ -82,6 +82,40 @@ Order.group('user_id')
      .or_having('COUNT(*) > 10')
 ```
 
+## Examples
+
+Let `A = {id: 1}`, `B = {account: 'a'}`, and `C = {email: 'b'}`
+
+### A && (B || C)
+```rb
+u = User.where(A)
+u.where(B).or(u.where(C))
+# =>
+# SELECT `users`.* FROM `users` 
+# WHERE `users`.`id` = 1 AND (`users`.`account` = 'a' OR `users`.`email` = 'b')
+```
+### (B || C) && A
+```rb
+User.where(B).or(C).where(A)
+# =>
+# SELECT `users`.* FROM `users` 
+# WHERE (`users`.`account` = 'a' OR `users`.`email` = 'b') AND `users`.`id` = 1
+```
+### A && B || A && C
+```rb
+User.where(A).where(B).or(User.where(A).where(C))
+# =>
+# SELECT `users`.* FROM `users` 
+# WHERE (`users`.`id` = 1 AND `users`.`account` = 'a' OR `users`.`id` = 1 AND `users`.`email` = 'b')
+```
+### A && B || C
+```rb
+User.where(A).where(B).or(C)
+# =>
+# SELECT `users`.* FROM `users` 
+# WHERE (`users`.`id` = 1 AND `users`.`account` = 'a' OR `users`.`email` = 'b')
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/rails_or.rb

@@ -29,6 +29,10 @@ class ActiveRecord::Relation
       end
 
       relation = rails_or_get_current_scope
+      if defined?(ActiveRecord::NullRelation) # Rails 3 does not have ActiveRecord::NullRelation
+        return other if relation.is_a?(ActiveRecord::NullRelation)
+        return relation if other.is_a?(ActiveRecord::NullRelation)
+      end
       relation.send("#{combining}_values=", common.where_values)
       relation.bind_values = common.bind_values
       return relation  

data/lib/rails_or/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_or
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: 'Support && Add syntax sugar to #or query method.'