active_record_extended 2.0.0 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9934d5a90324b46dc3faa7b496724ac219a2582d264db89e64e2b9be574adab6
-  data.tar.gz: c1359988f9a6b83148f36548e842a25cab68a191e7a839caef7e783b1415b346
+  metadata.gz: bbcdc3e208ac89fd2d55b8944ad7c0483e57f21a89941a4848beb548b56ce293
+  data.tar.gz: 10465bfe73686aae4fad33a7da0e533ed22401c68da5655654e1538a8bbb34c0
 SHA512:
-  metadata.gz: e7385b414ef4c8d8b0c5b29eaeb70e77ba79f07828255deef5db79e99cf33f18de7bab696501711dee1f8e056ca3bdf628cdd498b341a91b5ad5cd2c766bd61c
-  data.tar.gz: 10e8d4f65c570dba757b2cf47aaaff7f8a5538974e9c8aadb3c267e3e3fccb9508b05a8722eb5d6680937cb15827f6fa4f88d6dd219d8240c58323385fe44eb2
+  metadata.gz: 1ed8f4d6fe19c384bbb8add11443cc78b6f23cf4adc1808bdd0a1b6328a2dbeac22d4e0fa8fc6257dde505646d1c3613ed90711bbd36321cbb74231cf621958d
+  data.tar.gz: e139454fc996ad112d70332e39b002ba164d2172100f6b61f2494f090a0a3afe16c0e5e51998ab8f8cb8e839c6b0cb1104d152f821ae65d55bec4c83ec9c990a

data/lib/active_record_extended/active_record.rb

@@ -18,8 +18,8 @@ require "active_record_extended/query_methods/inet"
 require "active_record_extended/query_methods/json"
 require "active_record_extended/query_methods/select"
 
-if ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR == 1
+if Gem::Requirement.new("~> 5.1.0").satisfied_by?(ActiveRecord.gem_version)
   require "active_record_extended/patch/5_1/where_clause"
-elsif ActiveRecord::VERSION::MAJOR >= 5
+else
   require "active_record_extended/patch/5_2/where_clause"
 end

data/lib/active_record_extended/arel/nodes.rb

@@ -5,9 +5,11 @@ require "arel/nodes/function"
 
 module Arel
   module Nodes
+    if Gem::Requirement.new("< 6.1").satisfied_by?(ActiveRecord.gem_version)
+      ["Contains", "Overlaps"].each { |binary_node_name| const_set(binary_node_name, Class.new(::Arel::Nodes::Binary)) }
+    end
+
     [
-      "Overlap",
-      "Contains",
       "ContainsHStore",
       "ContainsArray",
       "ContainedInArray"

data/lib/active_record_extended/arel/predications.rb

@@ -14,9 +14,10 @@ module Arel
       Arel::Nodes::Equality.new(Nodes.build_quoted(other, self), all_tags_function)
     end
 
-    def overlap(other)
-      Nodes::Overlap.new(self, Nodes.build_quoted(other, self))
+    def overlaps(other)
+      Nodes::Overlaps.new(self, Nodes.build_quoted(other, self))
     end
+    alias overlap overlaps
 
     def contains(other)
       Nodes::Contains.new self, Nodes.build_quoted(other, self)

data/lib/active_record_extended/arel/visitors/postgresql_decorator.rb

@@ -9,7 +9,7 @@ module ActiveRecordExtended
 
       # rubocop:disable Naming/MethodName
 
-      def visit_Arel_Nodes_Overlap(object, collector)
+      def visit_Arel_Nodes_Overlaps(object, collector)
         infix_value object, collector, " && "
       end
 

data/lib/active_record_extended/query_methods/either.rb

@@ -52,6 +52,7 @@ module ActiveRecordExtended
       def xor_field_options_for_associations(associations)
         associations.each_with_object({}) do |association_name, options|
           reflection = reflect_on_association(association_name)
+          reflection = reflection.through_reflection if reflection.through_reflection?
           options[reflection.table_name] = reflection.foreign_key
         end
       end

data/lib/active_record_extended/query_methods/unionize.rb

@@ -107,7 +107,7 @@ module ActiveRecordExtended
       end
 
       def union(opts = :chain, *args)
-        return UnionChain.new(spawn) if opts == :chain
+        return UnionChain.new(spawn) if :chain == opts
 
         opts.nil? ? self : spawn.union!(opts, *args, chain_method: __callee__)
       end
@@ -121,7 +121,7 @@ module ActiveRecordExtended
       def union!(opts = :chain, *args, chain_method: :union)
         union_chain    = UnionChain.new(self)
         chain_method ||= :union
-        return union_chain if opts == :chain
+        return union_chain if :chain == opts
 
         union_chain.public_send(chain_method, *([opts] + args))
       end

data/lib/active_record_extended/query_methods/where_chain.rb

@@ -5,9 +5,10 @@ module ActiveRecordExtended
     # Finds Records that have an array column that contain any a set of values
     # User.where.overlap(tags: [1,2])
     #   # SELECT * FROM users WHERE tags && {1,2}
-    def overlap(opts, *rest)
-      substitute_comparisons(opts, rest, Arel::Nodes::Overlap, "overlap")
+    def overlaps(opts, *rest)
+      substitute_comparisons(opts, rest, Arel::Nodes::Overlaps, "overlap")
     end
+    alias overlap overlaps
 
     # Finds Records that contain an element in an array column
     # User.where.any(tags: 3)

data/lib/active_record_extended/query_methods/with_cte.rb

@@ -113,14 +113,14 @@ module ActiveRecordExtended
 
       # @param [Hash, WithCTE] opts
       def with(opts = :chain, *rest)
-        return WithChain.new(spawn) if opts == :chain
+        return WithChain.new(spawn) if :chain == opts
 
         opts.blank? ? self : spawn.with!(opts, *rest)
       end
 
       # @param [Hash, WithCTE] opts
       def with!(opts = :chain, *_rest)
-        return WithChain.new(self) if opts == :chain
+        return WithChain.new(self) if :chain == opts
 
         tap do |scope|
           scope.cte ||= WithCTE.new(self)

data/lib/active_record_extended/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordExtended
-  VERSION = "2.0.0"
+  VERSION = "2.0.3"
 end

data/spec/query_methods/either_spec.rb

@@ -23,6 +23,17 @@ RSpec.describe "Active Record Either Methods" do
         expect(query).to_not include(three)
       end
     end
+
+    context "Through association .either_joins/2" do
+      let!(:four) { User.create! }
+      let!(:group) { Group.create!(users: [four]) }
+
+      it "Should only only return records that belong to profile L or has group" do
+        query = User.either_joins(:profile_l, :groups)
+        expect(query).to include(one, four)
+        expect(query).to_not include(three, two)
+      end
+    end
   end
 
   describe ".either_order/2" do

data/spec/sql_inspections/either_sql_spec.rb

@@ -31,6 +31,22 @@ RSpec.describe "Either Methods SQL Queries" do
       query = User.either_join(:profile_l, :profile_r).to_sql
       expect(query).to include(where_join_case)
     end
+
+    context "Through association .either_joins/2" do
+      let!(:four) { User.create! }
+      let!(:group) { Group.create!(users: [four]) }
+      let(:where_join_through_case) do
+        "WHERE ((CASE WHEN profile_ls.user_id IS NULL"\
+        " THEN groups_users.user_id"\
+        " ELSE profile_ls.user_id END) "\
+        "= users.id)"
+      end
+
+      it "Should contain a case statement that will conditionally alternative between tables" do
+        query = User.either_join(:profile_l, :groups).to_sql
+        expect(query).to include(where_join_through_case)
+      end
+    end
   end
 
   describe ".either_order/2" do

data/spec/support/models.rb

@@ -5,6 +5,8 @@ class ApplicationRecord < ActiveRecord::Base
 end
 
 class User < ApplicationRecord
+  has_many :groups_users, class_name: "GroupsUser"
+  has_many :groups, through: :groups_users, dependent: :destroy
   has_many :hm_tags, class_name: "Tag"
   has_one :profile_l, class_name: "ProfileL"
   has_one :profile_r, class_name: "ProfileR"
@@ -66,3 +68,13 @@ class VersionControl < ApplicationRecord
   # t.jsonb :source, default: {}, null: false
   #
 end
+
+class Group < ApplicationRecord
+  has_many :groups_users, class_name: "GroupsUser"
+  has_many :users, through: :groups_users, dependent: :destroy
+end
+
+class GroupsUser < ApplicationRecord
+  belongs_to :user
+  belongs_to :group
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_extended
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.3
 platform: ruby
 authors:
 - George Protacio-Karaszi
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-22 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord