active_dry_form 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1bc39aacc5e7a40501a20eeadc515470220ba16439fa8c92c31bdf85f330103
-  data.tar.gz: 14f34c96e37c815f85c2adfee658e2fcf5801c92d8a17574f8f620ff90ab3159
+  metadata.gz: 0134c8126c7ce5ea25422550c9ed232b668ce2d0e3b892bbc1535340bf2bcfe5
+  data.tar.gz: a1a90179815dec9d0964d6aa03612565afc1cafe157cb29eebeba225fcf0996d
 SHA512:
-  metadata.gz: 295333f32cd4a66a5e8dc30953af57b527370abbb808d7f668bafd13ee1f256976245f4ba1db7bf8288caa5ba5f92ddaab6f32d085f285bfe1d7599652cd67c3
-  data.tar.gz: 96e147d7df5450147c17722c8867cdd7836108f91c274f1b6e660857c2742c52942fc9de10744cdde5fc9da8ba3a2817f4ae03242d00f91b5a5644672af000ad
+  metadata.gz: eb484a9edbfb4fe0f215717dbd4cab04b41ec6eaf33334c663ac588df393bdae26d13cd7d7c973d25e3c193a5f21871314142122679c91b44c3fee7765cd5af7
+  data.tar.gz: f845993ba3a0cc7c0756b610634cae6a1c6b3fb0e4cee3f45d985ffc045cbe10460637b198fdcbd35cdbc1f1ff71df105edddc55ac3aaaca18f832223a40b15e

data/Gemfile.lock

@@ -27,7 +27,7 @@ GIT
 PATH
   remote: .
   specs:
-    active_dry_form (0.1.0)
+    active_dry_form (1.0.0)
       actionpack
       activerecord
       dry-configurable

data/lib/active_dry_form/builder.rb

@@ -3,8 +3,6 @@
 module ActiveDryForm
   class Builder < ActionView::Helpers::FormBuilder
 
-    include ActionView::Helpers::TagHelper
-    include ActionView::Context
     include Dry::Core::Constants
 
     def input(field, options = {})
@@ -56,16 +54,16 @@ module ActiveDryForm
     def show_base_errors
       return if @object.base_errors.empty?
 
-      tag.div class: ActiveDryForm.config.css_classes.base_error do
-        tag.ul do
+      @template.content_tag(:div, class: ActiveDryForm.config.css_classes.base_error) do
+        @template.content_tag(:ul) do
           # внутри ошибки может быть html
-          @object.base_errors.map { tag.li _1.html_safe }.join.html_safe
+          @object.base_errors.map { @template.content_tag(:li, _1.html_safe) }.join.html_safe
         end
       end
     end
 
     def show_error(field)
-      ActiveDryForm::Input.new(self, __method__, field, {}).error_text
+      ActiveDryForm::Input.new(self, nil, field, {}).error_text
     end
 
     def button(value = nil, options = {}, &block)

data/lib/active_dry_form/form_helper.rb

@@ -7,9 +7,7 @@ module ActiveDryForm
       options[:builder] = ActiveDryForm::Builder
       options[:html] = html_options(options)
 
-      # Array.wrap because Hash === name, it breaks polymorphic_path
-      # TODO: refactor to options[:url]
-      form_for(Array.wrap(name), options) do |f|
+      form_for(name, options) do |f|
         concat f.show_base_errors
         instance_exec(f, &block)
       end

data/lib/active_dry_form/input.rb

@@ -5,6 +5,9 @@ module ActiveDryForm
 
     def initialize(builder, builder_method, field, options)
       @builder = builder
+      @form_object = builder.object
+      @template = builder.instance_variable_get(:@template)
+
       @builder_method = builder_method
       @field = field
 
@@ -25,7 +28,7 @@ module ActiveDryForm
     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,
@@ -42,23 +45,23 @@ module ActiveDryForm
     def hint_text
       return unless @hint_text
 
-      @builder.tag.small @hint_text, class: ActiveDryForm.config.css_classes.hint
+      @template.content_tag(:small, @hint_text, class: ActiveDryForm.config.css_classes.hint)
     end
 
     def error_text
       return unless error?(@field)
 
       obj_error_text =
-        case e = @builder.object.errors[@field]
+        case e = @form_object.errors[@field]
         when Hash then e.values
         else e
         end
 
-      @builder.tag.div obj_error_text.join('<br />').html_safe, class: ActiveDryForm.config.css_classes.error
+      @template.content_tag(:div, obj_error_text.join('<br />').html_safe, class: ActiveDryForm.config.css_classes.error)
     end
 
     def error?(field)
-      @builder.object.errors.key?(field)
+      @form_object.errors.key?(field)
     end
 
   end

data/lib/active_dry_form/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveDryForm
 
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_dry_form
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ermolaev Andrey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-28 00:00:00.000000000 Z
+date: 2024-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -112,6 +112,9 @@ homepage: https://github.com/corp-gp/active_dry_form
 licenses:
 - MIT
 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
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []