arel-extensions 8.0.1 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 864929650ef61e3f9365767b052b403ec511d8102654e2890e9fd6b97492352a
-  data.tar.gz: e35c7b6b0a262623b3368f1517363d84c71fd7b91cc0327cc730b41d3f50dbe8
+  metadata.gz: 26af903829c4fe9d8b881fcd316d09a03f9253af796ab813523d6c074e7fc3fe
+  data.tar.gz: 4c8ff81dc39a82b8dabd1fe792b18c43e9d683bc5f8ede192932fda4d0864667
 SHA512:
-  metadata.gz: 7db5423c6f8ee72c58d6a351a6ac4c8e633c2358762aa797698cc6c3f7710acf520a08c8a1fff5645ab8dfe0f5cadb13edbb115e76cb9c7d394fde8ed0d987fa
-  data.tar.gz: 30230816dbd511c6631e63908a242792d88f793fc45e5678465f2f9b6f0ba670d563563e0402590e5805fcf5a5cd04d8ed0057a4f91d75df934cbc3a79a91398
+  metadata.gz: 9a596cde6baa6b9b54fe900786dd63980da37bbe10408ca09ed9bf7a1df3ddb23de11d79e64f75634120e93e134dd739f36872131e13cba2fc1bb90eaa064deb
+  data.tar.gz: 53b6e4cd418d977fb825e1f9753b117bf5b64644dc29be64c530f9f15f44f158aa16f4dc0acd0a39a78eea7856ebf0ec27aa3b65cb7f5b83e09c9e93398e899d

data/.github/workflows/ci.yml

@@ -5,16 +5,21 @@ on: [push, pull_request]
 jobs:
   sunstone:
     name: Arel::Extensions Test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
-        rails: ['7.1.5.1', '7.2.2.1', '8.0.1']
-        ruby-version: ['3.1', '3.2', '3.3', '3.4']
-        postgres-version: ['17']
-        exclude:
-          - rails: '8.0.1'
-            ruby-version: '3.1'
+        rails-version:
+          - 7.1.6
+          - 7.2.3
+          - 8.0.4
+          - 8.1.1
+        ruby-version:
+          - 3.3
+          - 3.4
+          - 4.0.0-preview2
+        postgres-version:
+          - 17
 
     steps:
       - name: Install Postgresql
@@ -39,15 +44,10 @@ jobs:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: false # runs 'bundle install' and caches installed gems automatically
 
-      - name: Fix activerecord-postgis-adapter
-        if: ${{ matrix.rails == '8.0.1' }}
-        run: |
-          echo "gem 'activerecord-postgis-adapter', github: 'rgeo/activerecord-postgis-adapter', branch: 'rails8'" >> Gemfile
-
       - run: |
-          sed -i -e "s/gem.add_dependency 'activerecord', '>= [[:digit:]]\+.[[:digit:]]\+.[[:digit:]]\+'/gem.add_dependency 'activerecord', '${{ matrix.rails }}'/" arel-extensions.gemspec
+          sed -i -e "s/gem.add_dependency 'activerecord', '>= [[:digit:]]\+.[[:digit:]]\+.[[:digit:]]\+'/gem.add_dependency 'activerecord', '${{ matrix.rails-version }}'/" arel-extensions.gemspec
           rm -f Gemfile.lock
-          bundle
+          bundle install --jobs=3 --retry=3
 
       - name: Test Geos
         run: |
@@ -57,13 +57,23 @@ jobs:
 
   ar-postgresql:
     name: ActiveRecord PostgresQL Test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     strategy:
+      fail-fast: false
       matrix:
-        rails: ['7.1.5.1', '7.2.2.1', '8.0.1']
-        ruby-version: ['3.3']
-        postgres-version: ['17']
+        rails-version:
+          - 7.2.3
+          - 8.0.4
+          - 8.1.1
+        ruby-version:
+          - 3.4
+        postgres-version:
+          - 17
+        include:
+          - rails-version: '7.1.6'
+            ruby-version: '3.3'
+            postgres-version: '17'
 
     steps:
       - name: Install Postgresql
@@ -89,19 +99,34 @@ jobs:
 
       - name: Download Rails
         run: |
-          git clone --branch v${{ matrix.rails }} https://github.com/rails/rails.git ~/rails
+          git clone --branch v${{ matrix.rails-version }} https://github.com/rails/rails.git ~/rails
           pushd ~/rails
           cat /home/runner/work/_temp/*.sh
           sed -i "s/Gem.ruby, '-w'/Gem.ruby, '-w0'/" ~/rails/activerecord/Rakefile
           sed -i "s/t.warning = true/t.warning = false/g" ~/rails/activerecord/Rakefile
-          sed -i "/require 'support\/connection'/a \$LOAD_PATH.unshift\(File.expand_path\(ENV['GITHUB_WORKSPACE']\)\)\nrequire 'arel/extensions'" ~/rails/activerecord/test/cases/helper.rb
+          sed -i "/require \"active_record\"/a \$LOAD_PATH.unshift\(File.expand_path\(ENV['GITHUB_WORKSPACE']\)\)\nrequire 'arel/extensions'" ~/rails/activerecord/test/cases/helper.rb
           rm ~/rails/Gemfile.lock
           sed -i "/# Active Record./a gem 'arel-extensions', require: 'arel/extensions', path: File.expand_path\(ENV['GITHUB_WORKSPACE']\)" ~/rails/Gemfile
           echo "gem 'ostruct'" >> ~/rails/Gemfile
           sed -i "s/# frozen_string_literal: true/# frozen_string_literal: true\nrequire 'ostruct'/" ~/rails/activerecord/test/cases/encryption/configurable_test.rb
           cat ~/rails/Gemfile
-          bundle update --jobs=3 --retry=3
 
+      - name: This can eventually be removed
+        run: |
+          sed -i 's/gem "minitest"$/gem "minitest"\ngem "minitest-mock", require: "minitest\/mock"/' ~/rails/Gemfile
+          sed -i 's/module ActiveRecord$/module Rails\nend\nmodule ActiveRecord/' ~/rails/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb || true
+          sed -i 's/t.options = "--profile" if ENV\["CI"\]//g' ~/rails/activerecord/Rakefile
+
+      - name: Fix Weird Test Cases
+        run: |
+          sed -i 's|} - \[:|} - \[:distinct_on, :uniq_on, :|' ~/rails/activerecord/test/cases/relation/delegation_test.rb
+
+      - name: Bundle
+        run: |
+          pushd ~/rails
+          bundle update --jobs=3 --retry=3
+          popd
+          
       - run: |
           pushd ~/rails/activerecord
           bundle exec rake db:postgresql:rebuild postgresql:test --trace
@@ -109,13 +134,20 @@ jobs:
           
   ar-sqlite:
     name: ActiveRecord SQLite Test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     strategy:
+      fail-fast: false
       matrix:
-        rails: ['7.1.5.1', '7.2.2.1', '8.0.1']
-        ruby-version: ['3.3']
-        postgres-version: ['17']
+        rails-version:
+          - 7.2.3
+          - 8.0.4
+          - 8.1.1
+        ruby-version:
+          - 3.4
+        include:
+          - rails-version: '7.1.6'
+            ruby-version: '3.3'
 
     steps:
       - uses: actions/checkout@v4
@@ -127,18 +159,36 @@ jobs:
 
       - name: Download Rails
         run: |
-          git clone --branch v${{ matrix.rails }} https://github.com/rails/rails.git ~/rails
+          git clone --branch v${{ matrix.rails-version }} https://github.com/rails/rails.git ~/rails
           pushd ~/rails
           cat /home/runner/work/_temp/*.sh
           sed -i "s/Gem.ruby, '-w'/Gem.ruby, '-w0'/" ~/rails/activerecord/Rakefile
           sed -i "s/t.warning = true/t.warning = false/g" ~/rails/activerecord/Rakefile
-          sed -i "/require 'support\/connection'/a \$LOAD_PATH.unshift\(File.expand_path\(ENV['GITHUB_WORKSPACE']\)\)\nrequire 'arel/extensions'" ~/rails/activerecord/test/cases/helper.rb
+          sed -i "/require \"active_record\"/a \$LOAD_PATH.unshift\(File.expand_path\(ENV['GITHUB_WORKSPACE']\)\)\nrequire 'arel/extensions'" ~/rails/activerecord/test/cases/helper.rb
           rm ~/rails/Gemfile.lock
           sed -i "/# Active Record./a gem 'arel-extensions', require: 'arel/extensions', path: File.expand_path\(ENV['GITHUB_WORKSPACE']\)" ~/rails/Gemfile
           echo "gem 'ostruct'" >> ~/rails/Gemfile
           sed -i "s/# frozen_string_literal: true/# frozen_string_literal: true\nrequire 'ostruct'/" ~/rails/activerecord/test/cases/encryption/configurable_test.rb
           cat ~/rails/Gemfile
+
+      - name: This can eventually be removed
+        run: |
+          sed -i 's/gem "minitest"$/gem "minitest"\ngem "minitest-mock", require: "minitest\/mock"/' ~/rails/Gemfile
+          cat ~/rails/Gemfile
+          sed -i 's/module ActiveRecord$/module Rails\nend\nmodule ActiveRecord/' ~/rails/activerecord/test/cases/adapters/sqlite3/dbconsole_test.rb
+          cat  ~/rails/activerecord/test/cases/adapters/sqlite3/dbconsole_test.rb
+          sed -i 's/t.options = "--profile" if ENV\["CI"\]//g' ~/rails/activerecord/Rakefile
+          cat ~/rails/activerecord/Rakefile
+
+      - name: Fix Weird Test Cases
+        run: |
+          sed -i 's|} - \[:|} - \[:distinct_on, :uniq_on, :|' ~/rails/activerecord/test/cases/relation/delegation_test.rb
+
+      - name: Bundle
+        run: |
+          pushd ~/rails
           bundle update --jobs=3 --retry=3
+          popd
 
       - run: |
           pushd ~/rails/activerecord
@@ -150,14 +200,20 @@ jobs:
         
   ar-mysql:
     name: ActiveRecord MySQL Test
-    runs-on: ubuntu-22.04
-
+    runs-on: ubuntu-24.04
 
     strategy:
+      fail-fast: false
       matrix:
-        rails: ['7.1.5.1', '7.2.2.1', '8.0.1']
-        ruby-version: ['3.3']
-        postgres-version: ['17']
+        rails-version:
+          - 7.2.3
+          - 8.0.4
+          - 8.1.1
+        ruby-version:
+          - 3.4
+        include:
+          - rails-version: '7.1.6'
+            ruby-version: '3.3'
 
     steps:
       - name: Install MySQL
@@ -175,18 +231,35 @@ jobs:
 
       - name: Download Rails
         run: |
-          git clone --branch v${{ matrix.rails }} https://github.com/rails/rails.git ~/rails
+          git clone --branch v${{ matrix.rails-version }} https://github.com/rails/rails.git ~/rails
           pushd ~/rails
           cat /home/runner/work/_temp/*.sh
           sed -i "s/Gem.ruby, '-w'/Gem.ruby, '-w0'/" ~/rails/activerecord/Rakefile
           sed -i "s/t.warning = true/t.warning = false/g" ~/rails/activerecord/Rakefile
-          sed -i "/require 'support\/connection'/a \$LOAD_PATH.unshift\(File.expand_path\(ENV['GITHUB_WORKSPACE']\)\)\nrequire 'arel/extensions'" ~/rails/activerecord/test/cases/helper.rb
+          sed -i "/require \"active_record\"/a \$LOAD_PATH.unshift\(File.expand_path\(ENV['GITHUB_WORKSPACE']\)\)\nrequire 'arel/extensions'" ~/rails/activerecord/test/cases/helper.rb
           rm ~/rails/Gemfile.lock
           sed -i "/# Active Record./a gem 'arel-extensions', require: 'arel/extensions', path: File.expand_path\(ENV['GITHUB_WORKSPACE']\)" ~/rails/Gemfile
           echo "gem 'ostruct'" >> ~/rails/Gemfile
           sed -i "s/# frozen_string_literal: true/# frozen_string_literal: true\nrequire 'ostruct'/" ~/rails/activerecord/test/cases/encryption/configurable_test.rb
           cat ~/rails/Gemfile
+
+      - name: This can eventually be removed
+        run: |
+          sed -i 's/gem "minitest"$/gem "minitest"\ngem "minitest-mock", require: "minitest\/mock"/' ~/rails/Gemfile
+          sed -i 's/class WarningsTest < ActiveRecord::AbstractMysqlTestCase$/module Rails\nend\nclass WarningsTest < ActiveRecord::AbstractMysqlTestCase/' ~/rails/activerecord/test/cases/adapters/abstract_mysql_adapter/warnings_test.rb || true
+          sed -i 's/class Mysql2AdapterTest < ActiveRecord::Mysql2TestCase$/module Rails\nend\nclass Mysql2AdapterTest < ActiveRecord::Mysql2TestCase/' ~/rails/activerecord/test/cases/adapters/mysql2/mysql2_adapter_test.rb || true
+          sed -i 's/t.options = "--profile" if ENV\["CI"\]//g' ~/rails/activerecord/Rakefile
+          cat ~/rails/activerecord/Rakefile
+
+      - name: Fix Weird Test Cases
+        run: |
+          sed -i 's|} - \[:|} - \[:distinct_on, :uniq_on, :|' ~/rails/activerecord/test/cases/relation/delegation_test.rb
+
+      - name: Bundle
+        run: |
+          pushd ~/rails
           bundle update --jobs=3 --retry=3
+          popd
 
       - run: |
           pushd ~/rails/activerecord

data/ext/arel/nodes/ascending.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Nodes
     class Ascending < Ordering

data/ext/arel/nodes/descending.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Nodes
     class Descending < Ordering

data/ext/arel/order_predications.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Ordering with :nulls_last, :nulls_first options
 module Arel
   module OrderPredications

data/lib/active_record/query_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record'
 require 'active_record/relation'
 require 'active_record/querying'
@@ -24,7 +26,15 @@ module ActiveRecord::QueryMethods
   end
   alias uniq_on! distinct_on!
 
-  if ActiveRecord.version >= "7.2"
+  private
+
+  if ActiveRecord.version >= "8.1"
+    def build_arel_with_distinct_on(aliases = nil)
+      arel = build_arel_without_distinct_on(aliases)
+      arel.distinct_on(self.distinct_on_values) if !self.distinct_on_values.empty?
+      arel
+    end
+  elsif ActiveRecord.version >= "7.2"
     def build_arel_with_distinct_on(connection, aliases = nil)
       arel = build_arel_without_distinct_on(connection, aliases)
       arel.distinct_on(self.distinct_on_values) if !self.distinct_on_values.empty?

data/lib/arel/array_predications.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module ArrayPredications
 

data/lib/arel/attributes/cast.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Attributes
     class Cast < Attribute

data/lib/arel/attributes/key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Attributes
     class Key < Attribute

data/lib/arel/extensions/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Arel
   module Extensions
-    VERSION = '8.0.1'
+    VERSION = '8.1.0'
   end
 end

data/lib/arel/extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "arel"
 require File.expand_path('../nodes/binary_value', __FILE__)
 require File.expand_path('../nodes/hex_encoded_binary_value', __FILE__)

data/lib/arel/gis_predications.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module GISPredications
 

data/lib/arel/json_predications.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module JSONPredications
     

data/lib/arel/nodes/binary_value.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Nodes
     class BinaryValue < Arel::Nodes::Unary

data/lib/arel/nodes/contained_by.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Nodes
     class ContainedBy < InfixOperation

data/lib/arel/nodes/excludes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Nodes
     class Excludes < Binary

data/lib/arel/nodes/geometry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Nodes
     class Geometry < Arel::Nodes::Unary

data/lib/arel/nodes/has_any_key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Nodes
     class HasAnyKey < Binary

data/lib/arel/nodes/has_key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Nodes
     class HasKey < Binary

data/lib/arel/nodes/has_keys.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Nodes
     class HasKeys < Binary

data/lib/arel/nodes/hex_encoded_binary_value.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Nodes
     class HexEncodedBinaryValue < Arel::Nodes::Unary

data/lib/arel/nodes/intersects.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Nodes
     class Intersects < Binary

data/lib/arel/nodes/random.rb

@@ -1,7 +1,18 @@
+# frozen_string_literal: true
+
 module Arel
   module Nodes
     class RandomOrdering < Arel::Nodes::Node
 
+      def hash
+        self.class.hash
+      end
+
+      def eql? other
+        self.class == other.class
+      end
+      alias :== :eql?
+
     end
   end
 end

data/lib/arel/nodes/relation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Attributes
     class Relation < Attribute

data/lib/arel/nodes/ts_match.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Nodes
     class TSMatch < Binary

data/lib/arel/nodes/ts_query.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Nodes
     class TSQuery < Arel::Nodes::Node
@@ -9,6 +11,17 @@ module Arel
         @language = Arel::Nodes.build_quoted(language) if language
       end
 
+      def hash
+        [@expression, @language].hash
+      end
+
+      def eql? other
+        self.class == other.class &&
+        self.expression == other.expression &&
+        self.language == other.language
+      end
+      alias :== :eql?
+
     end
   end
 end

data/lib/arel/nodes/ts_rank.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Nodes
     class TSRank < Arel::Nodes::Node
@@ -9,6 +11,17 @@ module Arel
         @tsquery = tsquery
       end
 
+      def hash
+        [@tsvector, @tsquery].hash
+      end
+
+      def eql? other
+        self.class == other.class &&
+        self.tsvector == other.tsvector &&
+        self.tsquery == other.tsquery
+      end
+      alias :== :eql?
+
     end
   end
 end

data/lib/arel/nodes/ts_rank_cd.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Nodes
     class TSRankCD < Arel::Nodes::Node
@@ -10,6 +12,18 @@ module Arel
         @normalization = normalization
       end
 
+      def hash
+        [@tsvector, @tsquery, @normalization].hash
+      end
+
+      def eql? other
+        self.class == other.class &&
+        self.tsvector == other.tsvector &&
+        self.tsquery == other.tsquery &&
+        self.normalization == other.normalization
+      end
+      alias :== :eql?
+
     end
   end
 end

data/lib/arel/nodes/ts_vector.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Nodes
     class TSVector < Arel::Nodes::Node
@@ -8,7 +10,17 @@ module Arel
         @attribute = attribute
         @language = Arel::Nodes.build_quoted(language) if language
       end
-      
+
+      def hash
+        [@attribute, @language].hash
+      end
+
+      def eql? other
+        self.class == other.class &&
+        self.attribute == other.attribute &&
+        self.language == other.language
+      end
+      alias :== :eql?
     end
   end
 end

data/lib/arel/nodes/within.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Nodes
     class Within < Binary

data/lib/arel/ts_predications.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module TSPredications
     

data/lib/arel/visitors/postgresql_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Visitors
     class PostgreSQL

data/lib/arel/visitors/sunstone_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Visitors
     class Sunstone

data/lib/arel/visitors/to_sql_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Arel
   module Visitors
     class ToSql

data/test/test_helper.rb

@@ -11,7 +11,6 @@ $LOAD_PATH << File.expand_path('../lib', __FILE__)
 require 'rgeo'
 require 'debug'
 require "minitest/autorun"
-require 'minitest/unit'
 require 'minitest/reporters'
 require 'webmock/minitest'
 # require 'mocha/minitest'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: arel-extensions
 version: !ruby/object:Gem::Version
-  version: 8.0.1
+  version: 8.1.0
 platform: ruby
 authors:
 - Jon Bracy
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -170,7 +169,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '8.0'
-description:
 email:
 - jonbracy@gmail.com
 executables: []
@@ -227,7 +225,6 @@ homepage: https://github.com/malomalo/arel-extensions
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -242,8 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.21
-signing_key:
+rubygems_version: 4.0.2
 specification_version: 4
 summary: Adds support for missing SQL operators and functions to Arel
 test_files: