effective_bootstrap 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4ec43f24a86db3d6d7a24e365db93e9163d037c
-  data.tar.gz: 06d5baab43386a3a3f8b5e0ed742f7ee659766ab
+  metadata.gz: a413a43fe8afc26a398fada64c130819a1914a46
+  data.tar.gz: 62bb5c67a83990375e733cbc30ed4a712638ae65
 SHA512:
-  metadata.gz: 4762161acb5b6293f613c847455a4258900703f614033ddb6bbaab501184b90046f01209176a834921e99b19ce1704509a9ddd792416b6e2480432b7c1c7ee69
-  data.tar.gz: a614847bda10fe72c9f117de71bed0bb5a0604584c5923b88253f48a6d53538e49bf47a1d0fca7d01d7f934fb89da3e73722468efd6d8f132aa068e4b1ff9718
+  metadata.gz: 41ac345f9d6b0d8a6ba4488e14cf1fb9fe81b7fa79f010accabe30f006cf76d5f5150cd2b0ebcf6f8659d43d3a3a87b1f3f900cc06b68a36e448c9fbd5076947
+  data.tar.gz: b05a8b54efe3aaeb1bc556c9fafcf125210c3e020de2a70fd807665be56dd6f653a557800126d973ef69864772f7edc0c51ebbc60b2a60b2b30c276ec0b2b707

data/app/models/effective/form_input.rb

@@ -368,7 +368,7 @@ module Effective
         obj.reverse_merge!(defaults)
         obj
       else
-        raise 'unexpected object'
+        defaults.merge(text: obj.to_s)
       end
     end
 

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

@@ -19,9 +19,21 @@ module Effective
 
       def build_check_box_wrap(&block)
         if custom?
-          content_tag(:div, yield, class: 'form-group custom-control custom-checkbox' + (inline? ? ' custom-control-inline' : ''))
+          content_tag(:div, yield, options[:wrapper])
         else
-          content_tag(:div, yield, class: 'form-check' + (inline? ? ' form-check-inline' : ''))
+          content_tag(:div, yield, options[:wrapper])
+        end
+      end
+
+      def wrapper_options
+        if custom? && inline?
+          { class: 'form-group custom-control custom-checkbox custom-control-inline' }
+        elsif custom?
+          { class: 'form-group custom-control custom-checkbox' }
+        elsif inline?
+          { class: 'form-check form-check-inline' }
+        else
+          { class: 'form-check' }
         end
       end
 
@@ -45,7 +57,7 @@ module Effective
 
       def inline? # default false
         return @inline unless @inline.nil?
-        @inline = (options[:input].delete(:inline) == true)
+        @inline = ((options[:input] || {}).delete(:inline) == true)
       end
 
       def custom? # default true

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

@@ -29,11 +29,14 @@ module Effective
       end
 
       def input_js_options
+        placeholder = options.delete(:placeholder)
+        placeholder = '' if placeholder == false
+
         opts = {
           theme: 'bootstrap',
           minimumResultsForSearch: 6,
           width: 'style',
-          placeholder: (options.delete(:placeholder) || 'Please choose'),
+          placeholder: (placeholder || 'Please choose'),
           allowClear: (true if include_blank?),
           tokenSeparators: ([',', ';', '\n', '\t'] if tags?),
           tags: (true if tags?),

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.3.11'.freeze
+  VERSION = '0.3.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails