rails_or 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f9c88ae5f5c4ed9ac8fb2cfc64dbe22be904da8
-  data.tar.gz: 639ff10eb8da02ab73d0a5701b75c2fa5a438b08
+  metadata.gz: 06d5dd12cf0c23251f01c2b591bf8f313e3e99e8
+  data.tar.gz: 936f18b090e9f5b56bc483ce353aa347190d3956
 SHA512:
-  metadata.gz: 22dabe94aee61e0c55067c1249b1e247069d0d63ea3273360148408ba6614fcf30cc7ea64ca38edca4d22e092461884a6fa3fe3b0f656543859b035a5a8cf75a
-  data.tar.gz: a4ad1799eb864d973f8fa0bdc8581e2e71792104a53c155c5729fc6d66277dedb4355064ba63260076ce8887a3509cc17468ec46b690e7b89d457fd7dcb0067a
+  metadata.gz: f01e2a4d78a54f9d318088ca27d3c534ab149bebd53566df64b9cd84121f67ce994b8719f282766b029f0bc104919cb82405ccdd615968dc11059ea3021b776c
+  data.tar.gz: 4420743158b6612111c00af6dd03e98fbb129aa0f20d70fe7b4cbc5ff30366de41101448b56de049cf8b512c0282b3ff93711cad0fd3aa1e99147856bd86402a

data/CHANGELOG.md

@@ -3,6 +3,15 @@
 
 - No changes.
 
+### RailsOr [1.1.7] - (September 12, 2017)
+
+- Better Rails 5 Support. [[#21](https://github.com/khiav223577/rails_or/pull/21)] @khiav223577
+
+### RailsOr [1.1.6] - (June 30, 2017)
+
+- Supports `or` with `.none`. [[#20](https://github.com/khiav223577/rails_or/pull/20)] @khiav223577
+<br><br>
+
 ### 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
@@ -50,7 +59,9 @@
 - 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.5...HEAD
+[Unreleased]: https://github.com/khiav223577/rails_or/compare/v1.1.7...HEAD
+[1.1.7]: https://github.com/khiav223577/rails_or/compare/v1.1.6...v1.1.7
+[1.1.6]: https://github.com/khiav223577/rails_or/compare/v1.1.5...v1.1.6
 [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

data/lib/rails_or.rb

@@ -4,10 +4,13 @@ require 'active_record'
 
 class ActiveRecord::Relation
   IS_RAILS3_FLAG = Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('4.0.0')
+  IS_RAILS5_FLAG = Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new('5.0.0')
   if method_defined?(:or)
-    alias rails5_or or
-    def or(*other)
-      return rails5_or(rails_or_parse_parameter(*other))
+    if not method_defined?(:rails5_or)
+      alias_method :rails5_or, :or
+      def or(*other)
+        return rails5_or(rails_or_parse_parameter(*other))
+      end
     end
   else
     def or(*other)
@@ -38,40 +41,61 @@ class ActiveRecord::Relation
       return relation  
     end
   end
-  def or_not(*args)
-    raise 'This method is not support in Rails 3' if IS_RAILS3_FLAG
-    return self.or(klass.where.not(*args))
+
+  def or_not(*args) # Works in Rails 4+
+    self.or(klass.where.not(*args))
   end
-  def or_having(*args)
-    self.or(klass.having(*args))
+
+  def or_having(hash)
+    self.or(rails_or_spwan_relation(:having, hash))
   end
 
-private
+  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
-    when Hash   ; klass.where(other)
-    when Array  ; klass.where(other)
-    when String ; klass.where(other)
+    when Hash   ; rails_or_spwan_relation(:where, other)
+    when Array  ; rails_or_spwan_relation(:where, other)
+    when String ; rails_or_spwan_relation(:where, other)
     else        ; other
     end
   end
+
+  def rails_or_copy_values_to(relation) # For Rails 5
+    relation.joins_values = self.joins_values
+    relation.limit_value = self.limit_value
+    relation.group_values = self.group_values
+    relation.distinct_value = self.distinct_value
+    relation.order_values = self.order_values
+    relation.offset_value = self.offset_value
+    relation.references_values = self.references_values
+  end
+
+  def rails_or_spwan_relation(method, condition)
+    relation = klass.send(method, condition)
+    rails_or_copy_values_to(relation) if IS_RAILS5_FLAG
+    return relation
+  end
+
   def rails_or_get_current_scope
     return self.clone if IS_RAILS3_FLAG
-    #ref: https://github.com/rails/rails/blob/17ef58db1776a795c9f9e31a1634db7bcdc3ecdf/activerecord/lib/active_record/scoping/named.rb#L26
-    #return self.all # <- cannot use this because some gem changes this method's behavior
+    # ref: https://github.com/rails/rails/blob/17ef58db1776a795c9f9e31a1634db7bcdc3ecdf/activerecord/lib/active_record/scoping/named.rb#L26
+    # return self.all # <- cannot use this because some gem changes this method's behavior
     return (self.current_scope || self.default_scoped).clone
   end
 end
+
 class ActiveRecord::Base
   def self.or(*args)
     self.where('').or(*args)

data/lib/rails_or/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_or
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-30 00:00:00.000000000 Z
+date: 2017-09-12 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.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: 'Support && Add syntax sugar to #or query method.'