reform-rails 0.2.0.rc3 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4f1ac1e0e188391ad063e8f61c6dafbc25554d8f
-  data.tar.gz: 6ddf5369a091079b68013c66c49bda0a4b7d1fe6
+SHA256:
+  metadata.gz: 7d315dbb4f57ba5ca99e97471777bc21c1a1825107b8c134b57806711b57df61
+  data.tar.gz: 3d796966db787d3c58093252543edb5c0ef1c7ab02dad056b5ca3c6ed10a4844
 SHA512:
-  metadata.gz: 144fd8cb2e456c2af911bd69e7cacd9f198fd17626265cc2dd86296bcf098a03743de2f496b564bad73d4f92412c076290e113220a22398cdc4e03c8e38ac91d
-  data.tar.gz: 364f34a9e3ecfadd3fb4edd4e7489888b460f586fecc687fcb2ff75b2df35a74db6ac64818ad262c56641d24ccd1d520eb080299dec4a1d22a2f998b6d126c34
+  metadata.gz: ae19a0207cd6e0004777f61d2a9390a00c0571c679f5192c672580b3310b0c199720294f017720aa5dc686f6b66a8e746f68a26ebea0270baa849f0d66db5770
+  data.tar.gz: eb1fcac6f076d2f226d71a43af3134c6227dbb7191a4068b9551c28befdfdfd7ca50bef0753ce79876dc0fa940c5c615022679756eef170e510fc7847bb55820

data/.github/workflows/ci.yml

@@ -0,0 +1,28 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
+        ruby: [2.5, 2.6, 2.7, '3.0', head]
+        rails: ['6.1', '6.0', '5.2']
+        mongodb-version: ['4.4']
+        exclude:
+          - ruby: '3.0'
+            rails: 5.2
+          - ruby: head
+            rails: 5.2
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: supercharge/mongodb-github-action@1.6.0
+      with:
+        mongodb-version: ${{ matrix.mongodb-version }}
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        # bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - run: RAILS_VERSION=${{ matrix.rails }} bundle install
+    - run: RAILS_VERSION=${{ matrix.rails }} bundle exec rake

data/CHANGES.md

@@ -1,3 +1,15 @@
+# 0.2.3
+
+* Fix deprecation warning related to `respond_to?`
+
+# 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)
+
 # 0.2.0
 
 * Needs Reform >= 2.3.0.
@@ -11,6 +23,7 @@
 * 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.

data/Gemfile

@@ -16,18 +16,16 @@ case ENV["GEMS_SOURCE"]
     gem "reform", github: "trailblazer/reform"
 end
 
-rails_version = ENV.fetch("RAILS_VERSION", "5.2.0")
+rails_version = ENV.fetch("RAILS_VERSION", "6.0.0")
 
 # bored of wrestling with rails...
-if rails_version.include? "4.0"
-  gem "mongoid", "~> 4"
-else
-  gem("mongoid", "< 7.0") unless rails_version.include?('6.0')
-end
+
+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 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/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/rails.html) 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,16 +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 4.2.0.
+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=4.2.0; bundle update; bundle exec rake test`
+`export RAILS_VERSION=5.0.0; bundle update; bundle exec rake test`
 
 ## License
 

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
 
@@ -161,8 +162,37 @@ module Reform
             @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
+          def respond_to?(method, include_all = false)
+            @amv_errors.respond_to?(method, include_all) ? 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

data/lib/reform/rails/version.rb

@@ -1,5 +1,5 @@
 module Reform
   module Rails
-    VERSION = "0.2.0.rc3"
+    VERSION = "0.2.3"
   end
 end

data/reform-rails.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "reform", ">= 2.3.0.rc1", "< 3.0.0"
-  spec.add_dependency "activemodel", ">= 3.2"
+  spec.add_dependency "reform", ">= 2.3.1", "< 3.0.0"
+  spec.add_dependency "activemodel", ">= 5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reform-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0.rc3
+  version: 0.2.3
 platform: ruby
 authors:
 - Nick Sutterer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2021-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reform
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0.rc1
+        version: 2.3.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0.rc1
+        version: 2.3.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.0'
 description: Automatically load and include all common Reform features for a standard
   Rails environment.
 email:
@@ -52,10 +52,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -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
@@ -92,13 +93,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Automatically load and include all common Rails form features.
 test_files: []

data/.travis.yml

@@ -1,38 +0,0 @@
-language: ruby
-cache: bundler
-before_install:
-  - gem update --system
-  - gem install bundler
-rvm:
-    - 2.4.6
-    - 2.5.5
-    - 2.6.3
-services:
-  - mongodb
-env:
-  - "RAILS_VERSION=6.0.0"
-  - "RAILS_VERSION=5.2.0"
-  - "RAILS_VERSION=5.1.0"
-  - "RAILS_VERSION=5.0.0"
-  - "RAILS_VERSION=4.2.0"
-  - "RAILS_VERSION=4.1.0"
-  - "RAILS_VERSION=4.0.0"
-matrix:
-  fast_finish: true
-  exclude:
-    - rvm: 2.4.6
-      env: "RAILS_VERSION=4.0.0"
-    - rvm: 2.4.6
-      env: "RAILS_VERSION=4.1.0"
-    - rvm: 2.4.6
-      env: "RAILS_VERSION=6.0.0"
-
-    - rvm: 2.5.5
-      env: "RAILS_VERSION=4.0.0"
-    - rvm: 2.5.5
-      env: "RAILS_VERSION=4.1.0"
-
-    - rvm: 2.6.3
-      env: "RAILS_VERSION=4.0.0"
-    - rvm: 2.6.3
-      env: "RAILS_VERSION=4.1.0"