bullet_train 1.36.0 → 1.37.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c1d33c15093050889618d0a58e53899f22dbbee55e6792adad049b36107eec6
-  data.tar.gz: a7a547ddbb60545ee9b2f37e984aa1b293a84ddd231a3233542ea85e5a2c5a61
+  metadata.gz: 1dabb35a975775f9912af481e118c8e7a500e0ae622c10f50e999a2f22a86482
+  data.tar.gz: 946f16163a0e7a71530f7d4ce9cf71c593b1251fa9e4b2e645d023a048ba8917
 SHA512:
-  metadata.gz: dafe1f7e4ec075acbd7fd8417a2080b7dc51c496eaf2b8d3b63e14262d9a43b2bce61e8ed8b42678688ba48c4346026c2ae3ce87e4b778532e7bec7931dab8e7
-  data.tar.gz: f25805b74ba7e7f77ccadfe2404350a312f6de5d4f223b4940f8a881c5017cccc4aa2d348fa9fca3acd3a247d2fd9b994b85dfa63b1d0c46727ee683ea85e9e8
+  metadata.gz: 6f4d1a1cafc2d2087fea34ce131b809e154ee9a61d2fe42c9d0fcffd97ccbe7ef25a74d867ae77f780d70e06050ff94dc2c4a6af5ece94ece67179bcba0bb0e3
+  data.tar.gz: 1987c53b1c4d33badb48edf8202aba6d1d0a882f2e2df2863976d61960b48e2e31feb4ef6f0ba5dda980e8ad64744315a0c4f8cc0a78a98da2288ecba5725588

data/app/views/active_storage/blobs/_blob.html.erb

@@ -0,0 +1,29 @@
+<figure class="attachment attachment--<%= blob.representable? ? "preview" : "file" %> attachment--<%= blob.filename.extension %>">
+  <% if blob.video? %>
+    <video controls width="<%= local_assigns[:in_gallery] ? 800 : 1024 %>" preload="metadata" class="max-w-full h-auto rounded-md"
+      poster="<%= url_for(blob.representation(resize_to_limit: local_assigns[:in_gallery] ? [ 800, 600 ] : [ 1024, 768 ])) %>"
+    >
+      <source src="<%= rails_blob_url(blob) %>" type="<%= blob.content_type %>">
+    </video>
+  <% elsif blob.representable? %>
+    <%
+      # loader_options are passed through to lib-vips: https://www.libvips.org/API/current/ctor.Image.gifload.html
+      # By default the loader uses page = 1, and n = 1 to pick just the first "page" (aka frame) of a GIF.
+      # We pass -1 for n to indicate that it should pull all the frames and give us a scaled verison of the whole GIF.
+      loader_options = {}
+      if blob.filename.extension.casecmp("gif")
+        loader_options[:n] = -1
+      end
+    %>
+    <%= image_tag blob.representation(loader: loader_options, resize_to_limit: local_assigns[:in_gallery] ? [ 800, 600 ] : [ 1024, 768 ]) %>
+  <% end %>
+
+  <figcaption class="attachment__caption">
+    <% if caption = blob.try(:caption) %>
+      <%= caption %>
+    <% else %>
+      <span class="attachment__name"><%= blob.filename %></span>
+      <span class="attachment__size"><%= number_to_human_size blob.byte_size %></span>
+    <% end %>
+  </figcaption>
+</figure>

data/app/views/layouts/action_text/contents/_content.html.erb

@@ -0,0 +1,3 @@
+<div class="trix-content">
+  <%= yield -%>
+</div>

data/config/initializers/action_text_sanitzer.rb

@@ -0,0 +1,15 @@
+# This is to render previews for video attachments in Action Text
+# Source: https://mileswoodroffe.com/articles/action-text-video-support
+#
+# NOTE: This is all way more verbose that I'd like it to be. Maybe we can
+# slim it down if this Rails issue is ever fixed:
+# https://github.com/rails/rails/issues/54478
+Rails.application.config.after_initialize do
+  default_allowed_attributes = Rails::HTML5::Sanitizer.safe_list_sanitizer.allowed_attributes + ActionText::Attachment::ATTRIBUTES.to_set
+  custom_allowed_attributes = Set.new(%w[controls poster type])
+  ActionText::ContentHelper.allowed_attributes = (default_allowed_attributes + custom_allowed_attributes).freeze
+
+  default_allowed_tags = Rails::HTML5::Sanitizer.safe_list_sanitizer.allowed_tags + Set.new([ActionText::Attachment.tag_name, "figure", "figcaption"])
+  custom_allowed_tags = Set.new(%w[audio video source])
+  ActionText::ContentHelper.allowed_tags = (default_allowed_tags + custom_allowed_tags).freeze
+end

data/config/initializers/actiontext_override.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+# We're using this monkey patch: https://github.com/rails/rails/pull/39113#issuecomment-1729082686
+# To work around this long-standing bug: https://github.com/rails/rails/issues/38027
+# If PR #39113 is ever merged and released in Rails we can ditch this entire file.
+
+require "active_support/core_ext/object/try"
+module ActionText
+  module Attachments
+    module TrixConversion
+      def to_trix_attachment(content = trix_attachment_content)
+        attributes = full_attributes.dup
+        attributes["content"] = content if content
+        attributes["url"] = trix_attachable_url if previewable_attachable? && previewable?
+        TrixAttachment.from_attributes(attributes)
+      end
+
+      def trix_attachable_url
+        Rails.application.routes.url_helpers.rails_blob_url(preview_image.blob, only_path: true)
+      end
+    end
+  end
+end

data/docs/stylesheets.md

@@ -13,4 +13,8 @@ You can eject only the theme files you wish to override or you can eject the who
 
 To add your own custom CSS, add to the `app/assets/stylesheets/application.css` file found in your app. In this file, you'll be able to use Tailwind `@apply` directives and add `@import` statements to include the CSS from third-party `npm` packages.
 
-For further modifications to the theme's style sheet (for example, to change the order in which base Tailwind stylesheets are included), you can eject the theme's css by using the command `rake bullet_train:themes:light:eject_css`.
+For further modifications to the theme's style sheet (for example, to change the order in which base Tailwind stylesheets are included), you can eject the theme's css by using the command `rake bullet_train:themes:light:eject_css`.
+
+## Using Custom Fonts
+
+For information on customizing fonts in your application, see the [Customizing Fonts](/docs/themes.md#customizing-fonts) section in the Themes documentation.

data/docs/themes.md

@@ -52,6 +52,52 @@ themeConfig.theme.extend.colors = ({colors}) => ({
 Here you need to include `primary` and `secondary` as well as `base`. The settings in `tailwind.config.js` will **mostly** clobber the settings
 in `theme.rb`, but not entirely. So for the best results you should make sure that those two files agree about the primary and secondary colors.
 
+## Customizing Fonts
+
+By default, Bullet Train uses [Inter](https://rsms.me/inter/) as its font family. You can customize this to use your own fonts.
+
+### Removing the Default Font
+
+To remove the default Inter font, which appears as a stylesheet `<link>` tag in the `<head>`, you'll need to eject the `shared/layouts/head/_fonts.html.erb` partial locally and modify or remove the link tag. To eject this partial, use `bin/resolve shared/layouts/head/fonts --eject` (see [Dealing with Indirection](#dealing-with-indirection) below for more details).
+
+Once ejected to `app/views/themes/light/layouts/head/_fonts.html.erb` (or your custom theme directory), you can remove the stylesheet `<link>` tag.
+
+### Adding a Custom Font
+
+To add your own custom fonts, hosted locally:
+
+_Note: if you'd like to use a CDN-hosted font different than `inter`, you can replace the stylesheet `<link>` tag for inter found in the head (see Removing the Default Font above) and skip to step 3 below on updating the Tailwind config._
+
+1. **Add font files** to your application's `app/assets/fonts/` directory.
+
+2. **Add `@font-face` rules** in your `app/assets/stylesheets/application.css` file:
+
+```css
+@font-face {
+  font-family: 'YourFontName';
+  src: url('YourFontFile.woff2') format('woff2');
+  font-weight: normal;
+  font-style: normal;
+}
+```
+
+Note: When you use `url('FontFileName.woff2')`, Propshaft will automatically replace it with a full fingerprinted public path to the font file.
+
+3. **Update `tailwind.config.js`** to use your custom font in the Tailwind configuration:
+
+```javascript
+const defaultTheme = require('tailwindcss/defaultTheme')
+
+// ... existing config ...
+
+themeConfig.theme.extend.fontFamily.sans = [
+  'YourFontName',
+  ...defaultTheme.fontFamily.sans,
+]
+```
+
+This configuration sets your custom font as the primary sans-serif font while keeping the default system font stack as fallbacks.
+
 ## The Theme Subsystem
 
 Bullet Train has a theme subsystem designed to allow you the flexibility to either extend or completely replace the stock “Light” UI theme.

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.36.0"
+  VERSION = "1.37.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.36.0
+  version: 1.37.1
 platform: ruby
 authors:
 - Andrew Culver
@@ -506,6 +506,7 @@ files:
 - app/views/account/users/_oauth.html.erb
 - app/views/account/users/edit.html.erb
 - app/views/account/users/show.html.erb
+- app/views/active_storage/blobs/_blob.html.erb
 - app/views/bullet_train/partial_resolver.html.erb
 - app/views/devise/confirmations/new.html.erb
 - app/views/devise/mailer/confirmation_instructions.html.erb
@@ -524,6 +525,7 @@ files:
 - app/views/devise/shared/_oauth.html.erb
 - app/views/devise/unlocks/new.html.erb
 - app/views/layouts/account.html.erb
+- app/views/layouts/action_text/contents/_content.html.erb
 - app/views/layouts/devise.html.erb
 - app/views/layouts/docs.html.erb
 - app/views/layouts/mailer.html.erb
@@ -534,6 +536,8 @@ files:
 - app/views/user_mailer/welcome.html.erb
 - config/addresses/countries.json
 - config/addresses/states.json
+- config/initializers/action_text_sanitzer.rb
+- config/initializers/actiontext_override.rb
 - config/initializers/concerns/inflections_base.rb
 - config/initializers/concerns/turbo_failure_app.rb
 - config/locales/en/addresses.en.yml