effective_bootstrap 1.17.5 → 1.17.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c64c14e776a0ac77215a2f959501bb99fd2f9fa1c5e61153ee17bf312de92f5
-  data.tar.gz: f424ca3d20d69148e10d4da63713b57c56de2545c05296c1af55ed3b1685b545
+  metadata.gz: 3b2a7d47bccf1fd227f588ae7ea5d25375a00536fee1bccae10e9b8abdac8eb4
+  data.tar.gz: aa117408de621d35fb3ddb31740eef7c5693e13e7fed704a1d5f5235fd068482
 SHA512:
-  metadata.gz: 647c8bd55eb7f33901ad665b26874142ebf99dc944c208f7ae9a1fd0055a611fb92086c8c6294e9a86821721f2d9548283ff48605e02e9ec4b11c983da84b4ba
-  data.tar.gz: b9ee04bbd4c0e123da289cdb359ea3879b80bca4408ac88f4710aac56a95914e9df4555613f046eac97a6440acf9770ed10c79cd4d565435fb4909e05d2923e5
+  metadata.gz: 9049537bfb8755953bba4fc5f225a98fbbdd079bd06f16f4d96dd3258378d73cc74de896873846e5e1e7ca7e433c3f940a1c57b722622d29bba7f5eead5a2ada
+  data.tar.gz: 0d6d9e1db87a4a08f429f18954a5db491b8977dfe6c17de740b238de2fe81eedc3692037c27a796f52467d5b66889105504a1d912a6bda136d76e8f1a2f1b37a

data/app/helpers/effective_form_builder_helper.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 module EffectiveFormBuilderHelper
-  def effective_form_with(**options, &block)
+  def effective_form_with(model: nil, scope: nil, url: nil, format: nil, **options, &block)
     # This allows us to call effective_form_with inside an effective_table_with and just get the fields
     return @_effective_table_builder.capture(&block) if @_effective_table_builder
 
     # Compute the default ID
-    subject = Array(options[:model] || options[:scope]).last
-    class_name = (options[:scope] || subject.class.name.parameterize.underscore)
+    subject = Array(model || scope).last
+    class_name = (scope || subject.class.name.parameterize.underscore)
     unique_id = options.except(:model).hash.abs
 
     html_id = if subject.kind_of?(Symbol)
@@ -63,8 +63,8 @@ module EffectiveFormBuilderHelper
     options[:id] ||= (options[:html].delete(:id) || html_id) unless options.key?(:id)
 
     # Assign url if engine present
-    options[:url] ||= if options[:engine] && options[:model].present?
-      resource = Effective::Resource.new(options[:model])
+    url ||= if options[:engine] && model.present?
+      resource = Effective::Resource.new(model)
 
       if subject.respond_to?(:persisted?) && subject.persisted?
         resource.action_path(:update, subject)
@@ -74,7 +74,7 @@ module EffectiveFormBuilderHelper
     end
 
     without_error_proc do
-      form_with(**options.merge(builder: Effective::FormBuilder), &block)
+      form_with(model: model, scope: scope, url: url, format: format, **options.merge(builder: Effective::FormBuilder), &block)
     end
   end
 

data/app/models/effective/form_input.rb

@@ -245,29 +245,29 @@ module Effective
     def required_options?(opts)
       return true unless (opts.key?(:if) || opts.key?(:unless))
 
-      if opts[:if].respond_to?(:call)
-        return object.instance_exec(&opts[:if])
-      end
+      # if opts[:if].respond_to?(:call)
+      #   return object.instance_exec(object, &opts[:if])
+      # end
 
-      if opts[:if].kind_of?(Symbol)
-        return object.send(opts[:if])
-      end
+      # if opts[:if].kind_of?(Symbol)
+      #   return object.send(opts[:if])
+      # end
 
-      if opts.key?(:if)
-        return opts[:if]
-      end
+      # if opts.key?(:if)
+      #   return opts[:if]
+      # end
 
-      if opts[:unless].respond_to?(:call)
-        return !object.instance_exec(&opts[:unless])
-      end
+      # if opts[:unless].respond_to?(:call)
+      #   return !object.instance_exec(&opts[:unless])
+      # end
 
-      if opts[:unless].kind_of?(Symbol)
-        return !object.send(opts[:unless])
-      end
+      # if opts[:unless].kind_of?(Symbol)
+      #   return !object.send(opts[:unless])
+      # end
 
-      if opts.key?(:unless)
-        return !opts[:unless]
-      end
+      # if opts.key?(:unless)
+      #   return !opts[:unless]
+      # end
 
       false
     end

data/app/models/effective/form_inputs/has_many.rb

@@ -144,7 +144,7 @@ module Effective
           fields = block.call(form)
 
           remove += form.super_hidden_field(:_destroy) if remove? && can_remove && resource.persisted?
-          reorder += form.super_hidden_field(:position) if reorder? && !fields.include?('][position]')
+          reorder += form.super_hidden_field(:position) if reorder? && !fields.to_s.include?('][position]')
 
           fields
         end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '1.17.5'.freeze
+  VERSION = '1.17.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 1.17.5
+  version: 1.17.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-27 00:00:00.000000000 Z
+date: 2023-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails