active_record_extended 2.1.0 → 3.0.0

data/lib/active_record_extended/version.rb

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

data/lib/active_record_extended.rb

@@ -1,10 +1,61 @@
 # frozen_string_literal: true
 
 require "active_record_extended/version"
-require "active_record_extended/utilities/support"
-require "active_record_extended/utilities/order_by"
-require "active_record_extended/active_record"
-require "active_record_extended/arel"
+
+require "active_record"
+require "active_record/relation"
+require "active_record/relation/merger"
+require "active_record/relation/query_methods"
 
 module ActiveRecordExtended
+  extend ActiveSupport::Autoload
+
+  AR_VERSION_GTE_6_1 = Gem::Requirement.new(">= 6.1").satisfied_by?(ActiveRecord.gem_version)
+
+  module Utilities
+    extend ActiveSupport::Autoload
+
+    eager_autoload do
+      autoload :OrderBy
+      autoload :Support
+    end
+  end
+
+  module Patch
+    extend ActiveSupport::Autoload
+
+    eager_autoload do
+      autoload :ArrayHandlerPatch
+      autoload :RelationPatch
+      autoload :WhereClausePatch
+    end
+  end
+
+  module QueryMethods
+    extend ActiveSupport::Autoload
+
+    eager_autoload do
+      autoload :AnyOf
+      autoload :Either
+      autoload :FosterSelect
+      autoload :Inet
+      autoload :Json
+      autoload :Unionize
+      autoload :WhereChain
+      autoload :Window
+      autoload :WithCTE
+    end
+  end
+
+  def self.eager_load!
+    super
+    ActiveRecordExtended::Utilities.eager_load!
+    ActiveRecordExtended::Patch.eager_load!
+    ActiveRecordExtended::QueryMethods.eager_load!
+  end
+end
+
+ActiveSupport.on_load(:active_record) do
+  require "active_record_extended/arel"
+  ActiveRecordExtended.eager_load!
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: active_record_extended
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - George Protacio-Karaszi
 - Dan McClain
 - Olivier El Mekki
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.0
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.0
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -76,7 +76,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -147,22 +147,20 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/active_record_extended.rb
-- lib/active_record_extended/active_record.rb
-- lib/active_record_extended/active_record/relation_patch.rb
 - lib/active_record_extended/arel.rb
 - lib/active_record_extended/arel/aggregate_function_name.rb
 - lib/active_record_extended/arel/nodes.rb
 - lib/active_record_extended/arel/predications.rb
-- lib/active_record_extended/arel/sql_literal.rb
+- lib/active_record_extended/arel/sql_literal_patch.rb
 - lib/active_record_extended/arel/visitors/postgresql_decorator.rb
-- lib/active_record_extended/patch/5_1/where_clause.rb
-- lib/active_record_extended/patch/5_2/where_clause.rb
-- lib/active_record_extended/predicate_builder/array_handler_decorator.rb
+- lib/active_record_extended/patch/array_handler_patch.rb
+- lib/active_record_extended/patch/relation_patch.rb
+- lib/active_record_extended/patch/where_clause_patch.rb
 - lib/active_record_extended/query_methods/any_of.rb
 - lib/active_record_extended/query_methods/either.rb
+- lib/active_record_extended/query_methods/foster_select.rb
 - lib/active_record_extended/query_methods/inet.rb
 - lib/active_record_extended/query_methods/json.rb
-- lib/active_record_extended/query_methods/select.rb
 - lib/active_record_extended/query_methods/unionize.rb
 - lib/active_record_extended/query_methods/where_chain.rb
 - lib/active_record_extended/query_methods/window.rb
@@ -170,35 +168,12 @@ files:
 - lib/active_record_extended/utilities/order_by.rb
 - lib/active_record_extended/utilities/support.rb
 - lib/active_record_extended/version.rb
-- spec/active_record_extended_spec.rb
-- spec/query_methods/any_of_spec.rb
-- spec/query_methods/array_query_spec.rb
-- spec/query_methods/either_spec.rb
-- spec/query_methods/hash_query_spec.rb
-- spec/query_methods/inet_query_spec.rb
-- spec/query_methods/json_spec.rb
-- spec/query_methods/select_spec.rb
-- spec/query_methods/unionize_spec.rb
-- spec/query_methods/window_spec.rb
-- spec/query_methods/with_cte_spec.rb
-- spec/spec_helper.rb
-- spec/sql_inspections/any_of_sql_spec.rb
-- spec/sql_inspections/arel/aggregate_function_name_spec.rb
-- spec/sql_inspections/arel/array_spec.rb
-- spec/sql_inspections/arel/inet_spec.rb
-- spec/sql_inspections/contains_sql_queries_spec.rb
-- spec/sql_inspections/either_sql_spec.rb
-- spec/sql_inspections/json_sql_spec.rb
-- spec/sql_inspections/unionize_sql_spec.rb
-- spec/sql_inspections/window_sql_spec.rb
-- spec/sql_inspections/with_cte_sql_spec.rb
-- spec/support/database_cleaner.rb
-- spec/support/models.rb
 homepage: https://github.com/georgekaraszi/ActiveRecordExtended
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -206,39 +181,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.3.7
+signing_key: 
 specification_version: 4
 summary: Adds extended functionality to Activerecord Postgres implementation
-test_files:
-- spec/active_record_extended_spec.rb
-- spec/query_methods/any_of_spec.rb
-- spec/query_methods/array_query_spec.rb
-- spec/query_methods/either_spec.rb
-- spec/query_methods/hash_query_spec.rb
-- spec/query_methods/inet_query_spec.rb
-- spec/query_methods/json_spec.rb
-- spec/query_methods/select_spec.rb
-- spec/query_methods/unionize_spec.rb
-- spec/query_methods/window_spec.rb
-- spec/query_methods/with_cte_spec.rb
-- spec/spec_helper.rb
-- spec/sql_inspections/any_of_sql_spec.rb
-- spec/sql_inspections/arel/aggregate_function_name_spec.rb
-- spec/sql_inspections/arel/array_spec.rb
-- spec/sql_inspections/arel/inet_spec.rb
-- spec/sql_inspections/contains_sql_queries_spec.rb
-- spec/sql_inspections/either_sql_spec.rb
-- spec/sql_inspections/json_sql_spec.rb
-- spec/sql_inspections/unionize_sql_spec.rb
-- spec/sql_inspections/window_sql_spec.rb
-- spec/sql_inspections/with_cte_sql_spec.rb
-- spec/support/database_cleaner.rb
-- spec/support/models.rb
+test_files: []

data/lib/active_record_extended/active_record/relation_patch.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-require "active_record_extended/query_methods/window"
-require "active_record_extended/query_methods/unionize"
-require "active_record_extended/query_methods/json"
-
-module ActiveRecordExtended
-  module RelationPatch
-    module QueryDelegation
-      delegate :with, :define_window, :select_window, :foster_select, to: :all
-      delegate(*::ActiveRecordExtended::QueryMethods::Unionize::UNIONIZE_METHODS, to: :all)
-      delegate(*::ActiveRecordExtended::QueryMethods::Json::JSON_QUERY_METHODS, to: :all)
-    end
-
-    module Merger
-      def normal_values
-        super + [:union, :define_window]
-      end
-
-      def merge
-        merge_ctes!
-        super
-      end
-
-      def merge_ctes!
-        return unless other.with_values?
-
-        if other.recursive_value? && !relation.recursive_value?
-          relation.with!(:chain).recursive(other.cte)
-        else
-          relation.with!(other.cte)
-        end
-      end
-    end
-
-    module ArelBuildPatch
-      def build_arel(*aliases)
-        super.tap do |arel|
-          build_windows(arel) if window_values?
-          build_unions(arel)  if union_values?
-          build_with(arel)    if with_values?
-        end
-      end
-    end
-  end
-end
-
-ActiveRecord::Relation.prepend(ActiveRecordExtended::RelationPatch::ArelBuildPatch)
-ActiveRecord::Relation::Merger.prepend(ActiveRecordExtended::RelationPatch::Merger)
-ActiveRecord::Querying.prepend(ActiveRecordExtended::RelationPatch::QueryDelegation)

data/lib/active_record_extended/active_record.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require "active_record"
-require "active_record/relation"
-require "active_record/relation/merger"
-require "active_record/relation/query_methods"
-
-require "active_record_extended/predicate_builder/array_handler_decorator"
-
-require "active_record_extended/active_record/relation_patch"
-
-require "active_record_extended/query_methods/where_chain"
-require "active_record_extended/query_methods/with_cte"
-require "active_record_extended/query_methods/unionize"
-require "active_record_extended/query_methods/any_of"
-require "active_record_extended/query_methods/either"
-require "active_record_extended/query_methods/inet"
-require "active_record_extended/query_methods/json"
-require "active_record_extended/query_methods/select"
-
-if Gem::Requirement.new("~> 5.1.0").satisfied_by?(ActiveRecord.gem_version)
-  require "active_record_extended/patch/5_1/where_clause"
-else
-  require "active_record_extended/patch/5_2/where_clause"
-end

data/lib/active_record_extended/patch/5_1/where_clause.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecordExtended
-  module WhereClause
-    def modified_predicates(&block)
-      ::ActiveRecord::Relation::WhereClause.new(predicates.map(&block), binds)
-    end
-  end
-end
-
-ActiveRecord::Relation::WhereClause.prepend(ActiveRecordExtended::WhereClause)

data/lib/active_record_extended/patch/5_2/where_clause.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveRecordExtended
-  module WhereClause
-    def modified_predicates(&block)
-      ::ActiveRecord::Relation::WhereClause.new(predicates.map(&block))
-    end
-  end
-end
-
-ActiveRecord::Relation::WhereClause.prepend(ActiveRecordExtended::WhereClause)

data/lib/active_record_extended/predicate_builder/array_handler_decorator.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require "active_record/relation/predicate_builder"
-require "active_record/relation/predicate_builder/array_handler"
-
-module ActiveRecordExtended
-  module ArrayHandlerDecorator
-    def call(attribute, value)
-      cache = ActiveRecord::Base.connection.schema_cache
-      if cache.data_source_exists?(attribute.relation.name)
-        column = cache.columns(attribute.relation.name).detect { |col| col.name.to_s == attribute.name.to_s }
-        return attribute.eq(value) if column.try(:array)
-      end
-
-      super(attribute, value)
-    end
-  end
-end
-
-ActiveRecord::PredicateBuilder::ArrayHandler.prepend(ActiveRecordExtended::ArrayHandlerDecorator)

data/spec/active_record_extended_spec.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe ActiveRecordExtended do
-  it "has a version number" do
-    expect(ActiveRecordExtended::VERSION).not_to be nil
-  end
-end

data/spec/query_methods/any_of_spec.rb

@@ -1,131 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-RSpec.describe "Active Record Any / None of Methods" do
-  let!(:one)       { User.create!(personal_id: 1) }
-  let!(:two)       { User.create!(personal_id: 2) }
-  let!(:three)     { User.create!(personal_id: 3) }
-
-  let!(:tag_one)   { Tag.create!(user_id: one.id) }
-  let!(:tag_two)   { Tag.create!(user_id: two.id) }
-  let!(:tag_three) { Tag.create!(user_id: three.id) }
-
-  describe "where.any_of/1" do
-    it "Should return queries that match any of the outlined queries" do
-      query = User.where.any_of({ personal_id: 1 }, { personal_id: 2 })
-      expect(query).to include(one, two)
-      expect(query).to_not include(three)
-    end
-
-    it "Should accept where query predicates" do
-      personal_one = User.where(personal_id: 1)
-      personal_two = User.where(personal_id: 2)
-      query = User.where.any_of(personal_one, personal_two)
-
-      expect(query).to include(one, two)
-      expect(query).to_not include(three)
-    end
-
-    it "Should accept query strings" do
-      personal_one = User.where(personal_id: 1)
-
-      query = User.where.any_of(personal_one, "personal_id > 2")
-      expect(query).to include(one, three)
-      expect(query).to_not include(two)
-
-      query = User.where.any_of(["personal_id >= ?", 2])
-      expect(query).to include(two, three)
-      expect(query).to_not include(one)
-    end
-
-    context "Relationship queries" do
-      it "Finds records that are queried from two or more has_many associations" do
-        user_one_tag = Tag.create!(user_id: one.id)
-        user_two_tag = Tag.create!(user_id: two.id)
-        query = Tag.where.any_of(one.hm_tags, two.hm_tags)
-
-        expect(query).to include(tag_one, tag_two, user_one_tag, user_two_tag)
-        expect(query).to_not include(tag_three)
-      end
-
-      it "Finds records that are dynamically joined" do
-        user_one_tag = Tag.where(users: { id: one.id }).includes(:user).references(:user)
-        user_two_tag = Tag.where(users: { id: two.id }).joins(:user)
-        query = Tag.where.any_of(user_one_tag, user_two_tag)
-
-        expect(query).to include(tag_one, tag_two)
-        expect(query).to_not include(tag_three)
-      end
-
-      it "Return matched records of a joined table on the parent level" do
-        query = Tag.joins(:user).where.any_of(
-          { users: { personal_id: 1 } },
-          { users: { personal_id: 3 } }
-        )
-
-        expect(query).to include(tag_one, tag_three)
-        expect(query).to_not include(tag_two)
-      end
-    end
-  end
-
-  describe "where.none_of/1" do
-    it "Should return queries that match none of the outlined queries" do
-      query = User.where.none_of({ personal_id: 1 }, { personal_id: 2 })
-      expect(query).to include(three)
-      expect(query).to_not include(one, two)
-    end
-
-    it "Should accept where query predicates" do
-      personal_one = User.where(personal_id: 1)
-      personal_two = User.where(personal_id: 2)
-      query = User.where.none_of(personal_one, personal_two)
-
-      expect(query).to include(three)
-      expect(query).to_not include(one, two)
-    end
-
-    it "Should accept query strings" do
-      personal_one = User.where(personal_id: 1)
-
-      query = User.where.none_of(personal_one, "personal_id > 2")
-      expect(query).to include(two)
-      expect(query).to_not include(one, three)
-
-      query = User.where.none_of(["personal_id >= ?", 2])
-      expect(query).to include(one)
-      expect(query).to_not include(two, three)
-    end
-
-    context "Relationship queries" do
-      it "Finds records that are queried from two or more has_many associations" do
-        user_one_tag = Tag.create!(user_id: one.id)
-        user_two_tag = Tag.create!(user_id: two.id)
-        query = Tag.where.none_of(one.hm_tags, two.hm_tags)
-
-        expect(query).to include(tag_three)
-        expect(query).to_not include(tag_one, tag_two, user_one_tag, user_two_tag)
-      end
-
-      it "Finds records that are dynamically joined" do
-        user_one_tag = Tag.where(users: { id: one.id }).includes(:user).references(:user)
-        user_two_tag = Tag.where(users: { id: two.id }).joins(:user)
-        query = Tag.where.none_of(user_one_tag, user_two_tag)
-
-        expect(query).to include(tag_three)
-        expect(query).to_not include(tag_one, tag_two)
-      end
-
-      it "Return matched records of a joined table on the parent level" do
-        query = Tag.joins(:user).where.none_of(
-          { users: { personal_id: 1 } },
-          { users: { personal_id: 3 } }
-        )
-
-        expect(query).to include(tag_two)
-        expect(query).to_not include(tag_one, tag_three)
-      end
-    end
-  end
-end

data/spec/query_methods/array_query_spec.rb

@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-RSpec.describe "Active Record Array Query Methods" do
-  let!(:one)   { User.create!(tags: [1, 2, 3],  personal_id: 33) }
-  let!(:two)   { User.create!(tags: [3, 1, 5],  personal_id: 88) }
-  let!(:three) { User.create!(tags: [2, 8, 20], personal_id: 33) }
-
-  describe "#overlap" do
-    it "Should return matched records" do
-      query = User.where.overlap(tags: [1])
-      expect(query).to include(one, two)
-      expect(query).to_not include(three)
-
-      query = User.where.overlap(tags: [2, 3])
-      expect(query).to include(one, two, three)
-    end
-  end
-
-  describe "#contains" do
-    it "returns records that contain elements in an array" do
-      query = User.where.contains(tags: [1, 3])
-      expect(query).to include(one, two)
-      expect(query).to_not include(three)
-
-      query = User.where.contains(tags: [8, 2])
-      expect(query).to include(three)
-      expect(query).to_not include(one, two)
-    end
-  end
-
-  describe "#any" do
-    it "should return any records that match" do
-      query = User.where.any(tags: 3)
-      expect(query).to include(one, two)
-      expect(query).to_not include(three)
-    end
-
-    it "allows chaining" do
-      query = User.where.any(tags: 3).where(personal_id: 33)
-      expect(query).to include(one)
-      expect(query).to_not include(two, three)
-    end
-  end
-
-  describe "#all" do
-    let!(:contains_all)     { User.create!(tags: [1], personal_id: 1) }
-    let!(:contains_all_two) { User.create!(tags: [1], personal_id: 2) }
-    let!(:contains_some)    { User.create!(tags: [1, 2], personal_id: 2) }
-
-    it "should return any records that match" do
-      query = User.where.all(tags: 1)
-      expect(query).to include(contains_all, contains_all_two)
-      expect(query).to_not include(contains_some)
-    end
-
-    it "allows chaining" do
-      query = User.where.all(tags: 1).where(personal_id: 1)
-      expect(query).to include(contains_all)
-      expect(query).to_not include(contains_all_two, contains_some)
-    end
-  end
-end

data/spec/query_methods/either_spec.rb

@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-RSpec.describe "Active Record Either Methods" do
-  let!(:one)       { User.create! }
-  let!(:two)       { User.create! }
-  let!(:three)     { User.create! }
-  let!(:profile_l) { ProfileL.create!(user_id: one.id, likes: 100) }
-  let!(:profile_r) { ProfileR.create!(user_id: two.id, dislikes: 50) }
-
-  describe ".either_join/2" do
-    it "Should only only return records that belong to profile L or profile R" do
-      query = User.either_join(:profile_l, :profile_r)
-      expect(query).to include(one, two)
-      expect(query).to_not include(three)
-    end
-
-    context "Alias .either_joins/2" do
-      it "Should only only return records that belong to profile L or profile R" do
-        query = User.either_joins(:profile_l, :profile_r)
-        expect(query).to include(one, two)
-        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
-    it "Should not exclude anyone who does not have a relationship" do
-      query = User.either_order(:asc, profile_l: :likes, profile_r: :dislikes)
-      expect(query.count).to eq(3)
-      expect(query[0]).to eq(two)
-      expect(query[1]).to eq(one)
-      expect(query[2]).to eq(three)
-    end
-
-    it "Should order users based on their likes and dislikes in ascended order" do
-      query = User.either_order(:asc, profile_l: :likes, profile_r: :dislikes).where(id: [one.id, two.id])
-      expect(query.count).to eq(2)
-      expect(query.first).to eq(two)
-      expect(query.last).to eq(one)
-    end
-
-    it "Should order users based on their likes and dislikes in descending order" do
-      query = User.either_order(:desc, profile_l: :likes, profile_r: :dislikes).where(id: [one.id, two.id])
-      expect(query.first).to eq(one)
-      expect(query.last).to eq(two)
-    end
-
-    context "Alias .either_order/2" do
-      it "Should order users based on their likes and dislikes in ascended order" do
-        query = User.either_orders(:asc, profile_l: :likes, profile_r: :dislikes).where(id: [one.id, two.id])
-        expect(query.count).to eq(2)
-        expect(query.first).to eq(two)
-        expect(query.last).to eq(one)
-      end
-    end
-  end
-end