Drop dry-v compatibility < 1.x and fix memory leak (#514)

* Drop dry-v compatibility < 1.x

* remove minitest deprecation warnings

* Test added to reproduce issue #511

* fix memoization issue

Author: emaglio

.travis.yml

@@ -7,9 +7,6 @@ rvm:
   - 2.6
   - 2.5
   - 2.4
-gemfile:
-  - gemfiles/1.5.0.gemfile
-  - gemfiles/0.13.0.gemfile
 matrix:
   fast_finish: true
   allow_failures:

Appraisals

@@ -1,5 +1,6 @@
 ## 3.0.0
 
+* [BREAKING] Dropping compatibility of dry-validation < 1.x
 [* Removed `Reform::Contract` ?]
 [* Move Form#deserializer to Form::deserializer]
 

CHANGES.md

@@ -2,4 +2,5 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "appraisal", "~> 2.2"
+gem 'dry-monads', "1.3.5"
+gem 'dry-validation', '~> 1.5.0'

Gemfile

@@ -5,19 +5,9 @@ require "dry/types/version"
 
 task default: %i[test]
 
-TEST_WITH_OLD_AND_NEW_API = %w[
-  validation/dry_validation call composition contract errors inherit module reform
-  save skip_if populate validate form
-].freeze
-
-def dry_v_test_files
-  api = Gem::Version.new(Dry::Types::VERSION).to_s.split('.').first.to_i >= 1 ? "new" : "old"
-  TEST_WITH_OLD_AND_NEW_API.map { |file| "test/#{file}_#{api}_api.rb" }
-end
-
 Rake::TestTask.new(:test) do |test|
   test.libs << "test"
-  test.test_files = FileList["test/*_test.rb"] + FileList["test/validation/*_test.rb"] + dry_v_test_files
+  test.test_files = FileList["test/*_test.rb"] + FileList["test/validation/*_test.rb"]
   test.verbose = true
 end
 

Rakefile

@@ -11,7 +11,7 @@ def validate
       validate!(nil).success?
     end
 
-    # The #errors method will be removed in Reform 2.4/3.0 core.
+    # The #errors method will be removed in Reform 3.0 core.
     def errors(*args)
       Result::Errors.new(@result, self)
     end

gemfiles/0.13.0.gemfile

@@ -1,19 +1,53 @@
 require "dry-validation"
-require "dry/validation/version"
 require "reform/validation"
 require "reform/form/dry/input_hash"
 
+::Dry::Validation.load_extensions(:hints)
+
 module Reform::Form::Dry
+  class Contract < Dry::Validation::Contract
+  end
+
   def self.included(includer)
-    if Gem::Version.new(Dry::Validation::VERSION) > Gem::Version.new("0.13.3")
-      require "reform/form/dry/new_api"
-      validations = Reform::Form::Dry::NewApi::Validations
-    else
-      require "reform/form/dry/old_api"
-      validations = Reform::Form::Dry::OldApi::Validations
+    includer.send :include, Validations
+    includer.extend Validations::ClassMethods
+  end
+
+  module Validations
+    module ClassMethods
+      def validation_group_class
+        Group
+      end
+    end
+
+    def self.included(includer)
+      includer.extend(ClassMethods)
     end
 
-    includer.send :include, validations
-    includer.extend validations::ClassMethods
+    class Group
+      include InputHash
+
+      def initialize(options = {})
+        @validator = options.fetch(:schema, Contract)
+        @schema_inject_params = options.fetch(:with, {})
+      end
+
+      attr_reader :validator, :schema_inject_params, :block
+
+      def instance_exec(&block)
+        @block = block
+      end
+
+      def call(form)
+        # when passing options[:schema] the class instance is already created so we just need to call
+        # "call"
+        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.build(inject_options, &block).call(input_hash(form))
+      end
+    end
   end
 end

gemfiles/1.5.0.gemfile

@@ -43,7 +43,6 @@ def self.call(groups, form)
 
         groups.collect do |(name, group, options)|
           next unless evaluate?(options[:if], results, form)
-
           results[name] = group.(form) # run validation for group. store and collect <Result>.
         end
       end

lib/reform/contract/validate.rb

@@ -0,0 +1,23 @@
+require "test_helper"
+
+class CallTest < Minitest::Spec
+  Song = Struct.new(:title)
+
+  class SongForm < TestForm
+    property :title
+
+    validation do
+      params { required(:title).filled }
+    end
+  end
+
+  let(:form) { SongForm.new(Song.new) }
+
+  it { assert form.(title: "True North").success? }
+  it { refute form.(title: "True North").failure? }
+  it { refute form.(title: "").success? }
+  it { assert form.(title: "").failure? }
+
+  it { assert_equal form.(title: "True North").errors.messages, {} }
+  it { assert_equal form.(title: "").errors.messages, title: ["must be filled"] }
+end

lib/reform/form/dry.rb

@@ -26,16 +26,16 @@ class AlbumForm < TestForm
 
   # nothing changed after setup.
   it do
-    form.changed?(:name).must_equal false
-    form.songs[0].changed?(:title).must_equal false
-    form.songs[0].composer.changed?(:name).must_equal false
+    refute form.changed?(:name)
+    refute form.songs[0].changed?(:title)
+    refute form.songs[0].composer.changed?(:name)
   end
 
   # after validate, things might have changed.
   it do
     form.validate("name" => "Out Of Bounds", "songs" => [{"composer" => {"name" => "Ingemar Jansson & Mikael Danielsson"}}])
-    form.changed?(:name).must_equal true
-    form.songs[0].changed?(:title).must_equal false
-    form.songs[0].composer.changed?(:name).must_equal true
+    assert form.changed?(:name)
+    refute form.songs[0].changed?(:title)
+    assert form.songs[0].composer.changed?(:name)
   end
 end