bullet_train 1.2.20 → 1.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4561ddbfaa81217ae48ea15b210025cb0390f3acecb2a7be5f0cd239eb0ec731
-  data.tar.gz: 610569262d3a98cf8778a702202f21c0739b62e4e68691befa83b90b1800fab2
+  metadata.gz: d03b4bc2028c88dac20f3223cd1cd6ef395cae53b6cf84377360b0b068a0c0e8
+  data.tar.gz: 3524f24af8fd64c3be1ae14ddf99562fd9ba251faed18e88f35800ff11c3a7f2
 SHA512:
-  metadata.gz: 2a2a672f5278fa428754aeee9f17a4115e4bf0b9420b9768790bd3d7e9a29c2a98dfeec7ce82b6d33338cd61674fc7ebf4074a7b4b7f3f239733a3e20ef8e194
-  data.tar.gz: 4dc593a08ee2e2137a807038ca554be019b1a3fb8362e691be55f4e9834be6636a9475947b51e272205968b5665306261bc8bc63aec9e4cc6f4dbab23c9361f3
+  metadata.gz: 7da1cc8e9a9acaef9fa0eeeab6c135f7d3c7d6261c2518c4b29c572711fe2e347ce3da8e7476a6fd2f8515af6d6c442df77f1d7566b7d9ba95c9dc0f59026078
+  data.tar.gz: 622671f75556fe2358107f3acdba1f917da32347df64b325514ad670c09044b85baad4e56ed3d7edc45ae761e4bf07cac91170cbeb5ea73254e3d0f124bb3985

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

@@ -11,9 +11,10 @@ module Invitations::Base
 
     validates :email, presence: true
 
-    before_create :generate_uuid
     after_create :set_added_by_membership
     after_create :send_invitation_email
+
+    attribute :uuid, default: -> { SecureRandom.hex }
   end
 
   def set_added_by_membership
@@ -24,10 +25,6 @@ module Invitations::Base
     UserMailer.invited(uuid).deliver_later
   end
 
-  def generate_uuid
-    self.uuid = SecureRandom.hex
-  end
-
   def accept_for(user)
     User.transaction do
       user.memberships << membership

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

@@ -128,7 +128,7 @@ module Memberships::Base
 
   def last_initial
     return nil unless last_name.present?
-    "#{last_name}."
+    "#{last_name[0]}."
   end
 
   def first_name_last_initial

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

@@ -73,11 +73,7 @@ module Records::Base
   end
 
   def seeding?
-    rake_tasks = ObjectSpace.each_object(Rake::Task)
-    return false if rake_tasks.count.zero?
-
-    db_seed_task = rake_tasks.find { |task| task.name.match?(/^db:seed$/) }
-    db_seed_task.already_invoked
+    Rake::Task.task_defined?("db:seed") && Rake::Task["db:seed"].already_invoked
   end
 
   # TODO This should really be in the API package and included from there.

data/app/views/account/invitations/new.html.erb

@@ -1,12 +1,7 @@
-<%= render 'account/shared/page' do |p| %>
-  <% p.content_for :title, t('.section') %>
-  <% p.content_for :body do %>
-    <%= render 'account/shared/box', divider: true do |p| %>
-      <% p.content_for :title, t('.header') %>
-      <% p.content_for :description, t('.description') %>
-      <% p.content_for :body do %>
-        <%= render 'form', invitation: @invitation %>
-      <% end %>
-    <% end %>
+<%= render 'account/shared/page' do |page| %>
+  <% page.title t('.section') %>
+  <% page.body.render 'account/shared/box', divider: true do |box| %>
+    <% box.t :description, title: '.header' %>
+    <% box.body.render 'form', invitation: @invitation %>
   <% end %>
 <% end %>

data/app/views/account/invitations/show.html.erb

@@ -1,6 +1,6 @@
-<%= render 'account/shared/workflow/box' do |p| %>
-  <% p.content_for :title, t(".join_team") %>
-  <% p.content_for :body do %>
+<%= render 'account/shared/workflow/box' do |box| %>
+  <% box.title t(".join_team") %>
+  <% box.body do %>
     <div class="space-y">
       <% if !@invitation.is_for?(current_user) %>
         <p><%= raw t('.has_invited', user_name: @invitation.from_membership.name) %></p>

data/app/views/account/memberships/_index.html.erb

@@ -3,14 +3,14 @@
 <% hide_back ||= false %>
 
 <%= updates_for context, :memberships do %>
-  <%= render 'account/shared/box' do |p| %>
-    <% p.content_for :title, t(".contexts.#{context.class.name.underscore}.header") %>
-    <% p.content_for :description do %>
+  <%= render 'account/shared/box' do |box| %>
+    <% box.title t(".contexts.#{context.class.name.underscore}.header") %>
+    <% box.description do %>
       <%= raw t(".contexts.#{context.class.name.underscore}.#{@memberships.any? ? 'description' : 'description_empty'}") %>
       <%= render "shared/limits/index", model: @memberships.model %>
     <% end %>
 
-    <% p.content_for :table do %>
+    <% box.table do %>
       <% if @memberships.any? %>
         <table class="table">
           <thead>
@@ -29,7 +29,7 @@
     <% end %>
 
     <% unless hide_actions %>
-      <% p.content_for :actions do %>
+      <% box.actions do %>
         <%= link_to t('invitations.buttons.new'), new_account_team_invitation_path(@team, cancel_path: account_team_memberships_path(@team)), class: "#{first_button_primary}" %>
         <%= link_to t('global.buttons.back'), [:account, context], class: "#{first_button_primary} back" unless hide_back %>
       <% end %>

data/app/views/account/memberships/_menu_item.html.erb

@@ -1,8 +1,8 @@
 <%= render 'account/shared/menu/item', {
   url: main_app.polymorphic_path([:account, current_team, :memberships]),
   label: t('memberships.navigation.label'),
-} do |p| %>
-  <% p.content_for :icon do %>
+} do |item| %>
+  <% item.icon do %>
     <i class="<%= t('memberships.navigation.icon') %>"></i>
   <% end %>
 <% end %>

data/app/views/account/memberships/_tombstones.html.erb

@@ -1,13 +1,13 @@
 <% context ||= @team %>
 <% hide_actions ||= false %>
 
-<%= render 'account/shared/box' do |p| %>
-  <% p.content_for :title, t("memberships.tombstones.contexts.#{context.class.name.underscore}.header") %>
-  <% p.content_for :description do %>
+<%= render 'account/shared/box' do |box| %>
+  <% box.title t("memberships.tombstones.contexts.#{context.class.name.underscore}.header") %>
+  <% box.description do %>
     <%= raw t("memberships.tombstones.contexts.#{context.class.name.underscore}.#{memberships.any? ? 'description' : 'description_empty'}") %>
   <% end %>
 
-  <% p.content_for :body do %>
+  <% box.body do %>
     <% if memberships.any? %>
       <table class="table">
         <thead>

data/app/views/account/memberships/edit.html.erb

@@ -1,21 +1,15 @@
-<%= render 'account/shared/page' do |p| %>
-  <% p.content_for :title, t('.section') %>
-  <% p.content_for :body do %>
-    <%= render 'account/shared/box', divider: true do |p| %>
-      <% p.content_for :title, t('.header') %>
-      <% p.content_for :description, t('.description') %>
-      <% p.content_for :body do %>
-        <%= render 'form', membership: @membership %>
-      <% end %>
+<%= render 'account/shared/page' do |page| %>
+  <% page.title t('.section') %>
+  <% page.body do %>
+    <%= render 'account/shared/box', divider: true do |box| %>
+      <% box.t :description, title: '.header' %>
+      <% box.body.render 'form', membership: @membership %>
     <% end %>
 
     <% if can? :destroy, @membership %>
-      <%= render 'account/shared/box', divider: true do |p| %>
-        <% p.content_for :title, t('.remove_header') %>
-        <% p.content_for :description, t('.remove_description') %>
-        <% p.content_for :body do %>
-          <%= button_to t('.buttons.destroy'), [:account, @membership], method: :delete, data: { confirm: t('.buttons.confirmations.destroy') }, class: 'button' %>
-        <% end %>
+      <%= render 'account/shared/box', divider: true do |box| %>
+        <% box.t title: '.remove_header', description: '.remove_description' %>
+        <% box.body.button_to t('.buttons.destroy'), [:account, @membership], method: :delete, data: { confirm: t('.buttons.confirmations.destroy') }, class: 'button' %>
       <% end %>
     <% end %>
   <% end %>

data/app/views/account/memberships/index.html.erb

@@ -1,6 +1,6 @@
-<%= render 'account/shared/page' do |p| %>
-  <% p.content_for :title, t('.section') %>
-  <% p.content_for :body do %>
+<%= render 'account/shared/page' do |page| %>
+  <% page.title t('.section') %>
+  <% page.body do %>
     <% if @memberships.current_and_invited.any? %>
       <%= render 'index' do %>
         <%= render @memberships.current_and_invited.includes(:user) %>

data/app/views/account/memberships/show.html.erb

@@ -1,8 +1,8 @@
-<%= render 'account/shared/page' do |p| %>
-  <% p.content_for :title, t('.section') %>
-  <% p.content_for :body do %>
-    <%= render 'account/shared/box', divider: true do |p| %>
-      <% p.content_for :title do %>
+<%= render 'account/shared/page' do |page| %>
+  <% page.title t('.section') %>
+  <% page.body do %>
+    <%= render 'account/shared/box', divider: true do |box| %>
+      <% box.title do %>
         <% if @membership.unclaimed? %>
           <%= t('.invitation_header') %>
         <% elsif @membership.tombstone? %>
@@ -12,16 +12,14 @@
         <% end %>
       <% end %>
 
-      <% p.content_for :description do %>
-        <%= t('.description') %>
-      <% end %>
+      <% box.t :description %>
 
-      <% p.content_for :body do %>
+      <% box.body do %>
         <% with_attribute_settings object: @membership, strategy: :label do %>
           <%= render 'shared/attributes/text', attribute: :name %>
-          <%= render 'shared/attributes/base' do |p| %>
-            <% p.content_for :heading, t('.fields.role_ids.heading') %>
-            <% p.content_for :body do %>
+          <%= render 'shared/attributes/base' do |base| %>
+            <% base.heading t('.fields.role_ids.heading') %>
+            <% base.body do %>
               <% if @membership.assignable_roles.any? %>
                 <%= @membership.assignable_roles.map { |role| t(".fields.role_ids.options.#{role.key}.label") }.to_sentence %>
               <% else %>
@@ -33,7 +31,7 @@
         <%# 🚅 super scaffolding will insert new fields above this line. %>
       <% end %>
 
-      <% p.content_for :actions do %>
+      <% box.actions do %>
         <% if @membership.tombstone? %>
           <%= link_to t('.buttons.reinvite'), [:reinvite, :account, @membership], class: first_button_primary, method: :post, data: {confirm: t('.buttons.confirmations.reinvite', membership_name: @membership.name)} if can? :edit, @membership %>
         <% end %>
@@ -53,7 +51,6 @@
 
         <%= link_to t('global.buttons.back'), [:account, @team, :memberships], class: first_button_primary %>
       <% end %>
-
     <% end %>
 
     <%= render 'account/scaffolding/completely_concrete/tangible_things/index', tangible_things: @membership.scaffolding_completely_concrete_tangible_things, context: @membership if @membership.scaffolding_completely_concrete_tangible_things.any? %>

data/app/views/account/onboarding/user_details/edit.html.erb

@@ -1,8 +1,8 @@
 <% @title = t('.header') %>
 
-<%= render 'account/shared/workflow/box' do |p| %>
-  <% p.content_for :title, @title %>
-  <% p.content_for :body do %>
+<%= render 'account/shared/workflow/box' do |box| %>
+  <% box.title @title %>
+  <% box.body do %>
     <% within_fields_namespace(:self) do %>
       <%= form_for @user, url: account_onboarding_user_detail_path(@user), method: :put, html: {class: 'form'} do |f| %>
         <%= render 'account/shared/forms/errors', form: f %>

data/app/views/account/onboarding/user_email/edit.html.erb

@@ -1,8 +1,8 @@
 <% @title = t('.header') %>
 
-<%= render 'account/shared/workflow/box' do |p| %>
-  <% p.content_for :title, @title %>
-  <% p.content_for :body do %>
+<%= render 'account/shared/workflow/box' do |box| %>
+  <% box.title @title %>
+  <% box.body do %>
     <% within_fields_namespace(:self) do %>
       <%= form_for @user, url: account_onboarding_user_email_path(@user), method: :put, html: {class: 'form'} do |f| %>
         <% if @email_taken %>

data/app/views/account/teams/_menu_item.html.erb

@@ -1,8 +1,8 @@
 <%= render 'account/shared/menu/item', {
   url: main_app.polymorphic_path([:account, current_team]),
   label: t('menus.main.labels.dashboard'),
-} do |p| %>
-  <% p.content_for :icon do %>
+} do |item| %>
+  <% item.icon do %>
     <i class="fal fa-home-lg-alt ti ti-home"></i>
   <% end %>
 <% end %>

data/app/views/account/teams/_team.html.erb

@@ -1,3 +1,3 @@
-<%= render 'account/shared/team', link_url: [:account, team], memberships: team.memberships.current_and_invited.first(10)  do |p| %>
-  <% p.content_for :name, team.name %>
+<%= render 'account/shared/team', link_url: [:account, team], memberships: team.memberships.current_and_invited.first(10) do |p| %>
+  <% p.name team.name %>
 <% end %>

data/app/views/account/teams/edit.html.erb

@@ -1,12 +1,7 @@
-<%= render 'account/shared/page' do |p| %>
-  <% p.content_for :title, t('.section') %>
-  <% p.content_for :body do %>
-    <%= render 'account/shared/box', divider: true do |p| %>
-      <% p.content_for :title, t('.header') %>
-      <% p.content_for :description, t('.description') %>
-      <% p.content_for :body do %>
-        <%= render 'form', team: @team %>
-      <% end %>
-    <% end %>
+<%= render 'account/shared/page' do |page| %>
+  <% page.title t('.section') %>
+  <% page.body.render 'account/shared/box', divider: true do |box| %>
+    <% box.t :description, title: '.header' %>
+    <% box.body.render 'form', team: @team %>
   <% end %>
 <% end %>

data/app/views/account/teams/index.html.erb

@@ -1,8 +1,6 @@
-<%= render 'account/shared/page' do |p| %>
-  <% p.content_for :title, t('.section') %>
-  <% p.content_for :body do %>
-    <%= render 'index', creative_concepts: @creative_concepts do %>
-      <%= render @teams %>
-    <% end %>
+<%= render 'account/shared/page' do |page| %>
+  <% page.title t('.section') %>
+  <% page.body.render 'index', creative_concepts: @creative_concepts do %>
+    <%= render @teams %>
   <% end %>
 <% end %>

data/app/views/account/teams/new.html.erb

@@ -6,9 +6,9 @@ else
 end
 %>
 
-<%= render 'account/shared/workflow/box' do |p| %>
-  <% p.content_for :title, @title %>
-  <% p.content_for :body do %>
+<%= render 'account/shared/workflow/box' do |box| %>
+  <% box.title @title %>
+  <% box.body do %>
     <%= form_with model: @team, url: [:account, @team], local: true, class: 'form' do |form| %>
       <%= render 'account/shared/notices' %>
       <%= render 'account/shared/forms/errors', form: form %>

data/app/views/account/users/edit.html.erb

@@ -1,18 +1,15 @@
-<%= render 'account/shared/page' do |p| %>
-  <% p.content_for :title, t('.section') %>
-  <% p.content_for :body do %>
+<%= render 'account/shared/page' do |page| %>
+  <% page.title t('.section') %>
+  <% page.body do %>
     <%= form_for [:account, @user] do |form| %>
       <%= render 'account/shared/forms/errors', form: form %>
     <% end if @user.errors.any? %>
 
     <div class="grid grid-cols-1 gap-y gap-x-8 lg:grid-cols-2">
       <div class="xl:col-span-1 space-y-8">
-        <%= render 'account/shared/box', divider: true do |p| %>
-          <% p.content_for :title, t('.profile.header') %>
-          <% p.content_for :description, t('.profile.description') %>
-          <% p.content_for :body do %>
-            <%= render "account/users/form", user: @user %>
-          <% end %>
+        <%= render 'account/shared/box', divider: true do |box| %>
+          <% box.t title: '.profile.header', description: '.profile.description' %>
+          <% box.body.render "account/users/form", user: @user %>
         <% end %>
 
         <% if two_factor_authentication_enabled? %>
@@ -25,9 +22,9 @@
       <div class="xl:col-span-1 space-y-8">
         <%= render 'account/users/oauth' %>
 
-        <%= render 'account/shared/box', divider: true do |p| %>
-          <% p.content_for :title, t('.password.header') %>
-          <% p.content_for :body do %>
+        <%= render 'account/shared/box', divider: true do |box| %>
+          <% box.title t('.password.header') %>
+          <% box.body do %>
             <% within_fields_namespace(:update_self) do %>
               <%= form_for [:account, @user], html: {id: dom_id(@user, :password), class: 'form'} do |form| %>
                 <% with_field_settings form: form do %>

data/app/views/devise/passwords/edit.html.erb

@@ -1,7 +1,7 @@
 <% @title = t('devise.headers.change_password') %>
-<%= render 'account/shared/workflow/box' do |p| %>
-  <% p.content_for :title, @title %>
-  <% p.content_for :body do %>
+<%= render 'account/shared/workflow/box' do |box| %>
+  <% box.title @title %>
+  <% box.body do %>
     <% within_fields_namespace(:update_self) do %>
       <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: 'form', method: :put }) do |f| %>
         <%= f.hidden_field :reset_password_token %>

data/app/views/devise/passwords/new.html.erb

@@ -1,6 +1,6 @@
-<%= render 'account/shared/workflow/box' do |p| %>
-  <% p.content_for :title, t('devise.titles.reset_password') %>
-  <% p.content_for :body do %>
+<%= render 'account/shared/workflow/box' do |box| %>
+  <% box.title t('devise.titles.reset_password') %>
+  <% box.body do %>
     <% within_fields_namespace(:sign_up) do %>
       <%= form_for resource, as: resource_name, url: password_path(resource_name), html: {method: :post, class: 'form'} do |f| %>
         <%= render 'account/shared/forms/errors', form: f %>

data/app/views/devise/registrations/_two_factor.html.erb

@@ -1,10 +1,9 @@
-<%= render 'account/shared/box', divider: @backup_codes do |p| %>
-  <% p.content_for :title, t("users.edit.two_factor.header") %>
-  <% p.content_for :description, t("users.edit.two_factor.description_#{@user.otp_required_for_login? ? 'enabled' : 'disabled'}") %>
+<%= render 'account/shared/box', divider: @backup_codes do |box| %>
+  <% box.title t("users.edit.two_factor.header") %>
+  <% box.description t("users.edit.two_factor.description_#{@user.otp_required_for_login? ? 'enabled' : 'disabled'}") %>
   <% if current_user.otp_secret %>
     <% if @backup_codes %>
-      <% p.content_for :body do %>
-
+      <% box.body do %>
         <%= render 'account/shared/alert' do %>
           <%= t('users.edit.two_factor.warning').html_safe %>
         <% end %>
@@ -38,7 +37,7 @@
       <% end %>
     <% end %>
   <% end %>
-  <% p.content_for :actions do %>
+  <% box.actions do %>
     <div class="<%= 'hidden' if @backup_codes %> space-y">
       <% if local_assigns.has_key? :verified %>
         <% if verified %>

data/app/views/devise/registrations/new.html.erb

@@ -1,6 +1,6 @@
-<%= render 'account/shared/workflow/box' do |p| %>
-  <% p.content_for :title, t('devise.headers.create_account') %>
-  <% p.content_for :body do %>
+<%= render 'account/shared/workflow/box' do |box| %>
+  <% box.title t('devise.headers.create_account') %>
+  <% box.body do %>
     <% within_fields_namespace(:sign_up) do %>
      <%= form_for resource, as: resource_name, url: registration_path(resource_name), html: {class: 'form'} do |f| %>
        <%= render 'account/shared/notices' %>

data/app/views/devise/sessions/new.html.erb

@@ -1,6 +1,6 @@
-<%= render 'account/shared/workflow/box' do |p| %>
-  <% p.content_for :title, t('devise.headers.sign_in') %>
-  <% p.content_for :body do %>
+<%= render 'account/shared/workflow/box' do |box| %>
+  <% box.title t('devise.headers.sign_in') %>
+  <% box.body do %>
     <% within_fields_namespace(:self) do %>
       <%# TODO: Turbo is set to `false` for now, but we may want to only bypass Turbo for JavaScript-based requests in the future. %>
       <%= form_for resource, as: resource_name, url: two_factor_authentication_enabled? ? users_pre_otp_path : session_path(resource_name), remote: two_factor_authentication_enabled?, html: {class: 'form'}, authenticity_token: true, data: {turbo: false} do |form| %>
@@ -44,11 +44,7 @@
           </div>
 
           <% if devise_mapping.rememberable? %>
-            <% # TODO This needs to be its own component. Can't have this kind of styling here. %>
-            <div class="flex items-center">
-              <%= form.check_box :remember_me, class: "h-4 w-4 text-blue focus:ring-blue-800 border-slate-300 rounded dark:bg-slate-800 dark:border-slate-900" %>
-              <%= form.label :remember_me, class: "ml-2 block" %>
-            </div>
+            <%= render 'shared/fields/option', method: :remember_me, form: form, single_check_box: true %>
           <% end %>
         <% end %>
       <% end %>

data/app/views/layouts/docs.html.erb

@@ -60,19 +60,19 @@
 
               <%= render 'account/shared/menu/section', title: 'Introduction' do %>
                 <%= render 'account/shared/menu/item', url: '/docs', label: 'Table of Contents' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-home-lg-alt ti ti-list"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/getting-started', label: 'Getting Started' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-terminal ti ti-flag"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/upgrades', label: 'Upgrades' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-sparkles ti ti-arrow-up"></i>
                   <% end %>
                 <% end %>
@@ -80,37 +80,37 @@
 
               <%= render 'account/shared/menu/section', title: 'General Topics' do %>
                 <%= render 'account/shared/menu/item', url: '/docs/modeling', label: 'Domain Modeling' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-bolt ti ti-ruler-pencil"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/indirection', label: 'Indirection' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-bolt ti ti-direction"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/overriding', label: 'Overriding' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-bolt ti ti-spray"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/tunneling', label: 'Tunneling' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-bolt ti ti-bolt"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/javascript', label: 'JavaScript' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                   <i class="fa-brands fa-js ti ti-pulse"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/i18n', label: 'Internationalzation' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                   <i class="fa-brands fa-js ti ti-world"></i>
                   <% end %>
                 <% end %>
@@ -118,37 +118,37 @@
 
               <%= render 'account/shared/menu/section', title: 'Developer Tools' do %>
                 <%= render 'account/shared/menu/item', url: '/docs/super-scaffolding', label: 'Super Scaffolding' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-magic ti ti-wand"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/action-models', label: 'Action Models' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-bars-progress ti ti-target"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/seeds', label: 'Database Seeds' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-seedling ti ti-server"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/testing', label: 'Test Suite' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-check ti ti-check"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: 'https://github.com/bullet-train-co/magic_test', label: 'Magic Test' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-check ti ti-video-camera"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/application-options', label: 'Application Options' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-gear ti ti-settings"></i>
                   <% end %>
                 <% end %>
@@ -156,31 +156,31 @@
 
               <%= render 'account/shared/menu/section', title: 'Accounts & Teams' do %>
                 <%= render 'account/shared/menu/item', url: '/docs/authentication', label: 'Authentication' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-fingerprint ti ti-id-badge"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/teams', label: 'Teams' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-users ti ti-user"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/permissions', label: 'Roles & Permissions' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-lock-alt ti ti-lock"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/onboarding', label: 'Onboarding' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-snowboarding ti ti-direction"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/namespacing', label: 'Namespacing' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-object-group ti ti-widgetized"></i>
                   <% end %>
                 <% end %>
@@ -188,19 +188,19 @@
 
               <%= render 'account/shared/menu/section', title: 'User Interface' do %>
                 <%= render 'account/shared/menu/item', url: '/docs/field-partials', label: 'Field Partials' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-i-cursor ti ti-text"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/themes', label: 'Themes' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-swatchbook ti ti-palette"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: 'https://github.com/bullet-train-co/nice_partials', label: 'Nice Partials' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-swatchbook ti ti-widget"></i>
                   <% end %>
                 <% end %>
@@ -208,7 +208,7 @@
 
               <%= render 'account/shared/menu/section', title: 'Billing' do %>
                 <%= render 'account/shared/menu/item', url: '/docs/billing/stripe', label: 'Stripe' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fab fa-stripe-s ti ti-money"></i>
                   <% end %>
                 <% end %>
@@ -216,31 +216,31 @@
 
               <%= render 'account/shared/menu/section', title: 'Integration' do %>
                 <%= render 'account/shared/menu/item', url: '/docs/api', label: 'REST API' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-brackets-curly ti ti-settings"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/zapier', label: 'Zapier' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-bolt ti ti-bolt"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/oauth', label: 'OAuth Providers' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-at ti ti-reload"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/webhooks/outgoing', label: 'Outgoing Webhooks' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-outlet ti ti-pulse"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/webhooks/incoming', label: 'Incoming Webhooks' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-plug ti ti-plug"></i>
                   <% end %>
                 <% end %>
@@ -248,7 +248,7 @@
 
               <%= render 'account/shared/menu/section', title: 'Internationalization' do %>
                 <%= render 'account/shared/menu/item', url: '/docs/i18n', label: 'Translations' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-language ti ti-world"></i>
                   <% end %>
                 <% end %>
@@ -256,7 +256,7 @@
 
               <%= render 'account/shared/menu/section', title: 'Add-Ons' do %>
                 <%= render 'account/shared/menu/item', url: '/docs/font-awesome-pro', label: 'Font Awesome Pro' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-flag ti ti-flag"></i>
                   <% end %>
                 <% end %>
@@ -264,13 +264,13 @@
 
               <%= render 'account/shared/menu/section', title: 'Deployment' do %>
                 <%= render 'account/shared/menu/item', url: '/docs/heroku', label: 'Heroku' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-cloud ti ti-cloud-up"></i>
                   <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/desktop', label: 'Desktop Applications' do |p| %>
-                  <% p.content_for :icon do %>
+                  <% p.icon do %>
                     <i class="fal fa-window-restore ti ti-desktop"></i>
                   <% end %>
                 <% end %>

data/docs/application-options.md

@@ -15,6 +15,7 @@ The helper methods below can also be directly invoked in your application if you
 | FONTAWESOME_NPM_AUTH_TOKEN | String | `"your_font_awesome_token"` | `font_awesome?` |
 | SILENCE_LOGS | Boolean | `"true"` | `silence_logs?` |
 | TESTING_PROVISION_KEY | String | `"asdf123"` | N/A |
+| OPENAI_ACCESS_TOKEN | String |`your_openai_token`| `openai_enabled?` |
 
 | Option | Description |
 | --- | --- |
@@ -27,3 +28,4 @@ The helper methods below can also be directly invoked in your application if you
 | FONTAWESOME_NPM_AUTH_TOKEN | Enables use of Font Awesome. |
 | SILENCE_LOGS | Silences Super Scaffolding logs. |
 | TESTING_PROVISION_KEY | Creates a test `Platform::Application` by accessing `/testing/provision?key=your_provision_key` |
+| OPENAI_ACCESS_TOKEN | Enables use [OpenAI](https://openai.com/) with the [ruby-openai](https://github.com/alexrudall/ruby-openai) gem. |

data/docs/field-partials.md

@@ -114,7 +114,7 @@ Certain form field partials like `buttons` and `super_select` can also have thei
 | `boolean`                                              | `boolean`    |                  | `assign_boolean`        |                                                                                   |                                                                                          |
 | [`buttons`](/docs/field-partials/buttons.md)           | `string`     | Optionally       | `assign_checkboxes`     |                                                                                   |                                                                                          |
 | `cloudinary_image`                                     | `string`     |                  |                         |                                                                                   |                                                                                          |
-| `color_picker`                                         |              |                  |                         | [pickr](https://simonwep.github.io/pickr/)                                        |                                                                                          |
+| `color_picker`                                         | `string`     |                  |                         | [pickr](https://simonwep.github.io/pickr/)                                        |                                                                                          |
 | `date_and_time_field`                                  | `datetime`   |                  | `assign_date_and_time`  | [Date Range Picker](https://www.daterangepicker.com)                              |                                                                                          |
 | `date_field`                                           | `date`       |                  | `assign_date`           | [Date Range Picker](https://www.daterangepicker.com)                              |                                                                                          |
 | `email_field`                                          | `string`     |                  |                         |                                                                                   |                                                                                          |

data/docs/super-scaffolding/sortable.md

@@ -12,7 +12,7 @@ The `--sortable` option:
 
 1. Wraps the table's body in a `sortable` Stimulus controller, providing drag-and-drop re-ordering;
 2. Adds a `reorder` action to your resource via `include SortableActions`, triggered automatically on re-order;
-3. Adds a migration to add the `sort_order` column to your model to store the ordering;
+3. Adds a `sort_order` attribute to your model to store the ordering;
 4. Adds a `default_scope` which orders by `sort_order` and auto increments `sort_order` on create via `include Sortable` on the model.
 
 ## Disabling Saving on Re-order
@@ -134,4 +134,4 @@ And on the `sortable` element, catch the `sortable:drop`, `sortable:drag` (for c
   data-confirm-reorder-target="sortable"
   ...
 >
-```
+```

data/lib/bullet_train/resolver.rb

@@ -72,7 +72,10 @@ module BulletTrain
         if open
           path = source_file[:package_name] ? source_file[:absolute_path] : (source_file[:project_path]).to_s
           puts "Opening `#{path}`.\n".green
-          exec "open #{path}"
+
+          # TODO: Use TerminalCommands to open this file
+          open_command = `which open`.present? ? "open" : "xdg-open"
+          exec "#{open_command} #{path}"
         end
       else
         puts "Couldn't resolve `#{@needle}`.".red
@@ -101,7 +104,8 @@ module BulletTrain
 
       if result[:absolute_path]
         if result[:absolute_path].include?("/bullet_train")
-          base_path = "bullet_train" + result[:absolute_path].partition("/bullet_train").last
+          regex = /#{"bullet_train-core" if result[:absolute_path].include?("bullet_train-core")}\/bullet_train[.\-_a-z|0-9]*.*/
+          base_path = result[:absolute_path].scan(regex).pop
 
           # Try to calculate which package the file is from, and what it's path is within that project.
           ["app", "config", "lib"].each do |directory|
@@ -146,14 +150,13 @@ module BulletTrain
           # all we need to do is change it to "shared/attributes/code"
           partial_parts.last.gsub!(/(_)|(\.html\.erb)/, "")
           @needle = partial_parts.join("/")
-        elsif @needle.match?(/bullet_train-/)
+        elsif @needle.match?(/bullet_train/)
           # If it's a full path, we need to make sure we're getting it from the right package.
-          _, partial_view_package, partial_path_without_package = @needle.partition(/bullet_train-[a-z|\-_0-9.]*/)
+          _, partial_view_package, partial_path_without_package = @needle.partition(/bullet_train-core\/bullet_train[a-z|\-_0-9.]*/)
 
-          # Pop off the version so we can call `bundle show` correctly.
-          # Also change `bullet_train-base` to `bullet_train`.
+          # Pop off `bullet_train-core` and the gem's version so we can call `bundle show` correctly.
+          partial_view_package.gsub!(/bullet_train-core\//, "")
           partial_view_package.gsub!(/[-|.0-9]*$/, "") if partial_view_package.match?(/[-|.0-9]*$/)
-          partial_view_package.gsub!("-base", "") if /base/.match?(@needle)
 
           local_package_path = `bundle show #{partial_view_package}`.chomp
           return local_package_path + partial_path_without_package

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.2.20"
+  VERSION = "1.2.22"
 end

data/lib/bullet_train.rb

@@ -33,6 +33,7 @@ require "commonmarker"
 require "extended_email_reply_parser"
 require "pagy"
 require "devise/pwned_password"
+require "openai"
 
 module BulletTrain
   mattr_accessor :routing_concerns, default: []
@@ -152,3 +153,11 @@ end
 def silence_logs?
   ENV["SILENCE_LOGS"].present?
 end
+
+def openai_enabled?
+  ENV["OPENAI_ACCESS_TOKEN"].present?
+end
+
+def openai_organization_exists?
+  ENV["OPENAI_ORGANIZATION_ID"]
+end

data/lib/tasks/bullet_train_tasks.rake

@@ -112,15 +112,23 @@ namespace :bullet_train do
             puts ""
             puts "bin/hack: " + "Clone bullet_train-core and link up gems (will only link up gems if already cloned).".blue
             puts "bin/hack --link: " + "Link all of your Bullet Train gems to `local/bullet_train-core`.".blue
+            puts "bin/hack --link github: " + "Link all of your Bullet Train gems to the public repositories on GitHub".blue
             puts "bin/hack --link (version-number): " + "Link all of your Bullet Train gems to the version number passed.".blue
             puts "bin/hack --reset: " + "Resets all of your gems to their original definition.".blue
             puts "bin/hack --watch-js: " + "Watches for any changes in JavaScript files gems that have an npm package.".blue
             puts "bin/hack --clean-js: " + "Resets all of your npm packages from `local/bullet_train-core` to their original definition.".blue
             exit
           when "--link", "--reset"
-            version = process[:values].pop
-            set_core_gems(process[:flag], version, framework_packages)
-            stream "bundle install"
+            link_flag_value = process[:values].pop
+            set_core_gems(process[:flag], link_flag_value, framework_packages)
+
+            # Bundler will throw an error if we try to `bundle install` right after adding the GitHub link to the Gemfile.
+            if link_flag_value == "github"
+              puts ""
+              puts "Now you can run `bundle install` to check out the public repositories on GitHub."
+            else
+              stream "bundle install"
+            end
           when "--watch-js", "--clean-js"
             package_name = process[:values].pop
             framework_package = framework_packages.select { |k, v| k.to_s == package_name }
@@ -218,9 +226,10 @@ namespace :bullet_train do
   end
 
   # Pass "--link" or "--reset" as a flag to set the gems.
-  def set_core_gems(flag, version, framework_packages)
+  def set_core_gems(flag, link_flag_value, framework_packages)
     packages = framework_packages.keys
     gemfile_lines = File.readlines("./Gemfile")
+    version_regexp = /[\d|.]/
 
     packages.each do |package|
       original_path = "gem \"#{package}\""
@@ -241,7 +250,14 @@ namespace :bullet_train do
               puts "We can't do anything with this. Sorry! We'll proceed, but you have to link this package yourself.".red
             elsif `cat Gemfile | grep "gem \\\"#{package}\\\""`.chomp.present?
               puts "#{package} is directly present in the `Gemfile`, so we'll update that line.".green
-              line = version.present? ? "#{line.chomp}, \"#{version}\"\n" : line.gsub(original_path, local_path)
+
+              line = if link_flag_value == "github"
+                "#{line.chomp}, git: 'http://github.com/bullet-train-co/bullet_train-core.git'\n"
+              elsif link_flag_value&.match?(version_regexp)
+                "#{line.chomp}, \"#{link_flag_value}\"\n"
+              else
+                line.gsub(original_path, local_path)
+              end
             end
           elsif flag == "--reset"
             if line.match?(/bullet_train/)
@@ -258,8 +274,10 @@ namespace :bullet_train do
       if flag == "--link"
         unless match_found
           puts "Could not find #{package}. Adding to the end of the Gemfile.".blue
-          new_lines << if version
-            "#{original_path.chomp}, \"#{version}\"\n"
+          new_lines << if link_flag_value == "github"
+            "#{original_path.chomp}, git: 'http://github.com/bullet-train-co/bullet_train-core.git'\n"
+          elsif link_flag_value&.match?(version_regexp)
+            "#{original_path.chomp}, \"#{link_flag_value}\"\n"
           else
             "#{local_path}\n"
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.2.20
+  version: 1.2.22
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-11 00:00:00.000000000 Z
+date: 2023-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -388,6 +388,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-openai
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: unicode-emoji
   requirement: !ruby/object:Gem::Requirement
@@ -722,7 +736,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Bullet Train