active_record_change_matchers 1.0.0 → 1.1.0

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_change_matchers
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Maxim Krizhanovski
 - Nathan Wallace
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-03 00:00:00.000000000 Z
+date: 2026-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
@@ -40,103 +39,103 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: standalone_migrations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 description: This gem adds custom block expectation matchers for RSpec, such as `expect
   { ... }.to create_a_new(User)`
 email:
@@ -145,6 +144,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -153,19 +153,20 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- active_record_block_matchers.gemspec
 - active_record_change_matchers.gemspec
 - bin/console
 - bin/setup
 - db/config.yml
 - db/migrate/20150225014908_create_people.rb
 - db/migrate/20151017231107_create_dogs.rb
+- db/migrate/20160101000000_create_pets.rb
 - db/schema.rb
-- lib/active_record_block_matchers.rb
 - lib/active_record_change_matchers.rb
 - lib/active_record_change_matchers/config.rb
-- lib/active_record_change_matchers/create_a_new_matcher.rb
-- lib/active_record_change_matchers/create_records_matcher.rb
+- lib/active_record_change_matchers/hash_format.rb
+- lib/active_record_change_matchers/matchers/create_a_new_matcher.rb
+- lib/active_record_change_matchers/matchers/create_associated_matcher.rb
+- lib/active_record_change_matchers/matchers/create_records_matcher.rb
 - lib/active_record_change_matchers/strategies.rb
 - lib/active_record_change_matchers/strategies/id_strategy.rb
 - lib/active_record_change_matchers/strategies/timestamp_strategy.rb
@@ -174,7 +175,6 @@ homepage: https://github.com/Darhazer/active_record_change_matchers
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -182,15 +182,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Additional RSpec custom matchers for ActiveRecord
 test_files: []

data/active_record_block_matchers.gemspec

@@ -1,33 +0,0 @@
-# coding: utf-8
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "active_record_change_matchers/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "active_record_change_matchers"
-  spec.version       = ActiveRecordChangeMatchers::VERSION
-  spec.authors       = ["Maxim Krizhanovski", "Nathan Wallace"]
-  spec.email         = ["maxim.krizhanovski@hey.com"]
-
-  spec.summary       = %q{Additional RSpec custom matchers for ActiveRecord}
-  spec.description   = %q{This gem adds custom block expectation matchers for RSpec, such as `expect { ... }.to create_a_new(User)`}
-  spec.homepage      = "https://github.com/Darhazer/active_record_change_matchers"
-  spec.license       = "MIT"
-
-  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.required_ruby_version = ">= 1.9.3"
-
-  spec.add_dependency "activerecord", ">= 3.2.0"
-  spec.add_dependency "rspec-expectations", ">= 3.0.0"
-
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "pry", "~> 0.10"
-  spec.add_development_dependency "sqlite3", "~> 1.3"
-  spec.add_development_dependency "database_cleaner", "~> 1.6"
-  spec.add_development_dependency "standalone_migrations", "~> 5.2"
-  spec.add_development_dependency "timecop", "~> 0.9"
-end

data/lib/active_record_block_matchers.rb

@@ -1,7 +0,0 @@
-require "rspec/expectations"
-require "active_record"
-
-Dir[File.dirname(__FILE__) + "/active_record_change_matchers/**/*.rb"].each {|file| require file }
-
-module ActiveRecordChangeMatchers
-end

data/lib/active_record_change_matchers/create_a_new_matcher.rb

@@ -1,94 +0,0 @@
-RSpec::Matchers.define :create_a_new do |klass|
-  supports_block_expectations
-
-  description do
-    "create a #{klass}, optionally verifying attributes"
-  end
-
-  chain(:with_attributes) do |attributes|
-    @attributes = attributes
-  end
-
-  chain(:which) do |&block|
-    @which_block = block
-  end
-
-  chain(:which_is_expected_to) do |matcher|
-    @which_matcher = matcher
-  end
-
-  match do |options={}, block|
-    fetching_strategy =
-      ActiveRecordChangeMatchers::Strategies.for_key(options[:strategy]).new(block)
-
-    @created_records = fetching_strategy.new_records([klass])[klass]
-
-    return false unless @created_records.count == 1 # ? this shouldn't be necessary for all strategies...
-
-    record = @created_records.first
-
-    @attribute_mismatches = []
-
-    @attributes && @attributes.each do |field, value|
-      unless values_match?(value, record.public_send(field))
-        @attribute_mismatches << [field, value, record.public_send(field)]
-      end
-    end
- 
-    if @attribute_mismatches.none? && @which_block
-      begin
-        @which_block.call(record)
-      rescue RSpec::Expectations::ExpectationNotMetError => e
-        @which_failure = e
-      end
-    end
-
-    if @attribute_mismatches.none? && @which_matcher
-      unless @which_matcher.matches?(record)
-        @matcher_failure = @which_matcher.failure_message
-      end
-    end
-
-    @attribute_mismatches.empty? && @which_failure.nil? && @matcher_failure.nil?
-  end
-
-  failure_message do
-    if @created_records.count != 1
-      "the block should have created 1 #{klass}, but created #{@created_records.count}"
-    elsif @attribute_mismatches.any?
-      @attribute_mismatches.map do |field, expected, actual|
-        expected_description = is_composable_matcher?(expected) ? expected.description : expected.inspect
-        "Expected #{field.inspect} to be #{expected_description}, but was #{actual.inspect}"
-      end.join("\n")
-    elsif @which_failure
-      @which_failure.message
-    else
-      @matcher_failure
-    end
-  end
-
-  failure_message_when_negated do
-    if @created_records.count == 1 && @attributes && @attribute_mismatches.none?
-      "the block should not have created a #{klass} with attributes #{format_attributes_hash(@attributes).inspect}, but did"
-    elsif @created_records.count == 1 && @which_block && !@which_failure
-      "the newly created #{klass} should have failed an expectation in the given block, but didn't"
-    elsif @created_records.count == 1
-      "the block should not have created a #{klass}, but created #{@created_records.count}: #{@created_records.inspect}"
-    else
-      "the block created a #{klass} that matched all given criteria"
-    end
-  end
-
-  def is_composable_matcher?(value)
-    value.respond_to?(:failure_message_when_negated)
-  end
-
-  def format_attributes_hash(attributes)
-    attributes.each_with_object({}) do |(field,value), memo|
-      memo[field] = is_composable_matcher?(value) ? value.description : value
-    end
-  end
-end
-
-RSpec::Matchers.alias_matcher :create_a,  :create_a_new
-RSpec::Matchers.alias_matcher :create_an, :create_a_new

data/lib/active_record_change_matchers/create_records_matcher.rb

@@ -1,112 +0,0 @@
-RSpec::Matchers.define :create_records do |record_counts|
-  include ActiveSupport::Inflector
-
-  supports_block_expectations
-
-  description do
-    counts_strs = record_counts.map { |klass, count| count_str(klass, count) }
-    "create #{counts_strs.join(", ")}"
-  end
-
-  chain(:with_attributes) do |attributes|
-    if mismatch=attributes.find {|klass, hashes| hashes.size != record_counts[klass]}
-      mismatched_class, hashes = mismatch
-      raise ArgumentError, "Specified the block should create #{record_counts[mismatched_class]} #{mismatched_class}, but provided #{hashes.size} #{mismatched_class} attribute specifications"
-    end
-    @expected_attributes = attributes
-  end
-
-  chain(:which) do |&block|
-    @which_block = block
-  end
-
-  match do |options={}, block|
-    fetching_strategy =
-      ActiveRecordChangeMatchers::Strategies.for_key(options[:strategy]).new(block)
-
-    @new_records = fetching_strategy.new_records(record_counts.keys)
-
-    @incorrect_counts =
-      @new_records.each_with_object({}) do |(klass, new_records), incorrect|
-        actual_count = new_records.count
-        expected_count = record_counts[klass]
-        if actual_count != expected_count
-          incorrect[klass] = { expected: expected_count, actual: actual_count }
-        end
-      end
-
-    return false if @incorrect_counts.any?
-
-    if @expected_attributes
-      @matched_records = Hash.new {|hash, key| hash[key] = []}
-      @all_attributes = Hash.new {|hash, key| hash[key] = []}
-      @incorrect_attributes =
-        @expected_attributes.each_with_object(Hash.new {|hash, key| hash[key] = []}) do |(klass, expected_attributes), incorrect|
-          @all_attributes[klass] = expected_attributes.map(&:keys).flatten.uniq
-          expected_attributes.each do |expected_attrs|
-            matched_record = (@new_records.fetch(klass) - @matched_records[klass]).find do |record|
-              expected_attrs.all? {|k,v| values_match?(v, record.public_send(k))}
-            end
-            if matched_record
-              @matched_records[klass] << matched_record
-            else
-              incorrect[klass] << expected_attrs
-            end
-          end
-        end
-      @unmatched_records = @matched_records.map {|klass, records| [klass, @new_records[klass] - records]}.to_h.reject {|k,v| v.empty?}
-      return false if @incorrect_attributes.any?
-    end
-
-
-    begin
-      @which_block && @which_block.call(@new_records)
-    rescue RSpec::Expectations::ExpectationNotMetError => e
-      @which_failure = e
-    end
-
-    @which_failure.nil?
-  end
-
-  failure_message do
-    if @incorrect_counts.present?
-      @incorrect_counts.map do |klass, counts|
-        "The block should have created #{count_str(klass, counts[:expected])}, but created #{counts[:actual]}."
-      end.join(" ")
-    elsif @incorrect_attributes.present?
-      "The block should have created:\n" +
-        @expected_attributes.map do |klass, attrs|
-          "    #{attrs.count} #{klass} with these attributes:\n" +
-          attrs.map{|a| "        #{a.inspect}"}.join("\n")
-        end.join("\n") +
-        "\nDiff:" +
-        @incorrect_attributes.map do |klass, attrs|
-          "\n    Missing #{attrs.count} #{klass} with these attributes:\n" +
-          attrs.map{|a| "        #{a.inspect}"}.join("\n")
-        end.join("\n") +
-        @unmatched_records.map do |klass, records|
-          "\n    Extra #{records.count} #{klass} with these attributes:\n" +
-          records.map do |r|
-            attrs = @all_attributes[klass].each_with_object({}) {|attr, attrs| attrs[attr] = r.public_send(attr)}
-            "        #{attrs.inspect}"
-          end.join("\n")
-        end.join("\n")
-    elsif @which_failure
-      @which_failure
-    else
-      "Unknown error"
-    end
-  end
-
-  failure_message_when_negated do
-    record_counts.map do |klass, expected_count|
-      "The block should not have created #{count_str(klass, expected_count)}, but created #{expected_count}."
-    end.join(" ")
-  end
-
-  def count_str(klass, count)
-    "#{count} #{klass.name.pluralize(count)}"
-  end
-end
-
-RSpec::Matchers.alias_matcher :create, :create_records