rails_or 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba1ae5b2bc25a6e83952a0057393d7ab89d118a5
-  data.tar.gz: ebabbac16cb6e1e16d856b0ad4af23040f65c804
+  metadata.gz: eb04bc9b28a161af5935120a35ed5a27a34293cb
+  data.tar.gz: 43af4e319dd0f7d77b00c7c7f25ec5444b4ea0b3
 SHA512:
-  metadata.gz: 92650ae5783ed9c2060d29d96533eb7f6b593b71b25864cccd434fd1018e61d9dd99cc1a67a38f1d392864199b7863217b96ce14488988069b122b9cbbf987c9
-  data.tar.gz: 2f0006c7e3ad9fa18255c68ec39fbb5ad8f7911b8314f93501c42c5381ef8ebba3a21c76abae3643d3217ff385c4efc4f77592ddaa814d92a6ea139b75f2467b
+  metadata.gz: 2326a06c3c6cbab54864b790018f736818abdff7a0a8b9975e801fe1fef4e7ec40caee235fa3642c484c9096eaefc208400e7a37fa1761d81562b1b7a9fc44ec
+  data.tar.gz: d40665dcdbddd2886d4eba9bfbefb42b39b81b186652811c49e09a77beaaa30e1ed741e6eeba1a3f20a92c2ffdf3dca036965a2525d36d2e042fd6d8bd954261

data/lib/rails_or.rb

@@ -2,6 +2,7 @@ require "rails_or/version"
 require 'active_record'
 
 class ActiveRecord::Relation
+  IS_RAILS3_FLAG = Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('4.0.0')
   if method_defined?(:or)
     alias rails5_or or
     def or(*other)
@@ -29,14 +30,9 @@ class ActiveRecord::Relation
       return relation  
     end
   end
-  if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('4.0.0')
-    def or_not(*args)
-      raise 'This method is not support in Rails 3'
-    end
-  else
-    def or_not(*args)
-      return self.or(klass.where.not(*args))
-    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))
   end
   def or_having(*args)
     self.or(klass.having(*args))
@@ -51,10 +47,11 @@ private
     else        ; other
     end
   end
-  RAILS_OR_GET_CURRENT_SCOPE_METHOD = (Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('4.0.0') ? :clone : :all)
   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.send(RAILS_OR_GET_CURRENT_SCOPE_METHOD)
+    #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

data/lib/rails_or/version.rb

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

metadata

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