arel-extensions 7.0.3 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1a0a2f6ac5e4a3956f46fea9d82cf3771b71d73bef922c3c2cc84a2614684b7
-  data.tar.gz: bb688aea1ed1c5a146e0953a008024b43e6028b2e56e0717dd3573be97518f15
+  metadata.gz: d05a268b8339c9e578ab4f853d761b01f0722b639e1a87470a1aa4e26bb93772
+  data.tar.gz: b1372b85e0b46bb2513dba252fc7eb6ea972a591b08369bbc1f1640d0136d3ee
 SHA512:
-  metadata.gz: b583428d45935c98ef0e3e7af8307b2367f5d382abd6c522d253e9d9692ba0d564853f7d364394536a59df6a3c946f78241608b4859a1c130079961e5707603f
-  data.tar.gz: 6d1dae094b8956f5b3a0518c4bed1a0fc4a4c46763b5f5bded4ad6ee7cfc79b2ad8dabf7062adc11b40d86d90be20cd48615cc6f31b957155734dc0efdac0123
+  metadata.gz: a5f680f90f52892b29d03c25ae9ed26e4c5cf783e27aadd196852e659bc3215fb8f9dabf55edef7ce9b588957e4a295a4353ea274c57b9955c78f7fb8f584f61
+  data.tar.gz: e8e099b793021a12289c2965d426bc9e561d3cc31b1f341e217d2670f40ac6918d452d253bbd2a9413e4ffdc1d8d0d30b5e31595e641504b51c1d92b55ef1214

data/.github/workflows/ci.yml

@@ -7,10 +7,14 @@ jobs:
     name: Arel::Extensions Test
     runs-on: ubuntu-22.04
     strategy:
+      fail-fast: false
       matrix:
-        rails: ['7.0.8.4', '7.1.4', '7.2.1']
-        ruby-version: ['3.1', '3.2', '3.3']
-        postgres-version: ['15']
+        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'
 
     steps:
       - name: Install Postgresql
@@ -35,16 +39,21 @@ jobs:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: false # runs 'bundle install' and caches installed gems automatically
 
-      - name: Test Geos
+      - name: Fix activerecord-postgis-adapter
+        if: ${{ matrix.rails == '8.0.1' }}
         run: |
-          bundle exec ruby -e "require 'rgeo'; puts RGeo::Geos.capi_supported?; puts RGeo::Geos::CAPIGeometryMethods"
+          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
           rm -f Gemfile.lock
           bundle
 
-      - run: bundle exec rake test
+      - name: Test Geos
+        run: |
+          bundle exec ruby -e "require 'rgeo'; puts RGeo::Geos.capi_supported?; puts RGeo::Geos::CAPIGeometryMethods"
+
+      - run: bundle exec rake test --trace
 
   ar-postgresql:
     name: ActiveRecord PostgresQL Test
@@ -52,9 +61,9 @@ jobs:
 
     strategy:
       matrix:
-        rails: ['v7.0.8.4', 'v7.1.4']
+        rails: ['7.1.5.1', '7.2.2.1', '8.0.1']
         ruby-version: ['3.3']
-        postgres-version: ['15']
+        postgres-version: ['17']
 
     steps:
       - name: Install Postgresql
@@ -80,7 +89,7 @@ jobs:
 
       - name: Download Rails
         run: |
-          git clone --branch ${{ matrix.rails }} https://github.com/rails/rails.git ~/rails
+          git clone --branch v${{ matrix.rails }} 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
@@ -95,8 +104,8 @@ jobs:
 
       - run: |
           pushd ~/rails/activerecord
-          bundle exec rake db:postgresql:rebuild postgresql:test
-          bundle exec rake db:postgresql:rebuild postgresql:isolated_test
+          bundle exec rake db:postgresql:rebuild postgresql:test --trace
+          bundle exec rake db:postgresql:rebuild postgresql:isolated_test --trace
           
   ar-sqlite:
     name: ActiveRecord SQLite Test
@@ -104,8 +113,9 @@ jobs:
 
     strategy:
       matrix:
-        rails: ['v7.0.8.4', 'v7.1.4']
+        rails: ['7.1.5.1', '7.2.2.1', '8.0.1']
         ruby-version: ['3.3']
+        postgres-version: ['17']
 
     steps:
       - uses: actions/checkout@v4
@@ -117,7 +127,7 @@ jobs:
 
       - name: Download Rails
         run: |
-          git clone --branch ${{ matrix.rails }} https://github.com/rails/rails.git ~/rails
+          git clone --branch v${{ matrix.rails }} 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
@@ -132,11 +142,11 @@ jobs:
 
       - run: |
           pushd ~/rails/activerecord
-          bundle exec rake sqlite3:test
+          bundle exec rake sqlite3:test --trace
           rm test/db/*.sqlite3 test/fixtures/*.sqlite3
-          bundle exec rake sqlite3:isolated_test
+          bundle exec rake sqlite3:isolated_test --trace
           rm test/db/*.sqlite3 test/fixtures/*.sqlite3
-          bundle exec rake sqlite3_mem:test
+          bundle exec rake sqlite3_mem:test --trace
         
   ar-mysql:
     name: ActiveRecord MySQL Test
@@ -145,8 +155,9 @@ jobs:
 
     strategy:
       matrix:
-        rails: ['v7.0.8.4', 'v7.1.4']
+        rails: ['7.1.5.1', '7.2.2.1', '8.0.1']
         ruby-version: ['3.3']
+        postgres-version: ['17']
 
     steps:
       - name: Install MySQL
@@ -164,7 +175,7 @@ jobs:
 
       - name: Download Rails
         run: |
-          git clone --branch ${{ matrix.rails }} https://github.com/rails/rails.git ~/rails
+          git clone --branch v${{ matrix.rails }} 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
@@ -179,5 +190,5 @@ jobs:
 
       - run: |
           pushd ~/rails/activerecord
-          bundle exec rake db:mysql:rebuild mysql2:test
-          bundle exec rake db:mysql:rebuild mysql2:isolated_test
+          bundle exec rake db:mysql:rebuild mysql2:test --trace
+          bundle exec rake db:mysql:rebuild mysql2:isolated_test --trace

data/Gemfile

@@ -1,4 +1,5 @@
 source "https://rubygems.org"
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 # Specify your gem's dependencies in sunstone.gemspec
 gemspec

data/Rakefile

@@ -8,7 +8,7 @@ require "rake/testtask"
 # Test Task
 Rake::TestTask.new do |t|
     t.libs << 'lib' << 'test'
-    t.test_files = FileList['test/**/*_test.rb']
+    t.test_files = FileList[ARGV[1] ? ARGV[1] : 'test/**/*_test.rb']
     # t.warning = true
     # t.verbose = true
 end

data/arel-extensions.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'activerecord', '>= 7.0.0', '< 7.2'
+  gem.add_dependency 'activerecord', '>= 7.0.0', '< 9.0'
 
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "debug"
@@ -24,6 +24,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "webmock"
   gem.add_development_dependency 'pg'
   gem.add_development_dependency 'rgeo'
-  gem.add_development_dependency "activerecord-postgis-adapter"
+  gem.add_development_dependency "activerecord-postgis-adapter", '>= 8.0'
 
 end

data/lib/active_record/query_methods.rb

@@ -24,10 +24,18 @@ module ActiveRecord::QueryMethods
   end
   alias uniq_on! distinct_on!
 
-  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
+  if ActiveRecord >= "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?
+      arel
+    end
+  else
+    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
   end
   alias_method :build_arel_without_distinct_on, :build_arel
   alias_method :build_arel, :build_arel_with_distinct_on

data/lib/arel/extensions/version.rb

@@ -1,5 +1,5 @@
 module Arel
   module Extensions
-    VERSION = '7.0.3'
+    VERSION = '8.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arel-extensions
 version: !ruby/object:Gem::Version
-  version: 7.0.3
+  version: 8.0.0
 platform: ruby
 authors:
 - Jon Bracy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-09 00:00:00.000000000 Z
+date: 2025-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 7.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -162,14 +162,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '8.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '8.0'
 description:
 email:
 - jonbracy@gmail.com
@@ -242,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.21
 signing_key:
 specification_version: 4
 summary: Adds support for missing SQL operators and functions to Arel