rails_or 1.1.8 → 1.1.9

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
+  t.libs << 'test'
+  t.libs << 'lib'
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => :test
+task default: :test

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "rails_or"
+require 'bundler/setup'
+require 'rails_or'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "rails_or"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/bin/setup

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install --gemfile=gemfiles/4.2.gemfile
-
-# Do any other automated setup that you need to do here
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install --gemfile=gemfiles/4.2.gemfile
+
+# Do any other automated setup that you need to do here

data/gemfiles/3.2.gemfile

@@ -1,13 +1,10 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in rails_or.gemspec
-
-gem "activerecord", "~> 3.2"
-
-group :test do
-  gem "simplecov"
-  gem "codeclimate-test-reporter", "~> 1.0.0"
-end
-
-gemspec :path => "../"
-
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 3.2.0'
+
+group :test do
+  gem 'simplecov', '< 0.18'
+  gem 'sqlite3', '~> 1.3.6'
+end
+
+gemspec path: '../'

data/gemfiles/4.2.gemfile

@@ -1,13 +1,10 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in rails_or.gemspec
-
-gem "activerecord", "~> 4.2"
-
-group :test do
-  gem "simplecov"
-  gem "codeclimate-test-reporter", "~> 1.0.0"
-end
-
-gemspec :path => "../"
-
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 4.2.0'
+
+group :test do
+  gem 'simplecov', '< 0.18'
+  gem 'sqlite3', '~> 1.3.6'
+end
+
+gemspec path: '../'

data/gemfiles/5.0.gemfile

@@ -1,13 +1,10 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in rails_or.gemspec
-
-gem "activerecord", "~> 5.0"
-
-group :test do
-  gem "simplecov"
-  gem "codeclimate-test-reporter", "~> 1.0.0"
-end
-
-gemspec :path => "../"
-
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 5.0.0'
+
+group :test do
+  gem 'simplecov', '< 0.18'
+  gem 'sqlite3', '~> 1.3.6'
+end
+
+gemspec path: '../'

data/gemfiles/5.1.gemfile

@@ -1,13 +1,10 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in rails_or.gemspec
-
-gem "activerecord", "~> 5.1"
-
-group :test do
-  gem "simplecov"
-  gem "codeclimate-test-reporter", "~> 1.0.0"
-end
-
-gemspec :path => "../"
-
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 5.1.0'
+
+group :test do
+  gem 'simplecov', '< 0.18'
+  gem 'sqlite3', '~> 1.3.6'
+end
+
+gemspec path: '../'

data/gemfiles/5.2.gemfile

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 5.2.0'
+
+group :test do
+  gem 'simplecov', '< 0.18'
+  gem 'sqlite3', '~> 1.3.6'
+end
+
+gemspec path: '../'

data/gemfiles/6.0.gemfile

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 6.0.0'
+
+group :test do
+  gem 'simplecov', '< 0.18'
+  gem 'sqlite3', '~> 1.4.1'
+end
+
+gemspec path: '../'

data/gemfiles/6.1.gemfile

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 6.1.0'
+
+group :test do
+  gem 'simplecov', '< 0.18'
+  gem 'sqlite3', '~> 1.4.1'
+end
+
+gemspec path: '../'

data/lib/rails_or.rb

@@ -1,119 +1,63 @@
-require "rails_or/version"
-require "rails_or/where_binding_mixs"
-require 'active_record'
-
-if defined?(ActiveRecord::NullRelation)
-  module ActiveRecord::NullRelation
-    if method_defined?(:or)
-      if not method_defined?(:rails5_or)
-        alias_method :rails5_or, :or
-        def or(*other)
-          rails5_or(rails_or_parse_parameter(*other))
-        end
-      end
-    end
-  end
-end
-
-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')
-  FROM_VALUE_METHOD = %i[from_value from_clause].find{|s| method_defined?(s) }
-  ASSIGN_FROM_VALUE = :"#{FROM_VALUE_METHOD}="
-  if method_defined?(:or)
-    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)
-      other        = rails_or_parse_parameter(*other)
-      combining    = group_values.any? ? :having : :where
-      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
-      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  
-    end
-  end
-
-  def or_not(*args) # Works in Rails 4+
-    self.or(klass.where.not(*args))
-  end
-
-  def or_having(hash)
-    self.or(rails_or_spwan_relation(:having, hash))
-  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)
-  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   ; 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)
-    relation.send(ASSIGN_FROM_VALUE, send(FROM_VALUE_METHOD))
-    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
-    return (self.current_scope || self.default_scoped).clone
-  end
-end
-
-class ActiveRecord::Base
-  def self.or(*args)
-    self.where('').or(*args)
-  end
-end
+require 'rails_or/version'
+require 'rails_or/where_binding_mixs'
+require 'active_record'
+require 'rails_or/patches/null_relation' if defined?(ActiveRecord::NullRelation)
+require 'rails_or/active_record/extension'
+
+module RailsOr
+  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')
+  FROM_VALUE_METHOD = %i[from_value from_clause].find{|s| ActiveRecord::Relation.method_defined?(s) }
+  ASSIGN_FROM_VALUE = :"#{FROM_VALUE_METHOD}="
+
+  class << self
+    def values_to_arel(values)
+      values.map!{|x| wrap_arel(x) }
+      return (values.size > 1 ? Arel::Nodes::And.new(values) : values)
+    end
+
+    def spawn_relation(relation, method, condition)
+      new_relation = relation.klass.send(method, condition)
+
+      from_value = relation.send(FROM_VALUE_METHOD)
+      new_relation.send(ASSIGN_FROM_VALUE, from_value) if from_value.present?
+
+      copy_values(new_relation, relation) if IS_RAILS5_FLAG
+      return new_relation
+    end
+
+    def get_current_scope(relation)
+      return relation.clone if IS_RAILS3_FLAG
+      # ref: https://github.com/rails/rails/blob/17ef58db1776a795c9f9e31a1634db7bcdc3ecdf/activerecord/lib/active_record/scoping/named.rb#L26
+      # return relation.all # <- cannot use this because some gem changes this method's behavior
+      return (relation.current_scope || relation.default_scoped).clone
+    end
+
+    def parse_parameter(relation, *other)
+      other = other.first if other.size == 1
+      case other
+      when Hash   ; spawn_relation(relation, :where, other)
+      when Array  ; spawn_relation(relation, :where, other)
+      when String ; spawn_relation(relation, :where, other)
+      else        ; other
+      end
+    end
+
+    private
+
+    def wrap_arel(node)
+      return node if Arel::Nodes::Equality === node
+      return Arel::Nodes::Grouping.new(String === node ? Arel.sql(node) : node)
+    end
+
+    def copy_values(to, from) # For Rails 5, 6
+      to.joins_values      = from.joins_values if from.joins_values.any?
+      to.limit_value       = from.limit_value
+      to.group_values      = from.group_values if from.group_values.any?
+      to.distinct_value    = from.distinct_value
+      to.order_values      = from.order_values if from.order_values.any?
+      to.offset_value      = from.offset_value
+      to.references_values = from.references_values
+    end
+  end
+end

data/lib/rails_or/active_record/extension.rb

@@ -0,0 +1,52 @@
+class ActiveRecord::Relation
+  if method_defined?(:or)
+    if not method_defined?(:rails5_or)
+      alias rails5_or or
+      def or(*other)
+        rails5_or(RailsOr.parse_parameter(self, *other))
+      end
+    end
+  else
+    def or(*other)
+      other        = RailsOr.parse_parameter(self, *other)
+      combining    = group_values.any? ? :having : :where
+      left = RailsOr::WhereBindingMixs.new(send("#{combining}_values"), 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(
+          RailsOr.values_to_arel(left.where_values),
+          RailsOr.values_to_arel(right.where_values),
+        )
+        common += RailsOr::WhereBindingMixs.new([arel_or], left.bind_values + right.bind_values)
+      end
+
+      relation = RailsOr.get_current_scope(self)
+      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
+    end
+  end
+
+  def or_not(*args) # Works in Rails 4+
+    self.or(klass.where.not(*args))
+  end
+
+  def or_having(hash)
+    self.or(RailsOr.spawn_relation(self, :having, hash))
+  end
+end
+
+class ActiveRecord::Base
+  def self.or(*args)
+    where('').or(*args)
+  end
+end

data/lib/rails_or/patches/null_relation.rb

@@ -0,0 +1,8 @@
+module ActiveRecord::NullRelation
+  if method_defined?(:or) and not method_defined?(:rails5_or)
+    alias rails5_or or
+    def or(*other)
+      rails5_or(RailsOr.parse_parameter(self, *other))
+    end
+  end
+end

data/lib/rails_or/version.rb

@@ -1,3 +1,3 @@
-module RailsOr
-  VERSION = "1.1.8"
-end
+module RailsOr
+  VERSION = '1.1.9'
+end

data/lib/rails_or/where_binding_mixs.rb

@@ -1,38 +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
+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)
+    select{|node| !other.where_values.include?(node) }
+  end
+
+  def &(other)
+    common_where_values = @where_values & other.where_values
+    return 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