remockable 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ffc2a8134d4c752ce38d77cec8e266d50ea9f0f14d4d68c039d54983a25786e
-  data.tar.gz: 695c352b12e802ba5f175dea7bed983ef7051323d11157e52b58924172e8ae4f
+  metadata.gz: 5492de95e8e21114d1b6e9561bf73137b943dfabcffe4308ad201d92e966405e
+  data.tar.gz: ae94c8bfe61f44b63b85812f3d92527f90fd6f28787e4aa21dbbb549bf6cfee9
 SHA512:
-  metadata.gz: 61b0cb9dde668204f1dd5a150e24f299030f3049fb4218bae92c494ea8fb5843740cca45ee65dec6833841c5303b40ba44dfef632da7c60d060c1c4021ae2422
-  data.tar.gz: bae3c12a4724a77e40c99e3fbc9cc5cb4ad46132d2a7a2071349f8e44c188904679ef8594988cfa7271d27c371402e5dc9856ec1d4a479d7408f6d421bbc43a4
+  metadata.gz: 6acbc06082392f6ca96362bd9082215fd0fdf38eff2f745bcd44faf09245ce18252e7fbf47643b19d7dd0223a9c3700c7d2f16c493f23df9a24d3f11a738d3fe
+  data.tar.gz: 24325ec462e5250420f8f6b6f1dda50044c36577dfdc48690560b79651c54d96ec9385e853d1b51eea05ab585712564eae18fb3016cd03b7228ce49dd1a1f24c

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.3.10 (2024-02-08)
+
+  * Support symbol values for `:reject_if` option on
+    `accept_nested_attributes_for` ([Tyler Hunt][tylerhunt])
+
 ## 0.3.9 (2022-05-04)
 
   * Allow `:required`/`:optional` aliases with `belongs_to`

data/gemfiles/rails_4.2.gemfile.lock

@@ -30,18 +30,18 @@ GEM
       thor (>= 0.14.0)
     arel (6.0.4)
     builder (3.2.4)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.3)
+    minitest (5.15.0)
     rake (13.0.3)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)

data/gemfiles/rails_5.0.gemfile.lock

@@ -28,18 +28,18 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (7.1.4)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
-    i18n (1.8.7)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.3)
+    minitest (5.15.0)
     rake (13.0.3)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)

data/gemfiles/rails_5.1.gemfile.lock

@@ -28,18 +28,18 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (8.0.0)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
-    i18n (1.8.7)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.3)
+    minitest (5.15.0)
     rake (13.0.3)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)

data/gemfiles/rails_5.2.gemfile.lock

@@ -12,13 +12,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.4.4)
-      activesupport (= 5.2.4.4)
-    activerecord (5.2.4.4)
-      activemodel (= 5.2.4.4)
-      activesupport (= 5.2.4.4)
+    activemodel (5.2.7.1)
+      activesupport (= 5.2.7.1)
+    activerecord (5.2.7.1)
+      activemodel (= 5.2.7.1)
+      activesupport (= 5.2.7.1)
       arel (>= 9.0)
-    activesupport (5.2.4.4)
+    activesupport (5.2.7.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -28,18 +28,18 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (9.0.0)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
-    i18n (1.8.7)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.3)
+    minitest (5.15.0)
     rake (13.0.3)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)

data/gemfiles/rails_6.0.gemfile.lock

@@ -12,12 +12,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activerecord (6.0.3.4)
-      activemodel (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activesupport (6.0.3.4)
+    activemodel (6.0.4.8)
+      activesupport (= 6.0.4.8)
+    activerecord (6.0.4.8)
+      activemodel (= 6.0.4.8)
+      activesupport (= 6.0.4.8)
+    activesupport (6.0.4.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -27,18 +27,18 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
-    i18n (1.8.7)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.3)
+    minitest (5.15.0)
     rake (13.0.3)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
@@ -47,7 +47,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby

data/gemfiles/rails_6.1.gemfile.lock

@@ -12,12 +12,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.1)
-      activesupport (= 6.1.1)
-    activerecord (6.1.1)
-      activemodel (= 6.1.1)
-      activesupport (= 6.1.1)
-    activesupport (6.1.1)
+    activemodel (6.1.5.1)
+      activesupport (= 6.1.5.1)
+    activerecord (6.1.5.1)
+      activemodel (= 6.1.5.1)
+      activesupport (= 6.1.5.1)
+    activesupport (6.1.5.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -27,18 +27,18 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
-    i18n (1.8.7)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.3)
+    minitest (5.15.0)
     rake (13.0.3)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
     rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
@@ -46,7 +46,7 @@ GEM
     thor (1.0.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby

data/lib/remockable/active_record/accept_nested_attributes_for.rb

@@ -1,12 +1,32 @@
+all_blank_proc =
+  ActiveRecord::NestedAttributes::ClassMethods::REJECT_ALL_BLANK_PROC
+
 RSpec::Matchers.define(:accept_nested_attributes_for) do
   include Remockable::ActiveRecord::Helpers
 
-  unsupported_options %w(reject_if)
-  valid_options %w(allow_destroy limit update_only)
+  valid_options %w(allow_destroy limit reject_if update_only)
 
   match do |actual|
     if actual_options = subject.class.nested_attributes_options[attribute]
-      actual_options.slice(*options.keys) == options
+      options_without_reject_if = options.except(:reject_if)
+
+      reject_if_matches =
+        case options[:reject_if]
+        when :all_blank
+          all_blank_proc == actual_options[:reject_if]
+        when Symbol
+          options[:reject_if] == actual_options[:reject_if]
+        when nil
+          true
+        else
+          raise ArgumentError, 'cannot compare proc values for :reject_if'
+        end
+
+      other_options_match =
+        actual_options.slice(*options_without_reject_if.keys) ==
+          options_without_reject_if
+
+      reject_if_matches && other_options_match
     end
   end
 

data/lib/remockable/version.rb

@@ -1,3 +1,3 @@
 module Remockable
-  VERSION = '0.3.9'
+  VERSION = '0.3.10'
 end

data/spec/active_record/accept_nested_attributes_for_spec.rb

@@ -44,8 +44,11 @@ describe :accept_nested_attributes_for do
 
     with_option :allow_destroy, true, false
     with_option :limit, 1, 2
-    with_option :update_only, true, false
 
-    with_unsupported_option :reject_if, :all_blank
+    with_option :reject_if, :all_blank, :all_empty do
+      raise_on_invalid_value -> {}, /cannot compare proc values/
+    end
+
+    with_option :update_only, true, false
   end
 end

data/spec/support/shared/an_active_record_matcher.rb

@@ -12,10 +12,14 @@ shared_examples_for 'an Active Record matcher' do
     positive,
     negative,
     context={},
-    macro_option={ option_name => positive }
+    macro_option=nil,
+    &block
   )
     context "with option #{option_name.inspect}" do
-      let(:options) { context.merge(macro_option) }
+      let(:option_name) { option_name }
+      let(:value) { positive }
+
+      let(:options) { context.merge(macro_option || { option_name => value }) }
 
       before do
         model.send macro, :company, **options
@@ -28,6 +32,21 @@ shared_examples_for 'an Active Record matcher' do
       it 'does not match if the options do not match' do
         should_not send(matcher_name, :company, option_name => negative)
       end
+
+      instance_exec &block if block_given?
+    end
+  end
+
+  def self.raise_on_invalid_value(value, error_message)
+    value_description = value.is_a?(Proc) ? 'proc' : value.inspect
+
+    context "with #{value_description} value" do
+      let(:value) { value }
+
+      it 'raises an error' do
+        expect { should send(matcher_name, :company, option_name => value) }
+          .to raise_error ArgumentError, error_message
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remockable
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Tyler Hunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-05 00:00:00.000000000 Z
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -253,7 +253,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.6
+rubyforge_project: 
+rubygems_version: 2.7.6.3
 signing_key: 
 specification_version: 4
 summary: A collection of RSpec matchers for web apps.