effective_bootstrap 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebc807c7e59ae5211d7d6a5cc7db028d75598654
-  data.tar.gz: 970c0697fddd13505941e5903ed3931da0fbb740
+  metadata.gz: a836e789cb8b0bee567ef732e5b368ca39f8c9ca
+  data.tar.gz: 0f9450c9974758cb363a80324384a870936e5901
 SHA512:
-  metadata.gz: e583a91140b0c0988fab00a36a12c4991481045d1662a883c2ff0fdb6c79aba560bc79171607066715592b3e2b8bb04be52e6aa23a6cfc09b2d0f4ec408693b7
-  data.tar.gz: 43f174be82d4ec975ccaafe6e024c29b9479fdc87e5f15372c776a2e8bd5869313292c901632e1128ddf4bc1d5674e27bef7ddf52eca781de202d8d287c7a76d
+  metadata.gz: 2106312ad8bb61dd044bd50c63a72db6d7a6c1f05830e2610e3875d21f8de969467d6ca32dae6f5767d2dd3d7a5ef3fcded9f5892195d5070486c6091fd86db3
+  data.tar.gz: f239fc4e6d5afcc5cb75bdf0470f6dfb1f9653b0b5ba6441afaef80bf45b7632ad69c2d3353a9775c36bfb63a50de50064cdaff8dbee234ad4fd99fb95c42a15

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

@@ -107,7 +107,7 @@ this.EffectiveForm ||= new class
 
   buildFlash: (status, message) ->
     $("
-      <div class='alert alert-dismissable alert-#{status} fade show' role='alert'>
+      <div class='effective-form-flash alert alert-dismissable alert-#{status} fade show' role='alert'>
         #{message}
         <button class='close' type='button' aria-label='Close' data-dismiss='alert'>
           <span aria-hidden='true'>&times;</span>

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

@@ -4,9 +4,11 @@
   align-items: center;
   position: relative;
 
-  .alert {
+  // This is the inline ajax flash next to the save button.
+  .effective-form-flash {
     position: absolute;
-    top: 4.0em;
+    top: 3.0em;
+    z-index: 1;
   }
 }
 

data/app/models/effective/form_input.rb

@@ -165,8 +165,8 @@ module Effective
       return BLANK if options[:feedback] == false
 
       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 ||= options[:feedback][:invalid].delete(:text).presence
+      invalid ||= [("can't be blank" if options[:input][:required]), ('must be valid' if validated?(name))].compact.join(' and ').presence
       invalid ||= "can't be blank or is invalid"
 
       valid = options[:feedback][:valid].delete(:text) || "Look's good!"
@@ -191,6 +191,14 @@ module Effective
       obj = (object.class == Class) ? object : object.class
       return false unless obj.respond_to?(:validators_on)
 
+      if name.to_s.ends_with?('_id')
+        return required_presence?(obj, name) || required_presence?(obj, name[0...-3])
+      end
+
+      required_presence?(obj, name)
+    end
+
+    def required_presence?(obj, name)
       obj.validators_on(name).any? do |v|
         v.kind_of?(ActiveRecord::Validations::PresenceValidator) && required_options?(v.options)
       end

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

@@ -10,6 +10,11 @@ module Effective
         { class: 'form-control effective_float', autocomplete: 'off', step: '0.01' }
       end
 
+      # This has gotta be a valid pattern
+      def validated?(name)
+        true
+      end
+
     end
   end
 end

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

@@ -1,6 +1,10 @@
 module Effective
   module FormInputs
     class NumberField < Effective::FormInput
+      # This has gotta be a valid pattern
+      def validated?(name)
+        true
+      end
     end
   end
 end

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

@@ -15,6 +15,11 @@ module Effective
         { class: 'form-control effective_percent', autocomplete: 'off' }
       end
 
+      # This has gotta be a valid pattern
+      def validated?(name)
+        true
+      end
+
       private
 
       def percent_to_integer

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.3.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2018-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails