reform-rails 0.1.7 → 0.2.1

data/.travis.yml

@@ -1,18 +1,18 @@
 language: ruby
 cache: bundler
-
+before_install:
+  - gem update --system
+  - gem install bundler
 rvm:
-  - 2.3.1
-  - 2.2.3
-  - 2.0.0
+    - 2.5.5
+    - 2.6.3
+    - 2.7
 services:
   - mongodb
-gemfile:
-  - gemfiles/Gemfile.rails-4.2
-  - gemfiles/Gemfile.rails-4.1
-  - gemfiles/Gemfile.rails-4.0
-  - gemfiles/Gemfile.rails-3.2
-  # - gemfiles/Gemfile.rails-3.1
-  # - gemfiles/Gemfile.rails-3.0
+env:
+  - "RAILS_VERSION=6.0.0"
+  - "RAILS_VERSION=5.2.0"
+  - "RAILS_VERSION=5.1.0"
+  - "RAILS_VERSION=5.0.0"
 matrix:
   fast_finish: true

data/CHANGES.md

@@ -1,3 +1,25 @@
+# 0.2.1
+
+* Error's full_message  with translation fixed thanks to [@marcelolx](https://github.com/trailblazer/reform-rails/pull/85)
+
+# 0.2.0
+
+* Needs Reform >= 2.3.0.
+* make the inclusion of ActiveModel form builder modules optional when using dry-validation. This can be controlled via `config.reform.enable_active_model_builder_methods = true`.
+* delegate `validates_each` method and allow it to be called outside a validation block.
+* add `case_sensitive` option to Reform Uniqueness validation. Defaults to true.
+* fix bug in uniqueness validation where form has different attribute name to column
+* improve handling of persisted records in uniqueness validator
+* remove params.merge! as it's deprecated in rails 5
+* update to support reform 2.3, the new API means that `errors.add` is delegated to ActiveModel::Errors to support rails 5
+* Fix nested form validation (#53)
+* Errors supports symbol and string lookup (PR #77)
+* Implement respond_to that delegates to AMV errors (PR #78)
+* Drop support for activemodel before 5.0
+
+# 0.1.8
+* Drop support to mongoid < 4.
+
 # 0.1.7 (0.1.6 Yanked)
 
 * Fix a bug where requiring `form/active_model/validations` in a non-Rails environment wouldn't load all necessary files.
@@ -12,7 +34,7 @@
 
 # 0.1.3
 
-* Introduce a railtie to load either `ActiveModel::Validations` *or* `Dry::Validations`. This can be controller via `config.reform.validations = :dry`.
+* Introduce a railtie to load either `ActiveModel::Validations` *or* `Dry::Validations`. This can be controlled via `config.reform.validations = :dry`.
 
 # 0.1.2
 

data/Gemfile

@@ -1,6 +1,33 @@
-source 'https://rubygems.org'
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
 
-# Specify your gem's dependencies in reform-rails.gemspec
+source "https://rubygems.org"
 gemspec
 
-gem "reform", path: "../reform"
+gem 'pry-byebug'
+gem "minitest-line"
+
+case ENV["GEMS_SOURCE"]
+  when "local"
+    gem "reform", path: "../reform"
+  when "github"
+    gem "reform", github: "trailblazer/reform"
+end
+
+rails_version = ENV.fetch("RAILS_VERSION", "6.0.0")
+
+# bored of wrestling with rails...
+
+gem("mongoid", "< 7.0") unless rails_version.include?('6.0')
+
+
+gem "activerecord", "~> #{rails_version}"
+gem "railties", "~> #{rails_version}"
+if rails_version.include?('6.0')
+  gem "sqlite3", "~> 1.4"
+else
+  gem "sqlite3", "~> 1.3", "< 1.4"
+end
+puts "Rails version #{rails_version}"

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Nick Sutterer
+Copyright (c) 2015-Covid_19year Nick Sutterer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -14,7 +14,7 @@ Simply don't include this gem if you don't want to use the conventional Reform/R
 
 ## Documentation
 
-The [full documentation](http://trailblazer.to/gems/reform/#reform-rails) can be found on the Trailblazer page.
+The [full documentation](https://trailblazer.to/2.0/gems/reform/rails.html) can be found on the Trailblazer page.
 
 ## Installation
 
@@ -24,7 +24,16 @@ Add this line to your application's Gemfile:
 gem 'reform-rails'
 ```
 
-Reform-rails needs Reform >= 2.2.
+Reform-rails needs Reform >= 2.3.
+
+## Contributing
+
+By default your tests will run against rails 6.0.1.
+Please ensure that you test your changes against all supported ruby and rails versions (see .travis.yml)
+
+You can run tests for a specific version of rails by running the following:
+
+`export RAILS_VERSION=5.0.0; bundle update; bundle exec rake test`
 
 ## License
 

data/Rakefile

@@ -4,7 +4,9 @@ require "rake/testtask"
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
-  t.test_files = FileList['test/**/*_test.rb']
+  t.test_files = FileList['test/*_test.rb']
+  t.warning = false
+  t.verbose = true
 end
 
 task :default => :test

data/lib/reform/active_record.rb

@@ -1,4 +1,4 @@
-require "reform/form/active_model"
 require "reform/form/orm"
+require "reform/form/active_model"
 require "reform/form/active_record"
 require "reform/form/active_model/model_reflections" # only load this in AR context as simple_form currently is bound to AR.

data/lib/reform/form/active_model.rb

@@ -42,15 +42,19 @@ module Reform::Form::ActiveModel
 
     # moved from reform as not applicable to dry
     def validates(*args, &block)
-      validation(:default, inherit: true) { validates *args, &block }
+      validation(name: :default, inherit: true) { validates *args, &block }
     end
 
     def validate(*args, &block)
-      validation(:default, inherit: true) { validate *args, &block }
+      validation(name: :default, inherit: true) { validate *args, &block }
     end
 
     def validates_with(*args, &block)
-      validation(:default, inherit: true) { validates_with *args, &block }
+      validation(name: :default, inherit: true) { validates_with *args, &block }
+    end
+
+    def validates_each(*args, &block)
+      validation(name: :default, inherit: true) { validates_each *args, &block }
     end
 
     # Set a model name for this form if the infered is wrong.
@@ -85,7 +89,6 @@ module Reform::Form::ActiveModel
 
   private
     def active_model_name_for(string, namespace=nil)
-      return ::ActiveModel::Name.new(OpenStruct.new(:name => string)) if ::ActiveModel::VERSION::MAJOR == 3 and ::ActiveModel::VERSION::MINOR == 0 # TODO: remove when we drop rails 3.x.
       ::ActiveModel::Name.new(self, namespace, string)
     end
   end # ClassMethods

data/lib/reform/form/active_model/validations.rb

@@ -2,114 +2,239 @@ require "active_model"
 require "reform/form/active_model"
 require "uber/delegates"
 
-module Reform::Form::ActiveModel
+module Reform
+  module Form::ActiveModel
   # AM::Validations for your form.
   # Provides ::validates, ::validate, #validate, and #valid?.
   #
   # Most of this file contains unnecessary wiring to make ActiveModel's error message magic work.
   # Since Rails still thinks it's a good idea to do things like object.class.human_attribute_name,
   # we have some hacks in here to provide that. If it doesn't work for you, don't blame us.
-  module Validations
-    def self.included(includer)
-      includer.instance_eval do
-        include Reform::Form::ActiveModel
-
-        class << self
-          extend Uber::Delegates
-          # # Hooray! Delegate translation back to Reform's Validator class which contains AM::Validations.
-          delegates :active_model_really_sucks, :human_attribute_name, :lookup_ancestors, :i18n_scope # Rails 3.1.
+    module Validations
+      def self.included(includer)
+        includer.instance_eval do
+          include Reform::Form::ActiveModel
+
+          class << self
+            extend Uber::Delegates
+            # # Hooray! Delegate translation back to Reform's Validator class which contains AM::Validations.
+            delegates :active_model_really_sucks, :human_attribute_name, :lookup_ancestors, :i18n_scope # Rails 3.1.
+
+            def validation_group_class
+              Group
+            end
 
-          def validation_group_class
-            Group
+            # this is to allow calls like Form::human_attribute_name (note that this is on the CLASS level) to be resolved.
+            # those calls happen when adding errors in a custom validation method, which is defined on the form (as an instance method).
+            def active_model_really_sucks
+              Class.new(Validator).tap do |v|
+                v.model_name = model_name
+              end
+            end
           end
+        end # ::included
+      end
 
-          # this is to allow calls like Form::human_attribute_name (note that this is on the CLASS level) to be resolved.
-          # those calls happen when adding errors in a custom validation method, which is defined on the form (as an instance method).
-          def active_model_really_sucks
-            Class.new(Validator).tap do |v|
-              v.model_name = model_name
-            end
+      # The concept of "composition" has still not arrived in Rails core and they rely on 400 methods being
+      # available in one object. This is why we need to provide parts of the I18N API in the form.
+      def read_attribute_for_validation(name)
+        send(name)
+      end
+
+      def initialize(*)
+        super
+        @amv_errors = ActiveModel::Errors.new(self)
+      end
+
+      # Problem with this method is, it's being used in two completely different contexts: Once to add errors in validations,
+      # and second to expose errors for presentation.
+      def errors(*args)
+        @amv_errors
+      end
+
+      def custom_errors
+        # required to keep update the ActiveModel::Errors#details used to test for
+        # added errors ActiveModel::Errors#added? and needs to be inside this block!
+        super.each do |custom_error|
+          errors = custom_error.errors
+          # CustomError build always the errors with an hash where the value is an array
+          errors.values.first.each do |value|
+            @amv_errors.add(errors.keys.first, value)
           end
         end
-      end # ::included
-    end
+      end
 
-    def build_errors
-      Errors.new(self)
-    end
+      def validate!(params, pointers=[])
+        @amv_errors = ActiveModel::Errors.new(self)
 
-    # The concept of "composition" has still not arrived in Rails core and they rely on 400 methods being
-    # available in one object. This is why we need to provide parts of the I18N API in the form.
-    def read_attribute_for_validation(name)
-      send(name)
-    end
+        super.tap do
+          # @fran: super ugly hack thanks to the shit architecture of AMV. let's drop it in 3.0 and move on!
+          all_errors = @result.to_results
+          nested_errors = @result.instance_variable_get(:@failure)
 
-    class Group
-      def initialize(*)
-        @validations = Class.new(Reform::Form::ActiveModel::Validations::Validator)
+          @result = Reform::Contract::Result.new(all_errors, [nested_errors].compact)
+
+          @amv_errors = Result::ResultErrors.new(@result, self, @result.success?, @amv_errors)
+        end
+        @result
       end
 
-      extend Uber::Delegates
-      delegates :@validations, :validates, :validate, :validates_with, :validate_with
+      class Group
+        def initialize(*)
+          @validations = Class.new(Reform::Form::ActiveModel::Validations::Validator)
+        end
+
+        extend Uber::Delegates
+        delegates :@validations, :validates, :validate, :validates_with, :validate_with, :validates_each
 
-      def call(fields, errors, form) # FIXME.
-        validator = @validations.new(form)
-        validator.valid?
+        def call(form)
+          validator = @validations.new(form)
+          validator.instance_variable_set(:@errors, form.errors)
+          success = validator.valid? # run the validations.
 
-        validator.errors.each do |name, error| # TODO: handle with proper merge, or something. validator.errors is ALWAYS AM::Errors.
-          errors.add(name, error)
+          Result.new(success, validator.errors.messages)
         end
       end
-    end
 
-    # Validator is the validatable object. On the class level, we define validations,
-    # on instance, it exposes #valid?.
-    require "delegate"
-    class Validator < SimpleDelegator
-      # current i18n scope: :activemodel.
-      include ActiveModel::Validations
+      # The idea here to mimic Dry.RB's Result API.
+      class Result < Hash # FIXME; should this be AMV::Errors?
+        def initialize(success, hash)
+          super()
+          @success = success
+          hash.each { |k,v| self[k] = v }
+        end
 
-      class << self
-        def model_name
-          @_active_model_sucks ||= ActiveModel::Name.new(Reform::Form, nil, "Reform::Form")
+        def success?
+          @success
         end
 
-        def model_name=(name)
-          @_active_model_sucks = name
+        def failure?
+          ! success?
         end
 
-        def validates(*args, &block)
-          super(*Declarative::DeepDup.(args), &block)
+        def messages
+          self
         end
 
-        # Prevent AM:V from mutating the validator class
-        def attr_reader(*)
+        # DISCUSS @FRAN: not sure this is 100% compatible with AMV::Errors?
+        def errors
+          self
         end
 
-        def attr_writer(*)
+        class ResultErrors < ::Reform::Contract::Result::Errors # to expose via #errors. i hate it.
+          def initialize(a, b, success, amv_errors)
+            super(a, b)
+            @success = success
+            @amv_errors = amv_errors
+          end
+
+          def empty?
+            @success
+          end
+
+          def [](k)
+            super(k.to_sym) || []
+          end
+
+          # rails expects this to return a stringified hash of the messages
+          def to_s
+            messages.to_s
+          end
+
+          def add(key, error_text)
+            # use rails magic to get the correct error_text and make sure we still update details and fields
+            text = @amv_errors.add(key, error_text)
+
+            # using error_text instead of text to either keep the symbol which will be
+            # magically replaced with the translate or directly the string - this is also
+            # required otherwise in the custom_errors method we will add the actual message in the
+            # ActiveModel::Errors#details which is not correct if a symbol was passed here
+            Reform::Contract::CustomError.new(key, error_text, @result.to_results)
+
+            # but since messages method is actually already defined in `Reform::Contract::Result::Errors
+            # we need to update the @dotted_errors instance variable to add or merge a new error
+            @dotted_errors.key?(key) ? @dotted_errors[key] |= text : @dotted_errors[key] = text
+            instance_variable_set(:@dotted_errors, @dotted_errors)
+          end
+
+          def method_missing(m, *args, &block)
+            @amv_errors.send(m, *args, &block) # send all methods to the AMV errors, even privates.
+          end
+
+          def respond_to?(method)
+            @amv_errors.respond_to?(method) ? true : super
+          end
+
+          def full_messages
+            base_errors = @amv_errors.full_messages
+            form_fields = @amv_errors.instance_variable_get(:@base).instance_variable_get(:@fields)
+            nested_errors = full_messages_for_nested_fields(form_fields)
+            
+            [base_errors, nested_errors].flatten.compact
+          end
+
+          private
+          
+          def full_messages_for_nested_fields(form_fields)
+            form_fields.map { |field| full_messages_for_twin(field[1]) }
+          end
+
+          def full_messages_for_twin(object)
+            return get_collection_errors(object) if object.is_a? Disposable::Twin::Collection
+            return get_amv_errors(object) if object.is_a? Disposable::Twin
+
+            nil
+          end
+
+          def get_collection_errors(twin_collection)
+            twin_collection.map { |twin| get_amv_errors(twin) }
+          end
+
+          def get_amv_errors(object)
+            object.instance_variable_get(:@amv_errors).full_messages
+          end
         end
       end
 
-      def initialize(form)
-        super(form)
-        self.class.model_name = form.model_name # one of the many reasons why i will drop support for AM::V in 2.1. or maybe a bit later.
-      end
+      # Validator is the validatable object. On the class level, we define validations,
+      # on instance, it exposes #valid?.
+      require "delegate"
+      class Validator < SimpleDelegator
+        # current i18n scope: :activemodel.
+        include ActiveModel::Validations
+
+        class << self
+          def model_name
+            @_active_model_sucks ||= ActiveModel::Name.new(Reform::Form, nil, "Reform::Form")
+          end
+
+          def model_name=(name)
+            @_active_model_sucks = name
+          end
+
+          def validates(*args, &block)
+            super(*Declarative::DeepDup.(args), &block)
+          end
 
-      # FIXME: for some weird reason, Object#format is reserved and form.send(:format) crashes with ArgumentError: too few arguments.
-      # method_missing fix doesn't work with ruby 2.0 or 2.3
+          # Prevent AM:V from mutating the validator class
+          def attr_reader(*)
+          end
+
+          def attr_writer(*)
+          end
+        end
 
-      # this fixes 2.0 but I'm guessing that their are more methods than just format to consider
-      # def format
-      #   __getobj__.format
-      # end
+        def initialize(form)
+          super(form)
+          self.class.model_name = form.model_name
+        end
 
-      def method_missing(m, *args, &block)
-        __getobj__.send(m, *args, &block) # send all methods to the form, even privates.
+        def method_missing(m, *args, &block)
+          __getobj__.send(m, *args, &block) # send all methods to the form, even privates.
+        end
       end
     end
-  end
 
-  class Errors < ActiveModel::Errors
-    include Reform::Form::Errors::Merge
+
   end
 end