reform 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f22b2268e248120b5738d5387d464d8563d661d6749a6c371ed1172d9c3fb18b
-  data.tar.gz: 534162094e74586a1c73634f1394f8ef8f37bb79b970c7003d37773c1f2109a1
+  metadata.gz: 1632a1964f6950c4451e586caae9bfe4766501e22c6e7961c442aae3327c6b8f
+  data.tar.gz: cfa18510a8fad6eab78a5d7ffdb890b3f8e80dbbe2dcb7390a386fded0b7f479
 SHA512:
-  metadata.gz: d1f26ff2eb879a16cea3a230fb0fccf97525cf72321941b48312d47ed47e5a9759f67e44c9cd68057adf020ec0374706ae4991b9b29141b46ee963ef4e218d31
-  data.tar.gz: 77c4f8dc39bb7616e12b2b8c74f3f45e0b9285bd95dcc0a9a7206e35905c1b4ef956ab87eef49b20b87efc322578e047caa0f84cc30024ff236320af93764308
+  metadata.gz: af8948ced80b6370a1878317d5cb99609c64e073c6206c511825358a9535de70f1ef34791d06fd240f864554b00ef8e04a595b8993aefa8d9f49580b6644c226
+  data.tar.gz: c3f5a610f6dad84cb451f8880aa84294cfbf610649fc33aba20cf69b0be0414868b77756843b3c842a872c54dfbab759f40b15505b2e19c3075e5010119076c5

data/CHANGES.md

@@ -1,7 +1,6 @@
-## 3.0.0
+## 2.3.2
 
-[* Removed `Reform::Contract` ?]
-[* Move Form#deserializer to Form::deserializer]
+* Fix Validation block option :form incorrectly memoized between tests
 
 ## 2.3.1
 * With dry-validation 1.5 the form is always injected. Just add option :form to access it in the schema.

data/Rakefile

@@ -1,6 +1,5 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
-require "rubocop/rake_task"
 require "dry/types/version"
 
 task default: %i[test]
@@ -21,4 +20,3 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-RuboCop::RakeTask.new(:rubocop)

data/lib/reform/form/dry/new_api.rb

@@ -25,6 +25,8 @@ module Reform::Form::Dry
           @schema_inject_params = options.fetch(:with, {})
         end
 
+        attr_reader :validator, :schema_inject_params, :block
+
         def instance_exec(&block)
           @block = block
         end
@@ -32,13 +34,12 @@ module Reform::Form::Dry
         def call(form)
           # when passing options[:schema] the class instance is already created so we just need to call
           # "call"
-          if @validator.is_a?(Class) && @validator <= ::Dry::Validation::Contract
-            dynamic_options = {form: form}
-            inject_options = @schema_inject_params.merge(dynamic_options)
-            @validator = @validator.build(inject_options, &@block)
-          end
+          return validator.call(input_hash(form)) unless validator.is_a?(Class) && @validator <= ::Dry::Validation::Contract
+
+          dynamic_options = { form: form }
+          inject_options = schema_inject_params.merge(dynamic_options)
 
-          @validator.call(input_hash(form))
+          validator.build(inject_options, &block).call(input_hash(form))
         end
       end
     end

data/lib/reform/version.rb

@@ -1,3 +1,3 @@
 module Reform
-  VERSION = "2.3.1".freeze
+  VERSION = "2.3.2".freeze
 end

data/reform.gemspec

@@ -27,5 +27,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "multi_json"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rubocop"
 end

data/test/validate_new_api.rb

@@ -278,6 +278,51 @@ class ValidateWithInternalPopulatorOptionTest < MiniTest::Spec
   end
 end
 
+class ValidateUsingDifferentFormObject < MiniTest::Spec
+  Album = Struct.new(:name)
+
+  class AlbumForm < TestForm
+    property :name
+
+    validation do
+      option :form
+
+      params { required(:name).filled(:str?) }
+
+      rule(:name) do
+        if form.name == 'invalid'
+          key.failure('Invalid name')
+        end
+      end
+    end
+  end
+
+  let(:album) { Album.new }
+
+  let(:form) { AlbumForm.new(album) }
+
+  it 'sets name correctly' do
+    assert form.validate(name: 'valid')
+    form.sync
+    assert_equal form.model.name, 'valid'
+  end
+
+  it 'validates presence of name' do
+    refute form.validate(name: nil)
+    assert_equal form.errors[:name], ["must be filled"]
+  end
+
+  it 'validates type of name' do
+    refute form.validate(name: 1)
+    assert_equal form.errors[:name], ["must be a string"]
+  end
+
+  it 'when name is invalid' do
+    refute form.validate(name: 'invalid')
+    assert_equal form.errors[:name], ["Invalid name"]
+  end
+end
+
 #   # not sure if we should catch that in Reform or rather do that in disposable. this is https://github.com/trailblazer/reform/pull/104
 #   # describe ":populator with :empty" do
 #   #   let(:form) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reform
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: disposable
@@ -149,20 +149,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Form object decoupled from models.
 email:
 - apotonick@gmail.com
@@ -172,8 +158,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
 - ".travis.yml"
 - Appraisals
 - CHANGES.md
@@ -278,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Form object decoupled from models with validation, population and presentation.

data/.rubocop.yml

@@ -1,30 +0,0 @@
-AllCops:
-  TargetRubyVersion: '2.3'
-
-inherit_from:
-  - https://raw.githubusercontent.com/trailblazer/meta/master/rubocop.yml
-  - .rubocop_todo.yml
-
-Metrics/ClassLength:
-  Max: 150
-
-Lint/AssignmentInCondition:
-  Enabled: false
-
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-Style/OptionHash:
-  Enabled: false
-
-Style/ParallelAssignment:
-  Enabled: false
-
-Style/Send:
-  Enabled: false
-
-Style/SingleLineMethods:
-  Enabled: false
-
-Style/Lambda:
-  EnforcedStyle: literal

data/.rubocop_todo.yml

@@ -1,460 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2019-08-18 11:55:38 +1000 using RuboCop version 0.74.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: TreatCommentsAsGroupSeparators, Include.
-# Include: **/*.gemspec
-Gemspec/OrderedDependencies:
-  Exclude:
-    - 'reform.gemspec'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: outdent, indent
-Layout/AccessModifierIndentation:
-  Exclude:
-    - 'test/populate_test.rb'
-
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_argument, with_fixed_indentation
-Layout/AlignArguments:
-  Exclude:
-    - 'test/deserialize_test.rb'
-    - 'test/populate_test.rb'
-    - 'test/validate_test.rb'
-
-# Offense count: 4
-# Cop supports --auto-correct.
-Layout/AlignArray:
-  Exclude:
-    - 'test/populate_test.rb'
-
-# Offense count: 56
-# Cop supports --auto-correct.
-# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/AlignHash:
-  Exclude:
-    - 'test/coercion_test.rb'
-    - 'test/composition_test.rb'
-    - 'test/errors_test.rb'
-    - 'test/populate_test.rb'
-    - 'test/validate_test.rb'
-    - 'test/validation/dry_validation_test.rb'
-    - 'test/validation/result_test.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleAlignWith.
-# SupportedStylesAlignWith: either, start_of_block, start_of_line
-Layout/BlockAlignment:
-  Exclude:
-    - 'lib/reform/errors.rb'
-    - 'test/from_test.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Layout/BlockEndNewline:
-  Exclude:
-    - 'test/populate_test.rb'
-    - 'test/validate_test.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/ClosingParenthesisIndentation:
-  Exclude:
-    - 'test/composition_test.rb'
-
-# Offense count: 7
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterGuardClause:
-  Exclude:
-    - 'lib/reform/form/populator.rb'
-    - 'lib/reform/form/prepopulate.rb'
-    - 'lib/reform/validation/groups.rb'
-    - 'test/populator_skip_test.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterMagicComment:
-  Exclude:
-    - 'test/validation/dry_validation_test.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: around, only_before
-Layout/EmptyLinesAroundAccessModifier:
-  Exclude:
-    - 'test/populate_test.rb'
-    - 'test/prepopulator_test.rb'
-
-# Offense count: 10
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, no_empty_lines
-Layout/EmptyLinesAroundBlockBody:
-  Exclude:
-    - 'test/from_test.rb'
-    - 'test/inherit_test.rb'
-    - 'test/populate_test.rb'
-    - 'test/validate_test.rb'
-    - 'test/validation/dry_validation_test.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
-Layout/EmptyLinesAroundClassBody:
-  Exclude:
-    - 'test/skip_if_test.rb'
-    - 'test/validation/dry_validation_test.rb'
-
-# Offense count: 8
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
-Layout/ExtraSpacing:
-  Exclude:
-    - 'test/benchmarking.rb'
-    - 'test/composition_test.rb'
-    - 'test/populate_test.rb'
-    - 'test/prepopulator_test.rb'
-    - 'test/validation/dry_validation_test.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Layout/FirstArrayElementLineBreak:
-  Exclude:
-    - 'test/populate_test.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-Layout/FirstHashElementLineBreak:
-  Exclude:
-    - 'test/validate_test.rb'
-    - 'test/validation/dry_validation_test.rb'
-    - 'test/validation/result_test.rb'
-
-# Offense count: 4
-# Cop supports --auto-correct.
-Layout/FirstMethodArgumentLineBreak:
-  Exclude:
-    - 'test/deserialize_test.rb'
-    - 'test/validation/dry_validation_test.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: normal, indented_internal_methods
-Layout/IndentationConsistency:
-  Exclude:
-    - 'test/benchmarking.rb'
-
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: Width, IgnoredPatterns.
-Layout/IndentationWidth:
-  Exclude:
-    - 'lib/reform/errors.rb'
-    - 'test/benchmarking.rb'
-    - 'test/prepopulator_test.rb'
-
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: AllowDoxygenCommentStyle.
-Layout/LeadingCommentSpace:
-  Exclude:
-    - 'test/docs/**/*'
-    - 'test/benchmarking.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: symmetrical, new_line, same_line
-Layout/MultilineHashBraceLayout:
-  Exclude:
-    - 'test/validation/result_test.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: symmetrical, new_line, same_line
-Layout/MultilineMethodCallBraceLayout:
-  Exclude:
-    - 'test/composition_test.rb'
-    - 'test/deserialize_test.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: aligned, indented, indented_relative_to_receiver
-Layout/MultilineMethodCallIndentation:
-  Exclude:
-    - 'test/validation/dry_validation_test.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment.
-Layout/SpaceAroundOperators:
-  Exclude:
-    - 'lib/reform/form.rb'
-    - 'lib/reform/form/dry.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
-# SupportedStyles: space, no_space, compact
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceInsideHashLiteralBraces:
-  Exclude:
-    - 'Gemfile'
-    - 'lib/reform/form.rb'
-
-# Offense count: 7
-# Cop supports --auto-correct.
-# Configuration parameters: IndentationWidth.
-Layout/Tab:
-  Exclude:
-    - 'lib/reform/errors.rb'
-    - 'test/benchmarking.rb'
-
-# Offense count: 3
-Lint/IneffectiveAccessModifier:
-  Exclude:
-    - 'lib/reform/contract.rb'
-    - 'lib/reform/form/validate.rb'
-
-# Offense count: 12
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
-Lint/UnusedBlockArgument:
-  Exclude:
-    - 'lib/reform/errors.rb'
-    - 'lib/reform/form.rb'
-    - 'lib/reform/result.rb'
-    - 'test/composition_test.rb'
-    - 'test/parse_pipeline_test.rb'
-    - 'test/populate_test.rb'
-    - 'test/validate_test.rb'
-    - 'test/validation/dry_validation_test.rb'
-
-# Offense count: 10
-# Cop supports --auto-correct.
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
-Lint/UnusedMethodArgument:
-  Exclude:
-    - 'lib/reform/contract/validate.rb'
-    - 'lib/reform/errors.rb'
-    - 'lib/reform/form/populator.rb'
-    - 'lib/reform/form/validate.rb'
-    - 'test/inherit_test.rb'
-    - 'test/populate_test.rb'
-    - 'test/prepopulator_test.rb'
-
-# Offense count: 2
-# Configuration parameters: ContextCreatingMethods, MethodCreatingMethods.
-Lint/UselessAccessModifier:
-  Exclude:
-    - 'lib/reform/contract.rb'
-    - 'test/populate_test.rb'
-
-# Offense count: 4
-Lint/UselessAssignment:
-  Exclude:
-    - 'lib/reform/form.rb'
-    - 'lib/reform/form/dry.rb'
-    - 'test/benchmarking.rb'
-
-# Offense count: 42
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 271
-
-# Offense count: 1
-# Configuration parameters: EnforcedStyleForLeadingUnderscores.
-# SupportedStylesForLeadingUnderscores: disallowed, required, optional
-Naming/MemoizedInstanceVariableName:
-  Exclude:
-    - 'lib/reform/validation.rb'
-
-# Offense count: 39
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: braces, no_braces, context_dependent
-Style/BracesAroundHashParameters:
-  Exclude:
-    - 'test/call_test.rb'
-    - 'test/composition_test.rb'
-    - 'test/deserialize_test.rb'
-    - 'test/from_test.rb'
-    - 'test/module_test.rb'
-    - 'test/reform_test.rb'
-    - 'test/save_test.rb'
-    - 'test/validation/dry_validation_test.rb'
-    - 'test/validation/result_test.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: Keywords.
-# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW
-Style/CommentAnnotation:
-  Exclude:
-    - 'test/errors_test.rb'
-
-# Offense count: 9
-Style/CommentedKeyword:
-  Exclude:
-    - 'lib/reform/contract.rb'
-    - 'lib/reform/form/populator.rb'
-    - 'lib/reform/form/validate.rb'
-    - 'lib/reform/result.rb'
-    - 'test/module_test.rb'
-    - 'test/reform_test.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/Encoding:
-  Exclude:
-    - 'test/validation/dry_validation_test.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'lib/reform/form.rb'
-
-# Offense count: 1
-Style/ImplicitRuntimeError:
-  Exclude:
-    - 'lib/reform/form/populator.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/LineEndConcatenation:
-  Exclude:
-    - 'lib/reform/validation.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoredMethods.
-Style/MethodCallWithoutArgsParentheses:
-  Exclude:
-    - 'test/reform_test.rb'
-
-# Offense count: 1
-Style/MethodMissingSuper:
-  Exclude:
-    - 'lib/reform/form/module.rb'
-
-# Offense count: 1
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: if, case, both
-Style/MissingElse:
-  Exclude:
-    - 'test/composition_test.rb'
-
-# Offense count: 1
-Style/MissingRespondToMissing:
-  Exclude:
-    - 'lib/reform/form/module.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: predicate, comparison
-Style/NilComparison:
-  Exclude:
-    - 'test/prepopulator_test.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
-  Exclude:
-    - 'reform.gemspec'
-    - 'test/validation/dry_validation_test.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: compact, exploded
-Style/RaiseArgs:
-  Exclude:
-    - 'lib/reform/form.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/RedundantParentheses:
-  Exclude:
-    - 'test/populate_test.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/RedundantSelf:
-  Exclude:
-    - 'lib/reform/validation/groups.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: only_raise, only_fail, semantic
-Style/SignalException:
-  Exclude:
-    - 'lib/reform/form.rb'
-    - 'lib/reform/form/populator.rb'
-    - 'lib/reform/validation.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: use_perl_names, use_english_names
-Style/SpecialGlobalVars:
-  Exclude:
-    - 'reform.gemspec'
-
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiterals:
-  Exclude:
-    - 'Gemfile'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: IgnoredMethods.
-# IgnoredMethods: respond_to, define_method
-Style/SymbolProc:
-  Exclude:
-    - 'lib/reform/errors.rb'
-
-# Offense count: 8
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInArguments:
-  Exclude:
-    - 'test/populate_test.rb'
-    - 'test/validate_test.rb'
-    - 'test/validation/dry_validation_test.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline.
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
-Style/TrailingCommaInHashLiteral:
-  Exclude:
-    - 'test/validation/result_test.rb'