effective_bootstrap 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78fbc7d3d44502df4a631325adacdaee57d369a6
-  data.tar.gz: 5f3833d0c601d317f36e4877e56febee50cc6c05
+  metadata.gz: b7fa96dba4c20705dcf039d7c1eabb04f29f1212
+  data.tar.gz: 53207e5edb6761cc8b989532576b9b630c8a840d
 SHA512:
-  metadata.gz: 34f01b7ad8447dd72045ece989299c770dd1fae83a64de3e8c72b9c1c1abcaa9d8a2e7b05f8c02562ceedbcdbe95b59f1def19df3c959ebef37d5b81f8ea8be2
-  data.tar.gz: f053fe30ec3aed91587a81ba3793c913cb1f9f6ad2d42ca4a1de2896d14cd3bac3fcec8bb33b91cbdfddb07e321d617ef5aeadcbe6b5b5b6bf9e411f75a6ac26
+  metadata.gz: 5bfe93d73ca753ff390ea0f0d2970de2941130a10226cea030c413169fc174bdd1470ca5368df18cbd70e40c0eaa8cc45540f07e88e499a89332eb6361a393dc
+  data.tar.gz: fbaf93f9765338f90e1d6795d54c3fc9ba9282cb953da2d62b498d765f729f9c9b65e45859c395f4df29b13e3e33b4ff7ae0a02872d9a977de1f1d47dc1c0858

data/app/helpers/effective_form_builder_helper.rb

@@ -3,15 +3,17 @@ module EffectiveFormBuilderHelper
     options[:class] = [options[:class], 'needs-validation', ('form-inline' if options[:layout] == :inline)].compact.join(' ')
     options[:html] = (options[:html] || {}).merge(novalidate: true, onsubmit: 'return EffectiveForm.validate(this);')
 
+    remote_index = options.except(:model).hash.abs
+
     if options.delete(:remote) == true
       @_effective_remote_index ||= 0
 
       if options[:html][:data].kind_of?(Hash)
         options[:html][:data][:remote] = true
-        options[:html][:data]['data-remote-index'] = (@_effective_remote_index += 1)
+        options[:html][:data]['data-remote-index'] = remote_index
       else
         options[:html]['data-remote'] = true
-        options[:html]['data-remote-index'] = (@_effective_remote_index += 1)
+        options[:html]['data-remote-index'] = remote_index
       end
     end
 

data/app/models/effective/form_input.rb

@@ -126,13 +126,13 @@ module Effective
       return BLANK if options[:label] == false
       return BLANK if name.kind_of?(NilClass)
 
-      text = (options[:label].delete(:text) || (object.class.human_attribute_name(name) if object) || BLANK).html_safe
+      text = (options[:label].delete(:text) || (object.class.human_attribute_name(name) if object) || BLANK)
 
       if options[:input][:id]
         options[:label][:for] = options[:input][:id]
       end
 
-      @builder.label(name, text, options[:label])
+      @builder.label(name, text.html_safe, options[:label])
     end
 
     def build_input(&block)
@@ -143,9 +143,9 @@ module Effective
       return BLANK unless options[:hint] && options[:hint][:text]
 
       tag = options[:hint].delete(:tag)
-      text = options[:hint].delete(:text).html_safe
+      text = options[:hint].delete(:text)
 
-      content_tag(tag, text, options[:hint])
+      content_tag(tag, text.html_safe, options[:hint])
     end
 
     def build_feedback
@@ -153,13 +153,13 @@ 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]
-      invalid ||= "can't be blank or invalid"
+      invalid ||= [("can't be blank" if options[:input][:required]), ('must be valid' if validated?(name))].compact.join(' and ')
+      invalid ||= "can't be blank or is invalid"
 
       valid = options[:feedback][:valid].delete(:text) || "Look's good!"
 
-      content_tag(:div, invalid, options[:feedback][:invalid]) +
-      content_tag(:div, valid, options[:feedback][:valid])
+      content_tag(:div, invalid.html_safe, options[:feedback][:invalid]) +
+      content_tag(:div, valid.html_safe, options[:feedback][:valid])
     end
 
     def has_error?(name = nil)

data/lib/effective_bootstrap/version.rb

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

metadata

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