formnestic 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2efafe689f391ab0a0771c1d5b13786194905218
-  data.tar.gz: 5dffa27fc75df13805da4ef765f4efd1bbe573a4
+SHA256:
+  metadata.gz: 3dd0bc0425d77a4cd8462fca70aa96a62ce58074501803e19c99d5b502f89b4a
+  data.tar.gz: 74dbbfd7b390e44634908d16b8a6cf6361732af0e518970bb6397de064394e45
 SHA512:
-  metadata.gz: 6fe94b00531903a3ceaf7501b2057410b3069cfb07cfaac4273c092b70340a4aa61d94e31ceb8b866274d00dd8054d8a5377239acf524439dd257f50479cbe59
-  data.tar.gz: eea158cd30f720f04e435a6cb2c2a631439a5b13e19b6a1ef3d70f2ce74a2299603bc0168fb061c3baee3a37ecf4321be41bd002f528a7fd11d4a0506b3a6c7d
+  metadata.gz: b4c62189e490379215453b77c315ddcbf262ec91ee9877287ef56e30a6703fbb20dc4f42e30265f2e9da285db2647d6da2066e5dd181ea204b14ba9a0571a6f3
+  data.tar.gz: 3810b3d89604978d062945906a23666981bcc91930aee605200e8bc7408d316b3bc6e571a8ee90ace290f81586ba939ce07aa7411ea23b640670d966a94c33ac

data/formnestic.gemspec

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

data/lib/formnestic/form_builder/table_form_builder.rb

@@ -184,7 +184,7 @@ module Formnestic
             )
           input_base.label_text
         elsif table_header_element_opts[:label].present?
-          table_header_element_opts[:label]
+          table_header_element_opts[:label].html_safe
         else
           "Column #{position}"
         end

data/lib/formnestic/inputs/base/wrapping.rb

@@ -1,9 +1,31 @@
+# rubocop:disable MethodLength, AbcSize
 module Formnestic
   module Inputs
     module Base
       module Wrapping
+        def table_builder?
+          builder.options[:display_type] == 'table' ||
+            if builder.options[:parent_builder]
+              builder
+                .options[:parent_builder]
+                .options[:display_type] == 'table'
+            else
+              false
+            end
+        end
+
+        def parent_table_builder?
+          if builder.options[:parent_builder]
+            builder
+              .options[:parent_builder]
+              .options[:display_type] == 'table'
+          else
+            false
+          end
+        end
+
         def input_wrapping(&block)
-          if builder.options[:display_type] == 'table'
+          if table_builder?
             if [
               'Formtastic::Inputs::DateSelectInput',
               'Formtastic::Inputs::TimeSelectInput',
@@ -21,13 +43,16 @@ module Formnestic
         end
 
         def table_date_select_input_wrapping(&block)
-          builder
-            .options[:parent_builder]
-            .add_table_header(
-              attributized_method_name,
-              self.class,
-              label_text
-            )
+          unless parent_table_builder?
+            builder
+              .options[:parent_builder]
+              .add_table_header(
+                attributized_method_name,
+                self.class,
+                label_text
+              )
+          end
+
           template.content_tag(
             :td,
             template.content_tag(
@@ -40,13 +65,15 @@ module Formnestic
         end
 
         def table_input_wrapping(&block)
-          builder
-            .options[:parent_builder]
-            .add_table_header(
-              attributized_method_name,
-              self.class,
-              label_text
-            )
+          unless parent_table_builder?
+            builder
+              .options[:parent_builder]
+              .add_table_header(
+                attributized_method_name,
+                self.class,
+                label_text
+              )
+          end
 
           template.content_tag(
             :td,
@@ -62,3 +89,4 @@ module Formnestic
     end
   end
 end
+# rubocop:enable MethodLength, AbcSize

metadata

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