bullet_train-themes 1.2.26 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01d64b4706292d6dc26a93d325fdab34168f213abebb185acf8f9cbc4b595fe6
-  data.tar.gz: 81cd3ff53af6964373fb5261bb22b1f430c1576cc58f9244bf5fb62a7ab0d708
+  metadata.gz: 8dd0a191651334aa62d766d42e872a70b47bf0003a82500925e9e5e68a57aaad
+  data.tar.gz: 5091e0954cbce846b121f1b4396d505b98b838813167f1ce96346db0fa5257e9
 SHA512:
-  metadata.gz: aa99f75538c6fd0739022d28dde6c8ba394111ec37794b9225f5214494d3b80c9844a4dc78615437ae5e55a35997345d4189d9e02ac27480ef15aa44b8fcef8e
-  data.tar.gz: 719da24c1e021387015ffe856c37e4037d7f7b4f8c5f8c48f8a96e871bd5fc48e17b36f5a2598ffad4e0ea369e8e27e576f1728aa9126e7ae621a53af44277bc
+  metadata.gz: 16f4a6f09b6d9d674f829082a4a250a1c1a8905c1638aeba68ace53cec78db9e985c697670be74c889e7112b89949cf9980acb6764c98a4c51dc5511fbd6acba
+  data.tar.gz: aaa27a63708ec55dc3fbe5c30f82c9f6cbd622ee80609d37510dbdf40da61db0aa63cc2a0500ffd9bdf1fc9017efedc486ac03a96019355170d7f55cfddf4f2b

data/app/views/themes/base/attributes/_belongs_to.html.erb

@@ -3,12 +3,12 @@
 <% disable_link ||= false %>
 <% url ||= nil %>
 
-<% if object.send(attribute).present? %>
+<% if object.public_send(attribute).present? %>
   <%= render 'shared/attributes/attribute', object: object, attribute: attribute, strategy: strategy, url: url do %>
     <% if disable_link %>
-      <%= object.send(attribute).label_string %>
+      <%= object.public_send(attribute).label_string %>
     <% else %>
-      <%= link_to object.send(attribute).label_string, url || [:account, object.send(attribute)] %>
+      <%= link_to object.public_send(attribute).label_string, url || [:account, object.public_send(attribute)] %>
     <% end %>
   <% end %>
 <% end %>

data/app/views/themes/base/attributes/_block.html.erb

@@ -2,8 +2,8 @@
 <% strategy ||= current_attributes_strategy || :none %>
 <% url ||= nil %>
 
-<% if object.send(attribute).present? %>
+<% if object.public_send(attribute).present? %>
   <%= render 'shared/attributes/attribute', object: object, attribute: attribute, strategy: strategy, url: url do %>
-    <pre><%= object.send(attribute) %></pre>
+    <pre><%= object.public_send(attribute) %></pre>
   <% end %>
 <% end %>

data/app/views/themes/base/attributes/_boolean.html.erb

@@ -4,6 +4,6 @@
 
 <%= render 'shared/attributes/attribute', object: object, attribute: attribute, strategy: strategy, url: url do %>
   <% unless object[attribute].nil? %>
-    <%= t("#{object.class.name.underscore.pluralize}.fields.#{attribute}.options.#{object.send(attribute)}") %>
+    <%= t("#{object.class.name.underscore.pluralize}.fields.#{attribute}.options.#{object.public_send(attribute)}") %>
   <% end %>
 <% end %>

data/app/views/themes/base/attributes/_code.html.erb

@@ -3,7 +3,7 @@
 <% source ||= nil %>
 <% url ||= nil %>
 
-<% if object.send(attribute).present? %>
+<% if object.public_send(attribute).present? %>
   <%= render 'shared/attributes/attribute', object: object, attribute: attribute, strategy: strategy, url: url do %>
     <code class="text-pink-600 font-light"><%= object.send(source || attribute) %></code>
   <% end %>

data/app/views/themes/base/attributes/_date.html.erb

@@ -3,9 +3,9 @@
 <% url ||= nil %>
 <% default_message = local_assigns[:default_message] || t('global.formats.timestamp_unavailable') %>
 
-<% if object.send(attribute).present? %>
+<% if object.public_send(attribute).present? %>
   <%= render 'shared/attributes/attribute', object: object, attribute: attribute, strategy: strategy, url: url do %>
-    <%= display_date(object.send(attribute), local_assigns[:date_format]) %>
+    <%= display_date(object.public_send(attribute), **local_assigns.slice(:format), **local_assigns.slice(:date_format)) %>
   <% end %>
 <% else %>
   <%= default_message %>

data/app/views/themes/base/attributes/_date_and_time.html.erb

@@ -3,9 +3,9 @@
 <% url ||= nil %>
 <% default_message = local_assigns[:default_message] || t('global.formats.timestamp_unavailable') %>
 
-<% if object.send(attribute).present? %>
+<% if object.public_send(attribute).present? %>
   <%= render 'shared/attributes/attribute', object: object, attribute: attribute, strategy: strategy, url: url do %>
-    <%= display_date_and_time(object.send(attribute), local_assigns[:date_format], local_assigns[:time_format]) %>
+    <%= display_date_and_time(object.public_send(attribute), **local_assigns.slice(:format), **local_assigns.slice(:date_format), **local_assigns.slice(:time_format)) %>
   <% end %>
 <% else %>
   <%= default_message %>

data/app/views/themes/base/attributes/_days_ago.html.erb

@@ -4,8 +4,8 @@
 
 <%= render 'shared/attributes/attribute', object: object, attribute: attribute, strategy: strategy, url: url do %>
   <% if object.send(attribute) %>
-    <%= time_ago_in_words(object.send(attribute)) %> ago
+    <%= t("global.time_ago", time: time_ago_in_words(object.send(attribute))) %>
   <% else %>
-    Never
+    <%= t("global.never") %>
   <% end %>
 <% end %>

data/app/views/themes/base/attributes/_email.html.erb

@@ -2,8 +2,8 @@
 <% strategy ||= current_attributes_strategy || :none %>
 <% url ||= nil %>
 
-<% if object.send(attribute).present? %>
+<% if object.public_send(attribute).present? %>
   <%= render 'shared/attributes/attribute', object: object, attribute: attribute, strategy: strategy, url: url do %>
-    <%= link_to object.send(attribute), "mailto:#{object.send(attribute)}" %>
+    <%= link_to object.public_send(attribute), "mailto:#{object.public_send(attribute)}" %>
   <% end %>
 <% end %>

data/app/views/themes/base/attributes/_has_many.html.erb

@@ -4,9 +4,9 @@
 <% disable_links ||= false %>
 <% link_options ||= {} %>
 
-<% if object.send(attribute).any? %>
+<% if object.public_send(attribute).any? %>
   <%= render 'shared/attributes/attribute', object: object, attribute: attribute, strategy: strategy do %>
-    <%= object.send(attribute).map do |child_object| %>
+    <%= object.public_send(attribute).map do |child_object| %>
       <% capture do %>
         <% if disable_links %>
           <%= child_object.label_string %>

data/app/views/themes/base/attributes/_html.html.erb

@@ -2,9 +2,14 @@
 <% strategy ||= current_attributes_strategy || :none %>
 <% url ||= nil %>
 
-<% if object.send(attribute).present? %>
+<% if object.public_send(attribute).present? %>
   <%= render 'shared/attributes/attribute', object: object, attribute: attribute, strategy: strategy, url: url do %>
-    <% # `.to_s` is for action text. %>
-    <%= html_sanitize(object.send(attribute).to_s).html_safe %>
+    <% # Here we manually add a trix-content class since sanitizing the body removes the Rails default. %>
+    <% if object.send(attribute).is_a?(ActionText::RichText) %>
+      <%= tag.div(html_sanitize(object.public_send(attribute).body.to_trix_html).html_safe, class:"trix-content") %>
+    <% else %>
+      <% # `.to_s` is for action text. %>
+      <%= html_sanitize(object.public_send(attribute).to_s).html_safe %>
+    <% end %>
   <% end %>
 <% end %>

data/app/views/themes/base/attributes/_image.html.erb

@@ -4,4 +4,4 @@
 <% options ||= {} %>
 <% options[:height] ||= 200 %>
 
-<%= cloudinary_image_tag object.send(attribute), options %>
+<%= cloudinary_image_tag object.public_send(attribute), options %>

data/app/views/themes/base/attributes/_number.html.erb

@@ -1,10 +1,15 @@
 <% object ||= current_attributes_object %>
 <% strategy ||= current_attributes_strategy || :none %>
 <% url ||= nil %>
+<% format ||= nil %>
 <% options ||= {} %>
 
-<% if object.send(attribute).present? %>
+<% if object.public_send(attribute).present? %>
   <%= render 'shared/attributes/attribute', object: object, attribute: attribute, strategy: strategy do %>
-    <%= object.send(attribute) %>
+    <% if format %>
+      <%= sprintf(format, object.public_send(attribute)) %>
+    <% else %>
+      <%= object.public_send(attribute) %>
+    <% end %>
   <% end %>
 <% end %>

data/app/views/themes/base/attributes/_option.html.erb

@@ -2,8 +2,8 @@
 <% strategy ||= current_attributes_strategy || :none %>
 <% url ||= nil %>
 
-<% if object.send(attribute).present? %>
+<% if object.public_send(attribute).present? %>
   <%= render 'shared/attributes/attribute', object: object, attribute: attribute, strategy: strategy, url: url do %>
-    <%= t("#{object.class.name.underscore.pluralize}.fields.#{attribute}.options.#{object.send(attribute)}") %>
+    <%= t("#{object.class.name.underscore.pluralize}.fields.#{attribute}.options.#{object.public_send(attribute)}") %>
   <% end %>
 <% end %>

data/app/views/themes/base/attributes/_options.html.erb

@@ -2,10 +2,10 @@
 <% strategy ||= current_attributes_strategy || :none %>
 <% url ||= nil %>
 
-<% if object.send(attribute).any? %>
+<% if object.public_send(attribute).any? %>
   <%= render 'shared/attributes/attribute', object: object, attribute: attribute, strategy: strategy, url: url do %>
     <%# TODO: Multiple option partials return arrays with blank characters in them. Is this expected? %>
-    <%= object.send(attribute).reject(&:blank?).map do |value| %>
+    <%= object.public_send(attribute).reject(&:blank?).map do |value| %>
       <% t("#{object.class.name.underscore.pluralize}.fields.#{attribute}.options.#{value}") %>
     <% end.map(&:strip).to_sentence %>
   <% end %>

data/app/views/themes/base/attributes/_phone_number.html.erb

@@ -2,8 +2,8 @@
 <% strategy ||= current_attributes_strategy || :none %>
 <% url ||= nil %>
 
-<% if object.send(attribute).present? %>
+<% if object.public_send(attribute).present? %>
   <%= render 'shared/attributes/attribute', object: object, attribute: attribute, strategy: strategy, url: url do %>
-    <%= display_phone_number(object.send(attribute)) %>
+    <%= display_phone_number(object.public_send(attribute)) %>
   <% end %>
 <% end %>

data/app/views/themes/base/attributes/_text.html.erb

@@ -3,8 +3,8 @@
 <% url ||= nil %>
 <% options ||= {} %>
 
-<% if object.send(attribute).present? %>
+<% if object.public_send(attribute).present? %>
   <%= render 'shared/attributes/attribute', object: object, attribute: attribute, strategy: strategy, url: url do %>
-    <%= options[:password] ? "●" * object.send(attribute).length : object.send(attribute) %>
+    <%= options[:password] ? "●" * object.public_send(attribute).length : object.public_send(attribute) %>
   <% end %>
 <% end %>

data/app/views/themes/base/fields/_ckeditor.html.erb

@@ -1,5 +1,3 @@
-<% yield %>
-
 <%
 # ⚠️ CKEditor 5 is distributed under a GPL 2+ copyleft license.
 # You need a commercial license to utilize it in closed-source SaaS products.

data/app/views/themes/base/fields/_email_field.html.erb

@@ -1,5 +1,3 @@
-<% yield %>
-
 <%
 form ||= current_fields_form
 options ||= {}

data/app/views/themes/base/fields/_emoji_field.html.erb

@@ -1,5 +1,3 @@
-<% yield %>
-
 <%
 stimulus_controller = 'fields--emoji-picker'
 
@@ -21,7 +19,7 @@ value = form.object.send(method)
           <% end %>
         </span>
       &nbsp;
-      Choose an Emoji
+      <%= t('fields.choose_emoji') %>
       <% end %>
       <%= form.hidden_field method, data: {"#{stimulus_controller}-target": "input"} %>
     </div>

data/app/views/themes/base/fields/_number_field.html.erb

@@ -1,5 +1,3 @@
-<% yield %>
-
 <%
 form ||= current_fields_form
 options ||= {}

data/app/views/themes/base/fields/_password_field.html.erb

@@ -1,12 +1,10 @@
-<% yield %>
-
 <%
 stimulus_controller = 'fields--password'
 
 form ||= current_fields_form
 options ||= {}
 
-if options[:show_strength_indicator]
+if options[:show_strength_indicator] && BulletTrain::Configuration.strong_passwords
   options = options.merge({ data: {"action": "keyup->fields--password#estimateStrength" }})
 end
 
@@ -17,6 +15,6 @@ other_options ||= {}
   <%= render 'shared/fields/field', form: form, method: method, helper: :password_field, options: options, other_options: other_options %>
   <% if options[:show_strength_indicator] %>
     <% # TODO This is the wrong place to define this kind of style, but I couldn't make this work in the `:help` content buffer. %>
-    <div data-<%= stimulus_controller %>-target="strengthIndicator" class="hidden mt-1.5 text-xs text-red-600"></div>
+    <div data-<%= stimulus_controller %>-target="strengthIndicator" class="hidden mt-1.5 text-xs text-red-500"></div>
   <% end %>
-</div>
+</div>

data/app/views/themes/base/fields/_phone_field.html.erb

@@ -1,5 +1,3 @@
-<% yield %>
-
 <%
 stimulus_controller = 'fields--phone'
 

data/app/views/themes/base/fields/_super_select.html.erb

@@ -1,11 +1,10 @@
-<% yield %>
-
 <%
 stimulus_controller = 'fields--super-select'
 
 form ||= current_fields_form
 options ||= {}
 other_options ||= {}
+select2_options ||= nil
 html_options ||= {}
 html_options[:id] ||= form.field_id(method)
 html_options[:class] = "form-control select2 #{html_options[:class]}".strip
@@ -26,6 +25,7 @@ wrapper_options = { data: { controller: stimulus_controller }}
 wrapper_options[:data]["#{stimulus_controller}-enable-search-value"] = true if other_options[:search]
 wrapper_options[:data]["#{stimulus_controller}-accepts-new-value"] = true if other_options[:accepts_new]
 wrapper_options[:data]["#{stimulus_controller}-search-url-value"] = choices_url if choices_url.present?
+wrapper_options[:data]["#{stimulus_controller}-select2-options-value"] = select2_options.to_json if select2_options.present?
 
 unless options[:multiple]
   wrapper_options[:data]["action"] ||= ""

data/app/views/themes/base/fields/_text_area.html.erb

@@ -1,5 +1,3 @@
-<% yield %>
-
 <%
 form ||= current_fields_form
 options ||= {}

data/app/views/themes/base/fields/_text_field.html.erb

@@ -1,5 +1,3 @@
-<% yield %>
-
 <%
 form ||= current_fields_form
 options ||= {}

data/config/locales/en/fields.en.yml

@@ -0,0 +1,3 @@
+en:
+  fields:
+    choose_emoji: Choose an Emoji

data/lib/bullet_train/themes/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module Themes
-    VERSION = "1.2.26"
+    VERSION = "1.3.0"
   end
 end

data/lib/bullet_train/themes.rb

@@ -9,7 +9,6 @@ module BulletTrain
 
     mattr_reader :partial_paths, default: {}
 
-    # TODO Do we want this to be configurable by downstream applications?
     INVOCATION_PATTERNS = [
       # ❌ This path is included for legacy purposes, but you shouldn't reference partials like this in new code.
       /^account\/shared\//,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-themes
 version: !ruby/object:Gem::Version
-  version: 1.2.26
+  version: 1.3.0
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-18 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -78,18 +78,19 @@ files:
 - app/views/themes/base/fields/_text_area.html.erb
 - app/views/themes/base/fields/_text_field.html.erb
 - app/views/themes/base/fields/_trix_editor.html.erb
+- config/locales/en/fields.en.yml
 - config/routes.rb
 - lib/bullet_train/themes.rb
 - lib/bullet_train/themes/engine.rb
 - lib/bullet_train/themes/version.rb
 - lib/tasks/application.rb
 - lib/tasks/bullet_train/themes_tasks.rake
-homepage: https://github.com/bullet-train-co/bullet_train-themes
+homepage: https://github.com/bullet-train-co/bullet_train-core/tree/main/bullet_train-themes
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/bullet-train-co/bullet_train-themes
-  source_code_uri: https://github.com/bullet-train-co/bullet_train-themes
+  homepage_uri: https://github.com/bullet-train-co/bullet_train-core/tree/main/bullet_train-themes
+  source_code_uri: https://github.com/bullet-train-co/bullet_train-core/tree/main/bullet_train-themes
 post_install_message:
 rdoc_options: []
 require_paths: