rspec-activerecord-expectations 1.3.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92f14ca413e9e716ea9b3046abc13d3929893185cfef8cdeaf14b7bebc93755c
-  data.tar.gz: 93bfa962b7954844560961d66d080fa2c45a3188b8c9b92420d1852e36ce718b
+  metadata.gz: d320c1e0f80e96c3bbb2cb07df63b941aa9bb1aa3878f9ca46e6fa1fed483569
+  data.tar.gz: 69487efb7a89d208d28a0d26faa3c74fc3315645803a1ec4162a6bd9f3677008
 SHA512:
-  metadata.gz: bb81903bbb00357ab9613a59fb2684bfaad7671fbca955f9876d503f5b179f8ead6d36f248ea24909f30db3ddb6f4fc307c509a181d2fe85d33d1e04006856da
-  data.tar.gz: f813c1e8d6e320f6810cc33620fe702c379f47124b6add4bc1bdabde81c4e12c60a6aac5711caf8c23672f838d6185106ffb3695770a7c4002d04404c87929cb
+  metadata.gz: 7db71325cbfa0abd65c7128cceb18ba8017af399bee5cdd4502d84a988c3865605f0c5d34f858af352c1520b401651723fbf1c2335d652ec45f9ef0308a675bb
+  data.tar.gz: 44082fc8ad08369ea9e578f6cb3a11ec3dd7f92445b63ef4d415e10e14c79e350ded3a39828821b613513c382fd71b72db9b0669e7c14bd2e900655e03cffa5d

data/.github/workflows/main.yml

@@ -11,19 +11,19 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        ruby_version: ['3.0', '2.7']
+        ruby-version: ['3.1', '3.0', '2.7']
         rails: ['5.0', '5.1', '5.2', '6.0', '6.1', '7.0']
 
     runs-on: ${{ matrix.os }}
-    name: ruby ${{ matrix.ruby_version }}, rails ${{ matrix.rails }}, ${{ matrix.os }}
+    name: ruby ${{ matrix.ruby-version }}, rails ${{ matrix.rails }}, ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Ruby ${{ matrix.ruby_version }}
+      - name: Set up Ruby ${{ matrix.ruby-version }}
         uses: ruby/setup-ruby@v1
         with:
-          ruby_version: ${{ matrix.ruby_version }}
+          ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
 
       - name: Install Gems w/ Rails ${{ matrix.rails }}
@@ -40,19 +40,19 @@ jobs:
   test_legacy:
     strategy:
       matrix:
-        ruby_version: ['2.6', '2.5', '2.4', '2.3']
+        ruby-version: ['2.6', '2.5']
         rails: ['5.0', '5.1', '5.2']
 
     runs-on: ubuntu-latest
-    name: legacy ruby ${{ matrix.ruby_version }}, rails ${{ matrix.rails }}
+    name: ruby ${{ matrix.ruby-version }}, rails ${{ matrix.rails }}
 
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Ruby ${{ matrix.ruby_version }}
+      - name: Set up Ruby ${{ matrix.ruby-version }}
         uses: ruby/setup-ruby@v1
         with:
-          ruby_version: ${{ matrix.ruby_version }}
+          ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
 
       - name: Install Gems w/ Rails ${{ matrix.rails }}
@@ -65,3 +65,33 @@ jobs:
 
       - name: Run tests
         run: bundle exec rspec
+
+  test_alt_rubies:
+    strategy:
+      matrix:
+        ruby-version: ['jruby', 'truffleruby']
+        rails: ['6.0', '6.1'] # jruby / jdbc-sqlite3 end up tightly bound to rails 6.x
+
+    runs-on: ubuntu-latest
+    name: ${{ matrix.ruby-version }}, rails ${{ matrix.rails }}
+
+    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: Install Gems w/ Rails ${{ matrix.rails }}
+        env:
+          MATRIX_RAILS_VERSION: ${{ matrix.rails }}
+        run: |
+          export BUNDLE_GEMFILE="${GITHUB_WORKSPACE}/gemfiles/rails_${MATRIX_RAILS_VERSION}.gemfile"
+          gem install bundler
+          bundle install --jobs 4 --retry 3
+
+      - name: Run tests
+        run: bundle exec rspec
+ 

data/CHANGELOG.md

@@ -1,25 +1,33 @@
 # Changelog
 
-## [1.3.0] - 2020-12-31
+## [2.1.0] - 2022-01-12
+- change CI matrix for more version compatibility
+- update gemspec to move some deps into development only
+- README changes
+
+## [2.0.0] - 2022-01-07
+- Require much more recent ruby, to use syntax that's been around since 2017
+
+## [1.3.0] - 2021-12-31
 - Add `repeatedly_load` matcher
 - Add query type matchers for `load_queries`, `schema_queries`, `transaction_queries`, `destroy_queries`
 - Allow singular version of all query types (e.g. `transaction_queries` vs `transaction_query`)
 - Fix failure message for `execute.exactly` matcher
 
-## [1.2.0] - 2020-12-31
+## [1.2.0] - 2021-12-31
 - Add `query` as a synonym for `queries`
 - Ignore schema and transaction queries in query count
 - Add beginning of recording specific query types
 - Add query count matcher for `exactly`
 
-## [1.1.0] - 2020-12-30
+## [1.1.0] - 2021-12-30
 - Add query count matchers for e.g. `less_than_or_equal_to`, `greater_than`
 
-## [1.0.1] - 2020-12-30
+## [1.0.1] - 2021-12-30
 - Pin all the dependencies to a proper working subset
 - Expand testing to many rails / ruby combinations
 
-## [1.0.0] - 2020-12-30
+## [1.0.0] - 2021-12-30
 - Basic gem w/ all the fixins and README and such
 - Add `less_than` comparison, and `queries` type
 - Basic tests in place, and not bad tbh

data/README.md

@@ -30,7 +30,8 @@ group 'test' do
 end
 ```
 
-Then, include the functionality within your spec helper (or in a support file).
+Then, include the functionality within your `rails_helper.rb` (or in a support
+file).
 
 ```ruby
 RSpec.configure do |config|
@@ -109,11 +110,24 @@ This matcher will track ActiveRecord's built in load methods to prevent those
 N+1 situations. Using eager loading (e.g. `Track.all.includes(:album)`) will
 allow these expectations to pass as expected!
 
-**Note:** At the moment, this expectation will fail if you use a mechanism
-that loads records in batches, such as with `find_in_batches`. This will cause
-records to be "repeatedly loaded", but this is actually expected behavior in
-this case. If your tests load a relatively small number of records (which is
-probable), your tests won't fail. But it is possible.
+### Testing Batch Queries
+
+If your code loads records in batches, it may be more difficult to create
+expectations for repeated loading. After all, each batch will execute its own
+queries, which may look like repeated loading.
+
+If your test has a small enough number of records that only one batch is
+loaded, your tests may work just fine. But otherwise, you may want to allow
+your code to specify a batch size in order to guarantee only a single batch
+is loaded:
+
+```ruby
+tracks = Track.all
+
+expect {
+  TrackSerializer.perform(tracks, batch_size: tracks.count)
+}.not_to repeatedly_load('Track')
+```
 
 ## Counting Queries
 

data/lib/rspec/activerecord/expectations/query_inspector.rb

@@ -8,7 +8,7 @@ module RSpec::ActiveRecord::Expectations
     def categorize(query)
       if query[:name] == "SCHEMA"
         [:schema_queries]
-      elsif query[:name] == "TRANSACTION"
+      elsif query[:name] == "TRANSACTION" || query[:sql] =~ /^begin/i || query[:sql] =~ /^commit/i
         [:transaction_queries]
       elsif query[:name] =~ /Create$/
         [:queries, :insert_queries]
@@ -18,7 +18,7 @@ module RSpec::ActiveRecord::Expectations
         [:queries, :destroy_queries]
       elsif query[:name] =~ /Delete All$/
         [:queries, :destroy_queries]
-      elsif query[:name] =~ /Exists\?$/
+      elsif query[:name] =~ /Exists\??$/
         [:queries, :exists_queries]
       else
         [:queries]

data/rspec-activerecord-expectations.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "rspec-activerecord-expectations"
-  spec.version       = '1.3.0'
+  spec.version       = '2.1.0'
   spec.authors       = ["Joseph Mastey"]
   spec.email         = ["hello@joemastey.com"]
 
@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Adds new matchers to rspec to help you test whether your code is executing an unreasonable number of queries.}
   spec.homepage      = "https://github.com/jmmastey/rspec-activerecord-expectations"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
@@ -23,7 +23,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activerecord", ">= 5.0.0", "< 7.1.0"
-  spec.add_dependency "sqlite3", "~> 1.0"
+
+  if RUBY_PLATFORM == 'java'
+    spec.add_development_dependency "activerecord-jdbcsqlite3-adapter", '>= 60'
+  else
+    spec.add_development_dependency "sqlite3", "~> 1.0"
+  end
 
   spec.add_development_dependency "pry", "~> 0.0"
   spec.add_development_dependency "appraisal", "~> 2"

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: rspec-activerecord-expectations
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Joseph Mastey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-04 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -20,8 +19,9 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 7.1.0
-  type: :runtime
+  name: activerecord
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -31,42 +31,42 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 7.1.0
 - !ruby/object:Gem::Dependency
-  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: '60'
+  name: activerecord-jdbcsqlite3-adapter
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '60'
 - !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
-  type: :development
+  name: pry
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-  type: :development
+  name: appraisal
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -121,14 +121,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: A gem to test how many activerecord queries your code executes.