test ruby 2.7 and remove memory leak (#505)

Author: seuros

.gitignore

@@ -4,7 +4,6 @@
 .config
 .yardoc
 Gemfile.lock
-gemfiles/*.lock
 InstalledFiles
 _yardoc
 coverage
@@ -18,3 +17,6 @@ test/version_tmp
 tmp
 .rubocop-https*
 .byebug_history
+.idea
+*.iml
+gemfiles/*.gemfile.lock

.travis.yml

@@ -3,32 +3,14 @@ cache: bundler
 bundler_args: --without benchmarks tools
 rvm:
   - ruby-head
+  - 2.7
+  - 2.6
   - 2.5
   - 2.4
-env:
-  - "DRY_VALIDATION='~> 1.5.0'"
-  - "DRY_VALIDATION='~> 1.4.0'"
-  - "DRY_VALIDATION='~> 1.3.0'"
-  - "DRY_VALIDATION='~> 1.2.0'"
-  - "DRY_VALIDATION='~> 1.1.0'"
-  - "DRY_VALIDATION='~> 1.0.0'"
-  - "DRY_VALIDATION='~> 0.13.0'"
-  - "DRY_VALIDATION='~> 0.12.0'"
+gemfile:
+  - gemfiles/1.5.0.gemfile
+  - gemfiles/0.13.0.gemfile
 matrix:
   fast_finish: true
   allow_failures:
     - rvm: ruby-head
-  include:
-    - { rvm: 2.2, env: "DRY_VALIDATION='~> 0.11.0'" }
-    - { rvm: 2.3, env: "DRY_VALIDATION='~> 0.12.0'" }
-    - { rvm: 2.3, env: "DRY_VALIDATION='~> 0.13.0'" }
-
-
-# maybe move this to slack in a private channel
-# notifications:
-#   webhooks:
-#     urls:
-#       - https://webhooks.gitter.im/e/680e86d98056f2ae2fd7
-#     on_success: change  # options: [always|never|change] default: always
-#     on_failure: always  # options: [always|never|change] default: always
-#     on_start: never     # options: [always|never|change] default: always

Appraisals

@@ -0,0 +1,8 @@
+appraise "1.5.0" do
+  gem 'dry-monads', "1.3.5"
+  gem 'dry-validation', '~> 1.5.0'
+end
+
+appraise "0.13.0" do
+  gem 'dry-validation', '~> 0.13.0'
+end

Gemfile

@@ -2,9 +2,4 @@ source "https://rubygems.org"
 
 gemspec
 
-# gem "disposable", path: "../disposable"
-
-# just trying to add `dry-monads` correct version in base on dry-validation
-dry_v_version = ENV.fetch('DRY_VALIDATION', '~> 0.13.0').gsub("~>", "").to_f
-gem 'dry-monads', "~> #{[dry_v_version, 1.3].min}" if dry_v_version >= 1
-gem 'dry-validation', ENV.fetch('DRY_VALIDATION', '~> 0.13.0')
+gem "appraisal", "~> 2.2"

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 - 2016 Nick Sutterer
+Copyright (c) 2013 - 2020 Nick Sutterer
 
 MIT License
 

Rakefile

@@ -1,6 +1,7 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 require "rubocop/rake_task"
+require "dry/types/version"
 
 task default: %i[test]
 
@@ -10,8 +11,7 @@ TEST_WITH_OLD_AND_NEW_API = %w[
 ].freeze
 
 def dry_v_test_files
-  dry_v_version = ENV.fetch("DRY_VALIDATION", "~> 0.13.0")
-  api = dry_v_version.gsub("~>", "").to_f >= 1.0 ? "new" : "old"
+  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
 

gemfiles/0.13.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 2.2"
+gem "dry-validation", "~> 0.13.0"
+
+gemspec path: "../"

gemfiles/1.5.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 2.2"
+gem "dry-monads", "1.3.5"
+gem "dry-validation", "~> 1.5.0"
+
+gemspec path: "../"

lib/reform/form/dry/new_api.rb

@@ -1,6 +1,9 @@
+::Dry::Validation.load_extensions(:hints)
+
 module Reform::Form::Dry
   module NewApi
-    class Contract < Dry::Validation::Contract
+
+    class Contract < ::Dry::Validation::Contract
     end
 
     module Validations
@@ -18,39 +21,25 @@ class Group
         include InputHash
 
         def initialize(options = {})
-          options ||= {}
-          @validator = options[:schema] || Reform::Form::Dry::NewApi::Contract
-
-          @schema_inject_params = options[:with] || {}
+          @validator = options.fetch(:schema, Contract)
+          @schema_inject_params = options.fetch(:with, {})
         end
 
         def instance_exec(&block)
-          Dry::Validation.load_extensions(:hints)
           @block = block
         end
 
         def call(form)
-          dynamic_options = {}
-          dynamic_options[:form] = form if @schema_inject_params[:form]
-          inject_options = @schema_inject_params.merge(dynamic_options)
-
-          Dry::Schema::DSL.class_eval do
-            inject_options.each do |key, value|
-              define_method(key) { value }
-            end
-          end
-
           # when passing options[:schema] the class instance is already created so we just need to call
           # "call"
-          @validator = @validator.build(&@block) if @validator == Reform::Form::Dry::NewApi::Contract
-
-          # TODO: only pass submitted values to Schema#call?
-          dry_result = @validator.call(input_hash(form))
-          # dry_messages    = dry_result.messages
-
-          return dry_result
+          if @validator.is_a?(Class) && @validator <= ::Dry::Validation::Contract
+            dynamic_options = {}
+            dynamic_options[:form] = form if @schema_inject_params[:form]
+            inject_options = @schema_inject_params.merge(dynamic_options)
+            @validator = @validator.build(inject_options, &@block)
+          end
 
-          _reform_errors = Reform::Contract::Errors.new(dry_result) # TODO: dry should be merged here.
+          @validator.call(input_hash(form))
         end
       end
     end

reform.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "minitest-line"
-  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "multi_json"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rubocop"

test/test_helper.rb

@@ -3,7 +3,7 @@
 require "representable/debug"
 require "declarative/testing"
 require "pp"
-require "byebug"
+require "pry-byebug"
 
 require "reform/form/dry"
 

test/validation/dry_validation_new_api.rb

@@ -73,21 +73,21 @@ class AlbumForm < TestForm
     form.to_result.hints.must_equal(title: ["size cannot be less than 2"])
     form.artist.to_result.errors.must_equal(email: ["must be filled"])
     form.artist.to_result.messages.must_equal(email: ["must be filled"])
-    form.artist.to_result.hints.must_equal(email: [])
+    form.artist.to_result.hints.must_equal({})
     form.artist.label.to_result.errors.must_equal(location: ["must be filled"])
     form.artist.label.to_result.messages.must_equal(location: ["must be filled"])
-    form.artist.label.to_result.hints.must_equal(location: [])
+    form.artist.label.to_result.hints.must_equal({})
     form.songs[0].to_result.errors.must_equal({})
     form.songs[0].to_result.messages.must_equal({})
     form.songs[0].to_result.hints.must_equal({})
     form.songs[1].to_result.errors.must_equal(title: ["must be filled"])
     form.songs[1].to_result.messages.must_equal(title: ["must be filled"])
-    form.songs[1].to_result.hints.must_equal(title: [])
+    form.songs[1].to_result.hints.must_equal({})
     form.songs[1].to_result.errors(locale: :de).must_equal(title: ["muss abgefüllt sein"])
     # seems like dry-v when calling Dry::Schema::Result#messages locale option is ignored
     # started a topic in their forum https://discourse.dry-rb.org/t/dry-result-messages-ignore-locale-option/910
     # form.songs[1].to_result.messages(locale: :de).must_equal(title: ["muss abgefüllt sein"])
-    form.songs[1].to_result.hints(locale: :de).must_equal(title: [])
+    form.songs[1].to_result.hints(locale: :de).must_equal({})
   end
 
   it "only nested property is invalid." do
@@ -196,7 +196,13 @@ class SessionForm < TestForm
     end
 
     validation name: :dynamic_args, with: {form: true} do
-      params { required(:color).maybe(included_in?: form.colors) }
+      option :form
+      params { optional(:color) }
+      rule(:color) do
+        if value
+          key.failure("must be one of: #{form.colors}") unless form.colors.include? value
+        end
+      end
     end
 
     def colors
@@ -208,15 +214,15 @@ def colors
 
   # valid.
   it do
-    form.validate(
+    assert form.validate(
       username: "Helloween",
       email:    "yep",
       starts_at: "01/01/2000 - 11:00",
       active: "true",
       confirm_password: "pA55w0rd"
-    ).must_equal true
-    form.active.must_equal true
-    form.errors.messages.inspect.must_equal "{}"
+    )
+    assert form.active
+    assert_equal "{}", form.errors.messages.inspect
   end
 
   it "invalid" do
@@ -309,8 +315,12 @@ class SessionForm < TestForm
         property :username
 
         validation name: :default, with: {user: OpenStruct.new(name: "Nick")} do
+          option :user
           params do
-            required(:username).filled(eql?: user.name)
+            required(:username).filled
+          end
+          rule(:username) do
+            key.failure("must be equal to #{user.name}") unless user.name == value
           end
         end
       end
@@ -471,7 +481,7 @@ class AlbumForm < TestForm
       # TODO: use the same form structure as the top one and do the same test against messages, errors and hints.
       form.producers[0].to_result.errors.must_equal(name: ["must be filled"])
       form.producers[0].to_result.messages.must_equal(name: ["must be filled"])
-      form.producers[0].to_result.hints.must_equal(name: [])
+      form.producers[0].to_result.hints.must_equal({})
     end
 
     # FIXME: fix the "must be filled error"