formnestic 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 378acbe981c8058b6d6e6105a0009cf5f38f561cf8154b8b65b9bed52dca9f7d
-  data.tar.gz: 322c9cebfec61e08bbac6d18cc84fe46bf0bfc0adcdbfae5e0b8f94edc8c1975
+  metadata.gz: e1621bcb434bcdbcba856cb23bc8be60ea07f1722ccc468abe0a80b2f3adbe28
+  data.tar.gz: 54fc1c385b28dda9f53090a7d092826d3f72c9a3fc208a3e7da258cd143964f6
 SHA512:
-  metadata.gz: 5e7e6874272578eca36e0d82b6f3f0d01a33bfe0aae89505f5422234637ed411de8c9aa34be3ac554c70017c6c695b8881c02ec52100b78869aa80631da10763
-  data.tar.gz: 22000bb8c88983a8852e946921644b4ec3a85eb544d01801e4486ca12c90789a52f30ff28f56ac04c3d16847e1ed2357c02f92fd15b63482d866899c4aff3e65
+  metadata.gz: dfca5c52f22b47c1c35b444c5b53ce6fa0803cb8796d6f6337ca4416cc2c7f29e907394b95d81365dd56eba78192d0252320a4a437f504fa6727a8b0e2a8b22f
+  data.tar.gz: 1fea05ff4909724c25da44289f6aae4d2a0e01d41d695713dd5b4bb1198fd5c6f9683bd74e191d38b9df649638bdbab1788c0c7006584bcf25e50208c95f6858

data/VERSION

@@ -1 +1 @@
-1.0.9
+1.0.11

data/formnestic.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'formnestic'
-  s.version = '1.0.10'
+  s.version = '1.0.11'
 
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.authors = ['James']

data/lib/formnestic/helpers/inputs_helper.rb

@@ -1,3 +1,4 @@
+# rubocop:disable MethodLength, AbcSize, ModuleLength
 module Formnestic
   module Helpers
     module InputsHelper
@@ -13,18 +14,54 @@ module Formnestic
 
       # for listing form
       def formnestic_list_row_inputs(*args, &block)
-        html_options = formnestic_prepare_html_options_for_wrapper(:list, *args)
-        rows_counter = template.content_tag(:span, options[:parent_builder].rows_counter, class: 'formnestic-li-fieldset-for-order')
-        content_div_content = [formnestic_legend_for_list_form, ' #'.html_safe, rows_counter].join.html_safe
-        title_div = template.content_tag(:div, content_div_content, class: 'formnestic-li-fieldset-legend')
-        template.content_tag(:fieldset, [title_div, (options[:row_removable] ? formnestic_row_removing_content_tag(:list) : ''), template.capture(&block)].join.html_safe, html_options)
+        html_options =
+          formnestic_prepare_html_options_for_wrapper(:list, *args)
+        rows_counter =
+          template.content_tag(
+            :span,
+            options[:parent_builder].rows_counter,
+            class: 'formnestic-li-fieldset-for-order'
+          )
+        content_div_content = [
+          formnestic_legend_for_list_form,
+          ' #'.html_safe,
+          rows_counter
+        ].join.html_safe
+        title_div = template.content_tag(
+          :div,
+          content_div_content,
+          class: 'formnestic-li-fieldset-legend'
+        )
+        template.content_tag(
+          :fieldset, [
+            title_div, (
+              if options[:row_removable]
+                formnestic_row_removing_content_tag(:list)
+              else
+                ''
+              end
+            ),
+            template.capture(&block)
+          ].join.html_safe,
+          html_options
+        )
       end
 
       # For table form
       def formnestic_table_row_inputs(*args, &block)
-        html_options = formnestic_prepare_html_options_for_wrapper(:table, *args)
-        template.content_tag(:tr, [template.capture(&block), (options[:row_removable] ?
-formnestic_row_removing_content_tag(:table) : '')].join.html_safe, html_options)
+        html_options =
+          formnestic_prepare_html_options_for_wrapper(:table, *args)
+        template.content_tag(
+          :tr, [
+            template.capture(&block), (
+              if options[:row_removable]
+                formnestic_row_removing_content_tag(:table)
+              else
+                ''
+              end
+            )
+          ].join.html_safe, html_options
+        )
       end
 
       def formnestic_legend_for_list_form
@@ -40,20 +77,55 @@ formnestic_row_removing_content_tag(:table) : '')].join.html_safe, html_options)
                           .downcase
                           .titleize
                       end
-        template.content_tag(:span, record_name, class: 'formnestic-li-fieldset-for')
+        template.content_tag(
+          :span,
+          record_name,
+          class: 'formnestic-li-fieldset-for'
+        )
       end
 
       def formnestic_row_removing_content_tag(form_type)
         contents = []
-        contents.push(hidden_field(:_destroy, class: 'formnestic-destroy-input', value: false))
-        contents.push(template.content_tag(:div, '', title: I18n.t('formnestic.labels.remove_this_entry'), class: "#{formnestic_row_removing_cell_div_class(form_type)} icon-cancel-circled", onclick: formnestic_row_removing_cell_js_call(form_type)))
-        template.content_tag(form_type == :table ? :td : :div, contents.join.html_safe, class: formnestic_row_removing_cell_container_div_class(form_type))
+        contents.push(
+          hidden_field(
+            :_destroy,
+            class: 'formnestic-destroy-input',
+            value: object.marked_for_destruction?
+          )
+        )
+        contents.push(
+          template.content_tag(
+            :div,
+            '',
+            title: I18n.t('formnestic.labels.remove_this_entry'),
+            class: "#{formnestic_row_removing_cell_div_class(form_type)} \
+icon-cancel-circled",
+            onclick: formnestic_row_removing_cell_js_call(form_type)
+          )
+        )
+        template.content_tag(
+          form_type == :table ? :td : :div,
+          contents.join.html_safe,
+          class: formnestic_row_removing_cell_container_div_class(form_type)
+        )
       end
 
       def formnestic_prepare_html_options_for_wrapper(form_type, *args)
         html_options = args.extract_options!
         html_options[:name] = field_set_title_from_args(*args)
-        html_options[:class] = [html_options[:class] || 'inputs', formnestic_wrapper_class(form_type), formnestic_row_class_based_on_position(options[:parent_builder].rows_counter)].join(' ')
+        html_options[:class] = [
+          html_options[:class] || 'inputs',
+          formnestic_wrapper_class(form_type),
+          formnestic_row_class_based_on_position(
+            options[:parent_builder].rows_counter
+          )
+        ].join(' ')
+        if object.marked_for_destruction?
+          html_options[:style] = [
+            html_options[:style],
+            'display: none'
+          ].compact.join(';')
+        end
         options[:parent_builder].increase_rows_counter
         html_options
       end
@@ -96,3 +168,4 @@ formnestic_row_removing_content_tag(:table) : '')].join.html_safe, html_options)
     end
   end
 end
+# rubocop:enable all

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formnestic
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - James
@@ -237,8 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 3
 summary: An extension of formtastic form builder gem