rspec-activerecord-expectations 2.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3205b050d5f2164b5bc72de9fe29a0f6d988cd869ecd6703a09b83b2550bb02e
-  data.tar.gz: d43d363888f5c8f85dc551fae7d1381a945ac304c597192544ffd1506d1f7495
+  metadata.gz: 5f3b1aba7ee663b3763870bac6d6e359f130d2dff57e822e25934fc6afc9ae2a
+  data.tar.gz: f1de8e2ff900b0faa2e1d2c61318e5e61edfadff30067bed892d9c63fa4c290d
 SHA512:
-  metadata.gz: a98cfac5ba127c3e5f7bd2b42ef48fa56e6750e75d0ab841988b076a2a39c0ca13e5d67e534020fd81af3b7885cba3d192c23a2fbb0b4ccd0d8e725e3cafb147
-  data.tar.gz: 65347df27d406531b1ea594bfe9a3d9b6405c75ad5f8be5c3f52f668e3d976e0e73c5e1560caeb308cb203b73547ab18c0ffd758aff0e913a9f010665a0a6595
+  metadata.gz: 9b8fe61d292eda6cbf649eb07d95d961f3c8605ba98e769b26026e8476a01492c1e6a004cfde11c0487247976a55f5deacd79fe4398e7c0f302a160f0ffacc8d
+  data.tar.gz: 01b282410566fd88187b2ad87bcce07f40f3f9b01952a37f31d2cfd0cd0384d24fbf4e376c4aed6b0ab696272957948a3eaf14f28a40c383224a144de31cba20

data/.ruby-version

@@ -1 +1 @@
-ruby-2.7.3
+ruby-3.1.6

data/Appraisals

@@ -1,3 +1,11 @@
+appraise "rails-7.2" do
+  gem "rails", "~> 7.2.0.beta2"
+end
+
+appraise "rails-7.1" do
+  gem "rails", "~> 7.1.0"
+end
+
 appraise "rails-7.0" do
   gem "rails", "~> 7.0.0"
 end

data/CHANGELOG.md

@@ -1,4 +1,12 @@
 # Changelog
+ 
+## [3.0.0] - 2024-06-21
+- Add support for RAils 7.0-7.2
+
+## [2.3.0] - 2022-01-29
+- Add quantifiers to transaction matchers
+- Add much more complicated English output for readable matchers
+- Update README for the same
 
 ## [2.2.0] - 2022-01-14
 - Adds transaction matcher to verify that code was executed within a

data/README.md

@@ -26,7 +26,7 @@ group.
 
 ```ruby
 group 'test' do
-  gem 'rspec-activerecord-expectations', '~> 1.0'
+  gem 'rspec-activerecord-expectations', '~> 3.0'
 end
 ```
 
@@ -230,8 +230,20 @@ end.not_to rollback_a_transaction
 ```
 
 Note that ActiveRecord will not only roll back the transaction, but also
-re-raise errors. As such, it's necessary in this example to rescue that
-error in order for the test to fail.
+re-raise errors. As such, it's necessary in this example to rescue that error,
+otherwise the test would fail simply because the code caused a `raise`.
+
+### Counting Transactions
+
+Similar to counting queries, you can quantify the number of transactions you
+expect to succeed / fail. This is probably of limited value in all but some
+very specific cases.
+
+```ruby
+expect {}.to commit_a_transaction.once
+expect {}.to rollback_a_transaction.exactly(5).times
+expect {}.to commit_a_transaction.at_least(5).times
+```
 
 ## Future Planned Functionality
 
@@ -248,9 +260,6 @@ expect {}.to create.exactly(5).of_type(User)
 expect {}.to insert.exactly(5).subscription_changes
 expect {}.to update.exactly(2).of_any_type
 expect {}.to delete.exactly(2).of_any_type
-
-expect {}.to commit_a_transaction.once
-expect {}.to rollback_a_transaction.exactly(5).times
 ```
 
 - warn if we smite any built in methods (or methods from other libs)

data/gemfiles/rails_7.1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "~> 12.0"
+gem "rspec", "~> 3.0"
+gem "rails", "~> 7.1.0"
+
+gemspec path: "../"

data/gemfiles/rails_7.2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "~> 12.0"
+gem "rspec", "~> 3.0"
+gem "rails", "~> 7.2.0.beta2"
+
+gemspec path: "../"

data/lib/rspec/activerecord/expectations/matchers/query_count_matcher.rb

@@ -1,16 +1,25 @@
 module RSpec::ActiveRecord::Expectations
   module Matchers
     class QueryCountMatcher
-      attr_reader :failure_message, :failure_message_when_negated
+      attr_reader :collector, :quantifier, :comparison, :query_type
 
       def initialize
         @collector = Collector.new
+        @message_builder = MessageBuilder.new(self)
 
         @match_method = nil
-        @comparison   = nil
+        @quantifier   = nil
         @query_type   = nil
       end
 
+      def failure_message
+        @message_builder.failure_message
+      end
+
+      def failure_message_when_negated
+        @message_builder.failure_message_when_negated
+      end
+
       def supports_block_expectations?
         true
       end
@@ -26,39 +35,44 @@ module RSpec::ActiveRecord::Expectations
         result
       end
 
-      # COMPARISON TYPES
+      # QUANTIFIERS
 
       def less_than(n)
-        @comparison   = n
-        @match_method = method(:compare_less_than)
+        @quantifier   = n
+        @comparison   = :less_than
+        @match_method = -> { actual_count < @quantifier }
         self
       end
       alias_method :fewer_than, :less_than
 
       def less_than_or_equal_to(n)
-        @comparison   = n
-        @match_method = method(:compare_less_than_or_equal_to)
+        @quantifier   = n
+        @comparison   = :less_than_or_equal_to
+        @match_method = -> { actual_count <= @quantifier }
         self
       end
       alias_method :at_most, :less_than_or_equal_to
 
       def greater_than(n)
-        @comparison   = n
-        @match_method = method(:compare_greater_than)
+        @quantifier   = n
+        @comparison   = :greater_than
+        @match_method = -> { actual_count > @quantifier }
         self
       end
       alias_method :more_than, :greater_than
 
       def greater_than_or_equal_to(n)
-        @comparison   = n
-        @match_method = method(:compare_greater_than_or_equal_to)
+        @quantifier   = n
+        @comparison   = :greater_than_or_equal_to
+        @match_method = -> { actual_count >= @quantifier }
         self
       end
       alias_method :at_least, :greater_than_or_equal_to
 
       def exactly(n)
-        @comparison   = n
-        @match_method = method(:compare_exactly)
+        @quantifier   = n
+        @comparison   = :exactly
+        @match_method = -> { actual_count == @quantifier }
         self
       end
 
@@ -79,62 +93,10 @@ module RSpec::ActiveRecord::Expectations
         end
       end
 
-      # TODO singularize everything
-      alias_method :query, :queries
-
-      private
-
-      def humanized_query_type
-        @query_type.to_s.gsub("_", " ")
-      end
-
-      # MATCHERS
-
-      def compare_less_than
-        count = @collector.queries_of_type(@query_type)
-
-        @failure_message = "expected block to execute fewer than #{@comparison} #{humanized_query_type}, but it executed #{count}"
-        @failure_message_when_negated = "expected block not to execute fewer than #{@comparison} #{humanized_query_type}, but it executed #{count}"
-
-        count < @comparison
-      end
-
-      def compare_less_than_or_equal_to
-        count = @collector.queries_of_type(@query_type)
-
-        # boy this negated operator is confusing. don't use that plz.
-        @failure_message = "expected block to execute at most #{@comparison} #{humanized_query_type}, but it executed #{count}"
-        @failure_message_when_negated = "expected block not to execute any less than #{@comparison} #{humanized_query_type}, but it executed #{count}"
-
-        count <= @comparison
-      end
-
-      def compare_greater_than
-        count = @collector.queries_of_type(@query_type)
-
-        @failure_message = "expected block to execute greater than #{@comparison} #{humanized_query_type}, but it executed #{count}"
-        @failure_message_when_negated = "expected block not to execute greater than #{@comparison} #{humanized_query_type}, but it executed #{count}"
-
-        count > @comparison
-      end
-
-      def compare_greater_than_or_equal_to
-        count = @collector.queries_of_type(@query_type)
-
-        # see above, negating this matcher is so confusing.
-        @failure_message = "expected block to execute at least #{@comparison} #{humanized_query_type}, but it executed #{count}"
-        @failure_message_when_negated = "expected block not to execute any more than #{@comparison} #{humanized_query_type}, but it executed #{count}"
-
-        count >= @comparison
-      end
-
-      def compare_exactly
-        count = @collector.queries_of_type(@query_type)
-
-        @failure_message = "expected block to execute exactly #{@comparison} #{humanized_query_type}, but it executed #{count}"
-        @failure_message_when_negated = "expected block not to execute exactly #{@comparison} #{humanized_query_type}, but it executed #{count}"
+      # helper for message builder
 
-        count == @comparison
+      def actual_count
+        @collector.queries_of_type(@query_type)
       end
     end
   end

data/lib/rspec/activerecord/expectations/matchers/transaction_matcher.rb

@@ -1,9 +1,22 @@
 module RSpec::ActiveRecord::Expectations
   module Matchers
     class TransactionMatcher
+      attr_reader :collector, :quantifier, :comparison, :query_type
+
       def initialize(transaction_type)
         @collector    = Collector.new
-        @transaction  = transaction_type
+        @query_type  = transaction_type
+        @message_builder = MessageBuilder.new(self)
+
+        self.at_least(1)
+      end
+
+      def failure_message
+        @message_builder.failure_message
+      end
+
+      def failure_message_when_negated
+        @message_builder.failure_message_when_negated
       end
 
       def supports_block_expectations?
@@ -11,59 +24,75 @@ module RSpec::ActiveRecord::Expectations
       end
 
       def matches?(block)
+        raise NoComparisonError unless @match_method
+
         block.call
+        result = @match_method.call
+        @collector.finalize
 
-        @count = @collector.queries_of_type(@transaction)
-        @count > 0
+        result
       end
 
-      def failure_message
-        type_msg = case @transaction
-                   when :transaction_queries
-                     "execute a transaction"
-                   when :rollback_queries
-                     "roll back a transaction"
-                   when :commit_queries
-                     "commit a transaction"
-                   end
-
-        "expected block to #{type_msg}, but it didn't do so"
+      # QUANTIFIERS
+
+      def less_than(n)
+        @quantifier   = n
+        @comparison = :less_than
+        @match_method = -> { actual_count < @quantifier }
+        self
       end
+      alias_method :fewer_than, :less_than
 
-      def failure_message_when_negated
-        if @count == 1
-          negated_message_singular
-        else
-          negated_message_plural
-        end
+      def less_than_or_equal_to(n)
+        @quantifier   = n
+        @comparison = :less_than_or_equal_to
+        @match_method = -> { actual_count <= @quantifier }
+        self
+      end
+      alias_method :at_most, :less_than_or_equal_to
+
+      def greater_than(n)
+        @quantifier   = n
+        @comparison = :greater_than
+        @match_method = -> { actual_count > @quantifier }
+        self
       end
+      alias_method :more_than, :greater_than
 
-      private
+      def greater_than_or_equal_to(n)
+        @quantifier   = n
+        @comparison = :greater_than_or_equal_to
+        @match_method = -> { actual_count >= @quantifier }
+        self
+      end
+      alias_method :at_least, :greater_than_or_equal_to
+
+      def exactly(n)
+        @quantifier   = n
+        @comparison = :exactly
+        @match_method = -> { actual_count == @quantifier }
+        self
+      end
 
-      def negated_message_singular
-        pre_msg, post_msg  = case @transaction
-                             when :transaction_queries
-                               ["execute a transaction", "executed one"]
-                             when :rollback_queries
-                               ["roll back a transaction", "rolled one back"]
-                             when :commit_queries
-                               ["commit a transaction", "committed one"]
-                             end
+      def once
+        exactly(1).time
+      end
+
+      def twice
+        exactly(2).times
+      end
+
+      def thrice # hehe
+        exactly(3).times
+      end
 
-        "expected block not to #{pre_msg}, but it #{post_msg}"
+      def times
+        self # NOOP
       end
+      alias_method :time, :times
 
-      def negated_message_plural
-        pre_msg, post_msg = case @transaction
-                   when :transaction_queries
-                     ["execute a transaction", "executed #{@count} transactions"]
-                   when :rollback_queries
-                     ["roll back a transaction", "rolled back #{@count} transactions"]
-                   when :commit_queries
-                     ["commit a transaction", "committed #{@count} transactions"]
-                   end
-
-        "expected block not to #{pre_msg}, but it #{post_msg}"
+      def actual_count
+        @collector.queries_of_type(@query_type)
       end
     end
   end

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

@@ -0,0 +1,160 @@
+module RSpec::ActiveRecord::Expectations
+  class MessageBuilder
+    attr_reader :matcher, :phrase_builder
+
+    def initialize(matcher)
+      @matcher = matcher
+      @phrase_builder = case matcher
+        when Matchers::QueryCountMatcher then QueryPhrases.new(matcher)
+        when Matchers::TransactionMatcher then TransactionPhrases.new(matcher)
+        else raise ArgumentError
+      end
+    end
+
+    def failure_message
+      "expected block to #{phrase_builder.prefix}, but it #{phrase_builder.suffix}"
+    end
+
+    def failure_message_when_negated
+      "expected block not to #{phrase_builder.prefix}, but it #{phrase_builder.negative_suffix}"
+    end
+
+    private
+
+    # TODO: expect {}.not_to execute.less_than_or_equal_to(3).insert_queries
+    # expected block not to execute at most 3 insert queries, but it executed 0
+
+
+    class QueryPhrases
+      attr_reader :matcher
+
+      def initialize(matcher)
+        @matcher = matcher
+      end
+
+      def prefix
+        "execute #{comparison_phrase} #{query_type_name}"
+      end
+
+      def suffix
+        if matcher.actual_count == 0
+          "didn't execute any"
+        elsif matcher.actual_count == 1
+          "executed one"
+        else
+          "executed #{matcher.actual_count}"
+        end
+      end
+
+      # using positive suffix from above can cause double negatives
+      def negative_suffix
+        if matcher.comparison == :exactly
+          "did so"
+        elsif matcher.actual_count == 1
+          "executed one"
+        else
+          "executed #{matcher.actual_count}"
+        end
+      end
+
+      private
+
+      def query_type_name
+        if matcher.quantifier == 1
+          matcher.query_type.to_s.gsub("_", " ").gsub("queries", "query")
+        else
+          matcher.query_type.to_s.gsub("_", " ")
+        end
+      end
+
+      def comparison_phrase
+        quant = if matcher.quantifier == 1 && matcher.comparison == :exactly
+          "a"
+        elsif matcher.quantifier == 1
+          "one"
+        else
+          matcher.quantifier
+        end
+
+        case matcher.comparison
+          when :exactly                   then quant
+          when :greater_than              then "more than #{quant}"
+          when :greater_than_or_equal_to  then "at least #{quant}"
+          when :less_than                 then "less than #{quant}"
+          when :less_than_or_equal_to     then "at most #{quant}"
+          else raise ArgumentError, "unsupported comparison matcher #{matcher.comparison}"
+        end
+      end
+    end
+
+    class TransactionPhrases
+      attr_reader :matcher
+
+      def initialize(matcher)
+        @matcher = matcher
+      end
+
+      def prefix
+        nouns = matcher.quantifier == 1 ? "transaction" : "transactions"
+        verb  = case matcher.query_type
+          when :transaction_queries then "execute"
+          when :rollback_queries then "roll back"
+          when :commit_queries then "commit"
+        end
+
+        "#{verb} #{comparison} #{nouns}"
+      end
+
+      def suffix
+        singular_verb  = case matcher.query_type
+          when :transaction_queries then "execute"
+          when :rollback_queries then "roll back"
+          when :commit_queries then "commit"
+        end
+
+        plural_verb  = case matcher.query_type
+          when :transaction_queries then "executed"
+          when :rollback_queries then "rolled back"
+          when :commit_queries then "committed"
+        end
+
+        if matcher.actual_count == 0
+          "didn't #{singular_verb} any"
+        elsif matcher.actual_count == 1
+          "#{plural_verb} one"
+        else
+          "#{plural_verb} #{matcher.actual_count}"
+        end
+      end
+
+      def negative_suffix
+        if matcher.comparison == :exactly
+          "did so"
+        else
+          suffix
+        end
+      end
+
+      private
+
+      def comparison
+        quant = if matcher.quantifier == 1 && matcher.comparison == :exactly
+          "a"
+        elsif matcher.quantifier == 1
+          "one"
+        else
+          matcher.quantifier
+        end
+
+        case matcher.comparison
+          when :exactly                   then quant
+          when :greater_than              then "more than #{quant}"
+          when :greater_than_or_equal_to  then "at least #{quant}"
+          when :less_than                 then "less than #{quant}"
+          when :less_than_or_equal_to     then "at most #{quant}"
+          else raise ArgumentError, "unsupported comparison matcher #{matcher.comparison}"
+        end
+      end
+    end
+  end
+end

data/lib/rspec/activerecord/expectations.rb

@@ -31,6 +31,7 @@ end
 require_relative 'expectations/errors'
 require_relative 'expectations/query_inspector'
 require_relative 'expectations/collector'
+require_relative 'expectations/message_builder'
 require_relative 'expectations/matchers/query_count_matcher'
 require_relative 'expectations/matchers/load_matcher'
 require_relative 'expectations/matchers/transaction_matcher'

data/rspec-activerecord-expectations.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "rspec-activerecord-expectations"
-  spec.version       = '2.2.0'
+  spec.version       = '3.0.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.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
@@ -22,14 +22,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 5.0.0", "< 7.1.0"
+  spec.add_dependency "activerecord", ">= 5.0.0", "< 8.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 "pg"
 
-  spec.add_development_dependency "pry", "~> 0.0"
+  spec.add_development_dependency "pry"
   spec.add_development_dependency "appraisal", "~> 2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-activerecord-expectations
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Joseph Mastey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-15 00:00:00.000000000 Z
+date: 2024-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,35 +29,35 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: '8.0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -98,6 +98,8 @@ files:
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
 - gemfiles/rails_7.0.gemfile
+- gemfiles/rails_7.1.gemfile
+- gemfiles/rails_7.2.gemfile
 - lib/rspec/activerecord-expectations.rb
 - lib/rspec/activerecord/expectations.rb
 - lib/rspec/activerecord/expectations/collector.rb
@@ -105,6 +107,7 @@ files:
 - lib/rspec/activerecord/expectations/matchers/load_matcher.rb
 - lib/rspec/activerecord/expectations/matchers/query_count_matcher.rb
 - lib/rspec/activerecord/expectations/matchers/transaction_matcher.rb
+- lib/rspec/activerecord/expectations/message_builder.rb
 - lib/rspec/activerecord/expectations/query_inspector.rb
 - rspec-activerecord-expectations.gemspec
 homepage: https://github.com/jmmastey/rspec-activerecord-expectations
@@ -122,14 +125,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: A gem to test how many activerecord queries your code executes.