effective_bootstrap 0.9.9 → 0.9.14

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

@@ -0,0 +1,9 @@
+# Prevent non-currency buttons from being pressed
+$(document).on 'click', 'button[data-effective-password]', (event) ->
+  $obj = $(event.currentTarget)
+  $input = $obj.closest('.input-group')
+
+  $input.find('input').attr('type', $obj.data('effective-password'))
+  $input.find('button[data-effective-password]').toggle()
+
+  false

data/app/assets/javascripts/effective_password/input.js

@@ -0,0 +1 @@
+//= require ./initialize

data/app/assets/stylesheets/effective_bootstrap.scss

@@ -3,6 +3,7 @@
 @import 'effective_checks/input';
 @import 'effective_datetime/input';
 @import 'effective_file/input';
+@import 'effective_has_many/input';
 @import 'effective_rich_text_area/input';
 @import 'effective_select/input';
 @import 'effective_select_or_text/input';

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/assets/stylesheets/effective_has_many/input.scss

@@ -0,0 +1,42 @@
+body.dragging,
+body.dragging * {
+  cursor: move !important;
+}
+
+.form-has-many {
+  .has-many-placeholder {
+    position: relative;
+    height: 2rem;
+
+    &:before {
+      position: absolute;
+      content: '';
+      background-image: asset-data-url('icons/arrow-right-circle.svg');
+      background-repeat: no-repeat;
+      height: 2rem;
+      width: 2rem;
+    }
+  }
+
+  .has-many-fields.dragged {
+    position: absolute;
+    opacity: 0;
+    z-index: 2000;
+    .has-many-move { display: none; }
+  }
+
+  .has-many-move svg { margin-top: 6px; }
+  .has-many-move { display: none; }
+
+  .has-many-remove { margin-top: 1.5rem; }
+  .has-many-move { margin-top: 1.5rem; }
+}
+
+.form-has-many.reordering {
+  .has-many-move { display: inline-block; }
+}
+
+.form-has-many.tight {
+  .has-many-remove { margin-top: 0; }
+  .has-many-move { margin-top: 0; }
+}

data/app/helpers/effective_form_builder_helper.rb

@@ -1,8 +1,8 @@
 module EffectiveFormBuilderHelper
   def effective_form_with(**options, &block)
     # Compute the default ID
-    subject = Array(options[:scope] || options[:model]).last
-    class_name = subject.class.name.parameterize.underscore
+    subject = Array(options[:model] || options[:scope]).last
+    class_name = (options[:scope] || subject.class.name.parameterize.underscore)
     unique_id = options.except(:model).hash.abs
 
     html_id = if subject.kind_of?(Symbol)

data/app/models/effective/form_builder.rb

@@ -203,5 +203,19 @@ module Effective
       Effective::FormLogics::ShowIfAny.new(*args, builder: self).to_html(&block)
     end
 
+    # Has Many
+    def has_many(name, collection = nil, options = {}, &block)
+      association = object.class.reflect_on_all_associations.find { |a| a.name == name }
+      raise("expected #{object.class.name} to has_many :#{name}") if association.blank?
+
+      nested_attributes_options = (object.class.nested_attributes_options || {})[name]
+      raise("expected #{object.class.name} to accepts_nested_attributes_for :#{name}") if nested_attributes_options.blank?
+
+      options = collection if collection.kind_of?(Hash)
+      options.merge!(collection: collection) if collection && !collection.kind_of?(Hash)
+
+      Effective::FormInputs::HasMany.new(name, options, builder: self).to_html(&block)
+    end
+
   end
 end

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

@@ -0,0 +1,207 @@
+module Effective
+  module FormInputs
+    class HasMany < Effective::FormInput
+      BLANK = ''.html_safe
+
+      def to_html(&block)
+        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
+
+      def input_html_options
+        { class: 'form-has-many mb-4' }
+      end
+
+      def input_js_options
+        { sortable: true }
+      end
+
+      def collection
+        Array(options[:input][:collection] || object.send(name))
+      end
+
+      # cards: false
+      def display
+        @display ||= (options[:input].delete(:cards) ? :cards : :rows)
+      end
+
+      # 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?
+
+        @add ||= begin
+          add = options[:input].delete(:add)
+          add.nil? ? true : add
+        end
+      end
+
+      # 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?
+
+        @remove ||= begin
+          remove = options[:input].delete(:remove)
+
+          if remove != nil
+            remove
+          else
+            opts = (object.class.nested_attributes_options[name] || {})
+            opts[:update_only] != true && opts[:allow_destroy] != false
+          end
+        end
+      end
+
+      # reorder: true
+      def reorder?
+        return @reorder unless @reorder.nil?
+
+        @reorder ||= begin
+          reorder = options[:input].delete(:reorder)
+
+          if reorder != nil
+            reorder
+          else
+            build_resource().class.columns_hash['position']&.type == :integer
+          end
+        end
+      end
+
+      private
+
+      def has_many_fields_for(block)
+        collection.map { |resource| render_resource(resource, block) }.join.html_safe
+      end
+
+      def has_many_links_for(block)
+        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?)].join(' ').html_safe
+        end
+      end
+
+      def render_resource(resource, block)
+        remove = BLANK
+
+        content = @builder.fields_for(name, resource) do |form|
+          fields = block.call(form)
+
+          remove += form.super_hidden_field(:_destroy) if remove? && resource.persisted?
+          remove += form.super_hidden_field(:position) if reorder? && !fields.include?('][position]')
+
+          fields
+        end
+
+        remove += link_to_remove(resource) if remove?
+
+        content_tag(:div, render_fields(content, remove), class: 'has-many-fields')
+      end
+
+      def render_fields(content, remove)
+        case display
+        when :rows
+          content_tag(:div, class: 'form-row') do
+            (reorder? ? content_tag(:div, has_many_move, class: 'col-auto') : BLANK) +
+            content_tag(:div, content, class: 'col mr-auto') +
+            content_tag(:div, remove, class: 'col-auto')
+          end
+        when :cards
+          raise('unsupported')
+        else
+          content + remove
+        end
+      end
+
+      def render_template(block)
+        resource = build_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_")
+
+        html.html_safe
+      end
+
+      def link_to_add(block)
+        content_tag(
+          :button,
+          icon('plus-circle') + 'Add Another',
+          class: 'has-many-add btn btn-secondary',
+          title: 'Add Another',
+          data: {
+            'effective-form-has-many-add': true,
+            'effective-form-has-many-template': render_template(block)
+          }
+        )
+      end
+
+      def link_to_reorder(block)
+        content_tag(
+          :button,
+          icon('list') + 'Reorder',
+          class: 'has-many-reorder btn btn-secondary',
+          title: 'Reorder',
+          data: {
+            'effective-form-has-many-reorder': true,
+          }
+        )
+      end
+
+      def link_to_remove(resource)
+        content_tag(
+          :button,
+          icon('trash-2') + 'Remove',
+          class: 'has-many-remove btn btn-danger',
+          title: 'Remove',
+          data: {
+            'confirm': "Remove #{resource}?",
+            'effective-form-has-many-remove': true,
+          }
+        )
+      end
+
+      def has_many_move
+        @has_many_move ||= content_tag(:span, icon('move'), class: 'has-many-move')
+      end
+
+      def build_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
+  end
+end

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

@@ -3,11 +3,25 @@ module Effective
     class PasswordField < Effective::FormInput
 
       def input_html_options
-        { class: 'form-control', id: tag_id }
+        { class: 'form-control effective_password', id: tag_id }
       end
 
       def input_group_options
-        { input_group: { class: 'input-group' }, prepend: content_tag(:span, icon('lock'), class: 'input-group-text') }
+        { input_group: { class: 'input-group' }, append: eyes }
+      end
+
+      def eyes
+        content_tag(:button, icon('eye'),
+          class: 'btn input-group-text',
+          title: 'Show password',
+          'data-effective-password': 'text'
+        ) +
+        content_tag(:button, icon('eye-off'),
+          class: 'btn input-group-text',
+          title: 'Hide password',
+          style: 'display: none;',
+          'data-effective-password': 'password'
+        )
       end
 
       def feedback_options

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.9.9'.freeze
+  VERSION = '0.9.14'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.14
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2021-02-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
@@ -419,10 +433,15 @@ files:
 - app/assets/javascripts/effective_editor/quill.js
 - app/assets/javascripts/effective_file/initialize.js.coffee
 - app/assets/javascripts/effective_file/input.js
+- app/assets/javascripts/effective_has_many/initialize.js.coffee
+- app/assets/javascripts/effective_has_many/input.js
+- app/assets/javascripts/effective_has_many/jquery.sortable.js
 - app/assets/javascripts/effective_integer/initialize.js.coffee
 - app/assets/javascripts/effective_integer/input.js
 - app/assets/javascripts/effective_number_text/initialize.js.coffee
 - app/assets/javascripts/effective_number_text/input.js
+- app/assets/javascripts/effective_password/initialize.js.coffee
+- app/assets/javascripts/effective_password/input.js
 - app/assets/javascripts/effective_percent/initialize.js.coffee
 - app/assets/javascripts/effective_percent/input.js
 - app/assets/javascripts/effective_phone/initialize.js.coffee
@@ -584,6 +603,7 @@ files:
 - app/assets/stylesheets/effective_editor/overrides.scss
 - app/assets/stylesheets/effective_editor/quill.scss
 - app/assets/stylesheets/effective_file/input.scss
+- app/assets/stylesheets/effective_has_many/input.scss
 - app/assets/stylesheets/effective_radio/input.scss
 - app/assets/stylesheets/effective_rich_text_area/input.scss
 - app/assets/stylesheets/effective_select/bootstrap-theme.css
@@ -613,6 +633,7 @@ files:
 - app/models/effective/form_inputs/file_field.rb
 - app/models/effective/form_inputs/float_field.rb
 - app/models/effective/form_inputs/form_group.rb
+- app/models/effective/form_inputs/has_many.rb
 - app/models/effective/form_inputs/hidden_field.rb
 - app/models/effective/form_inputs/integer_field.rb
 - app/models/effective/form_inputs/number_field.rb