effective_bootstrap 1.14.11 → 1.14.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1c4ea60a0fdc9507852b607ec9809e8fb28490695f05df02ef4a8c11a1073ad
-  data.tar.gz: ce5db2b16eb76d873d0cf0149c9e1eef9099f24a93c9c6fce89f4439013b3a4f
+  metadata.gz: c79b3e0f8e491e05ac28f6fe0630f669f3ced789b5137ed76fac5ba9e5bc2149
+  data.tar.gz: f50ff44c62e6b68098f5210361933ff1eb0fcb0c2d3c67c4cdd5296cb6b8fe37
 SHA512:
-  metadata.gz: 16cd1d8a558e7af223b3084fb281051c3bf54d59adbc26e3b357d22e36aaefd5f7c8674fde3e84a9b0a2907025d613997e580e0d8f8da61707bd714b02881daa
-  data.tar.gz: b4cbd3b1aed8ef57810de7d64ef9997c7d80ab5a759ebb326ddcda13415f1dce247944bbe6101db105ccc534f2fe5eb98839afe63b096d96530f4ac2aae85f8d
+  metadata.gz: 52236956016cb32d8d35b3a4a22a88a5255696bc19a0f4b08e7e789fe3726e7fd84062b7d132e55a05b86ab30bf7bbeecc14f411113305a3543a2699d7a95a59
+  data.tar.gz: d116da97f759170fe2b718e429d1125ebfa339acb8863a4afd49a001746edd22e2c3bad37d5126154222382e4a16bb39d028c9d88410f70b89d8bf238f867d6c

data/README.md

@@ -697,6 +697,21 @@ 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 +781,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/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?
@@ -119,6 +120,14 @@ module Effective
       rows[name] = TableRows::BelongsTo.new(name, options, builder: self).to_html
     end
 
+    def date_field(name, options = {})
+      rows[name] = TableRows::DateField.new(name, options, builder: self).to_html
+    end
+
+    def datetime_field(name, options = {})
+      rows[name] = TableRows::DatetimeField.new(name, options, builder: self).to_html
+    end
+
     def email_field(name, options = {})
       rows[name] = TableRows::EmailField.new(name, options, builder: self).to_html
     end
@@ -152,15 +161,19 @@ module Effective
       rows[name] = TableRows::PercentField.new(name, options, builder: self).to_html
     end
 
+    def tel_field(name, options = {})
+      rows[name] = TableRows::PhoneField.new(name, options, builder: self).to_html
+    end
+
     def price_field(name, options = {})
       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/app/models/effective/table_rows/date_field.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Effective
+  module TableRows
+    class DateField < Effective::TableRow
+
+      def content
+        nice_date(value)
+      end
+
+      def nice_date(value)
+        return unless value.respond_to?(:strftime)
+
+        label = value.strftime("%b %-d, %Y")
+        full = value.strftime("%A %b %-d, %Y %l:%M%P %z")
+
+        now = Time.zone.now
+
+        distance = if (now > value)
+          template.distance_of_time_in_words(now, value) + ' ago'
+        else
+          template.distance_of_time_in_words(value, now) + ' from now'
+        end
+
+        content_tag(:span, label, title: full + ' (' + distance + ')')
+      end
+
+    end
+  end
+end

data/app/models/effective/table_rows/datetime_field.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Effective
+  module TableRows
+    class DatetimeField < Effective::TableRow
+
+      def content
+        nice_date_time(value)
+      end
+
+      def nice_date_time(value)
+        return unless value.respond_to?(:strftime)
+
+        label = value.strftime("%b %-d, %Y %l:%M%P")
+        full = value.strftime("%A %b %-d, %Y %l:%M%P %z")
+
+        now = Time.zone.now
+
+        distance = if (now > value)
+          template.distance_of_time_in_words(now, value) + ' ago'
+        else
+          template.distance_of_time_in_words(value, now) + ' from now'
+        end
+
+        content_tag(:span, label, title: full + ' (' + distance + ')')
+      end
+
+    end
+  end
+end

data/app/models/effective/table_rows/phone_field.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Effective
+  module TableRows
+    class PhoneField < Effective::TableRow
+
+      def content
+        return unless value.present?
+
+        digits = value.split('x').first.delete('^0-9')
+        link_to(value, "tel:+1#{digits}")
+      end
+
+    end
+  end
+end

data/app/models/effective/table_rows/url_field.rb

@@ -5,7 +5,7 @@ module Effective
     class UrlField < Effective::TableRow
 
       def content
-        template.link_to(value) if value.present?
+        template.link_to(value, value, target: '_blank') if value.present?
       end
 
     end

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '1.14.11'.freeze
+  VERSION = '1.14.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 1.14.11
+  version: 1.14.13
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -700,10 +700,13 @@ files:
 - app/models/effective/table_rows/boolean.rb
 - app/models/effective/table_rows/collection.rb
 - app/models/effective/table_rows/content_for.rb
+- app/models/effective/table_rows/date_field.rb
+- app/models/effective/table_rows/datetime_field.rb
 - app/models/effective/table_rows/effective_address.rb
 - app/models/effective/table_rows/email_field.rb
 - app/models/effective/table_rows/file_field.rb
 - app/models/effective/table_rows/percent_field.rb
+- app/models/effective/table_rows/phone_field.rb
 - app/models/effective/table_rows/price_field.rb
 - app/models/effective/table_rows/text_area.rb
 - app/models/effective/table_rows/url_field.rb