effective_bootstrap 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b7401c7fc3dab6443b98ff497f5e12fbf14f277
-  data.tar.gz: a110acdf369a5b250433b95bf4210a14a7df3c88
+  metadata.gz: ec5621959449ff4c414d797e5b635b197ad481cb
+  data.tar.gz: 98044a2f5c6167489ea5a1ef2b192322faae2726
 SHA512:
-  metadata.gz: da584d79497081312420637807902d91e9d5f88d95854798f36f385c2c2058df4862ebea347bc2f373eee487532477741ce706f6b8d7d8e7a18c1b1eabfc330d
-  data.tar.gz: 11da3d29d21d11e678ec69d9412def8ee90e4d89d52b083d8424b401dba94b7c32b86437269bd45e3c5408d3d4f45abffc37f5e8ea32786b37fee5b487de2ba9
+  metadata.gz: 55cf5551994328a7458abe296c1d1e73a02520f9a415a25a2d3437c9bb8f0abbc3cfa8ae0f9716ead00f0889b3b48ffda78824f4558ad7da46b4778e339774be
+  data.tar.gz: 9835d86a4c956040965e0cfd54c85c15ef8a3a7d8a559f972e1de883a11a105378c1d337ded67f4a9b2fa050e4076ce67429b10b5c6bf3cd3526ba5871d61e30

data/README.md

@@ -91,3 +91,21 @@ $('input.effective_date_time_picker').datetimepicker
 
 Any options passed in this way will be used to initialize the underlying javascript libraries.
 
+
+```
+  = f.submit
+  = f.submit 'Save 2'
+
+  = f.submit 'Save', left: true
+  = f.submit 'Save', center: true
+  = f.submit 'Save', right: true
+
+  = f.submit 'Save', border: false
+  = f.submit 'Save', center: true, border: false
+  = f.submit 'Save', left: true, border: false
+
+  = f.submit('Save', border: false) do
+    = f.save 'Okay'
+    = f.save 'Mom'
+```
+

data/app/assets/javascripts/effective_bootstrap/base.js.coffee

@@ -25,12 +25,18 @@ this.EffectiveBootstrap ||= new class
 
     if valid
       $form.addClass('form-is-valid').removeClass('form-is-invalid')
-      setTimeout((-> $('button[type=submit],input[type=submit]').prop('disabled', true)), 0)
+      setTimeout((-> EffectiveBootstrap.disable($form)), 0)
     else
       $form.addClass('was-validated').addClass('form-is-invalid').removeClass('form-is-valid')
 
     valid
 
+  disable: ($form) ->
+    $form.find('[type=submit]').prop('disabled', true)
+
+  enable: ($form) ->
+    $form.removeClass('form-is-valid').find('[type=submit]').removeAttr('disabled')
+
 $ -> EffectiveBootstrap.initialize()
 $(document).on 'turbolinks:load', -> EffectiveBootstrap.initialize()
 $(document).on 'cocoon:after-insert', -> EffectiveBootstrap.initialize()

data/app/assets/stylesheets/effective_bootstrap/forms.scss

@@ -1,15 +1,26 @@
 // Submit buttons
-.form-actions.form-group {
+.form-actions {
+  display: flex;
+  align-items: center;
+}
+
+.form-actions-bordered {
   border-top: solid 1px #eee;
   margin-top: 1rem;
 
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
+  > * { margin-top: 1rem; }
+}
+
+.form-actions.justify-content-start {
+  > * { margin-right: 0.5rem; }
+}
+
+.form-actions.justify-content-end {
+  > * { margin-left: 0.5rem; }
+}
 
-  > * {
-    margin: 1rem 0 0 0.5rem;
-  }
+.form-actions.justify-content-center {
+  > * { margin-left: 0.5rem; }
 }
 
 // Spinner

data/app/models/effective/form_builder.rb

@@ -66,6 +66,7 @@ module Effective
     end
 
     def save(name = 'Save', options = {})
+      (options = name; name = 'Save') if name.kind_of?(Hash)
       Effective::FormInputs::Save.new(name, options, builder: self).to_html { super(name, options) }
     end
 
@@ -74,8 +75,9 @@ module Effective
       Effective::FormInputs::Select.new(name, options, builder: self).to_html
     end
 
-    def submit(name = 'Submit', options = {})
-      Effective::FormInputs::Submit.new(name, options, builder: self).to_html { super(name, options) }
+    def submit(name = 'Save', options = {}, &block)
+      (options = name; name = 'Save') if name.kind_of?(Hash)
+      Effective::FormInputs::Submit.new(name, options, builder: self).to_html(&block)
     end
 
     def static_field(name, options = {}, &block)

data/app/models/effective/form_input.rb

@@ -3,6 +3,8 @@ module Effective
     attr_accessor :name, :options
 
     BLANK = ''.html_safe
+    EXCLUSIVE_CLASS_PREFIXES = [] # None
+    EXCLUSIVE_CLASS_SUFFIXES = ['-primary', '-secondary', '-success', '-danger', '-warning', '-info', '-light', '-dark']
 
     delegate :object, to: :@builder
     delegate :capture, :content_tag, :link_to, :icon, to: :@template
@@ -284,7 +286,22 @@ module Effective
       when String
         defaults.merge(text: obj)
       when Hash
+        html_classes = (obj[:class].to_s.split(' ') + defaults[:class].to_s.split(' ')).uniq
+
+        # Try to smart merge bootstrap classes
+        if (exclusive = html_classes.select { |c| c.include?('-') }).length > 1
+          EXCLUSIVE_CLASS_PREFIXES.each do |prefix|
+            prefixed = exclusive.select { |c| c.start_with?(prefix) }
+            prefixed[1..-1].each { |c| html_classes.delete(c) } if prefixed.length > 1
+          end
+
+          suffixed = exclusive.select { |c| EXCLUSIVE_CLASS_SUFFIXES.any? { |suffix| c.end_with?(suffix) } }
+          suffixed[1..-1].each { |c| html_classes.delete(c) } if suffixed.length > 1
+        end
+
+        obj[:class] = html_classes.join(' ') if html_classes.present?
         obj.reverse_merge!(defaults)
+        obj
       else
         raise 'unexpected object'
       end

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

@@ -7,7 +7,12 @@ module Effective
       end
 
       def input_html_options
-        { class: 'form-control-file', multiple: multiple?, direct_upload: true, 'data-progress-template': progress_template }
+        {
+          class: 'form-control form-control-file btn btn-outline-secondary',
+          multiple: multiple?,
+          direct_upload: true,
+          'data-progress-template': progress_template
+        }
       end
 
       def multiple?

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

@@ -3,15 +3,26 @@ module Effective
     class Submit < Effective::FormInput
 
       def build_input(&block)
-        content_tag(:button, name, options[:input])
+        icon('spinner') + (block_given? ? capture(&block) : content_tag(:button, name, options[:input]))
       end
 
       def wrapper_options
-        if layout == :horizontal
-          { class: 'form-group row form-actions'}
-        else
-          { class: 'form-group form-actions'}
-        end
+        border = options.key?(:border) ? options.delete(:border) : true
+        left = options.delete(:left) || false
+        center = options.delete(:center) || false
+        right = options.delete(:right) || false
+        right = true unless (left || center)
+
+        classes = [
+          ('row' if layout == :horizontal),
+          'form-group form-actions',
+          ('form-actions-bordered' if border),
+          ('justify-content-start' if left && layout == :vertical),
+          ('justify-content-center' if center && layout == :vertical),
+          ('justify-content-end' if right && layout == :vertical)
+        ].compact.join(' ')
+
+        { class: classes }
       end
 
       def input_html_options
@@ -23,18 +34,19 @@ module Effective
       end
 
       def feedback_options
-        case layout
-        when :inline
-          false
-        else
-          {
-            valid: { class: 'valid-feedback', text: 'Looks good! Submitting...' },
-            invalid: {
-              class: 'invalid-feedback',
-              text: 'one or more errors are present. please fix the errors above and try again.'
-            }
-          }
-        end
+        # case layout
+        # when :inline
+        #   false
+        # else
+        #   {
+        #     valid: { class: 'valid-feedback', text: 'Looks good! Submitting...' },
+        #     invalid: {
+        #       class: 'invalid-feedback',
+        #       text: 'one or more errors are present. please fix the errors above and try again.'
+        #     }
+        #   }
+        # end
+        false
       end
 
     end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.0.5'.freeze
+  VERSION = '0.0.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails