reform-rails 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f960a673533faebc84862cc0a7161d2b8c09c8d9c473af55041b5d9e4cb69fe1
-  data.tar.gz: 6c78405ee3b1a2c27aa24e1afde65b0caf400e4593f9004f22afedd3113d1857
+  metadata.gz: 754bad405b747f3fb7e2ea5bfb46ca9e32262eb0f17c85d9804312da30adaa6f
+  data.tar.gz: 1a5643a5b733a4f536964e4ea33b5a38ee645cd752696d337a97cb824b72f442
 SHA512:
-  metadata.gz: 9f4604d9ee1a6850d08968d5ccefec0a32e87a9a5176c92223c51bfadfbd13e268acbb4a3a0902120a209bc2b22095327ec441f3d01948743f7c96b522dc649e
-  data.tar.gz: 86b33a3361e6b8b960d5cc8a3d4bbc21e440fb89a43a09c01308a9c48d8592f354e88637bc01102359bbec32c0c6ba7da82755bafaeab270556b110dbf4df21f
+  metadata.gz: f9f24f96751b877f6dd57da25502dbf7bdc23362e255ff78b677c18c3d51a3ffdc2b30ea101831fb2ce8a2b8e1cef665e968cd57c7394e0d897e8a8d2054eab3
+  data.tar.gz: 129b85d74bcb7c45552991b0d76af9f4955119a9a57fb44d56620970ef935f8a8df3667db1b5088c5836c1c0f8c72367c8d80a9876448e21019cf5a3026de66d

data/.travis.yml

@@ -10,6 +10,7 @@ rvm:
 services:
   - mongodb
 env:
+  - "RAILS_VERSION=6.1.0"
   - "RAILS_VERSION=6.0.0"
   - "RAILS_VERSION=5.2.0"
   - "RAILS_VERSION=5.1.0"

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 0.2.2
+
+* Support ActiveRecord 6.1
+
 # 0.2.1
 
 * Error's full_message  with translation fixed thanks to [@marcelolx](https://github.com/trailblazer/reform-rails/pull/85)

data/Gemfile

@@ -20,12 +20,12 @@ 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("mongoid", "< 7.0") unless rails_version.to_i >= 6
 
 
 gem "activerecord", "~> #{rails_version}"
 gem "railties", "~> #{rails_version}"
-if rails_version.include?('6.0')
+if rails_version.to_i >= 6
   gem "sqlite3", "~> 1.4"
 else
   gem "sqlite3", "~> 1.3", "< 1.4"

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-Covid_19year Nick Sutterer
+Copyright (c) 2015-2021 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/lib/reform/active_record.rb

@@ -2,3 +2,4 @@ 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.
+require "reform/form/active_model/result"

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

@@ -0,0 +1,15 @@
+class Reform::Contract::Result  
+  private
+
+  def filter_for(method, *args)
+    @results.collect { |r| r.public_send(method, *args).to_h }
+            .inject({}) { |hah, err| hah.merge(err) { |key, old_v, new_v| (new_v.is_a?(Array) ? (old_v |= new_v) : old_v.merge(new_v)) } }
+            .find_all { |k, v| # filter :nested=>{:something=>["too nested!"]} #DISCUSS: do we want that here?
+              if v.is_a?(Hash)
+                nested_errors = v.select { |attr_key, val| attr_key.is_a?(Integer) && val.is_a?(Array) && val.any? }
+                v = nested_errors.to_a if nested_errors.any?
+              end
+              v.is_a?(Array) || v.class.to_s == "ActiveModel::DeprecationHandlingMessageArray"
+            }.to_h
+  end
+end

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

@@ -143,7 +143,8 @@ module Reform
 
           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)
+            error = @amv_errors.add(key, error_text)
+            error = [error.message] unless error.is_a?(Array)
 
             # 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
@@ -153,7 +154,7 @@ module Reform
 
             # 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
+            @dotted_errors.key?(key) ? @dotted_errors[key] |= error : @dotted_errors[key] = error
             instance_variable_set(:@dotted_errors, @dotted_errors)
           end
 

data/lib/reform/rails/version.rb

@@ -1,5 +1,5 @@
 module Reform
   module Rails
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reform-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Nick Sutterer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2021-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reform
@@ -66,6 +66,7 @@ files:
 - lib/reform/form/active_model/form_builder_methods.rb
 - lib/reform/form/active_model/model_reflections.rb
 - lib/reform/form/active_model/model_validations.rb
+- lib/reform/form/active_model/result.rb
 - lib/reform/form/active_model/validations.rb
 - lib/reform/form/active_record.rb
 - lib/reform/form/mongoid.rb
@@ -81,7 +82,7 @@ homepage: https://github.com/trailblazer/reform-rails
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -96,8 +97,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Automatically load and include all common Rails form features.
 test_files: []