bullet_train 1.35.0 → 1.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25534acd68cfd6da1b0e05199b35c0795bbd98d9fa1314fd1c1180b154e7c043
-  data.tar.gz: cc0cad473683e187e5dcaeca068748a3fe979cf7ebca0687766d4710e97cb164
+  metadata.gz: ac0619828c18dd73c0bd24b703b49c9055b3e2dbc8e9e17b3093c1f0b902c1dd
+  data.tar.gz: a7656a675b55ca274086d9001b35c7d32c46616198d8cec19c38357d2796eebb
 SHA512:
-  metadata.gz: a221a9c961bbd7f379d340f9a97d98cdaa4c4c74b88c593778d4b81e517b73e863a497a739fc465fb77d2ff6751e29d0d851b118e67957c1ffac4d82396a9690
-  data.tar.gz: c94b9763df8e2182a9f041771921c1d0299fcfdec7618ff44f167249378f9879ca21521c58d9903bdc09a501c42e1100d79c53f9c9ded2030e117a4b561bdb63
+  metadata.gz: 5be720efef93b47c086bf5432ca141d244c22996aaed1ce73325833caedb006fa795ae32fc910068dde432398f87373b36bf0ddfb96bc5eeecc492d9c9bae3cc
+  data.tar.gz: db0d4c4fdecb6f0a5f0f6e8f8b35420bc412f508948700443eb3ab4b65c16dc0629cfdc5d1ae24060f6466023f24598b818fd6a1aa8c232a00bbb86e827c6c8d

data/app/models/concerns/invitations/base.rb

@@ -14,6 +14,8 @@ module Invitations::Base
     after_create :set_added_by_membership
     after_create :send_invitation_email
 
+    after_validation :hoist_membership_email_error
+
     attribute :uuid, default: -> { SecureRandom.hex }
 
     def roles
@@ -44,4 +46,13 @@ module Invitations::Base
   def is_for?(user)
     user.email.downcase.strip == email.downcase.strip
   end
+
+  def hoist_membership_email_error
+    # This is special handling for the email field because we have a uniqueness validation in the
+    # `Membership` model for the `user_email` field. Since we copy the value from `invitation.email`
+    # into `invitation.membership.user_email` the error isn't passed through to the form in the normal way.
+    errors[:"membership.user_email"]&.each do |error|
+      errors.add(:email, error)
+    end
+  end
 end

data/app/models/concerns/users/base.rb

@@ -44,6 +44,7 @@ module Users::Base
     # callbacks
     after_validation :remove_profile_photo, if: :profile_photo_removal?
     after_update :set_teams_time_zone
+    after_update :set_memberships_email
   end
 
   def email_is_oauth_placeholder?
@@ -159,6 +160,12 @@ module Users::Base
     end
   end
 
+  def set_memberships_email
+    if email_previously_changed?
+      memberships.where.not(user_email: email).update(user_email: email)
+    end
+  end
+
   def profile_photo_removal?
     profile_photo_removal.present?
   end

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/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.35.0"
+  VERSION = "1.37.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.35.0
+  version: 1.37.0
 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