inquery 1.0.9 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90b7d62f5ccf00b1ddd813840b80e2bf702d50ae5523a19714130c0c6a3ad570
-  data.tar.gz: 9e45803cfbf729c3d8b1cdc8edbe94b02be8c1d3a700dbd64f8fdeb004884974
+  metadata.gz: 1196c966133abae58b4ba672eebc7fadf0852f4de0ff879673322bf6bfb4a285
+  data.tar.gz: 534d1e42f4df591e5cdb1e5e5995c8a3479f1afe03d6bb45d03773ad29c0838f
 SHA512:
-  metadata.gz: c6c71a8976c53fc140110fb6a74f3d5aafe680feedbd92622f39323a0042accd82214229e46b6e6e97e52ee78b1e6d07b660641cd0288010c950bc5d8c9879d7
-  data.tar.gz: 6832e0f4bc345cf8262a64f063d4d4c4d8a0d82922c635130e383720e08ca9b3ca60afada6baa9ba87f72aaf7693eacc57c8b018409252c6cabb0f82b94b6576
+  metadata.gz: 31c7638d4a5eb7b32df879028bd01ee612254b1c34ffd2851be7851a5bb72488851748eba904ce6c7967e70e98ba4a85729960a00addd093ea622cdf96f3df30
+  data.tar.gz: 0fbe2057d13400d67546ee5722eb85b5e04cc794552c85043d3e939bc89cbd55eff247f8c4b28d681297d2e1305be32da61fc47d1c811868822cf2c36e9759ac

data/.github/workflows/rubocop.yml

@@ -0,0 +1,17 @@
+name: Rubocop check
+on: push
+
+jobs:
+  verify:
+    name: Test
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0.1
+          bundler-cache: true
+      - name: Run rubocop
+        run: bundle exec rubocop

data/.github/workflows/ruby.yml

@@ -0,0 +1,53 @@
+name: Unit tests
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - rails-version: '5.1'
+            ruby-version: '2.5.1'
+          - rails-version: '5.2'
+            ruby-version: '2.5.1'
+          - rails-version: '5.2'
+            ruby-version: '2.6.2'
+          - rails-version: '6.0'
+            ruby-version: '2.5.1'
+          - rails-version: '6.0'
+            ruby-version: '2.6.2'
+          - rails-version: '6.0'
+            ruby-version: '2.7.1'
+          - rails-version: '6.1'
+            ruby-version: '2.5.1'
+          - rails-version: '6.1'
+            ruby-version: '2.6.2'
+          - rails-version: '6.1'
+            ruby-version: '2.7.1'
+          - rails-version: '6.1'
+            ruby-version: '3.0.1'
+          - rails-version: '7.0'
+            ruby-version: '2.7.1'
+          - rails-version: '7.0'
+            ruby-version: '3.0.1'
+          - rails-version: '7.0'
+            ruby-version: '3.1.0'
+    name: Test against Ruby ${{ matrix.ruby-version }} / Rails ${{ matrix.rails-version }}
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails-version }}.gemfile
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true
+    - name: Run rake tests
+      run: bundle exec rake test

data/.gitignore

@@ -13,4 +13,5 @@ tmtags
 /spec/reports
 /.yardoc
 .idea
-/*.gem
+/*.gem
+/gemfiles/*.lock

data/.releaser_config

@@ -2,4 +2,3 @@ version_file: VERSION
 always_from_master: true
 yard_path: doc
 gem_style: github
-ruby_command: ruby -S

data/.rubocop.yml

@@ -5,6 +5,7 @@ AllCops:
     - 'vendor/**/*'
     - 'tmp/**/*'
     - 'inquery.gemspec'
+  SuggestExtensions: false
 
   DisplayCopNames: true
 
@@ -101,3 +102,6 @@ Style/ConditionalAssignment:
 
 Style/CaseLikeIf:
   Enabled: false
+
+Style/OpenStructUse:
+  Enabled: false

data/Appraisals

@@ -0,0 +1,19 @@
+appraise 'rails-7.0' do
+  gem 'rails', '~> 7.0.1'
+end
+
+appraise 'rails-6.1' do
+  gem 'rails', '~> 6.1.4'
+end
+
+appraise 'rails-6.0' do
+  gem 'rails', '~> 6.0.4'
+end
+
+appraise 'rails-5.2' do
+  gem 'rails', '~> 5.2.6'
+end
+
+appraise 'rails-5.1' do
+  gem 'rails', '~> 5.1.7'
+end

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change log
 
+## 1.0.11 (2023-08-24)
+
+* Add configuration option `config.default_schema_version` that allows you to
+  specify the schema version in effect when using the `schema` DSL method. For
+  backwards compatibility, this new setting defaults to `2`.
+
+  Internal reference: `#115859`.
+
+## 1.0.10 (2022-05-19)
+
+* Update gem-internal ruby version and remove `bundler` from gemspec
+
 ## 1.0.9 (2021-02-24)
 
 - Update `schemacop` to version `~> 3.0.8`
@@ -34,7 +46,7 @@
 
 ## 1.0.3 (2020-05-12)
 
-- Overwrite parameter hash with the casted version if using 
+- Overwrite parameter hash with the casted version if using
   casting inside the schemacop `schema` block
 
 ## 1.0.2 (2019-10-09)

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright © 2016 - 2021 Sitrox
+Copyright © 2016 - 2023 Sitrox
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,4 +1,5 @@
-[![Build Status](https://travis-ci.org/sitrox/inquery.svg?branch=master)](https://travis-ci.org/sitrox/inquery)
+[![Unit tests](https://github.com/sitrox/inquery/actions/workflows/ruby.yml/badge.svg)](https://github.com/sitrox/inquery/actions/workflows/ruby.yml)
+[![Rubocop check](https://github.com/sitrox/inquery/actions/workflows/rubocop.yml/badge.svg)](https://github.com/sitrox/inquery/actions/workflows/rubocop.yml)
 [![Gem Version](https://badge.fury.io/rb/inquery.svg)](https://badge.fury.io/rb/inquery)
 
 # Inquery
@@ -27,9 +28,10 @@ Inquery is tested with the following ruby versions:
 * 2.5.1
 * 2.6.2
 * 2.7.1
-* 3.0.0
+* 3.0.1
+* 3.2.1
 
-Other ruby versions might work but are not covered by our Travis tests.
+Other ruby versions might work but are not covered by our automated tests.
 
 ## Basic usage
 
@@ -296,7 +298,9 @@ end
 ```
 
 Inquery supports both schemacop specification versions 2 and 3 using the methods
-`schema` / `schema2` for version 2 and method `schema3` for version 3.
+`schema2` for version 2 and method `schema3` for version 3. You can also use the
+method `schema`, which defaults to the schema version configured using
+`config.default_schema_version` (see [Configuration](#Configuration)).
 
 ## Rails integration
 
@@ -305,6 +309,18 @@ perfectly integrated into any Rails application. It has proven to be a winning
 concept to extract all complex queries into separate classes that are
 independently executable and testable.
 
+## Configuration
+
+Inquery can be configured globally using an optional initializer:
+
+```ruby
+# config/initializers/inquery.rb
+Inquery.setup do |config|
+  # Specify the default schemacop schema version. Can be one of 2 or 3.
+  # config.default_schema_version = 2
+end
+```
+
 ### Directory structure
 
 While not enforced, it is encouraged to use the following structure for storing
@@ -332,8 +348,9 @@ There are some key benefits to this approach:
 ## Contributors
 
 Thanks to Jeroen Weeink for his insights regarding using query classes as scopes
-in his [blog post](http://craftingruby.com/posts/2015/06/29/query-objects-through-scopes.html).
+in his [blog
+post](http://craftingruby.com/posts/2015/06/29/query-objects-through-scopes.html).
 
 ## Copyright
 
-Copyright © 2016 - 2021 Sitrox. See `LICENSE` for further details.
+Copyright © 2016 - 2023 Sitrox. See `LICENSE` for further details.

data/RUBY_VERSION

@@ -1 +1 @@
-ruby-2.6.2-p47
+ruby-3.0.1-p64

data/Rakefile

@@ -1,7 +1,7 @@
 task :gemspec do
   gemspec = Gem::Specification.new do |spec|
     spec.name          = 'inquery'
-    spec.version       = IO.read('VERSION').chomp
+    spec.version       = File.read('VERSION').chomp
     spec.authors       = ['Sitrox']
     spec.summary       = %(
       A skeleton that allows extracting queries into atomic, reusable classes.
@@ -11,12 +11,12 @@ task :gemspec do
     spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
     spec.require_paths = ['lib']
 
-    spec.add_development_dependency 'bundler'
+    spec.add_development_dependency 'appraisal'
     spec.add_development_dependency 'rake'
     spec.add_development_dependency 'sqlite3'
     spec.add_development_dependency 'haml'
     spec.add_development_dependency 'yard'
-    spec.add_development_dependency 'rubocop', '0.92.0'
+    spec.add_development_dependency 'rubocop', '1.25'
     spec.add_development_dependency 'redcarpet'
     spec.add_dependency 'minitest'
     spec.add_dependency 'activesupport'
@@ -24,7 +24,7 @@ task :gemspec do
     spec.add_dependency 'schemacop', '~> 3.0.8'
   end
 
-  File.open('inquery.gemspec', 'w') { |f| f.write(gemspec.to_ruby.strip) }
+  File.write('inquery.gemspec', gemspec.to_ruby.strip)
 end
 
 require 'rake/testtask'

data/VERSION

@@ -1 +1 @@
-1.0.9
+1.0.11

data/doc/Inquery/Exceptions/Base.html

@@ -6,7 +6,7 @@
 <title>
   Exception: Inquery::Exceptions::Base
   
-    &mdash; Documentation by YARD 0.9.26
+    &mdash; Documentation by YARD 0.9.27
   
 </title>
 
@@ -118,9 +118,9 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Feb 24 10:57:42 2021 by
+  Generated on Thu Aug 24 11:11:23 2023 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.26 (ruby-2.6.2).
+  0.9.27 (ruby-3.0.1).
 </div>
 
     </div>

data/doc/Inquery/Exceptions/InvalidRelation.html

@@ -6,7 +6,7 @@
 <title>
   Exception: Inquery::Exceptions::InvalidRelation
   
-    &mdash; Documentation by YARD 0.9.26
+    &mdash; Documentation by YARD 0.9.27
   
 </title>
 
@@ -122,9 +122,9 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Feb 24 10:57:42 2021 by
+  Generated on Thu Aug 24 11:11:23 2023 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.26 (ruby-2.6.2).
+  0.9.27 (ruby-3.0.1).
 </div>
 
     </div>

data/doc/Inquery/Exceptions/UnknownCallSignature.html

@@ -6,7 +6,7 @@
 <title>
   Exception: Inquery::Exceptions::UnknownCallSignature
   
-    &mdash; Documentation by YARD 0.9.26
+    &mdash; Documentation by YARD 0.9.27
   
 </title>
 
@@ -122,9 +122,9 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Feb 24 10:57:42 2021 by
+  Generated on Thu Aug 24 11:11:23 2023 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.26 (ruby-2.6.2).
+  0.9.27 (ruby-3.0.1).
 </div>
 
     </div>

data/doc/Inquery/Exceptions.html

@@ -6,7 +6,7 @@
 <title>
   Module: Inquery::Exceptions
   
-    &mdash; Documentation by YARD 0.9.26
+    &mdash; Documentation by YARD 0.9.27
   
 </title>
 
@@ -105,9 +105,9 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Feb 24 10:57:42 2021 by
+  Generated on Thu Aug 24 11:11:23 2023 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.26 (ruby-2.6.2).
+  0.9.27 (ruby-3.0.1).
 </div>
 
     </div>

data/doc/Inquery/Mixins/RawSqlUtils.html

@@ -6,7 +6,7 @@
 <title>
   Module: Inquery::Mixins::RawSqlUtils
   
-    &mdash; Documentation by YARD 0.9.26
+    &mdash; Documentation by YARD 0.9.27
   
 </title>
 
@@ -106,9 +106,9 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Feb 24 10:57:42 2021 by
+  Generated on Thu Aug 24 11:11:23 2023 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.26 (ruby-2.6.2).
+  0.9.27 (ruby-3.0.1).
 </div>
 
     </div>

data/doc/Inquery/Mixins/RelationValidation/ClassMethods.html

@@ -6,7 +6,7 @@
 <title>
   Module: Inquery::Mixins::RelationValidation::ClassMethods
   
-    &mdash; Documentation by YARD 0.9.26
+    &mdash; Documentation by YARD 0.9.27
   
 </title>
 
@@ -178,9 +178,9 @@ on. See <span class='object_link'><a href="../RelationValidation.html#OPTIONS_SC
 </div>
 
       <div id="footer">
-  Generated on Wed Feb 24 10:57:42 2021 by
+  Generated on Thu Aug 24 11:11:23 2023 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.26 (ruby-2.6.2).
+  0.9.27 (ruby-3.0.1).
 </div>
 
     </div>

data/doc/Inquery/Mixins/RelationValidation.html

@@ -6,7 +6,7 @@
 <title>
   Module: Inquery::Mixins::RelationValidation
   
-    &mdash; Documentation by YARD 0.9.26
+    &mdash; Documentation by YARD 0.9.27
   
 </title>
 
@@ -325,9 +325,9 @@ options specified at class level using the <code>relation</code> method.</p>
 </div>
 
       <div id="footer">
-  Generated on Wed Feb 24 10:57:42 2021 by
+  Generated on Thu Aug 24 11:11:23 2023 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.26 (ruby-2.6.2).
+  0.9.27 (ruby-3.0.1).
 </div>
 
     </div>

data/doc/Inquery/Mixins/SchemaValidation/ClassMethods.html

@@ -6,7 +6,7 @@
 <title>
   Module: Inquery::Mixins::SchemaValidation::ClassMethods
   
-    &mdash; Documentation by YARD 0.9.26
+    &mdash; Documentation by YARD 0.9.27
   
 </title>
 
@@ -206,13 +206,27 @@
 
 25
 26
-27</pre>
+27
+28
+29
+30
+31
+32
+33
+34</pre>
     </td>
     <td>
       <pre class="code"><span class="info file"># File 'lib/inquery/mixins/schema_validation.rb', line 25</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_schema'>schema</span><span class='lparen'>(</span><span class='op'>*</span><span class='id identifier rubyid_args'>args</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_schema2'>schema2</span><span class='lparen'>(</span><span class='op'>*</span><span class='id identifier rubyid_args'>args</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
+  <span class='kw'>case</span> <span class='const'><span class='object_link'><a href="../../../Inquery.html" title="Inquery (module)">Inquery</a></span></span><span class='period'>.</span><span class='id identifier rubyid_default_schema_version'>default_schema_version</span>
+  <span class='kw'>when</span> <span class='int'>2</span>
+    <span class='id identifier rubyid_schema2'>schema2</span><span class='lparen'>(</span><span class='op'>*</span><span class='id identifier rubyid_args'>args</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
+  <span class='kw'>when</span> <span class='int'>3</span>
+    <span class='id identifier rubyid_schema3'>schema3</span><span class='lparen'>(</span><span class='op'>*</span><span class='id identifier rubyid_args'>args</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
+  <span class='kw'>else</span>
+    <span class='id identifier rubyid_fail'>fail</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>Schemacop schema versions supported are 2 and 3.</span><span class='tstring_end'>&#39;</span></span>
+  <span class='kw'>end</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -292,9 +306,9 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Feb 24 10:57:42 2021 by
+  Generated on Thu Aug 24 11:11:23 2023 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.26 (ruby-2.6.2).
+  0.9.27 (ruby-3.0.1).
 </div>
 
     </div>

data/doc/Inquery/Mixins/SchemaValidation.html

@@ -6,7 +6,7 @@
 <title>
   Module: Inquery::Mixins::SchemaValidation
   
-    &mdash; Documentation by YARD 0.9.26
+    &mdash; Documentation by YARD 0.9.27
   
 </title>
 
@@ -116,9 +116,9 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Feb 24 10:57:42 2021 by
+  Generated on Thu Aug 24 11:11:23 2023 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.26 (ruby-2.6.2).
+  0.9.27 (ruby-3.0.1).
 </div>
 
     </div>

data/doc/Inquery/Mixins.html

@@ -6,7 +6,7 @@
 <title>
   Module: Inquery::Mixins
   
-    &mdash; Documentation by YARD 0.9.26
+    &mdash; Documentation by YARD 0.9.27
   
 </title>
 
@@ -107,9 +107,9 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Feb 24 10:57:42 2021 by
+  Generated on Thu Aug 24 11:11:23 2023 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.26 (ruby-2.6.2).
+  0.9.27 (ruby-3.0.1).
 </div>
 
     </div>

data/doc/Inquery/Query/Chainable.html

@@ -6,7 +6,7 @@
 <title>
   Class: Inquery::Query::Chainable
   
-    &mdash; Documentation by YARD 0.9.26
+    &mdash; Documentation by YARD 0.9.27
   
 </title>
 
@@ -529,9 +529,9 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Feb 24 10:57:42 2021 by
+  Generated on Thu Aug 24 11:11:23 2023 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.26 (ruby-2.6.2).
+  0.9.27 (ruby-3.0.1).
 </div>
 
     </div>

data/doc/Inquery/Query.html

@@ -6,7 +6,7 @@
 <title>
   Class: Inquery::Query
   
-    &mdash; Documentation by YARD 0.9.26
+    &mdash; Documentation by YARD 0.9.27
   
 </title>
 
@@ -779,9 +779,9 @@ easyer access.</p>
 </div>
 
       <div id="footer">
-  Generated on Wed Feb 24 10:57:42 2021 by
+  Generated on Thu Aug 24 11:11:23 2023 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.26 (ruby-2.6.2).
+  0.9.27 (ruby-3.0.1).
 </div>
 
     </div>