effective_bootstrap 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5092faff38f399976a16a668ef167ca4b9f2103db81cb03617a5165a05731c6b
-  data.tar.gz: 3168ab3c1c38bff6e1f6020a0aea2dadc5e6f2917ffef79827054415cb6b1198
+  metadata.gz: dfccd40b53981bf152c50dbcf01e94ba572c9647f7bbdd089a458eb84c18aa6a
+  data.tar.gz: 765eab4d79769e5a8bb970a95fcf8275dcd978ebb2aca709869590349cf8db71
 SHA512:
-  metadata.gz: ff0e00b34d8101166e8eb0d895634e2e5099366953232fa4063c20dd504bfe10641738fb5ed90c99599de0c9f3f3d6a3d029d1cc35548ef8eab0fdb7fcbb27c6
-  data.tar.gz: e24803d6584be1ff0a1aea39a6790528186c5189974a1a69af5ef95a295665b932e74af3734ec1735a2a82e5ee75ed9d5dbf98af4e6352f71971d250590a68fa
+  metadata.gz: 758307b2718b798b6b5827f8628ed66c037d30612d889edb88f39b79c44028e9a29b0ed7880dc1a79f2321fb62b80bd415d0920642ba44a6e758525fb6df1cbf
+  data.tar.gz: 9587c02c77dfbbdf5a454ff1122acca628af9a5556dcca2d6e6780b624d483560fb7f996f8c72e645f0b7beb6c50c2ccb563f16d28bc28fc2178a26384bde0c1

data/README.md

@@ -388,20 +388,26 @@ and
     = fb.date_field :published_at
 ```
 
-If `Book` has an integer `position` field, there will be reorder buttons to drag & drop reorder the items.
+If `:books` can be destroyed, a hidden field `_destroy` will automatically be added to each set of fields and a Remove button will be displayed to remove the item.
 
-If `allow_destroy: true` there will be remove buttons.
+If the `Book` model has an integer `position` attribute, a hidden field `position` will automatically be added to each set of fields and a Reorder button will be displayed to drag&drop reorder items.
 
-You can customize the has many behaviour by passing the following:
+If the has_many collection is blank?, `.build()` will be automatically called, unless `build: false` is passed.
+
+Any errors on the has_many name will be displayed unless `errors: false` is passed.
+
+You can customize this behaviour by passing the following:
 
 ```haml
-= f.has_many :books, add: true, remove: true, reorder: true
+= f.has_many :books, add: true, remove: true, reorder: true, build: true, errors: true do |fb|
+  = fb.text_field :title
 ```
 
 or add an html class:
 
 ```haml
-= f.has_many :books, class: 'tight'
+= f.has_many :books, class: 'tight' do |fb|
+  = fb.text_field :title
 ```
 
 ## Custom percent_field

data/app/assets/javascripts/effective_has_many/initialize.js.coffee

@@ -37,7 +37,7 @@ $(document).on 'click', '[data-effective-form-has-many-add]', (event) ->
   uid = (new Date).valueOf()
   template = $obj.data('effective-form-has-many-template').replace(/HASMANYINDEX/g, uid)
 
-  $fields = $(template).hide().fadeIn('slow')
+  $fields = $(template).hide().fadeIn('fast')
   EffectiveBootstrap.initialize($fields)
   $obj.closest('.has-many-links').before($fields)
 
@@ -56,9 +56,9 @@ $(document).on 'click', '[data-effective-form-has-many-remove]', (event) ->
 
   if $input.length > 0
     $input.val('true')
-    $fields.addClass('marked-for-destruction').fadeOut('slow')
+    $fields.addClass('marked-for-destruction').fadeOut('fast')
   else
-    $fields.fadeOut('slow', -> this.remove())
+    $fields.fadeOut('fast', -> this.remove())
 
   assignPositions($hasMany)
   true
@@ -70,5 +70,8 @@ $(document).on 'click', '[data-effective-form-has-many-reorder]', (event) ->
   $hasMany = $obj.closest('.form-has-many')
   return unless $hasMany.length > 0
 
+  $fields = $hasMany.children('.has-many-fields:not(.marked-for-destruction)')
+  return unless $fields.length > 1
+
   $hasMany.toggleClass('reordering')
   true

data/app/assets/stylesheets/effective_checks/input.scss

@@ -4,5 +4,5 @@
   font-size: 0.75rem;
   margin: 0.25rem 0;
 
-  a { padding: 0.25rem 0; }
+  a { padding: 0.5rem 0; }
 }

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

@@ -50,18 +50,29 @@ module Effective
       end
 
       def build_label
-        return BLANK if options[:label] == false
+        return BLANK if options[:label] == false && !actions?
         return BLANK if name.kind_of?(NilClass)
 
-        text = (options[:label].delete(:text) || (object.class.human_attribute_name(name) if object) || BLANK).html_safe
+        text = begin
+          if options[:label] == false
+            nil
+          elsif options[:label].key?(:text)
+            options[:label].delete(:text)
+          elsif object.present?
+            object.class.human_attribute_name(name)
+          end || BLANK
+        end.html_safe
+
+        actions = if !disabled? && actions?
+          content_tag(:div, class: 'effective-checks-actions text-muted') do
+            link_to('Select All', '#', 'data-effective-checks-all': true) + ' - ' + link_to('Select None', '#', 'data-effective-checks-none': true)
+          end
+        end
 
         content_tag(:label, options[:label]) do
-          text + content_tag(:div, class: 'effective-checks-actions text-muted') do
-            unless disabled? || !actions?
-              link_to('Select All', '#', 'data-effective-checks-all': true) + ' - ' + link_to('Select None', '#', 'data-effective-checks-none': true)
-            end
-          end
+          [text, actions].compact.join.html_safe
         end
+
       end
 
       def build_item(builder)
@@ -91,7 +102,7 @@ module Effective
 
       def actions? # default true
         return @actions unless @actions.nil?
-        @actions = (options.delete(:actions) != false)
+        @actions = (options[:input].delete(:actions) != false)
       end
 
     end

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

@@ -4,7 +4,11 @@ module Effective
       BLANK = ''.html_safe
 
       def to_html(&block)
-        content_tag(:div, options[:input]) do
+        object.send(name).build() if build? && collection.blank?
+
+        errors = (@builder.error(name) if errors?) || BLANK
+
+        errors + content_tag(:div, options[:input]) do
           has_many_fields_for(block) + has_many_links_for(block)
         end
       end
@@ -21,12 +25,22 @@ module Effective
         Array(options[:input][:collection] || object.send(name))
       end
 
-      # cards: true
+      # cards: false
       def display
         @display ||= (options[:input].delete(:cards) ? :cards : :rows)
       end
 
-      # add: false
+      # build: true
+      def build?
+        return @build unless @build.nil?
+
+        @build ||= begin
+          build = options[:input].delete(:build)
+          build.nil? ? true : build
+        end
+      end
+
+      # add: true
       def add?
         return @add unless @add.nil?
 
@@ -36,7 +50,17 @@ module Effective
         end
       end
 
-      # remove: false
+      # errors: true
+      def errors?
+        return @errors unless @errors.nil?
+
+        @errors ||= begin
+          errors = options[:input].delete(:errors)
+          errors.nil? ? true : errors
+        end
+      end
+
+      # remove: true
       def remove?
         return @remove unless @remove.nil?
 
@@ -77,7 +101,7 @@ module Effective
         return BLANK unless add? || reorder?
 
         content_tag(:div, class: 'has-many-links text-center mt-2') do
-          [(link_to_add(block) if add?), (link_to_reorder(block) if reorder?)].compact.join(' ').html_safe
+          [*(link_to_add(block) if add?), *(link_to_reorder(block) if reorder?)].join(' ').html_safe
         end
       end
 
@@ -115,9 +139,14 @@ module Effective
 
       def render_template(block)
         resource = build_resource()
-        index = object.send(name).index(resource)
+        index = collection.length
 
         html = render_resource(resource, block)
+
+        unless html.include?("#{name}_attributes][#{index}]")
+          raise('unexpected index. unable to render resource template.')
+        end
+
         html.gsub!("#{name}_attributes][#{index}]", "#{name}_attributes][HASMANYINDEX]")
         html.gsub!("#{name}_attributes_#{index}_", "#{name}_attributes_HASMANYINDEX_")
 
@@ -167,7 +196,10 @@ module Effective
       end
 
       def build_resource
-        @build_resource ||= object.send(name).build().tap { |resource| object.send(name).delete(resource) }
+        # Using .new() here seems like it should work but it doesn't. It changes the index
+        @build_resource ||= object.send(name).build().tap do |resource|
+          object.send(name).delete(resource)
+        end
       end
 
     end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.9.10'.freeze
+  VERSION = '0.9.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Everything you need to get set up with bootstrap 4.
 email:
 - info@codeandeffect.com