formnestic 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1621bcb434bcdbcba856cb23bc8be60ea07f1722ccc468abe0a80b2f3adbe28
-  data.tar.gz: 54fc1c385b28dda9f53090a7d092826d3f72c9a3fc208a3e7da258cd143964f6
+  metadata.gz: 19dbc5857976dba8a545a7e706263e1ec6052ffbbb7b7aab12f53a30b079f473
+  data.tar.gz: 751b42184a4c9ddd77e76d5996ea08ce6784c3b3bcb26e0aed4079ab20468dcc
 SHA512:
-  metadata.gz: dfca5c52f22b47c1c35b444c5b53ce6fa0803cb8796d6f6337ca4416cc2c7f29e907394b95d81365dd56eba78192d0252320a4a437f504fa6727a8b0e2a8b22f
-  data.tar.gz: 1fea05ff4909724c25da44289f6aae4d2a0e01d41d695713dd5b4bb1198fd5c6f9683bd74e191d38b9df649638bdbab1788c0c7006584bcf25e50208c95f6858
+  metadata.gz: 964bee3a47f68996bd88cfb03461da02a936ec507c5f109e1fecc50ca40665abfbc7d1904b42f4b908bf69309e3c9e95161de5e1650cbecb35b9aeb85bc480ea
+  data.tar.gz: ccc9d7e0bd8b7a372ca4051d287332fa0acd343d6989f5b35ddc1a119dac3ef760eb5adf621fe65c830c00d20a93433170352ee7d1fe02aec6091dc535a519cf

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'http://rubygems.org'
 # Add dependencies required to use your gem here.
 # Example:
@@ -16,6 +18,8 @@ group :development, :test do
   gem 'spork'
   gem 'tzinfo'
   gem 'watchr'
+
+  gem 'nokogiri', '~> 1.10'
 end
 
 group :test do

data/Gemfile.lock

@@ -17,7 +17,8 @@ GEM
     activesupport (3.2.18)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    addressable (2.3.6)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     builder (3.0.4)
     coveralls (0.7.0)
       multi_json (~> 1.3)
@@ -30,21 +31,20 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     erubis (2.7.0)
-    faraday (0.9.0)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     formtastic (2.2.1)
       actionpack (>= 3.0)
-    git (1.2.7)
-    github_api (0.11.3)
-      addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
-      oauth2
-    hashie (3.0.0)
-    highline (1.6.21)
+    git (1.6.0)
+      rchardet (~> 1.8)
+    github_api (0.18.2)
+      addressable (~> 2.4)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8)
+      hashie (~> 3.5, >= 3.5.2)
+      oauth2 (~> 1.0)
+    hashie (3.6.0)
+    highline (2.0.3)
     hike (1.2.3)
     i18n (0.6.9)
     jeweler (2.0.1)
@@ -58,21 +58,22 @@ GEM
       rdoc
     journey (1.0.4)
     json (1.8.6)
-    jwt (1.0.0)
+    jwt (2.2.1)
     mime-types (2.3)
-    mini_portile (0.6.0)
-    multi_json (1.10.1)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nokogiri (1.6.2.1)
-      mini_portile (= 0.6.0)
-    oauth2 (0.9.4)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
+    mini_portile2 (2.4.0)
+    multi_json (1.14.1)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nokogiri (1.10.9)
+      mini_portile2 (~> 2.4.0)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.4.5)
+      rack (>= 1.2, < 3)
+    public_suffix (4.0.3)
+    rack (1.4.7)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.4)
@@ -86,7 +87,8 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.3.2)
+    rake (13.0.1)
+    rchardet (1.8.0)
     rdoc (3.12.2)
       json (~> 1.4)
     rest-client (1.6.7)
@@ -126,7 +128,7 @@ GEM
     term-ansicolor (1.3.0)
       tins (~> 1.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.6)
     tilt (1.4.1)
     tins (1.3.0)
     tzinfo (1.2.1)
@@ -143,6 +145,7 @@ DEPENDENCIES
   formtastic (>= 2.2.1)
   jeweler (~> 2.0.1)
   json (>= 1.8.3)
+  nokogiri (~> 1.10)
   rake
   rdoc (~> 3.4)
   rspec-rails (~> 2.14.0)
@@ -153,4 +156,4 @@ DEPENDENCIES
   watchr
 
 BUNDLED WITH
-   1.15.4
+   1.17.2

data/VERSION

@@ -1 +1 @@
-1.0.11
+1.0.12

data/formnestic.gemspec

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

data/lib/formnestic/form_builder/list_form_builder.rb

@@ -1,28 +1,85 @@
+# frozen_string_literal: true
+
 module Formnestic
   module FormBuilder
     module ListFormBuilder
       include Formnestic::FormBuilder::BaseBuilder
-      def formnestic_list_semantic_fields_for(record_or_name_or_array, *args, &block)
+      def formnestic_list_semantic_fields_for(
+        record_or_name_or_array,
+        *args,
+        &block
+      )
         options = args.dup.extract_options!
 
         formnestic_add_rows_counter_related_attributes
-        existing_rows = formtastic_semantic_fields_for(record_or_name_or_array, *args, &block)
-        contents = [template.content_tag(:div, existing_rows, class: 'formnestic-list-entries-container')]
+        existing_rows = formtastic_semantic_fields_for(
+          record_or_name_or_array,
+          *args,
+          &block
+        )
+        contents = [
+          template.content_tag(
+            :div,
+            existing_rows,
+            class: 'formnestic-list-entries-container'
+          )
+        ]
 
         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])
-        contents.push(formnestic_add_new_record_button_row_for_list_form(record_or_name_or_array, *args, &block)) if options[:row_addable]
-        options[:class] = [options[:class], 'formnestic-nested-model-container'].compact.join
+        options[:min_entry_alert_message] =
+          formnestic_min_entry_alert_message(
+            record_or_name_or_array, options[:min_entry]
+          )
+        if resolve_row_addable(options[:row_addable])
+          contents.push(
+            formnestic_add_new_record_button_row_for_list_form(
+              record_or_name_or_array, *args, &block
+            )
+          )
+        end
+        options[:class] = [
+          options[:class],
+          'formnestic-nested-model-container'
+        ].compact.join
+
+        template.content_tag(
+          :div,
+          contents.join.html_safe,
+          options.except(
+            :builder,
+            :parent,
+            :name,
+            :parent_builder,
+            :display_type,
+            :row_removable,
+            :new_record_link_label,
+            :child_index
+          )
+        )
+      end
+
+      def resolve_row_addable(row_addable)
+        return row_addable if [true, false].index(row_addable)
+        return true if row_addable.nil?
+
+        return row_addable.call if row_addable.is_a?(Proc)
 
-        template.content_tag(:div,
-                             contents.join.html_safe,
-                             options.except(:builder, :parent, :name, :parent_builder, :display_type, :row_removable, :new_record_link_label, :child_index))
+        true
       end
 
-      def formnestic_add_new_record_button_row_for_list_form(record_or_name_or_array, *args, &block)
-        template.content_tag(:div, formnestic_link_to_add_fields_with_content(record_or_name_or_array, *args, &block), class: 'formnestic-list-new-entry-link-container')
+      def formnestic_add_new_record_button_row_for_list_form(
+        record_or_name_or_array, *args, &block
+      )
+        template.content_tag(
+          :div,
+          formnestic_link_to_add_fields_with_content(
+            record_or_name_or_array,
+            *args,
+            &block
+          ), class: 'formnestic-list-new-entry-link-container'
+        )
       end
     end
   end

data/lib/formnestic/form_builder/table_form_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # rubocop:disable MethodLength, Documentation, ModuleLength, AbcSize
 module Formnestic
   module FormBuilder
@@ -20,7 +22,7 @@ module Formnestic
           }
         )]
 
-        if options[:row_addable]
+        if resolve_row_addable(options[:row_addable])
           contents.push(
             formnestic_add_new_record_button_row_for_table(
               record_or_name_or_array, *args, &block
@@ -58,7 +60,16 @@ module Formnestic
                             :row_removable,
                             :new_record_link_label,
                             :table_headers
-        ))
+                          ))
+      end
+
+      def resolve_row_addable(row_addable)
+        return row_addable if [true, false].index(row_addable)
+        return true if row_addable.nil?
+
+        return row_addable.call if row_addable.is_a?(Proc)
+
+        true
       end
 
       def formnestic_add_table_headers_form_attributes
@@ -72,6 +83,7 @@ module Formnestic
             return if @table_headers.detect do |x|
               x[:attr] == column_name
             end.present?
+
             @table_headers.push(
               attr: column_name,
               class:
@@ -130,7 +142,7 @@ module Formnestic
             )
           )
         end
-        if row_removable
+        if row_removable != false
           tr_content_arr.push(
             template.content_tag(
               :th, '', class: 'formnestic-minus-thead'
@@ -190,5 +202,13 @@ module Formnestic
         end
       end
     end
+
+    def resolve_row_removable(row_removable, record)
+      if row_removable.is_a?(Proc)
+        row_removable.call(record)
+      else
+        row_removable
+      end
+    end
   end
 end

data/lib/formnestic/helpers/inputs_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # rubocop:disable MethodLength, AbcSize, ModuleLength
 module Formnestic
   module Helpers
@@ -36,7 +38,20 @@ module Formnestic
           :fieldset, [
             title_div, (
               if options[:row_removable]
-                formnestic_row_removing_content_tag(:list)
+                row_removable_for_record =
+                  resolve_row_removable(options[:row_removable], object)
+                if row_removable_for_record
+                  formnestic_row_removing_content_tag(
+                    :list
+                  )
+                else
+                  template.content_tag(
+                    :div,
+                    '',
+                    class: \
+                      formnestic_row_removing_cell_container_div_class(:list)
+                  )
+                end
               else
                 ''
               end
@@ -54,8 +69,22 @@ module Formnestic
         template.content_tag(
           :tr, [
             template.capture(&block), (
-              if options[:row_removable]
-                formnestic_row_removing_content_tag(:table)
+              if options[:row_removable] != false
+                row_removable_for_record =
+                  resolve_row_removable(options[:row_removable], object)
+
+                if row_removable_for_record
+                  formnestic_row_removing_content_tag(
+                    :table
+                  )
+                else
+                  template.content_tag(
+                    :td,
+                    '',
+                    class: \
+                      formnestic_row_removing_cell_container_div_class(:table)
+                  )
+                end
               else
                 ''
               end
@@ -64,6 +93,14 @@ module Formnestic
         )
       end
 
+      def resolve_row_removable(row_removable, record)
+        return row_removable if [true, false].index(row_removable)
+
+        row_removable.call(record) if row_removable.is_a?(Proc)
+
+        false
+      end
+
       def formnestic_legend_for_list_form
         record_name = if options[:record_header].present?
                         options[:record_header]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formnestic
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - James