active_record_extended 3.2.1 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2611c1b573495ab42f5a15ff8d85bdc8ba95bbe8d077ae037a5eae8e8f29f2c6
-  data.tar.gz: 4d6c36a2e09b490969f8f152bda00a45180bbcd0a728fb7344e058faa96da10c
+  metadata.gz: b9536d7712c3ce9ae40dd62525b5799ff2848e5ba94092c3f6d3c995ffe5467c
+  data.tar.gz: deb23d8497e024312c99a0a24723b7ffba98dc60d9f7027863b3c2901ee0070e
 SHA512:
-  metadata.gz: 8bbb84f095b990140d2cc7f6e11de1c7b11a039d4f6cdf02f910c470c9dd5cf71df71dcd344140e02baaec9969000c0d665845e830fff7aeddf3111339b578c2
-  data.tar.gz: cc11bebd6832cdb82cacc31d5af01d8dc9123414ef5f2ed3c7c8e995a3e2005352444cd247c79de081f473d9c8fcde7758d7cbdfe156c2b909bcea2f78a24c6d
+  metadata.gz: ff01f56a0b3fad3363809e3e89eac38642990beed9650c72573636581b1f7f8aed2ccefc5c4e74118be402fe180aaf2bdd8f12bd32d03a99fb172afe6aa8293d
+  data.tar.gz: f35c78ca01d1280638622f04aa1520999f3fb6f8d2ea1fc3949890b8949d5e644025fc5da97393e68e08dd4076589c9f6271374b06e84ed1bdac7af4a14dbf60

data/README.md

@@ -51,13 +51,13 @@ Active Record Extended is essentially providing users with the other half of Pos
 
 ## Compatibility
 
-This package is designed align and work with any officially supported Ruby and Rails versions.
- - Minimum Ruby Version: 2.7.x **(EOL warning!)**
- - Minimum Rails Version: 5.2.x **(EOL warning!)**
- - Minimum Postgres Version: 11.x **(EOL warning!)**
- - Latest Ruby supported: 3.2.x
- - Latest Rails supported: 7.0.x
- - Postgres: 11-current(15) (probably works with most older versions to a certain point)
+This package is designed to align and work with any officially supported Ruby and Rails versions.
+ - Minimum Ruby Version: 3.1.x **(EOL warning!)**
+ - Minimum Rails Version: 6.1.x **(EOL warning!)**
+ - Minimum Postgres Version: 12.x **(EOL warning!)**
+ - Latest Ruby supported: 3.4.x
+ - Latest Rails supported: 8.0.x
+ - Postgres: 11-current(18) (probably works with most older versions to a certain point)
 
 ## Installation
 
@@ -560,7 +560,7 @@ As a means for taking complex  query logic and transform them into a single or m
 
 **Options:**
    - `as`: [Symbol or String] (defaults to `"results"`): What the column will be aliased to
-   - `value`: [Symbol or String] (defaults to `key` argument): How the response should handel the json value return
+   - `value`: [Symbol or String] (defaults to `key` argument): How the response should handle the json value return
 
 See the included example on [Row To JSON](#row-to-json) to see it in action.
 
@@ -606,7 +606,7 @@ There's an issue with providing a single union clause and chaining it with a dif
 This is due to requirements of grouping SQL statements. The issue is being working on, but with no ETA.
 
 This issue only applies to the first initial set of unions and is recommended that you union two relations right off the bat.
-Afterwords you can union/chain single relations.
+Afterwards you can union/chain single relations.
 
 Example
 

data/lib/active_record_extended/arel/nodes.rb

@@ -5,10 +5,6 @@ require "arel/nodes/function"
 
 module Arel
   module Nodes
-    unless ActiveRecordExtended::AR_VERSION_GTE_6_1
-      ["Contains", "Overlaps"].each { |binary_node_name| const_set(binary_node_name, Class.new(::Arel::Nodes::Binary)) }
-    end
-
     [
       "ContainsHStore",
       "ContainsArray",

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

@@ -8,29 +8,6 @@ module ActiveRecordExtended
       private
 
       # rubocop:disable Naming/MethodName
-
-      unless ActiveRecordExtended::AR_VERSION_GTE_6_1
-        def visit_Arel_Nodes_Overlaps(object, collector)
-          infix_value object, collector, " && "
-        end
-      end
-
-      unless ActiveRecordExtended::AR_VERSION_GTE_6_1
-        def visit_Arel_Nodes_Contains(object, collector)
-          left_column = object.left.relation.name.classify.constantize.columns.detect do |col|
-            matchable_column?(col, object)
-          end
-
-          if [:hstore, :jsonb].include?(left_column&.type)
-            visit_Arel_Nodes_ContainsHStore(object, collector)
-          elsif left_column.try(:array)
-            visit_Arel_Nodes_ContainsArray(object, collector)
-          else
-            visit_Arel_Nodes_Inet_Contains(object, collector)
-          end
-        end
-      end
-
       def visit_Arel_Nodes_ContainsArray(object, collector)
         infix_value object, collector, " @> "
       end

data/lib/active_record_extended/patch/array_handler_patch.rb

@@ -13,7 +13,7 @@ module ActiveRecordExtended
           return attribute.eq(value) if column.try(:array)
         end
 
-        super(attribute, value)
+        super
       end
     end
   end

data/lib/active_record_extended/query_methods/foster_select.rb

@@ -7,7 +7,7 @@ module ActiveRecordExtended
         include ActiveRecordExtended::Utilities::Support
         include ActiveRecordExtended::Utilities::OrderBy
 
-        AGGREGATE_ONE_LINERS = /^(exists|sum|max|min|avg|count|jsonb?_agg|(bit|bool)_(and|or)|xmlagg|array_agg)$/.freeze
+        AGGREGATE_ONE_LINERS = /^(exists|sum|max|min|avg|count|jsonb?_agg|(bit|bool)_(and|or)|xmlagg|array_agg)$/
 
         def initialize(scope)
           @scope = scope

data/lib/active_record_extended/query_methods/json.rb

@@ -263,7 +263,7 @@ module ActiveRecordExtended
       #   - as: [Symbol or String] (default="results"): What the column will be aliased to
       #
       #
-      #   - value: [Symbol or String] (defaults=[key]): How the response should handel the json value return
+      #   - value: [Symbol or String] (defaults=[key]): How the response should handle the json value return
       #
       # Example:
       #

data/lib/active_record_extended/query_methods/unionize.rb

@@ -3,8 +3,9 @@
 module ActiveRecordExtended
   module QueryMethods
     module Unionize
-      UNION_RELATION_METHODS = [:order_union, :reorder_union, :union_as].freeze
-      UNIONIZE_METHODS       = [:union, :union_all, :union_except, :union_intersect].freeze
+      UNION_RELATION_METHODS  = [:order_union, :reorder_union, :union_as].freeze
+      UNIONIZE_METHODS        = [:union, :union_all, :union_except, :union_intersect].freeze
+      DEFAULT_STORAGE_VALUE   = proc { [] }
 
       class UnionChain
         include ActiveRecordExtended::Utilities::Support
@@ -86,22 +87,24 @@ module ActiveRecordExtended
       end
 
       {
-        union_values:          Array,
-        union_operations:      Array,
-        union_ordering_values: Array,
-        unionized_name:        lambda { |klass| klass.arel_table.name }
+        union_values:          DEFAULT_STORAGE_VALUE,
+        union_operations:      DEFAULT_STORAGE_VALUE,
+        union_ordering_values: DEFAULT_STORAGE_VALUE,
+        unionized_name:        proc { arel_table.name }
       }.each_pair do |method_name, default|
         define_method(method_name) do
-          return unionize_storage[method_name] if send("#{method_name}?")
-
-          (default.is_a?(Proc) ? default.call(@klass) : default.new)
+          if send(:"#{method_name}?")
+            unionize_storage[method_name]
+          else
+            instance_eval(&default)
+          end
         end
 
-        define_method("#{method_name}?") do
+        define_method(:"#{method_name}?") do
           unionize_storage.key?(method_name) && !unionize_storage[method_name].presence.nil?
         end
 
-        define_method("#{method_name}=") do |value|
+        define_method(:"#{method_name}=") do |value|
           unionize_storage![method_name] = value
         end
       end
@@ -141,7 +144,7 @@ module ActiveRecordExtended
 
       protected
 
-      def build_unions(arel = @klass.arel_table)
+      def build_unions(arel)
         return unless union_values?
 
         union_nodes      = apply_union_ordering(build_union_nodes!)

data/lib/active_record_extended/query_methods/where_chain.rb

@@ -46,26 +46,7 @@ module ActiveRecordExtended
       #   # SELECT tags.* FROM tags INNER JOIN user on user.id = tags.user_id WHERE user.data @> { nickname: 'chainer' }
       #
       def contains(opts, *rest)
-        if ActiveRecordExtended::AR_VERSION_GTE_6_1
-          return substitute_comparisons(opts, rest, Arel::Nodes::Contains, "contains")
-        end
-
-        build_where_chain(opts, rest) do |arel|
-          case arel
-          when Arel::Nodes::In, Arel::Nodes::Equality
-            column = left_column(arel) || column_from_association(arel)
-
-            if [:hstore, :jsonb].include?(column.type)
-              Arel::Nodes::ContainsHStore.new(arel.left, arel.right)
-            elsif column.try(:array)
-              Arel::Nodes::ContainsArray.new(arel.left, arel.right)
-            else
-              raise ArgumentError.new("Invalid argument for .where.contains(), got #{arel.class}")
-            end
-          else
-            raise ArgumentError.new("Invalid argument for .where.contains(), got #{arel.class}")
-          end
-        end
+        substitute_comparisons(opts, rest, Arel::Nodes::Contains, "contains")
       end
 
       private
@@ -111,11 +92,7 @@ module ActiveRecordExtended
       end
 
       def build_where_clause_for(scope, opts, rest)
-        if ActiveRecordExtended::AR_VERSION_GTE_6_1
-          scope.send(:build_where_clause, opts, rest)
-        else
-          scope.send(:where_clause_factory).build(opts, rest)
-        end
+        scope.send(:build_where_clause, opts, rest)
       end
     end
   end

data/lib/active_record_extended/query_methods/with_cte.rb

@@ -44,7 +44,7 @@ module ActiveRecordExtended
         end
 
         # @param [Hash, WithCTE] value
-        def pipe_cte_with!(value)
+        def pipe_cte_with!(value) # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
           return if value.nil? || value.empty?
 
           value.each_pair do |name, expression|
@@ -54,6 +54,8 @@ module ActiveRecordExtended
             # Ensure we follow FIFO pattern.
             # If the parent has similar CTE alias keys, we want to favor the parent's expressions over its children's.
             if expression.is_a?(ActiveRecord::Relation) && expression.with_values?
+              expression.cte = expression.cte.dup if expression.cte
+
               # Add child's materialized keys to the parent
               @materialized_keys += expression.cte.materialized_keys
               @not_materialized_keys += expression.cte.not_materialized_keys
@@ -136,6 +138,11 @@ module ActiveRecordExtended
         !(cte.nil? || cte.empty?)
       end
 
+      # @return [Array<Hash>]
+      def with_values
+        with_values? ? [cte.with_values] : []
+      end
+
       # @param [Hash, WithCTE] values
       def with_values=(values)
         cte.with_values = values

data/lib/active_record_extended/utilities/support.rb

@@ -2,7 +2,7 @@
 
 module ActiveRecordExtended
   module Utilities
-    module Support
+    module Support # rubocop:disable Metrics/ModuleLength
       A_TO_Z_KEYS = ("a".."z").to_a.freeze
 
       # We need to ensure we can flatten nested ActiveRecord::Relations

data/lib/active_record_extended/version.rb

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

data/lib/active_record_extended.rb

@@ -2,6 +2,7 @@
 
 require "active_record_extended/version"
 
+require "logger"
 require "active_record"
 require "active_record/relation"
 require "active_record/relation/merger"
@@ -10,7 +11,7 @@ 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)
+  AR_VERSION_GTE_8_0 = Gem::Requirement.new(">= 8.0").satisfied_by?(ActiveRecord.gem_version)
 
   module Utilities
     extend ActiveSupport::Autoload

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: active_record_extended
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.4.0
 platform: ruby
 authors:
 - George Protacio-Karaszi
 - Dan McClain
 - Olivier El Mekki
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -21,7 +20,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +30,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -46,96 +45,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-sqlimit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.5
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.16'
 description: Adds extended functionality to Activerecord Postgres implementation
 email:
 - georgekaraszi@gmail.com
@@ -173,7 +82,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -181,15 +89,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Adds extended functionality to Activerecord Postgres implementation
 test_files: []