rails_or 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ba1866dbfc59514dc65d0f0f52d88622fc53c89
-  data.tar.gz: 5e3c3b5676508f3c7460eb0c111ea19fd7179a5c
+  metadata.gz: ba1ae5b2bc25a6e83952a0057393d7ab89d118a5
+  data.tar.gz: ebabbac16cb6e1e16d856b0ad4af23040f65c804
 SHA512:
-  metadata.gz: 4c734ab55e58e714824a6c47c4b88232da7d16a87eae00e80bc46e55c43c125b6330fb2a6c6561297290c43f594297f311e13b4c634b84d8b26fd29af30f0669
-  data.tar.gz: ff5bd8170ce892c420b833e44b624f55dc8078bb50ff8ec372cb27fec558eabbe37edaf19ca9d1ca83debe5d9c6ee76d9a70b5b1db5a4475d890e17131ac1d84
+  metadata.gz: 92650ae5783ed9c2060d29d96533eb7f6b593b71b25864cccd434fd1018e61d9dd99cc1a67a38f1d392864199b7863217b96ce14488988069b122b9cbbf987c9
+  data.tar.gz: 2f0006c7e3ad9fa18255c68ec39fbb5ad8f7911b8314f93501c42c5381ef8ebba3a21c76abae3643d3217ff385c4efc4f77592ddaa814d92a6ea139b75f2467b

data/README.md

@@ -8,6 +8,8 @@
 
 Support && Add syntax sugar to #or query method in Rails 3, 4, 5.
 
+Allowing use of the OR operator to combine WHERE or HAVING clauses.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -33,7 +35,7 @@ Person.where(name: 'Pearl').or(Person.where(age: 24))
 Person.where("name = ? OR age = ?", 'Pearl', 24)
 ```
 
-### More Easy to use 
+### Easier to use 
 No need to repeat writing `Model.joins(XXX).where(...)`
 ```rb
 # before

data/gemfiles/3.2.gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rails_or.gemspec
 
-gem "rails", "~> 3.2"
+gem "activerecord", "~> 3.2"
 
 group :test do
   gem "simplecov"

data/gemfiles/4.2.gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rails_or.gemspec
 
-gem "rails", "~> 4.2"
+gem "activerecord", "~> 4.2"
 
 group :test do
   gem "simplecov"

data/gemfiles/5.0.gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rails_or.gemspec
 
-gem "rails", "~> 5.0"
+gem "activerecord", "~> 5.0"
 
 group :test do
   gem "simplecov"

data/lib/rails_or.rb

@@ -1,16 +1,15 @@
 require "rails_or/version"
-require 'rails'
 require 'active_record'
 
 class ActiveRecord::Relation
   if method_defined?(:or)
     alias rails5_or or
     def or(*other)
-      return rails5_or(parse_or_parameter(*other))
+      return rails5_or(rails_or_parse_parameter(*other))
     end
   else
     def or(*other)
-      other        = parse_or_parameter(*other)
+      other        = rails_or_parse_parameter(*other)
       combining    = group_values.any? ? :having : :where
       left_values  = send("#{combining}_values")
       right_values = other.send("#{combining}_values")
@@ -24,12 +23,13 @@ class ActiveRecord::Relation
         theirs = [Arel::Nodes::And.new(theirs)] if theirs.size > 1
         common << Arel::Nodes::Or.new(mine.first, theirs.first)
       end
-      send("#{combining}_values=", common)
-      self.bind_values = self.bind_values + other.bind_values
-      return self  
+      relation = rails_or_get_current_scope
+      relation.send("#{combining}_values=", common)
+      relation.bind_values = self.bind_values + other.bind_values
+      return relation  
     end
   end
-  if Gem::Version.new(Rails::VERSION::STRING) < Gem::Version.new('4.0.0')
+  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
@@ -42,7 +42,7 @@ class ActiveRecord::Relation
     self.or(klass.having(*args))
   end
 private
-  def parse_or_parameter(*other)
+  def rails_or_parse_parameter(*other)
     other = other.first if other.size == 1
     case other
     when Hash   ; klass.where(other)
@@ -51,6 +51,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
+    #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)
+  end
 end
 class ActiveRecord::Base
   def self.or(*args)

data/lib/rails_or/version.rb

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

data/rails_or.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "sqlite3", "~> 1.3"
   spec.add_development_dependency "minitest", "~> 5.0"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_or
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - khiav reoy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -97,7 +97,6 @@ files:
 - bin/setup
 - gemfiles/3.2.gemfile
 - gemfiles/4.2.gemfile
-- gemfiles/4.2.gemfile.lock
 - gemfiles/5.0.gemfile
 - lib/rails_or.rb
 - lib/rails_or/version.rb

data/gemfiles/4.2.gemfile.lock

@@ -1,127 +0,0 @@
-PATH
-  remote: ../
-  specs:
-    rails_or (0.0.1)
-      rails (>= 3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.7.1)
-      actionview (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      globalid (>= 0.3.0)
-    activemodel (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      builder (~> 3.1)
-    activerecord (4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      arel (~> 6.0)
-    activesupport (4.2.7.1)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    arel (6.0.4)
-    builder (3.2.2)
-    codeclimate-test-reporter (1.0.3)
-      simplecov
-    concurrent-ruby (1.0.4)
-    docile (1.1.5)
-    erubis (2.7.0)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
-    i18n (0.7.0)
-    json (1.8.3)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    nokogiri (1.7.0)
-      mini_portile2 (~> 2.1.0)
-    rack (1.6.5)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.7.1)
-      actionmailer (= 4.2.7.1)
-      actionpack (= 4.2.7.1)
-      actionview (= 4.2.7.1)
-      activejob (= 4.2.7.1)
-      activemodel (= 4.2.7.1)
-      activerecord (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.7.1)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.5.0)
-    simplecov (0.12.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    sprockets (3.7.1)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.0)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.3.12)
-    thor (0.19.4)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.11)
-  codeclimate-test-reporter (~> 1.0.0)
-  minitest (~> 5.0)
-  rails (~> 4.2)
-  rails_or!
-  rake (~> 10.0)
-  simplecov
-  sqlite3 (~> 1.3)
-
-BUNDLED WITH
-   1.11.2