formnestic 1.0.2 → 1.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ebe16f838c5cc06d26df3234123b7528acf0ca10
+  data.tar.gz: c27a6423ca05de992ba11853d2f0443504bb3894
+SHA512:
+  metadata.gz: 185ff7ebc0baebb71cef55379a41814b41542b4f920b66086fbfad6f3f0ebf7100915301a4f1919908257004cfe53208b23945ecbf60038e260219981ab85a82
+  data.tar.gz: 936c96890416217c9ae6aac5c9834438bf1827fe36c88a15e4315d41ddc12168edb9b8109c57ecfc394cbce90aa5e0f37ccdd5118c3689f9629d8a675dd79fd4

data/README.markdown

@@ -6,6 +6,8 @@
 
 An extension of famous [Formtastic Form Builder](https://github.com/justinfrench/formtastic) to make building nested and association form with nested model addable and removable ability extremely easy and simple.
 
+Checkout the the [Demo](http://formnestic-demo.herokuapp.com)
+
 ### Compatibility
 
 - Formnestic gem requires ``formtastic`` gem version ``>= 2.2.1``

data/app/assets/javascripts/formnestic/formnestic.js

@@ -32,7 +32,7 @@ var Formnestic = {
     var maxNumberOfEntries = parseInt(nestedModelContainer.attr("max_entry"), 10);    
     
     if (minNumberOfEntries !== -1 && numberOfShowingEntries <= minNumberOfEntries) {
-      return alert(nestedModelContainer.attr("min_entry_alert_message"));
+      return window.alert(nestedModelContainer.attr("min_entry_alert_message"));
     }//end if
     
     var entryContainer = deleteEntryLinkDom.parents("fieldset.inputs:first");
@@ -46,7 +46,7 @@ var Formnestic = {
       addRowLinkContainer.removeClass("formnestic-hidden");
     }//end else
     
-    entryContainer.fadeOut(function() {});
+    entryContainer.fadeOut();
   },
   
   removeATableEntry: function(deleteEntryLinkDom) {
@@ -57,7 +57,7 @@ var Formnestic = {
     var minNumberOfEntries = parseInt(table.attr("min_entry"), 10);
     var maxNumberOfEntries = parseInt(table.attr("max_entry"), 10);    
     if (minNumberOfEntries !== -1 && numberOfShowingEntries <= minNumberOfEntries) {
-        return alert(table.attr("min_entry_alert_message"));
+        return window.alert(table.attr("min_entry_alert_message"));
     }//end if
     
     var trContainer = deleteEntryLinkDom.parents("tr:first");
@@ -69,7 +69,7 @@ var Formnestic = {
     } else {
       addRowLink.removeClass("formnestic-hidden");
     }//end else
-    trContainer.fadeOut(function() {});
+    trContainer.fadeOut();
   },
   
   addOddAndEventClassForListContainer: function(listContainer) {
@@ -91,7 +91,7 @@ var Formnestic = {
 		$(table).find("tbody:first").find("tr").each(function() {
       var trDom = $(this);
 			if(!trDom.hasClass('formnestic-deleted-row') && !trDom.hasClass("formnestic-table-no-border")) {
-				trDom.removeClass("formnestic-odd-row formnestic-even-row").addClass(counter % 2 === 0 ? "formnestic-even-row" : "formnestic-odd-row")
+				trDom.removeClass("formnestic-odd-row formnestic-even-row").addClass(counter % 2 === 0 ? "formnestic-even-row" : "formnestic-odd-row");
 				counter = counter + 1;
       }
 		});
@@ -100,14 +100,12 @@ var Formnestic = {
   },
   
   addNewListEntry: function(linkDom, associationName, content) {
-    var newId = new Date().getTime();
-    var regexp = new RegExp("new_" + associationName, "g");
     var linkDomContainer = $(linkDom).parent();
     var listContainer = linkDomContainer.parents('div.formnestic-nested-model-container:first').find("div.formnestic-list-entries-container");
     var nestedModelContainer = listContainer.parent();
     var maxNumberOfEntries = parseInt(nestedModelContainer.attr('max_entry'), 10);
     
-    var entryContainer = $(content.replace(regexp, newId)).appendTo(listContainer);
+    var entryContainer = $(this.formatNewAppendedContent(content, associationName)).appendTo(listContainer);
     var counter = this.addOddAndEventClassForListContainer(listContainer);
     if (maxNumberOfEntries !== -1 && counter >= maxNumberOfEntries) {
       linkDomContainer.addClass("formnestic-hidden");
@@ -119,12 +117,10 @@ var Formnestic = {
   },
   
   addNewTableEntry: function(linkDom, associationName, content) {
-    var newId = new Date().getTime();
-    var regexp = new RegExp("new_" + associationName, "g");
     var linkDomjQuery = $(linkDom);
     var table = linkDomjQuery.parents('table:first');
     
-    var entryContainer = $(content.replace(regexp, newId)).insertBefore(linkDomjQuery.parents("tr:first"));
+    var entryContainer = $(this.formatNewAppendedContent(content, associationName)).insertBefore(linkDomjQuery.parents("tr:first"));
       
     var counter = this.addOddAndEvenClassForTable(table);
     var maxNumberOfEntries = parseInt(table.attr('max_entry'), 10);
@@ -135,5 +131,11 @@ var Formnestic = {
     }//end else
     
     entryContainer.css({display: 'none'}).fadeIn();
+  },
+  
+  formatNewAppendedContent: function(content, associationName) {
+    var newId = new Date().getTime();
+    var regexp = new RegExp("new_" + associationName, "g");
+    return content.replace(regexp, newId);
   }
 };

data/formnestic.gemspec

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

data/lib/formnestic/form_builder/base_builder.rb

@@ -1,31 +1,29 @@
 module Formnestic
   module FormBuilder
     module BaseBuilder
-      
       def formnestic_min_entry_alert_message(record_or_name_or_array, min_entry)
-        entity_name = I18n.t("activerecord.models.#{record_or_name_or_array.to_s.singularize}", default: record_or_name_or_array.to_s.gsub("_", " ").singularize.singularize)
+        entity_name = I18n.t("activerecord.models.#{record_or_name_or_array.to_s.singularize}", default: record_or_name_or_array.to_s.tr('_', ' ').singularize.singularize)
         min_entry != -1 ? (options[:min_entry_alert_message] ||
-             I18n.t('formnestic.labels.there_must_be_at_least_a_number_of_entries', {
-               count: min_entry,
-               entity_singular: entity_name, 
-               entity_plural: entity_name.pluralize})) : ''
+             I18n.t('formnestic.labels.there_must_be_at_least_a_number_of_entries', count: min_entry,
+                                                                                    entity_singular: entity_name,
+                                                                                    entity_plural: entity_name.pluralize)) : ''
       end
-            
+
       def formnestic_add_rows_counter_related_attributes
         instance_eval do
-          instance_variable_set("@rows_counter", 0)        
+          instance_variable_set('@rows_counter', 0)
           def rows_counter
-            return @rows_counter
+            @rows_counter
           end
-        
+
           def increase_rows_counter
             @rows_counter += 1
           end
-        end        
+        end
       end
-      
+
       def formnestic_link_to_add_fields_with_content(record_or_name_or_array, *args, &block)
-        new_object = self.object.class.reflect_on_association(record_or_name_or_array).klass.new
+        new_object = object.class.reflect_on_association(record_or_name_or_array).klass.new
         options = args.dup.extract_options!
         options[:max_entry] ||= -1
         duplicate_args = args.dup
@@ -34,22 +32,21 @@ module Formnestic
         rows_counter = self.rows_counter
         new_record_form_options[:child_index] = "new_#{record_or_name_or_array}"
         new_record_form_content = formtastic_semantic_fields_for(record_or_name_or_array, *(duplicate_args << new_record_form_options), &block)
-        link_title = options[:new_record_link_label] || I18n.t("formnestic.labels.add_new_entry")        
+        link_title = options[:new_record_link_label] || I18n.t('formnestic.labels.add_new_entry')
         javascript_fn_to_call = js_call_for_nested_model_display_type(options[:display_type])
-        
+
         template.link_to(link_title, '#', onclick:
           "Formnestic.#{javascript_fn_to_call}(this, \"#{record_or_name_or_array}\", \"#{escape_javascript(new_record_form_content)}\"); return false;", \
-            "class" => ["formnestic-add-row-field-link", options[:new_record_link_class], (options[:max_entry] != -1 and rows_counter >= options[:max_entry]) ? "formnestic-hidden" : nil].compact.join(" "))
-      
+                                          'class' => ['formnestic-add-row-field-link', options[:new_record_link_class], (options[:max_entry] != -1) && (rows_counter >= options[:max_entry]) ? 'formnestic-hidden' : nil].compact.join(' '))
       end
-      
+
       def js_call_for_nested_model_display_type(display_type)
         if display_type == 'table'
-          return 'addNewTableEntry'
+          'addNewTableEntry'
         else
-          return 'addNewListEntry'
+          'addNewListEntry'
         end
       end
     end
   end
-end
+end

data/lib/formnestic/form_builder/table_form_builder.rb

@@ -1,94 +1,194 @@
+# rubocop:disable MethodLength, Documentation, ModuleLength, AbcSize
 module Formnestic
   module FormBuilder
     module TableFormBuilder
       include Formnestic::FormBuilder::BaseBuilder
-      
-      def formnestic_table_semantic_fields_for(record_or_name_or_array, *args, &block)
-        options = args.dup.extract_options!                
+      def formnestic_table_semantic_fields_for(
+        record_or_name_or_array, *args, &block
+      )
+        options = args.dup.extract_options!
         formnestic_add_table_headers_form_attributes
         formnestic_add_rows_counter_related_attributes
-        
+
         child_form_builder = nil
-        contents = [formtastic_semantic_fields_for(record_or_name_or_array, *args, &lambda {|nested_form_builder|
-          child_form_builder = nested_form_builder
-          block.call(nested_form_builder)
-        })]
-        
-        contents.push(formnestic_add_new_record_button_row_for_table(record_or_name_or_array, *args, &block)) if options[:row_addable]
-        options[:class] = ["formnestic-table-inputs formnestic-nested-model", options[:class]].compact.join(" ")
+        contents = [formtastic_semantic_fields_for(
+          record_or_name_or_array,
+          *args,
+          &lambda { |nested_form_builder|
+            child_form_builder = nested_form_builder
+            yield(nested_form_builder)
+          }
+        )]
+
+        if options[:row_addable]
+          contents.push(
+            formnestic_add_new_record_button_row_for_table(
+              record_or_name_or_array, *args, &block
+            )
+          )
+        end
+        options[:class] = [
+          'formnestic-table-inputs formnestic-nested-model',
+          options[:class]
+        ].compact.join(' ')
         options[:min_entry] ||= -1
-        options[:max_entry] ||= -1      
-        options[:min_entry_alert_message] = formnestic_min_entry_alert_message(record_or_name_or_array, options[:min_entry])
-               
+        options[:max_entry] ||= -1
+        options[:min_entry_alert_message] =
+          formnestic_min_entry_alert_message(
+            record_or_name_or_array, options[:min_entry]
+          )
+
         ### Finally, wrap everything inside a table tag
         template.content_tag(:table, [
-            formnestic_table_header(options, record_or_name_or_array, child_form_builder), # table header
-            template.content_tag(:tbody, Formtastic::Util.html_safe(contents.join)) # table body
-          ].join.html_safe,
-          options.except(:builder, :parent, :name, :parent_builder, :display_type, :row_removable, :new_record_link_label, :table_headers)
-        )
+          formnestic_table_header(
+            options,
+            record_or_name_or_array,
+            child_form_builder
+          ), # table header
+          template.content_tag(
+            :tbody,
+            Formtastic::Util.html_safe(contents.join)
+          ) # table body
+        ].join.html_safe, options.except(
+                            :builder,
+                            :parent,
+                            :name,
+                            :parent_builder,
+                            :display_type,
+                            :row_removable,
+                            :new_record_link_label,
+                            :table_headers
+        ))
       end
-    
+
       def formnestic_add_table_headers_form_attributes
         instance_eval do
-          instance_variable_set("@table_headers", [])
+          instance_variable_set('@table_headers', [])
           def table_headers
-            return @table_headers
+            @table_headers
           end
-        
+
           def add_table_header(column_name, class_name, label_text)
-            if @table_headers.detect{|x| x[:attr] == column_name}.nil?
-              @table_headers.push({attr: column_name, class: class_name.to_s.tableize.gsub("formtastic/inputs/", "").gsub("_", "-").gsub("-inputs", ""), label_text: label_text})
-            end
+            return if @table_headers.detect do |x|
+              x[:attr] == column_name
+            end.present?
+            @table_headers.push(
+              attr: column_name,
+              class:
+                class_name
+                  .to_s
+                  .tableize
+                  .gsub('formtastic/inputs/', '')
+                  .tr('_', '-')
+                  .gsub('-inputs', ''),
+              label_text: label_text
+            )
           end
         end
       end
-      
-      def formnestic_add_new_record_button_row_for_table(record_or_name_or_array, *args, &block)
-        template.content_tag(:tr, template.content_tag(:td, formnestic_link_to_add_fields_with_content(record_or_name_or_array, *args, &block), {colspan: "100%"}), class: "formnestic-table-no-border")
+
+      def formnestic_add_new_record_button_row_for_table(
+        record_or_name_or_array,
+        *args,
+        &block
+      )
+        template.content_tag(
+          :tr,
+          template.content_tag(
+            :td,
+            formnestic_link_to_add_fields_with_content(
+              record_or_name_or_array, *args, &block
+            ), colspan: '100%'
+          ), class: 'formnestic-table-no-border'
+        )
       end
-                
-      def formnestic_table_header(header_options, record_or_name_or_array, child_form_builder)        
-        association_name = record_or_name_or_array.is_a?(Array) ? record_or_name_or_array[0] : record_or_name_or_array
+
+      def formnestic_table_header(
+        header_options, record_or_name_or_array, child_form_builder
+      )
         thead_contents = if header_options[:table_headers]
-          formnestic_thead_contents_from_arguments(header_options[:table_headers], record_or_name_or_array, child_form_builder)
-        else
-          formnestic_thead_contents_from_inputs(header_options[:row_removable])
-        end        
-        return template.content_tag(:thead, thead_contents.join.html_safe)
+                           formnestic_thead_contents_from_arguments(
+                             header_options[:table_headers],
+                             record_or_name_or_array, child_form_builder
+                           )
+                         else
+                           formnestic_thead_contents_from_inputs(
+                             header_options[:row_removable]
+                           )
+                         end
+        template.content_tag(:thead, thead_contents.join.html_safe)
       end
-      
+
       def formnestic_thead_contents_from_inputs(row_removable)
         tr_content_arr = []
         table_headers.each do |header|
-          tr_content_arr.push(template.content_tag(:th, header[:label_text], class: header[:class]))
+          tr_content_arr.push(
+            template.content_tag(
+              :th,
+              header[:label_text],
+              class: header[:class]
+            )
+          )
+        end
+        if row_removable
+          tr_content_arr.push(
+            template.content_tag(
+              :th, '', class: 'formnestic-minus-thead'
+            )
+          )
         end
-        tr_content_arr.push(template.content_tag(:th, "", class: "formnestic-minus-thead")) if row_removable
         [template.content_tag(:tr, tr_content_arr.join.html_safe)]
       end
-      
-      def formnestic_thead_contents_from_arguments(theads, record_or_name_or_array, child_form_builder)
+
+      def formnestic_thead_contents_from_arguments(
+        theads,
+        record_or_name_or_array,
+        child_form_builder
+      )
         thead_contents = []
         theads.each do |el_arr|
-    		  tr_content_arr = []
-    		  el_arr.each_with_index do |el, index|
-            tr_content_arr.push(template.content_tag(:th, formnestic_table_thead_th_content(record_or_name_or_array, el, index + 1, child_form_builder), el[:wrapper_html] || {}))
-    		  end
-    		  thead_contents.push(template.content_tag(:tr, tr_content_arr.join.html_safe))
-    		end
+          tr_content_arr = []
+          el_arr.each_with_index do |el, index|
+            tr_content_arr
+              .push(
+                template.content_tag(
+                  :th,
+                  formnestic_table_thead_th_content(
+                    record_or_name_or_array, el, index + 1, child_form_builder
+                  ), el[:wrapper_html] || {}
+                )
+              )
+          end
+          thead_contents.push(
+            template.content_tag(:tr, tr_content_arr.join.html_safe)
+          )
+        end
         thead_contents
       end
-      
-      def formnestic_table_thead_th_content(record_or_name_or_array, table_header_element_opts, position, child_form_builder)
+
+      def formnestic_table_thead_th_content(
+        record_or_name_or_array,
+        table_header_element_opts,
+        position,
+        child_form_builder
+      )
         if table_header_element_opts[:attr].present?
-          input_base = Formtastic::Inputs::StringInput.new(child_form_builder, "", record_or_name_or_array, child_form_builder.object, table_header_element_opts[:attr], {})
-          return input_base.label_text
+          input_base =
+            Formtastic::Inputs::StringInput.new(
+              child_form_builder,
+              '',
+              record_or_name_or_array,
+              child_form_builder.object,
+              table_header_element_opts[:attr],
+              {}
+            )
+          input_base.label_text
         elsif table_header_element_opts[:label].present?
-          return table_header_element_opts[:label]
+          table_header_element_opts[:label]
         else
-          return "Column #{position}"
+          "Column #{position}"
         end
       end
-    end    
+    end
   end
-end
+end

data/lib/formnestic/form_builder.rb

@@ -1,13 +1,12 @@
 module Formnestic
-  module FormBuilder    
+  module FormBuilder
     include ActionView::Helpers::JavaScriptHelper
-    
+
     autoload :BaseBuilder, File.join(File.dirname(__FILE__), 'form_builder', 'base_builder')
     autoload :TableFormBuilder, File.join(File.dirname(__FILE__), 'form_builder', 'table_form_builder')
     autoload :ListFormBuilder, File.join(File.dirname(__FILE__), 'form_builder', 'list_form_builder')
-    
+
     include Formnestic::FormBuilder::TableFormBuilder
     include Formnestic::FormBuilder::ListFormBuilder
-    
   end
-end
+end

data/lib/formnestic/helpers/inputs_helper.rb

@@ -2,81 +2,87 @@ module Formnestic
   module Helpers
     module InputsHelper
       def inputs(*args, &block)
-        if options[:display_type] == 'table'  
-          formnestic_table_row_inputs(*args, &block)  
-        elsif options[:row_removable] or options[:row_addable]
+        if options[:display_type] == 'table'
+          formnestic_table_row_inputs(*args, &block)
+        elsif options[:row_removable] || options[:row_addable]
           formnestic_list_row_inputs(*args, &block)
         else
           formtastic_inputs(*args, &block)
-        end    
+        end
       end
-      
+
       # for listing form
       def formnestic_list_row_inputs(*args, &block)
-        html_options = args.extract_options!
-        html_options[:name] = field_set_title_from_args(*args)
-        html_options[:class] = [html_options[:class] || "inputs", "formnestic-li-fieldset", formnestic_row_class_based_on_position(options[:parent_builder].rows_counter)].join(" ")        
-        self.options[:parent_builder].increase_rows_counter
-                        
-        rows_counter = template.content_tag(:span, self.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")        
+        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)
       end
-      
+
       # For table form
       def formnestic_table_row_inputs(*args, &block)
-        html_options = args.extract_options!
-        html_options[:name] = field_set_title_from_args(*args)
-        html_options[:class] = [html_options[:class] || "inputs", "formnestic-tr-fieldset", formnestic_row_class_based_on_position(options[:parent_builder].rows_counter)].join(" ")
-                
-        self.options[:parent_builder].increase_rows_counter
+        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)
       end
-      
+
       def formnestic_legend_for_list_form
-        record_name = self.object.class.to_s.underscore.gsub("_", " ").singularize.downcase
-        entity_name = I18n.t("activerecord.models.#{self.object.class.to_s.underscore.downcase}", default: record_name)
-        template.content_tag(:span, record_name.titleize, class: "formnestic-li-fieldset-for")
+        record_name = object.class.to_s.underscore.tr('_', ' ').singularize.downcase
+        entity_name = I18n.t("activerecord.models.#{object.class.to_s.underscore.downcase}", default: record_name)
+        template.content_tag(:span, record_name.titleize, class: 'formnestic-li-fieldset-for')
       end
-      
-      def formnestic_row_removing_content_tag(form_type)        
+
+      def formnestic_row_removing_content_tag(form_type)
         contents = []
-        contents.push(self.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)))
+        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))
       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(' ')
+        options[:parent_builder].increase_rows_counter
+        html_options
+      end
+
+      def formnestic_wrapper_class(form_type)
+        if form_type == :table
+          'formnestic-tr-fieldset'
+        else
+          'formnestic-li-fieldset'
+        end
+      end
+
       def formnestic_row_removing_cell_js_call(form_type)
         if form_type == :table
           'Formnestic.removeATableEntry(this);'
         else
           'Formnestic.removeAListEntry(this);'
-        end        
+        end
       end
-      
+
       def formnestic_row_removing_cell_div_class(form_type)
         if form_type == :table
           'formnestic-table-minus-button'
         else
           'formnestic-list-item-minus-button'
-        end        
+        end
       end
-      
+
       def formnestic_row_removing_cell_container_div_class(form_type)
         if form_type == :table
           'formnestic-minus-button-cell'
         else
           'formnestic-minus-button-container'
-        end        
+        end
       end
-      
+
       def formnestic_row_class_based_on_position(position)
-        position % 2 == 0 ? 'formnestic-even-row': 'formnestic-odd-row'
+        position.even? ? 'formnestic-even-row' : 'formnestic-odd-row'
       end
-      
-      
     end
   end
-end
+end

data/lib/formnestic/helpers.rb

@@ -1,9 +1,9 @@
 module Formnestic
   # @private
   module Helpers
-    autoload :InputsHelper, File.join(File.dirname(__FILE__), 'helpers', 'inputs_helper')
+    autoload :InputsHelper, \
+             File.join(File.dirname(__FILE__), 'helpers', 'inputs_helper')
     Formtastic::FormBuilder.send(:alias_method, :formtastic_inputs, :inputs)
     Formtastic::FormBuilder.send(:include, Formnestic::Helpers::InputsHelper)
-   
   end
-end
+end

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

@@ -3,13 +3,13 @@ module Formnestic
     module Base
       module Labelling
         def render_label?
-          if self.builder.options[:display_type] == "table"
+          if builder.options[:display_type] == 'table'
             false
           else
             formtastic_render_label?
           end
-        end        
+        end
       end
     end
   end
-end
+end

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

@@ -3,13 +3,13 @@ module Formnestic
     module Base
       module Wrapping
         def input_wrapping(&block)
-          if self.builder.options[:display_type] == "table"
+          if builder.options[:display_type] == 'table'
             if [
-              "Formtastic::Inputs::DateSelectInput", 
-              "Formtastic::Inputs::TimeSelectInput", 
-              "Formtastic::Inputs::DateTimeSelectInput",
-              "Formtastic::Inputs::TimeInput", 
-              "Formtastic::Inputs::DateInput", 
+              'Formtastic::Inputs::DateSelectInput',
+              'Formtastic::Inputs::TimeSelectInput',
+              'Formtastic::Inputs::DateTimeSelectInput',
+              'Formtastic::Inputs::TimeInput',
+              'Formtastic::Inputs::DateInput'
             ].index(self.class.to_s)
               table_date_select_input_wrapping(&block)
             else
@@ -19,24 +19,46 @@ module Formnestic
             formtastic_input_wrapping(&block)
           end
         end
-  
+
         def table_date_select_input_wrapping(&block)
-          self.builder.options[:parent_builder].add_table_header(self.attributized_method_name, self.class, label_text)
-          template.content_tag(:td, 
-            template.content_tag(:div, [
-              template.capture(&block), error_html, hint_html].join("\n").html_safe, 
-            class: "table-date-select-container"), wrapper_html_options
+          builder
+            .options[:parent_builder]
+            .add_table_header(
+              attributized_method_name,
+              self.class,
+              label_text
+            )
+          template.content_tag(
+            :td,
+            template.content_tag(
+              :div, [
+                template.capture(&block), error_html, hint_html
+              ].join("\n").html_safe,
+              class: 'table-date-select-container'
+            ), wrapper_html_options
           )
         end
-              
+
         def table_input_wrapping(&block)
-          self.builder.options[:parent_builder].add_table_header(self.attributized_method_name, self.class, label_text)
-          template.content_tag(:td, 
-            [template.capture(&block), error_html, hint_html].join("\n").html_safe, 
+          builder
+            .options[:parent_builder]
+            .add_table_header(
+              attributized_method_name,
+              self.class,
+              label_text
+            )
+
+          template.content_tag(
+            :td,
+            [
+              template.capture(&block),
+              error_html,
+              hint_html
+            ].join("\n").html_safe,
             wrapper_html_options
           )
-        end          
+        end
       end
     end
   end
-end
+end

data/lib/formnestic/inputs/base.rb

@@ -4,9 +4,9 @@ module Formnestic
       extend ActiveSupport::Autoload
       autoload :Wrapping
       autoload :Labelling
-      
+
       include Wrapping
       include Labelling
     end
   end
-end
+end

data/lib/formnestic.rb

@@ -1,72 +1,25 @@
-# encoding: utf-8
-require 'formtastic/engine' if defined?(::Rails)
+require 'formnestic/engine' if defined?(::Rails)
 require 'formtastic/helpers'
 require 'formtastic'
+
 module Formnestic
   extend ActiveSupport::Autoload
-  autoload :Helpers, File.join(File.dirname(__FILE__), 'formnestic', 'helpers')
-  autoload :FormBuilder, File.join(File.dirname(__FILE__), 'formnestic', 'form_builder')
-  autoload :Inputs, File.join(File.dirname(__FILE__), 'formnestic', 'inputs')  
-  
-  include Formnestic::Helpers  
+  autoload :Helpers,
+           File.join(File.dirname(__FILE__), 'formnestic', 'helpers')
+  autoload :FormBuilder,
+           File.join(File.dirname(__FILE__), 'formnestic', 'form_builder')
+  autoload :Inputs,
+           File.join(File.dirname(__FILE__), 'formnestic', 'inputs')
+  autoload \
+    :FormtasticExtensions,
+    File.join(File.dirname(__FILE__), 'formnestic', 'formtastic_extensions')
+
+  include Formnestic::Helpers
   include Formnestic::Inputs::Base
-  
-  Formtastic::FormBuilder.send(:alias_method, :formtastic_semantic_fields_for, :semantic_fields_for)
-  Formtastic::FormBuilder.send(:include, Formnestic::FormBuilder)
-  Formtastic::Inputs::Base.send(:alias_method, :formtastic_input_wrapping, :input_wrapping)
-  Formtastic::Inputs::Base.send(:include, Formnestic::Inputs::Base::Wrapping)
-  
-  Formtastic::Inputs::Base.send(:alias_method, :formtastic_render_label?, :render_label?)
-  Formtastic::Inputs::Base.send(:include, Formnestic::Inputs::Base::Labelling)
-  
-  Formtastic::Inputs::BooleanInput.send(:alias_method, :formtastic_label_text_with_embedded_checkbox, :label_text_with_embedded_checkbox)  
-  
-  [
-    'Formtastic::Inputs::DateSelectInput', 
-    'Formtastic::Inputs::DatetimeSelectInput',
-    'Formtastic::Inputs::TimeSelectInput'
-  ].each do |date_related_subclass_str|
-    if defined?(date_related_subclass_str)
-      date_related_subclass = date_related_subclass_str.constantize
-      date_related_subclass.send(:alias_method, :formtastic_fragment_label_html, :fragment_label_html)      
-      date_related_subclass.class_eval do
-        def fragment_label_html(fragment)
-          if self.builder.options[:display_type] == "table"
-            "".html_safe
-          else
-            formtastic_fragment_label_html(fragment)
-          end
-        end      
-      end
-    end
-  end  
-  
-  Formtastic::Inputs::BooleanInput.class_eval do
-    def label_text_with_embedded_checkbox
-      if self.builder.options[:display_type] == 'table'
-        check_box_html
-      else
-        formtastic_label_text_with_embedded_checkbox
-      end
-    end          
-  end
-  
-  Formtastic::FormBuilder.class_eval do
-    def semantic_fields_for(record_or_name_or_array, *args, &block)
-      options = args.dup.extract_options!
-      if options[:display_type] == 'table'
-        formnestic_table_semantic_fields_for(record_or_name_or_array, *args, &block)
-      elsif options[:row_removable].present? or options[:row_addable].present?
-        formnestic_list_semantic_fields_for(record_or_name_or_array, *args, &block)
-      else
-        formtastic_semantic_fields_for(record_or_name_or_array, *args, &block)
-      end
-    end    
-  end
-  
-  if defined?(::Rails)
-    class Engine < Rails::Engine
-    end
-  end
-  
-end
+  extend Formnestic::FormtasticExtensions
+
+  extend_form_builder
+  extend_form_inputs
+  extend_datetime_related_inputs
+  extend_boolean_input
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formnestic
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.0.3
 platform: ruby
 authors:
 - James
@@ -14,193 +13,169 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: formtastic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rspec_tag_matchers
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: spork
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: watchr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: An extension of famous Formtastic Form Builder to make building nested
@@ -212,10 +187,10 @@ extensions: []
 extra_rdoc_files:
 - README.markdown
 files:
-- .document
-- .rspec
-- .travis.yml
-- .watchr
+- ".document"
+- ".rspec"
+- ".travis.yml"
+- ".watchr"
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -259,28 +234,24 @@ files:
 homepage: http://github.com/jameshuynh/formnestic
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4363090041359353680
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 3
 summary: An extension of formtastic form builder gem