eager_group 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3717871f8324a6ec0a0886745b12c17f7443398a8658bcb60ce008fa1e924df1
-  data.tar.gz: 0eccab385f9d6ec341ace42258672f663b03598ee164ef22b1b25fb7bf17779a
+  metadata.gz: bedabe6da7cfa46fbfbdecf1d2cc63a40f2d820fc5e9c65557a84d1ab4078495
+  data.tar.gz: 1f3e1ce3e020df317036605a553a046f13f17cc614f9e30425676157904de6bb
 SHA512:
-  metadata.gz: c1fb52a045e4f2005a78ef698ff915195e705a9729e1fb6a25275d2516c48e7f016d3249946d3a337b07b70a822f75c0ffe1f2acbb130c78a2d13df03107449b
-  data.tar.gz: 0a7393ea354afaaf1c1002c7641c3a4bd94e26b2407eea9b6cb701da243b67733c34d226711650964251aaa2f5d117db0d0e418e5702ebb4b75f59323c3b6c49
+  metadata.gz: c591075a2549089e129caf73981483963cf93685485e7bd6903a6e6f692da0264405025187ddcf7ab4fe19f347be5fa0d132108b43c72c3156391a44d936c014
+  data.tar.gz: b10afd48502166c90dfe32abad7456dce45041a9e3b9412335696e849f5fa0ebe4af85d2e2489ed227e506de06b644b8f0dabd0789f3af42b7c09210689fd414

data/.github/workflows/main.yml

@@ -1,18 +1,39 @@
-name: test
+name: CI
+
 on:
   push:
     branches:
       - main
+  pull_request:
+    branches:
+      - main
+
 jobs:
   test:
-    name: test
+    name: Ruby ${{ matrix.ruby }} / ${{ matrix.gemfile }}
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '3.2'
+          - '3.3'
+          - '3.4'
+          - '4.0'
+        gemfile:
+          - Gemfile.rails-7.0
+          - Gemfile.rails-7.1
+          - Gemfile.rails-7.2
+          - Gemfile.rails-8.0
+          - Gemfile.rails-8.1
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
     steps:
-     - uses: actions/checkout@v2
-     - name: Set up Ruby
-       uses: ruby/setup-ruby@v1
-       with:
-         ruby-version: 3.1
-         bundler-cache: true
-     - name: Run tests
-       run: bundle exec rspec
+      - uses: actions/checkout@v5
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rspec

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 /.yardoc
 /Gemfile.lock
+/Gemfile.*.lock
 /_yardoc/
 /coverage/
 /doc/
@@ -9,3 +10,4 @@
 /tmp/
 .idea
 .tool-versions
+.DS_Store

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Next Release
 
+## 0.11.0 (11/06/2026)
+
+* Drop Ruby 3.1 and Rails 4.x, 5.x, 6.x support
+* Support Ruby 3.2, 3.3, 3.4, 4.0 and Rails 7.x, 8.x
+* Replace Travis CI with GitHub Actions
+
 ## 0.10.0 (12/28/2022)
 
 * Add STI support, use `class_attribute` to prevent subclasses affect each other

data/Gemfile.rails-7.0

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'activerecord', '~> 7.0.0'
+gem 'sqlite3', '~> 1.4'

data/Gemfile.rails-7.1

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'activerecord', '~> 7.1.0'
+gem 'sqlite3', '~> 1.4'

data/Gemfile.rails-7.2

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'activerecord', '~> 7.2.0'
+gem 'sqlite3'

data/Gemfile.rails-8.0

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'activerecord', '~> 8.0.0'
+gem 'sqlite3'

data/Gemfile.rails-8.1

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec
+
+gem 'activerecord', '~> 8.1.0'
+gem 'sqlite3'

data/README.md

@@ -1,6 +1,6 @@
 # EagerGroup
 
-[![Build Status](https://secure.travis-ci.org/flyerhzm/eager_group.png)](http://travis-ci.org/flyerhzm/eager_group)
+[![CI](https://github.com/flyerhzm/eager_group/actions/workflows/main.yml/badge.svg)](https://github.com/flyerhzm/eager_group/actions/workflows/main.yml)
 [![AwesomeCode Status for
 flyerhzm/eager_group](https://awesomecode.io/projects/e5386790-9420-4003-831a-c9a8c8a48108/status)](https://awesomecode.io/repos/flyerhzm/eager_group)
 
@@ -38,7 +38,7 @@ SELECT "posts".* FROM "posts";
 SELECT AVG("comments"."rating") AS average_comments_rating, post_id AS post_id FROM "comments" WHERE "comments"."post_id" IN (1, 2, 3) GROUP BY post_id;
 ```
 
-It supports Rails 4.x, Rails 5.x and Rails 6.x
+It supports Ruby 3.2, 3.3, 3.4 and 4.0, and Rails 7.x and 8.x
 
 ## Installation
 
@@ -70,7 +70,7 @@ class Post < ActiveRecord::Base
   has_many :comments
 
   define_eager_group :comments_average_rating, :comments, :average, :rating
-  define_eager_group :approved_comments_count, :comments, :count, :*, -> { approved }
+  define_eager_group :approved_comments_count, :comments, :count, :all, -> { approved }
 end
 
 class Comment < ActiveRecord::Base
@@ -90,7 +90,8 @@ result.
 `count`, `maximum`, `minimum`, `sum`, I define 2 additional aggregate
 function `first_object` and `last_object` to eager load first and last
 association objects.
-* `column_name`, aggregate column name, it can be `:*` for `count`
+* `column_name`, aggregate column name, it can be `:all` (from rails 8) or
+`:*` for `count`.
 * `scope`, scope is optional, it's used to filter data for aggregation.
 
 Then you can use `eager_group` to fix n+1 aggregate sql functions

data/eager_group.gemspec

@@ -16,17 +16,20 @@ Gem::Specification.new do |spec|
 
   spec.license = 'MIT'
 
+  spec.required_ruby_version = '>= 3.2.0'
+
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'activerecord'
+  spec.add_dependency 'activerecord', '>= 7.0', '< 9.0'
+
   spec.add_development_dependency 'activerecord-import'
   spec.add_development_dependency 'activesupport'
   spec.add_development_dependency 'benchmark-ips'
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.3'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'pry'

data/lib/eager_group/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EagerGroup
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: eager_group
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Richard Huang
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +15,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +91,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -146,9 +151,13 @@ files:
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.rails-7.0
+- Gemfile.rails-7.1
+- Gemfile.rails-7.2
+- Gemfile.rails-8.0
+- Gemfile.rails-8.1
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -170,7 +179,6 @@ homepage: https://github.com/flyerhzm/eager_group
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -178,15 +186,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key:
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Fix n+1 aggregate sql functions
 test_files: []

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-rvm:
-  - 2.3.0
-env:
-  - DB=sqlite
-script: bundle exec rspec spec