effective_bootstrap 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 381cb46d720fac97c73a41804a42238d4a871182
-  data.tar.gz: c570ae902eda1639f33624e4f9d8b257bcad856b
+  metadata.gz: 78fbc7d3d44502df4a631325adacdaee57d369a6
+  data.tar.gz: 5f3833d0c601d317f36e4877e56febee50cc6c05
 SHA512:
-  metadata.gz: 00268cb9c16ddbe1bf8811e51e7565cbcbbf0e6ceddd78eb927cc3eec76d0c12b8153f34b52ff85aa7d568e7244e546a712b4d67f30672cae8d7438e83c162cb
-  data.tar.gz: 149156b84bdbb38aeb2f36fa8acc2cd00c20de63b4c09b33e9492219b827637b8d35f3ee5fcd23d853a7cd8f4328288b56d886f008f674e840da8294ac662fb2
+  metadata.gz: 34f01b7ad8447dd72045ece989299c770dd1fae83a64de3e8c72b9c1c1abcaa9d8a2e7b05f8c02562ceedbcdbe95b59f1def19df3c959ebef37d5b81f8ea8be2
+  data.tar.gz: f053fe30ec3aed91587a81ba3793c913cb1f9f6ad2d42ca4a1de2896d14cd3bac3fcec8bb33b91cbdfddb07e321d617ef5aeadcbe6b5b5b6bf9e411f75a6ac26

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

@@ -38,3 +38,8 @@ $(document).on 'confirm', (event) ->
 
 $.rails.confirm = (message) -> true
 $(document).on 'confirm:complete', (event) -> $(event.target).data('confirmed')
+
+# Fade out cocoon remove.
+$(document).on 'cocoon:before-remove', (event, $obj) ->
+  $(event.target).data('remove-timeout', 1000)
+  $obj.fadeOut('slow')

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

@@ -3,6 +3,20 @@ div.btn-group > .btn.first-button {
   border-bottom-left-radius: 0.25rem;
 }
 
+.effective-radios {
+  white-space: nowrap;
+}
+
+.effective-radios.is-valid {
+  label { border-color: #28a745; }
+  .valid-feedback { display: block; }
+}
+
+.effective-radios.is-invalid {
+  label { border-color: #dc3545; }
+  .invalid-feedback { display: block; }
+}
+
 .effective-radios.card-deck {
   .card-header { cursor: pointer; }
 
@@ -17,10 +31,3 @@ div.btn-group > .btn.first-button {
   }
 }
 
-.effective-radios.is-valid {
-  label { border-color: #28a745; }
-}
-
-.effective-radios.is-invalid {
-  label { border-color: #dc3545; }
-}

data/app/models/effective/form_input.rb

@@ -153,8 +153,8 @@ module Effective
 
       invalid = object.errors[name].to_sentence.presence if object.respond_to?(:errors)
       invalid ||= options[:feedback][:invalid].delete(:text)
-      invalid ||= [("can't be blank" if options[:input][:required]), ('must be valid' if validated?(name))].compact.join(' and ')
-      invalid ||= 'is invalid'
+      invalid ||= "can't be blank" if options[:input][:required]
+      invalid ||= "can't be blank or invalid"
 
       valid = options[:feedback][:valid].delete(:text) || "Look's good!"
 
@@ -179,9 +179,38 @@ module Effective
       return false unless obj.respond_to?(:validators_on)
 
       obj.validators_on(name).any? do |v|
-        v.kind_of?(ActiveRecord::Validations::PresenceValidator) && !v.options.key?(:if) && !v.options.key?(:unless)
+        v.kind_of?(ActiveRecord::Validations::PresenceValidator) && required_options?(v.options)
+      end
+    end
+
+    def required_options?(opts)
+      return true unless (opts.key?(:if) || opts.key?(:unless))
+
+      if opts[:if].respond_to?(:call)
+        return object.instance_exec(&opts[:if])
+      end
+
+      if opts[:if].kind_of?(Symbol)
+        return object.send(opts[:if])
+      end
+
+      if opts.key?(:if)
+        return opts[:if]
+      end
+
+      if opts[:unless].respond_to?(:call)
+        return !object.instance_exec(&opts[:unless])
+      end
+
+      if opts[:unless].kind_of?(Symbol)
+        return !object.send(opts[:unless])
+      end
+
+      if opts.key?(:unless)
+        return !opts[:unless]
       end
 
+      false
     end
 
     def validated?(name)

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

@@ -35,7 +35,11 @@ module Effective
       end
 
       def wrapper_options
-        { class: "form-group #{tag_id}" }
+        if buttons? || cards?
+          { class: "form-group #{tag_id}" }
+        else
+          { class: "form-group effective-radios #{tag_id}" }
+        end
       end
 
       def button_group_class

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.0.14'.freeze
+  VERSION = '0.0.15'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2018-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails