reform-rails 0.1.7 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ef8e06973cbbd53737de0a7d0afe1250bdba0814
-  data.tar.gz: 986c4d29338ecdc03fb3dea2ab7c75f6c9253ce6
+SHA256:
+  metadata.gz: e32ac394ac02ea272b9a31655ca20b65253b8a417b0f716c7f1eda516c25981b
+  data.tar.gz: 7e520b5e80f4669f289bccaaa8cb5f3c549123d242e42a31e52f0be6e1f1086f
 SHA512:
-  metadata.gz: 314925db393628f4f0d7a2dc32808217c7b2d17d0e27d86d69299b14df875917a1598857c291ea3eec8605bbcfb4e31e1d908c12df66ad3c4dd25a8fae6bc3ce
-  data.tar.gz: 9f8f292731ef5b34f8abe6a046d738d18bd98b9192564ba592e8d922bfef02e0f61ba3feddee77d69cc2e590b4e91310bc925ec749fedbfcbee1b0ba458c0869
+  metadata.gz: 7b433bafad6faa28202c8a246c334fa2c7c41c735196b66f98353a9bf614990960278a2dccc87203a9985ad05e09077986795d7007e7d674e9938de3886c683d
+  data.tar.gz: 63f646b6f6bac1062176f84da317f05d0a44e58b0c9f3e9f5bfeb8573ceb25d2e659f84561ff831ee593f4f770494e991f49b046948036a67aa87eb2ab08b472

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/.gitignore

@@ -8,4 +8,7 @@
 /spec/reports/
 /tmp/
 *.gem
-test/dummy/log/*.log
+*.sqlite3
+.byebug*
+*.log
+.rubocop-https*

data/CHANGES.md

@@ -1,3 +1,46 @@
+# 0.2.6
+
+* Allow to override `#persisted?` and friends with modules.
+
+# 0.2.5
+
+* Fix: Delegating from form object causes ArgumentError with 0.2.4 (https://github.com/trailblazer/reform-rails/issues/99)
+
+# 0.2.4
+
+* Fix keyword argument warning in `method_missing` (https://github.com/trailblazer/reform-rails/pull/97)
+* Internal: Replace Uber::Delegates with Forwardable in Form::ActiveModel
+
+# 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.
+* 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 +55,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.to_i >= 6
+
+
+gem "activerecord", "~> #{rails_version}"
+gem "railties", "~> #{rails_version}"
+if rails_version.to_i >= 6
+  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-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/#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,5 @@
-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.
+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

@@ -2,114 +2,242 @@ 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, **error_options)
+            # use rails magic to get the correct error_text and make sure we still update details and fields
+            error = @amv_errors.add(key, error_text, **error_options)
+            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
+            # 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] |= error : @dotted_errors[key] = error
+            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
+          ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
+
+          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
 
-      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
+        ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
       end
     end
-  end
 
-  class Errors < ActiveModel::Errors
-    include Reform::Form::Errors::Merge
+
   end
 end

data/lib/reform/form/active_model.rb

@@ -1,13 +1,14 @@
-require "uber/delegates"
-
 module Reform::Form::ActiveModel
   def self.included(base)
     base.class_eval do
       extend ClassMethods
       register_feature ActiveModel
 
-      extend Uber::Delegates
-      delegates :model, *[:persisted?, :to_key, :to_param, :id] # Uber::Delegates
+      delegations = Module.new do
+        delegate :persisted?, :to_key, :to_param, :id, to: :model
+      end
+
+      include delegations # now, those methods (e.g. {#persisted?}) can be overridden by another module.
 
       def to_model # this is called somewhere in FormBuilder and ActionController.
         self
@@ -42,15 +43,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 +90,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_record.rb

@@ -1,5 +1,3 @@
-require "reform/form/orm"
-
 module Reform::Form::ActiveRecord
   def self.included(base)
     base.class_eval do

data/lib/reform/form/mongoid.rb

@@ -0,0 +1,26 @@
+gem 'mongoid', ">= 4.0"
+
+module Reform::Form::Mongoid
+  def self.included(base)
+    base.class_eval do
+      register_feature Reform::Form::Mongoid
+      include Reform::Form::ActiveModel
+      include Reform::Form::ORM
+      extend ClassMethods
+    end
+  end
+
+  module ClassMethods
+    def validates_uniqueness_of(attribute, options={})
+      options = options.merge(:attributes => [attribute])
+      validates_with(UniquenessValidator, options)
+    end
+    def i18n_scope
+      :mongoid
+    end
+  end
+
+  UniquenessValidator = Class.new("::Mongoid::Validatable::UniquenessValidator".constantize) do
+    include Reform::Form::ORM::UniquenessValidator
+  end
+end

data/lib/reform/form/multi_parameter_attributes.rb

@@ -19,7 +19,11 @@ module Reform::Form::MultiParameterAttributes
           )
         end
       end
-      params.merge!(date_attributes)
+
+      date_attributes.each do |attribute, date|
+        params[attribute] = date
+      end
+      params
     end
 
   private

data/lib/reform/form/orm.rb

@@ -19,7 +19,10 @@ module Reform::Form::ORM
 
       @klass = record.class # this is usually done in the super-sucky #setup method.
       super(record).tap do |res|
-        form.errors.add(property, record.errors.first.last) if record.errors.present?
+        if record.errors.present?
+          error = self.class.name.include?("Mongoid") ? record.errors.first.last : :taken
+          form.errors.add(property, error)
+        end
       end
     end
   end

data/lib/reform/form/validation/unique_validator.rb

@@ -7,6 +7,12 @@
 # validates :title, unique: true
 #
 # == Options
+#
+# = Case Sensitivity
+# Case sensitivity is true by default, but can be set to false:
+#
+# validates :title, unique: { case_sensitive: false }
+#
 # = Scope
 # A scope can be use to filter the records that need to be compare with the
 # current value to validate. A scope array can have one to many fields define.
@@ -31,9 +37,19 @@
 class Reform::Form::UniqueValidator < ActiveModel::EachValidator
   def validate_each(form, attribute, value)
     model = form.model_for_property(attribute)
+    original_attribute = form.options_for(attribute)[:private_name]
 
     # search for models with attribute equals to form field value
-    query = model.class.where(attribute => value)
+    query = if options[:case_sensitive] == false && value
+              model.class.where("lower(#{original_attribute}) = ?", value.downcase)
+            else
+              model.class.where(original_attribute => value)
+            end
+
+    # if model persisted, query should bypass model
+    if model.persisted?
+      query = query.where("#{model.class.primary_key} != ?", model.id)
+    end
 
     # apply scope if options has been declared
     Array(options[:scope]).each do |field|
@@ -41,9 +57,7 @@ class Reform::Form::UniqueValidator < ActiveModel::EachValidator
       query = query.where(field => form.send(field))
     end
 
-    # if model persisted, query may return 0 or 1 rows, else 0
-    allow_count = model.persisted? ? 1 : 0
-    form.errors.add(attribute, :taken) if query.count > allow_count
+    form.errors.add(attribute, :taken) if query.count > 0
   end
 end
 

data/lib/reform/mongoid.rb

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

data/lib/reform/rails/railtie.rb

@@ -6,48 +6,53 @@ module Reform
       initializer "reform.form_extensions", after: :load_config_initializers do
         validations = config.reform.validations || :active_model
 
+        require "reform/form/multi_parameter_attributes"
+
         if validations == :active_model
           active_model!
         elsif validations == :dry
-          dry!
+          enable_form_builder_methods = config.reform.enable_active_model_builder_methods || false
+
+          dry!(enable_form_builder_methods)
         else
           warn "[Reform::Rails] No validation backend set. Please do so via `config.reform.validations = :active_model`."
         end
       end
 
       def active_model!
-        require "reform"
-        require "reform/form/active_model/model_validations"
         require "reform/form/active_model/form_builder_methods"
         require "reform/form/active_model"
+
+        require "reform/form/active_model/model_validations"
         require "reform/form/active_model/validations"
-        require "reform/form/multi_parameter_attributes"
 
-        require "reform/active_record" if defined?(ActiveRecord)
-        require "reform/mongoid" if defined?(Mongoid)
+        require "reform/active_record" if defined?(::ActiveRecord)
+        require "reform/mongoid" if defined?(::Mongoid)
 
         Reform::Form.class_eval do
           include Reform::Form::ActiveModel
           include Reform::Form::ActiveModel::FormBuilderMethods
-          include Reform::Form::ActiveRecord if defined?(ActiveRecord)
-          include Reform::Form::Mongoid if defined?(Mongoid)
+          include Reform::Form::ActiveRecord if defined?(::ActiveRecord)
+          include Reform::Form::Mongoid if defined?(::Mongoid)
           include Reform::Form::ActiveModel::Validations
         end
       end
 
-      def dry!
-        require "reform"
-        require "reform/form/dry"
+      def dry!(enable_am = true)
+        if enable_am
+          require "reform/form/active_model/form_builder_methods" # this is for simple_form, etc.
 
-        require "reform/form/multi_parameter_attributes"
-        require "reform/form/active_model/form_builder_methods" # this is for simple_form, etc.
+          # This adds Form#persisted? and all the other crap #form_for depends on. Grrrr.
+          require "reform/form/active_model" # DISCUSS: only when using simple_form.
+        end
 
-        # This adds Form#persisted? and all the other crap #form_for depends on. Grrrr.
-        require "reform/form/active_model" # DISCUSS: only when using simple_form.
+        require "reform/form/dry"
 
         Reform::Form.class_eval do
-          include Reform::Form::ActiveModel # DISCUSS: only when using simple_form.
-          include Reform::Form::ActiveModel::FormBuilderMethods
+          if enable_am
+            include Reform::Form::ActiveModel
+            include Reform::Form::ActiveModel::FormBuilderMethods
+          end
 
           include Reform::Form::Dry
         end

data/lib/reform/rails/version.rb

@@ -1,5 +1,5 @@
 module Reform
   module Rails
-    VERSION = "0.1.7"
+    VERSION = "0.2.6"
   end
 end

data/lib/reform/rails.rb

@@ -1,4 +1,5 @@
 require "reform/rails/version"
+require 'reform'
 require "reform/rails/railtie"
 
 module Reform

data/reform-rails.gemspec

@@ -14,19 +14,12 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/trailblazer/reform-rails"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+                         f.match(%r{^(test/|spec/|features/|database.sqlite3)})
+                       end
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "reform", ">= 2.2.0"
-  spec.add_dependency "activemodel", ">= 3.2"
-
-  spec.add_development_dependency "rails"
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "actionpack"
-  spec.add_development_dependency "activerecord"
-  spec.add_development_dependency "mongoid"
-  spec.add_development_dependency "sqlite3"
+  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.1.7
+  version: 0.2.6
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reform
@@ -16,140 +16,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: 2.3.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: 2.3.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '5.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 description: Automatically load and include all common Reform features for a standard
   Rails environment.
 email:
@@ -158,32 +52,29 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- database.sqlite3
-- gemfiles/Gemfile.rails-3.2
-- gemfiles/Gemfile.rails-4.0
-- gemfiles/Gemfile.rails-4.1
-- gemfiles/Gemfile.rails-4.2
 - lib/reform/active_record.rb
 - lib/reform/form/active_model.rb
 - 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
 - lib/reform/form/multi_parameter_attributes.rb
 - lib/reform/form/orm.rb
 - lib/reform/form/validation/unique_validator.rb
+- lib/reform/mongoid.rb
 - lib/reform/rails.rb
 - lib/reform/rails/railtie.rb
 - lib/reform/rails/version.rb
-- log/development.log
 - reform-rails.gemspec
 homepage: https://github.com/trailblazer/reform-rails
 licenses:
@@ -204,8 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Automatically load and include all common Rails form features.

data/.travis.yml

@@ -1,18 +0,0 @@
-language: ruby
-cache: bundler
-
-rvm:
-  - 2.3.1
-  - 2.2.3
-  - 2.0.0
-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
-matrix:
-  fast_finish: true

data/gemfiles/Gemfile.rails-3.2

@@ -1,7 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in reform.gemspec
-gemspec :path => '../'
-
-gem 'railties', '~> 3.2.0'
-gem 'activerecord', '~> 3.2.0'

data/gemfiles/Gemfile.rails-4.0

@@ -1,7 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in reform.gemspec
-gemspec :path => '../'
-
-gem 'railties', '~> 4.0.0'
-gem 'activerecord', '~> 4.0.0'

data/gemfiles/Gemfile.rails-4.1

@@ -1,7 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in reform.gemspec
-gemspec :path => '../'
-
-gem 'railties', '~> 4.1.0'
-gem 'activerecord', '~> 4.1.0'

data/gemfiles/Gemfile.rails-4.2

@@ -1,7 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in reform.gemspec
-gemspec :path => '../'
-
-gem 'railties', '~> 4.2.0'
-gem 'activerecord', '~> 4.2.0'