active_dry_form 0.1.0 → 1.1.0

data/lib/active_dry_form/form.rb

@@ -1,129 +1,40 @@
 # frozen_string_literal: true
 
 module ActiveDryForm
-  class Form
+  class Form < BaseForm
 
     include Dry::Monads[:result]
-    Dry::Schema.load_extensions(:info)
+    Dry::Schema.load_extensions(:json_schema)
     ResultError = Class.new(StandardError)
 
-    class ContractBase < Dry::Validation::Contract
+    cattr_accessor :contract_klass, instance_accessor: false, default: ::ActiveDryForm::BaseContract
 
-      config.messages.load_paths << 'config/locales/dry_validation.ru.yml'
-      config.messages.default_locale = :ru
+    def self.fields(namespace, i18n_key: nil, &block)
+      const_set :CURRENT_CONTRACT, Class.new(contract_klass, &block).new
+      const_set :FIELDS_INFO, self::CURRENT_CONTRACT.schema.json_schema(loose: true)
 
-    end
-
-    def self.fields(namespace, &block)
-      const_set :NAMESPACE, ActiveModel::Name.new(nil, nil, namespace.to_s)
-      const_set :CURRENT_CONTRACT, Class.new(ContractBase, &block).new
-      const_set :FIELDS_INFO, self::CURRENT_CONTRACT.schema.info[:keys]
-
-      self::FIELDS_INFO.each do |key, value|
-        if value[:keys]
-          sub_klass = Class.new do
-            const_set :NAMESPACE, ActiveModel::Name.new(nil, nil, key.to_s)
-            const_set :FIELDS_INFO, value[:keys]
-
-            def initialize(params, record, errors)
-              @params = params || {}
-              @record = record
-              @errors = errors || {}
-            end
-
-            self::FIELDS_INFO.each_key do |sub_key|
-              define_method sub_key do
-                @params[sub_key] || @record.try(sub_key)
-              end
-
-              def model_name
-                self.class::NAMESPACE
-              end
-
-              def info(sub_key)
-                self.class::FIELDS_INFO[sub_key]
-              end
+      const_set :NAMESPACE, ActiveModel::Name.new(nil, nil, namespace.name.capitalize)
+      const_get(:NAMESPACE).i18n_key = i18n_key if i18n_key
 
-              # ActionView::Helpers::Tags::Translator#human_attribute_name
-              def to_model
-                self
-              end
-
-              def self.human_attribute_name(field)
-                I18n.t(field, scope: :"activerecord.attributes.#{self::NAMESPACE.i18n_key}")
-              end
-
-              def errors
-                @errors
-              end
-            end
-          end
-          define_method key do
-            sub_klass.new(@params[key], @record.try(key), errors[key])
-          end
-        else
-          define_method key do
-            @params[key] || @record.try(key)
-          end
-        end
-      end
-    end
-
-    def self.default(method)
-      alias_method :"__#{method}", method
-
-      class_eval <<~RUBY, __FILE__, __LINE__ + 1
-        # def create_default(...)
-        #  @params.merge!(__create_default(...))
-        # end
-
-        def #{method}(...)
-          @params.merge!(__#{method}(...))
-        end
-      RUBY
+      define_methods
     end
 
     def self.action(method)
       alias_method :"__#{method}", method
 
-      class_eval <<~RUBY, __FILE__, __LINE__ + 1
-        # def create(...)
-        #   if validator.failure?
-        #     @base_errors = validator.errors.filter(:base?).map(&:to_s).presence
-        #     return Failure(:validate_invalid)
-        #   end
-        #
-        #   result = __create(...)
-        #
-        #   unless result.is_a?(::Dry::Monads::Result)
-        #     raise ResultError, 'method `create` should be returning `monad`'
-        #   end
-        #
-        #   case result
-        #   in Failure[:failure_service, base_errors]
-        #     @base_errors = base_errors
-        #   else
-        #   end
-        #
-        #   result
-        # end
-
+      class_eval <<~RUBY, __FILE__, __LINE__ + 1 # rubocop:disable Style/DocumentDynamicEvalDefinition
         def #{method}(...)
-          if validator.failure?
-            @base_errors = validator.errors.filter(:base?).map(&:to_s).presence
-            return Failure(:validate_invalid)
-          end
+          validate
+          return Failure(:invalid_form) unless valid?
 
           result = __#{method}(...)
 
-          unless result.is_a?(::Dry::Monads::Result)
-            raise ResultError, 'method `#{method}` should be returning `monad`'
-          end
-
           case result
-          in Failure[:failure_service, base_errors]
-            @base_errors = base_errors
+          when ::Dry::Monads::Result::Failure
+            @base_errors = Array.wrap(result.failure)
+          when ::Dry::Monads::Result::Success
           else
+            raise ResultError, 'method `#{method}` must return `monad`'
           end
 
           result
@@ -131,81 +42,5 @@ module ActiveDryForm
       RUBY
     end
 
-    attr_reader :base_errors, :record
-
-    def initialize(record: nil, params_form: nil, params_init: nil)
-      raise 'in `params_form` use `request.parameters` instead of `params`' if params_form.is_a?(::ActionController::Parameters)
-      raise 'in `params_init` use `request.parameters` instead of `params`' if params_init.is_a?(::ActionController::Parameters)
-
-      @params =
-        if params_form
-          _deep_transform_values_in_params!(params_form[self.class::NAMESPACE.param_key].deep_transform_keys!(&:to_sym))
-        elsif params_init
-          params_init.deep_transform_keys!(&:to_sym)
-        else
-          {}
-        end
-
-      @record = record if record
-    end
-
-    def info(key)
-      self.class::FIELDS_INFO[key]
-    end
-
-    def model_name
-      self.class::NAMESPACE
-    end
-
-    # ActionView::Helpers::Tags::Translator#human_attribute_name
-    def to_model
-      self
-    end
-
-    def self.human_attribute_name(field)
-      I18n.t(field, scope: :"activerecord.attributes.#{self::NAMESPACE.i18n_key}")
-    end
-
-    def persisted?
-      @record&.persisted?
-    end
-
-    def to_key
-      key = @record&.id
-      [key] if key
-    end
-
-    # используется при генерации URL, когда record.persisted?
-    def to_param
-      @record.id.to_s
-    end
-
-    def validator
-      @validator ||= self.class::CURRENT_CONTRACT.call(@params, { form: self })
-    end
-
-    def errors
-      @errors ||= @validator ? @validator.errors.to_h : {}
-    end
-
-    def view_component
-      self.class.module_parent::Component.new(self)
-    end
-
-    private def _deep_transform_values_in_params!(object)
-      case object
-      when String
-        object.strip.presence
-      when Hash
-        object.transform_values! { |value| _deep_transform_values_in_params!(value) }
-      when Array
-        object.map! { |e| _deep_transform_values_in_params!(e) }
-        object.compact!
-        object
-      else
-        object
-      end
-    end
-
   end
 end

data/lib/active_dry_form/form_helper.rb

@@ -3,14 +3,21 @@
 module ActiveDryForm
   module FormHelper
 
-    def active_dry_form_for(name, options = {})
+    def active_dry_form_for(name, options = {}, &block)
       options[:builder] = ActiveDryForm::Builder
-      options[:html] ||= {}
-      options[:html][:class] = "active-dry-form #{options[:html][:class]}"
+      options[:html] = html_options(options)
 
       form_for(name, options) do |f|
         concat f.show_base_errors
-        yield(f)
+        instance_exec(f, &block)
+      end
+    end
+
+    private def html_options(options)
+      classes = { class: ActiveDryForm.config.css_classes.form }
+
+      (options[:html] || {}).merge(ActiveDryForm.config.html_options.form, classes) do |_key, oldval, newval|
+        Array.wrap(newval) + Array.wrap(oldval)
       end
     end
 

data/lib/active_dry_form/input.rb

@@ -3,37 +3,32 @@
 module ActiveDryForm
   class Input
 
-    attr_reader :input_opts, :input_type
-
-    def initialize(builder, method_type, method, options)
+    def initialize(builder, builder_method, field, options)
       @builder = builder
-      @method_type = method_type
-      @method = method
+      @form_object = builder.object
+      @template = builder.instance_variable_get(:@template)
 
-      info = builder.object.info(method)
-      @input_type = info[:type]
-      @required = info[:required]
+      @builder_method = builder_method
+      @field = field
 
       @label_opts = options[:label]
       @label_text = options[:label_text]
       @hint_text = options[:hint]
-      @input_opts = options.except(:label, :hint, :label_text)
-      @input_opts[:required] = true if @required
+      @required = options[:required]
+      @input_user_options = options.except(:label, :hint, :label_text)
     end
 
     def css_classes
       [
-        'input',
-        @method_type,
-        @input_type,
-        @method,
-        ('required' if @required),
-        ('error' if error?(@method)),
+        ActiveDryForm.config.css_classes.input,
+        @builder_method,
+        (ActiveDryForm.config.css_classes.input_required if @required),
+        (ActiveDryForm.config.css_classes.input_error if error?(@field)),
       ].compact
     end
 
     def wrap_tag(input, label_last: nil)
-      @builder.tag.div class: css_classes do
+      @template.tag(:div, class: css_classes) do
         [
           label_last ? input : label,
           label_last ? label : input,
@@ -44,29 +39,29 @@ module ActiveDryForm
     end
 
     def label
-      @builder.label(@method, @label_text) unless @label_opts == false
+      @builder.label(@field, @label_text) unless @label_opts == false
     end
 
     def hint_text
       return unless @hint_text
 
-      @builder.tag.small @hint_text, class: 'help-text'
+      @template.content_tag(:small, @hint_text, class: ActiveDryForm.config.css_classes.hint)
     end
 
     def error_text
-      return unless error?(@method)
+      return unless error?(@field)
 
       obj_error_text =
-        case e = @builder.object.errors[@method]
+        case e = @form_object.errors[@field]
         when Hash then e.values
         else e
         end
 
-      @builder.tag.div obj_error_text.join('<br />'), class: 'form-error is-visible'
+      @template.content_tag(:div, obj_error_text.join('<br />').html_safe, class: ActiveDryForm.config.css_classes.error)
     end
 
-    def error?(method)
-      @builder.object.errors.key?(method)
+    def error?(field)
+      @form_object.errors.key?(field)
     end
 
   end

data/lib/active_dry_form/version.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
 module ActiveDryForm
-  VERSION = "0.1.0"
+
+  VERSION = '1.1.0'
+
 end

data/lib/active_dry_form.rb

@@ -1,13 +1,24 @@
 # frozen_string_literal: true
 
-require_relative "active_dry_form/version"
-require_relative "active_dry_form/schema_compiler_patch"
-require_relative "active_dry_form/builder"
-require_relative "active_dry_form/form"
-require_relative "active_dry_form/input"
-require_relative "active_dry_form/form_helper"
+require 'dry-monads'
+require 'dry-validation'
+require 'active_model'
+require 'action_view'
+require 'action_controller'
+
+require_relative 'active_dry_form/version'
+require_relative 'active_dry_form/configuration'
+require_relative 'active_dry_form/builder'
+require_relative 'active_dry_form/base_form'
+require_relative 'active_dry_form/base_contract'
+require_relative 'active_dry_form/form'
+require_relative 'active_dry_form/input'
+require_relative 'active_dry_form/form_helper'
 
 module ActiveDryForm
+
   class Error < StandardError; end
-  # Your code goes here...
+  class ParamsNotAllowedError < Error; end
+  class DateTimeNotAllowedError < Error; end
+
 end

metadata

@@ -1,17 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: active_dry_form
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ermolaev Andrey
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2024-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-validation
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  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: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -38,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-validation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Form validation for Rails with Dry-Validation
 email:
 - andruhafirst@yandex.ru
@@ -48,18 +90,23 @@ files:
 - ".editorconfig"
 - ".rspec"
 - ".rubocop.yml"
+- ".tool-versions"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- config/locales/dry_validation.ru.yml
 - lib/active_dry_form.rb
+- lib/active_dry_form/base_contract.rb
+- lib/active_dry_form/base_form.rb
 - lib/active_dry_form/builder.rb
+- lib/active_dry_form/configuration.rb
 - lib/active_dry_form/form.rb
 - lib/active_dry_form/form_helper.rb
 - lib/active_dry_form/input.rb
-- lib/active_dry_form/schema_compiler_patch.rb
 - lib/active_dry_form/version.rb
 homepage: https://github.com/corp-gp/active_dry_form
 licenses:
@@ -68,7 +115,8 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/corp-gp/active_dry_form
   source_code_uri: https://github.com/corp-gp/active_dry_form
-post_install_message: 
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -76,15 +124,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.17
+signing_key:
 specification_version: 4
 summary: Form validation for Rails with Dry-Validation
 test_files: []

data/lib/active_dry_form/schema_compiler_patch.rb

@@ -1,31 +0,0 @@
-require "dry/schema/extensions/info/schema_compiler"
-
-require "dry/schema/constants"
-
-module Dry
-  module Schema
-    module Info
-      class SchemaCompiler
-        def visit_not(_node, opts = {})
-          key = opts[:key]
-          keys[key][:nullable] = true
-        end
-
-        def visit_predicate(node, opts = {})
-          name, rest = node
-
-          key = opts[:key]
-
-          if name.equal?(:key?)
-            keys[rest[0][1]] = { required: opts.fetch(:required, true) }
-          elsif name.equal?(:array?)
-            keys[key][:array] = true
-          else
-            type = PREDICATE_TO_TYPE[name]
-            keys[key][:type] = type if type
-          end
-        end
-      end
-    end
-  end
-end