effective_bootstrap 1.14.12 → 1.14.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da449090f0915cf6fbf42994401f49056bcc5fe1e1f6e45130b885f138cee53d
-  data.tar.gz: 5a8b92d846eb7ab5d6c1cfe644cf38cde4bda42600f87d18ee4dff7d5dbe9a8e
+  metadata.gz: d24661035aefda568e36bd05da600c648106f9d8848cf451fb05507ae6c8d34b
+  data.tar.gz: 7b7255fad5bbebe43bd5c7e751c26444fa32e2eee36d0a73df174d8a6c61b578
 SHA512:
-  metadata.gz: af6d95df0e83cb5dbb65a11f3666be5ef22a9f91797455e53343ceaecbdb4a2eb87ac9a2bcbdadbac9a20427bd55de0778829ca92859a02e74d7e2b905629dbf
-  data.tar.gz: 738864c3b53d675f58eef22f2ca32c72df0c628e59a25da0087c2f24ad4f62a95b51038ebf75e8a61a00bf7e3c740364fafafc9a6ad38a41c3d2ef86652063ed
+  metadata.gz: f67ec2cc997cd11a97c447c851eaee940e93bd0702d9218d8cc6f8c5af5c3649326cd3c3abfc9877bdf0ca04ffae7bb367c7c79e124db848bf72e9e5ebba6491
+  data.tar.gz: 7aa8297e0a5c2a7fdbea857301abdd05641f4b96f047a6fa2f2bee8be40f6d66196c1ef917695e048c9936333bea8aec802e89777c2b73a5b718d573671c3f9d

data/README.md

@@ -697,6 +697,23 @@ The `f.save` is purely a input submit button.
   = f.save 'Save 2'
 ```
 
+## Internationalization
+
+The form builder will use labels and hints based on your current localization, if present
+
+To use these, just assign the activemodel attributes values to your strings
+
+```
+en:
+  activerecord:
+    models:
+      thing: 'Thing'
+    attributes:
+      thing:
+        title: 'Good Title'
+        title_hint: 'please make this title really good'
+```
+
 ## Table Builder
 
 Use `effective_table_with(resource)` to intelligently output a table of attributes for a resource.
@@ -766,6 +783,7 @@ You can specify `only:` and `except:` and use `f.content_for` to override a row
 
 All values flow through to i18n and can be overriden, same as the form labels, in the locale .yml file.
 
+
 ## License
 
 MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)

data/app/assets/javascripts/effective_file/initialize.js.coffee

@@ -20,5 +20,10 @@ $(document).on 'direct-upload:end', (event) ->
   # Rails UJS fix
   $obj.closest('form').find('[type=submit][data-confirm]').data('confirmed', true)
 
+  # Remove any empty [] inputs after upload
+  $obj.closest('.form-group').find('input').each (i, input) ->
+    $input = $(input)
+    $input.remove() unless $input.val()
+
 $(document).on 'change', "input[type='file'][data-click-submit]", (event) ->
   $(event.currentTarget).closest('form').find('button[type=submit],input[type=submit]').first().click()

data/app/models/effective/form_input.rb

@@ -140,20 +140,7 @@ module Effective
       return BLANK if options[:label] == false
       return BLANK if name.kind_of?(NilClass)
 
-      text = options[:label].delete(:text)
-      name_to_s = name.to_s
-
-      text ||= (
-        if object && name_to_s.ends_with?('_id')
-          object.class.human_attribute_name(name_to_s.chomp('_id'))
-        elsif object && name_to_s.ends_with?('_ids')
-          object.class.human_attribute_name(name_to_s.chomp('_ids').pluralize)
-        elsif object
-          object.class.human_attribute_name(name)
-        else
-          BLANK
-        end
-      )
+      text = options[:label].delete(:text) || build_human_label()
 
       if options[:input][:id]
         options[:label][:for] = options[:input][:id]
@@ -162,19 +149,56 @@ module Effective
       @builder.label(name, text.html_safe, options[:label])
     end
 
+    def build_human_label
+      name = self.name.to_s
+
+      label = if object && name.ends_with?('_id')
+        object.class.human_attribute_name(name.chomp('_id'))
+      elsif object && name.ends_with?('_ids')
+        object.class.human_attribute_name(name.chomp('_ids').pluralize)
+      elsif object
+        object.class.human_attribute_name(name)
+      else
+        BLANK
+      end
+
+      label
+    end
+
     def build_input(&block)
       capture(&block)
     end
 
     def build_hint
-      return BLANK unless options[:hint] && options[:hint][:text]
+      return BLANK if options[:label] == false
+      return BLANK if name.kind_of?(NilClass)
 
       tag = options[:hint].delete(:tag)
-      text = options[:hint].delete(:text)
+      text = options[:hint].delete(:text) || build_human_hint()
+      return BLANK unless text.present?
 
       content_tag(tag, text.html_safe, options[:hint])
     end
 
+    def build_human_hint
+      name = self.name.to_s
+
+      key = if object && name.ends_with?('_id')
+        "activerecord.attributes.#{object.model_name.i18n_key}.#{name.chomp('_id')}_hint"
+      elsif object && name.ends_with?('_ids')
+        "activerecord.attributes.#{object.model_name.i18n_key}.#{name.chomp('_ids').pluralize}_hint"
+      elsif object
+        "activerecord.attributes.#{object.model_name.i18n_key}.#{name}_hint"
+      end
+
+      return nil if key.blank?
+
+      hint = ::I18n.t(key)
+      return nil if hint.include?(key) # missing translation 
+
+      hint
+    end
+
     def build_feedback
       return BLANK if options[:feedback] == false
 

data/app/models/effective/table_builder.rb

@@ -35,6 +35,7 @@ module Effective
       filtered = filter_parameters
 
       content = rows.merge(content_fors)
+
       content = content.slice(*only) if only.present?
       content = content.except(*except) if except.present?
       content = content.except(*filtered) if filtered.present?
@@ -168,11 +169,11 @@ module Effective
       rows[name] = TableRows::PriceField.new(name, options, builder: self).to_html
     end
 
-    def save(name, options = {})
+    def save(name = nil, options = {})
       # Nothing to do
     end
 
-    def submit(name, options = {}, &block)
+    def submit(name = nil, options = {}, &block)
       # Nothing to do
     end
 

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '1.14.12'.freeze
+  VERSION = '1.14.14'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 1.14.12
+  version: 1.14.14
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-04 00:00:00.000000000 Z
+date: 2023-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails