V1

.github/workflows/main.yml

@@ -1,27 +1,29 @@
-name: Ruby
+name: main
 
-on:
-  push:
-    branches:
-      - master
-
-  pull_request:
+on: [push, pull_request]
 
 jobs:
-  build:
+  tests:
+    name: Run tests for (${{ matrix.ruby }} / Rails ${{ matrix.rails }}
     runs-on: ubuntu-latest
-    name: Ruby ${{ matrix.ruby }}
     strategy:
+      fail-fast: false
       matrix:
-        ruby:
-          - '3.1.2'
-
+        ruby: [ "3.2", "3.3", "3.4" ]
+        rails: [ "7.0", "7.1", "7.2", "8.0" ]
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - name: Run the default task
-      run: bundle exec rake
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install gems
+        run: |
+          gem install bundler
+          bundle install
+          bundle update --bundler
+          bundle exec appraisal install --jobs 4 --retry 3
+      - name: Run test
+        env:
+          MATRIX_RAILS_VERSION: ${{ matrix.rails }}
+        run: bundle exec appraisal rails-${MATRIX_RAILS_VERSION} rake test

.gitignore

@@ -16,3 +16,4 @@ Gemfile.lock
 /.idea/
 /.gem_rbs_collection/
 rbs_collection.lock.yaml
+*.gemfile.lock

.standard.yml

@@ -1,3 +1,6 @@
 # For available configuration options, see:
 #   https://github.com/testdouble/standard
-ruby_version: 2.6
+ruby_version: 3.4
+ignore:
+  - "**/*":
+    - "Layout/LeadingCommentSpace"

Appraisals

@@ -0,0 +1,15 @@
+appraise "rails-7.0" do
+  gem "rails", "~> 7.0"
+end
+
+appraise "rails-7.1" do
+  gem "rails", "~> 7.1"
+end
+
+appraise "rails-7.2" do
+  gem "rails", "~> 7.2"
+end
+
+appraise "rails-8.0" do
+  gem "rails", "~> 8.0"
+end

CHANGELOG.md

@@ -1,5 +1,83 @@
 ## [Unreleased]
 
+
+## [1.0.0.rc1] - Unreleased
+
+### Breaking Changes
+
+Nearly everything has had changes. Porting will require some effort.
+
+- Quo now depends on `literal`, meaning attributes (options) to queries are typed and explicit
+- Composing query objects now allows you to compose query classes rather than just instances of query objects
+- `MergedQuery`, `EagerQuery` & `LoadedQuery` have been removed
+- `Query` is now an abstract base class for `RelationBackedQuery` and `CollectionBackedQuery`
+- The API of `Query` has been reduced/simplified significantly
+- `Query` classes only build queries, to actually execute/take actions on them you need to call `#results` and get a `Results` object
+- `preload`ing behaviour is now a separate concern from `Query` and is handled by `Preloadable` module.
+- Drop support for Ruby <= 3.1 and Rails < 7.0
+- Gem is now a Rails engine and relies on autoloading
+
+### Changed
+
+- Update docs, dependencies, and tests
+- Use appraisals for testing
+
+### Added
+
+- Helpers `stub_query` and `mock_query` for Minitest
+
+## [0.5.0] - 2022-12-23
+
+### Changed
+
+- Merged and Wrapped queries should not have factory methods as they are not meant to be constructed directly
+- Create new LoadedQuery which separates the concern of "preloaded" Query from EagerQuery which represents a query which is loaded and memoized
+
+## [0.4.0] - 2022-12-23
+
+### Changed
+
+- Some redundant nil checks (either safe navigation operator or conditionals) to make type check pass
+- Fix for type of transform method which takes optional index as second arg 
+- group_by can take a block
+- Change last and first methods to just take a limit value
+- Add new configuration options for page size limit and default and fix typing for enumerable
+- Rename Enumerator to Results and Query#enumerator to #results
+- Change EagerQuery initializer to take collection as positional param
+
+## [0.3.1] - 2022-12-22
+
+### Changed
+
+- Convenience methods on Query
+- Implement group_by on enumerator to transform values in resulting groups
+- Add WrappedQuery instead of Query taking a scope param
+- Change `initialize` method of MergedQuery
+
+## [0.3.0] - 2022-12-20
+
+### Changed
+
+- Make `joins` on compose a kwarg
+
+## [0.2.0] - 2022-12-20
+
+### Added
+
+- Railtie for rake task
+- Rake task which hackily looks for qo in the app and displays a list
+- Prepare to add RBS types
+
+### Changed
+
+- Gem deps
+- Query interface
+
+### Added
+
+- Test suite and dummy rails app
+- Add Enumerator
+
 ## [0.1.0] - 2022-11-18
 
 - Initial release

Gemfile

@@ -5,16 +5,18 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in quo.gemspec
 gemspec
 
+gem "rails", "~> 7.2"
+
 group :development, :test do
   gem "sqlite3"
 
-  gem "rails", ">= 6", "< 8"
-
   gem "rake", "~> 13.0"
 
   gem "minitest", "~> 5.0"
 
-  gem "standard", "~> 1.3"
+  gem "standard", require: false
+
+  gem "steep", require: false
 
-  gem "steep", "~> 1.2"
+  gem "rbs-inline", "~> 0.11.0", require: false
 end

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 Stephen Ierodiaconou
+Copyright (c) 2022-2024 Stephen Ierodiaconou
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal