bullet_train-super_scaffolding 1.2.19 → 1.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a3c3093d8ec80230c40009a71e1e17fcec9763fbc29c550f6b9d58d02bcdabd
-  data.tar.gz: 7e3574b17f2856743920f385cf6c19a03f939b7684d7907221db7b5c811c737b
+  metadata.gz: 223f16f152b545b1554a030ef0f492740fa59825d34f62ffc4685aadb6b7882e
+  data.tar.gz: cda0b98a79b3d69c020e0ff61b7d4e40cb9029a382a760041cb2f3d6ec306d61
 SHA512:
-  metadata.gz: e861799518ca1c86b8e4e2c146acde7af79bd08bab5caa0b4ee44c65f7c17728e6a8b6088f359b1a0341987e9ec2026c7c59835993adfc7b0ad99e1bc700581f
-  data.tar.gz: 3493d0bd968ad720dc04cf6511cda909da9ef1dd94ba4e00d1f5c2a01f5df1c8bdc5788d8c00ec5be9d0d576b8dc5bb49d5bb7d8000e70f3c8df70b7f42901e2
+  metadata.gz: 5ccd6e1495cd0f281bec5c3474694d43effb3fbad17dd438e808733526e7dcebb0f9584f4d3c375aaebbf44871cca3c2ca11b0f41ed801a9e537f30edfa7d896
+  data.tar.gz: 3949161365fc870eb977eb9962482123c8d30da896def52807ef0936dc86fd4089385a6147c94fcec71242d1fd988f60eb286f82f6e5b71bf5c0cc9bccf51dea

data/app/views/account/scaffolding/absolutely_abstract/creative_concepts/_index.html.erb

@@ -7,15 +7,15 @@
 <% pagy, creative_concepts = pagy(creative_concepts, page_param: :creative_concepts_page) unless pagy %>
 
 <%= updates_for context, :scaffolding_absolutely_abstract_creative_concepts 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 %>
       <%= t(".contexts.#{context.class.name.underscore}.description").html_safe %>
       <%= render "shared/limits/index", model: creative_concepts.model %>
     <% end %>
 
     <% if creative_concepts.any? %>
-      <% p.content_for :table do %>
+      <% box.table do %>
         <table class="table">
           <thead>
             <tr>
@@ -35,7 +35,7 @@
       <% end %>
     <% end %>
 
-    <% p.content_for :actions do %>
+    <% box.actions do %>
       <% unless hide_actions %>
         <% if can? :create, Scaffolding::AbsolutelyAbstract::CreativeConcept.new(team: @team) %>
           <%= link_to t('.buttons.new'), [:new, :account, @team, :scaffolding_absolutely_abstract_creative_concept], class: "#{first_button_primary(:absolutely_abstract_creative_concept)} new" %>

data/app/views/account/scaffolding/absolutely_abstract/creative_concepts/_menu_item.html.erb

@@ -3,7 +3,7 @@
     url: main_app.polymorphic_path([:account, current_team, :scaffolding_absolutely_abstract_creative_concepts]),
     label: t('scaffolding/absolutely_abstract/creative_concepts.navigation.label'),
   } do |p| %>
-    <% p.content_for :icon do %>
+    <% p.icon do %>
       <i class="<%= t('scaffolding/absolutely_abstract/creative_concepts.navigation.icon') %>"></i>
     <% end %>
   <% end %>

data/app/views/account/scaffolding/absolutely_abstract/creative_concepts/collaborators/_index.html.erb

@@ -4,16 +4,11 @@
 <% hide_actions ||= false %>
 <% hide_back ||= false %>
 
-<%= render 'account/shared/box' do |p| %>
-  <% p.content_for :title do %>
-    <%= t(".contexts.#{context.class.name.underscore}.header") %>
-  <% end %>
-
-  <% p.content_for :description do %>
-    <%= t(".contexts.#{context.class.name.underscore}.description") %>
-  <% end %>
+<%= render 'account/shared/box' do |box| %>
+  <% box.title t(".contexts.#{context.class.name.underscore}.header") %>
+  <% box.description t(".contexts.#{context.class.name.underscore}.description") %>
 
-  <% p.content_for :table do %>
+  <% box.table do %>
     <% if collaborators.any? %>
       <table class="table">
         <thead>
@@ -53,7 +48,7 @@
     <% end %>
   <% end %>
 
-  <% p.content_for :actions do %>
+  <% box.actions do %>
     <% unless hide_actions %>
       <% if context == creative_concept %>
         <% if can? :create, Scaffolding::AbsolutelyAbstract::CreativeConcepts::Collaborator.new(creative_concept: creative_concept) %>

data/app/views/account/scaffolding/absolutely_abstract/creative_concepts/collaborators/_menu_item.html.erb

@@ -3,7 +3,7 @@
     url: main_app.polymorphic_path([:account, current_team, :scaffolding_absolutely_abstract_creative_concepts_collaborators]),
     label: t('scaffolding/absolutely_abstract/creative_concepts/collaborators.navigation.label'),
   } do |p| %>
-    <% p.content_for :icon do %>
+    <% p.icon do %>
       <i class="<%= t('scaffolding/absolutely_abstract/creative_concepts/collaborators.navigation.icon') %>"></i>
     <% end %>
   <% end %>

data/app/views/account/scaffolding/absolutely_abstract/creative_concepts/collaborators/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', collaborator: @collaborator %>
-      <% 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', collaborator: @collaborator %>
   <% end %>
 <% end %>

data/app/views/account/scaffolding/absolutely_abstract/creative_concepts/collaborators/index.html.erb

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

data/app/views/account/scaffolding/absolutely_abstract/creative_concepts/collaborators/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', collaborator: @collaborator %>
-      <% 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', collaborator: @collaborator %>
   <% end %>
 <% end %>

data/app/views/account/scaffolding/absolutely_abstract/creative_concepts/collaborators/show.html.erb

@@ -1,11 +1,10 @@
-<%= 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') %>
+<%= 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' %>
 
-      <% p.content_for :body do %>
+      <% box.body do %>
         <%= render 'shared/attributes/belongs_to', object: @collaborator, attribute: :membership %>
         <%= render 'shared/attributes/attribute', object: @collaborator, attribute: :roles do %>
           <% if @collaborator.roles.present? %>
@@ -17,12 +16,11 @@
         <%# 🚅 super scaffolding will insert new fields above this line. %>
       <% end %>
 
-      <% p.content_for :actions do %>
+      <% box.actions do %>
         <%= link_to t('.buttons.edit'), [:edit, :account, @collaborator], class: first_button_primary if can? :edit, @collaborator %>
         <%= button_to t('.buttons.destroy'), [:account, @collaborator], method: :delete, class: first_button_primary, data: { confirm: t('.buttons.confirmations.destroy', model_locales(@collaborator)) } if can? :destroy, @collaborator %>
         <%= link_to t('global.buttons.back'), [:account, @creative_concept, :collaborators], class: first_button_primary %>
       <% end %>
-
     <% end %>
 
     <%# 🚅 super scaffolding will insert new children above this line. %>

data/app/views/account/scaffolding/absolutely_abstract/creative_concepts/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', creative_concept: @creative_concept %>
-      <% 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', creative_concept: @creative_concept %>
   <% end %>
 <% end %>

data/app/views/account/scaffolding/absolutely_abstract/creative_concepts/index.html.erb

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

data/app/views/account/scaffolding/absolutely_abstract/creative_concepts/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', creative_concept: @creative_concept %>
-      <% 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', creative_concept: @creative_concept %>
   <% end %>
 <% end %>

data/app/views/account/scaffolding/absolutely_abstract/creative_concepts/show.html.erb

@@ -1,11 +1,10 @@
-<%= 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 %>
     <%= updates_for @creative_concept 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 'account/shared/box', divider: true do |box| %>
+        <% box.t :description, title: '.header' %>
+        <% box.body do %>
           <% with_attribute_settings object: @creative_concept, strategy: :label do %>
             <%= render 'shared/attributes/text', attribute: :name %>
             <%= render 'shared/attributes/text', attribute: :description %>
@@ -14,20 +13,16 @@
             <div class="grid grid-cols-1 gap-y gap-x sm:grid-cols-3">
               <div class="sm:col-span-1">
                 <%= render 'shared/attributes/base' do |p| %>
-                  <% p.content_for :heading, t(".fields.admins.heading") %>
-                  <% p.content_for :body do %>
-                    <%= render 'account/shared/memberships/photos', memberships: (@team.admins.reject(&:platform_agent?) + @creative_concept.admins.reject(&:platform_agent?)).uniq %>
-                  <% end %>
+                  <% p.heading t(".fields.admins.heading") %>
+                  <% p.body.render 'account/shared/memberships/photos', memberships: (@team.admins.reject(&:platform_agent?) + @creative_concept.admins.reject(&:platform_agent?)).uniq %>
                 <% end %>
               </div>
 
               <% if @creative_concept.editors.any? %>
                 <div class="sm:col-span-1">
                   <%= render 'shared/attributes/base' do |p| %>
-                    <% p.content_for :heading, t(".fields.editors.heading") %>
-                    <% p.content_for :body do %>
-                      <%= render 'account/shared/memberships/photos', memberships: @creative_concept.editors.reject(&:platform_agent?) %>
-                    <% end %>
+                    <% p.heading t(".fields.editors.heading") %>
+                    <% p.body.render 'account/shared/memberships/photos', memberships: @creative_concept.editors.reject(&:platform_agent?) %>
                   <% end %>
                 </div>
               <% end %>
@@ -35,10 +30,8 @@
               <% if @creative_concept.viewers.any? %>
                 <div class="sm:col-span-1">
                   <%= render 'shared/attributes/base' do |p| %>
-                    <% p.content_for :heading, t(".fields.viewers.heading") %>
-                    <% p.content_for :body do %>
-                      <%= render 'account/shared/memberships/photos', memberships: @creative_concept.viewers.reject(&:platform_agent?) %>
-                    <% end %>
+                    <% p.heading t(".fields.viewers.heading") %>
+                    <% p.body.render 'account/shared/memberships/photos', memberships: @creative_concept.viewers.reject(&:platform_agent?) %>
                   <% end %>
                 </div>
               <% end %>
@@ -46,7 +39,7 @@
           <% end %>
         <% end %>
 
-        <% p.content_for :actions do %>
+        <% box.actions do %>
           <%= link_to t('.buttons.edit'), [:edit, :account, @creative_concept], class: first_button_primary if can? :edit, @creative_concept %>
           <%= button_to t('.buttons.destroy'), [:account, @creative_concept], method: :delete, class: first_button_primary, data: { confirm: t('.buttons.confirmations.destroy', model_locales(@creative_concept)) } if can? :destroy, @creative_concept %>
           <%= link_to t('global.buttons.back'), [:account, @team, :scaffolding_absolutely_abstract_creative_concepts], class: first_button_primary %>

data/app/views/account/scaffolding/completely_concrete/tangible_things/_index.html.erb

@@ -10,14 +10,14 @@
 
 <%= action_model_select_controller do %>
   <% updates_for context, collection do %>
-    <%= render 'account/shared/box', pagy: pagy do |p| %>
-      <% p.content_for :title, t(".contexts.#{context.class.name.underscore}.header") %>
-      <% p.content_for :description do %>
+    <%= render 'account/shared/box', pagy: pagy do |box| %>
+      <% box.title t(".contexts.#{context.class.name.underscore}.header") %>
+      <% box.description do %>
         <%= t(".contexts.#{context.class.name.underscore}.description#{"_empty" unless tangible_things.any?}") %>
         <%= render "shared/limits/index", model: tangible_things.model %>
       <% end %>
 
-      <% p.content_for :table do %>
+      <% box.table do %>
         <% if tangible_things.any? %>
           <table class="table">
             <thead>
@@ -43,7 +43,7 @@
         <% end %>
       <% end %>
 
-      <% p.content_for :actions do %>
+      <% box.actions do %>
         <% unless hide_actions %>
           <% if context == absolutely_abstract_creative_concept %>
             <% if can? :create, Scaffolding::CompletelyConcrete::TangibleThing.new(absolutely_abstract_creative_concept: absolutely_abstract_creative_concept) %>
@@ -61,7 +61,7 @@
         <% end %>
       <% end %>
 
-      <% p.content_for :raw_footer do %>
+      <% box.raw_footer do %>
         <%# 🚅 super scaffolding will insert new action model index views above this line. %>
       <% end %>
     <% end %>

data/app/views/account/scaffolding/completely_concrete/tangible_things/_menu_item.html.erb

@@ -3,7 +3,7 @@
     url: main_app.polymorphic_path([:account, current_team, :scaffolding_completely_concrete_tangible_things]),
     label: t('scaffolding/completely_concrete/tangible_things.navigation.label'),
   } do |p| %>
-    <% p.content_for :icon do %>
+    <% p.icon do %>
       <i class="<%= t('scaffolding/completely_concrete/tangible_things.navigation.icon') %>"></i>
     <% end %>
   <% end %>

data/app/views/account/scaffolding/completely_concrete/tangible_things/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', tangible_thing: @tangible_thing %>
-      <% 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', tangible_thing: @tangible_thing %>
   <% end %>
 <% end %>

data/app/views/account/scaffolding/completely_concrete/tangible_things/index.html.erb

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

data/app/views/account/scaffolding/completely_concrete/tangible_things/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', tangible_thing: @tangible_thing %>
-      <% 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', tangible_thing: @tangible_thing %>
   <% end %>
 <% end %>

data/app/views/account/scaffolding/completely_concrete/tangible_things/show.html.erb

@@ -1,15 +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 %>
     <%= updates_for @tangible_thing do %>
-      <%= render 'account/shared/box', divider: true do |p| %>
-        <% p.content_for :title, t('.header') %>
-        <% p.content_for :description do %>
+      <%= render 'account/shared/box', divider: true do |box| %>
+        <% box.title t('.header') %>
+        <% box.description do %>
           <%= t('.description') %>
           <%= t('.manage_description') if can? :manage, @tangible_thing %>
         <% end %>
 
-        <% p.content_for :body do %>
+        <% box.body do %>
           <% with_attribute_settings object: @tangible_thing, strategy: :label do %>
             <%# 🚅 skip this section when scaffolding. %>
             <%= render 'shared/attributes/text', attribute: :text_field_value %>
@@ -34,14 +34,14 @@
           <% end %>
         <% end %>
 
-        <% p.content_for :actions do %>
+        <% box.actions do %>
           <%= link_to t('.buttons.edit'), [:edit, :account, @tangible_thing], class: first_button_primary if can? :edit, @tangible_thing %>
           <%# 🚅 super scaffolding will insert new action model buttons above this line. %>
           <%= button_to t('.buttons.destroy'), [:account, @tangible_thing], method: :delete, class: first_button_primary, data: { confirm: t('.buttons.confirmations.destroy', model_locales(@tangible_thing)) } if can? :destroy, @tangible_thing %>
           <%= link_to t('global.buttons.back'), [:account, @absolutely_abstract_creative_concept, :completely_concrete_tangible_things], class: first_button_primary %>
         <% end %>
 
-        <% p.content_for :raw_footer do %>
+        <% box.raw_footer do %>
           <%# 🚅 super scaffolding will insert new action model index views above this line. %>
         <% end %>
       <% end %>

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.2.19"
+    VERSION = "1.2.21"
   end
 end

data/lib/scaffolding/file_manipulator.rb

@@ -23,7 +23,7 @@ module Scaffolding::FileManipulator
       return false
     end
 
-    if target_file_content.include?(content)
+    if options[:content_replacement_transformed] && target_file_content.include?(content)
       puts "No need to update '#{file}'. It already has '#{content}'."
     else
       puts "Updating '#{file}'." unless silence_logs?

data/lib/scaffolding/transformer.rb

@@ -192,7 +192,7 @@ class Scaffolding::Transformer
     # If the file exists in the application repository, we want to target it there.
     return file if File.exist?(file)
 
-    ENV["OTHER_TARGETS"].split(",").each do |possible_target|
+    ENV["OTHER_TARGETS"]&.split(",")&.each do |possible_target|
       candidate_path = "#{possible_target}/#{file}".gsub("//", "/")
       return candidate_path if File.exist?(candidate_path)
     end
@@ -421,11 +421,13 @@ class Scaffolding::Transformer
     add_line_to_file(file, content, hook, options)
   end
 
-  def scaffold_replace_line_in_file(file, content, in_place_of)
+  def scaffold_replace_line_in_file(file, content, content_to_replace)
     file = resolve_target_path(transform_string(file))
     # we specifically don't transform the content, we assume a builder function created this content.
-    in_place_of = transform_string(in_place_of)
-    Scaffolding::FileManipulator.replace_line_in_file(file, content, in_place_of, suppress_could_not_find: suppress_could_not_find)
+    transformed_content_to_replace = transform_string(content_to_replace)
+    content_replacement_transformed = content_to_replace != transformed_content_to_replace
+    options = {suppress_could_not_find: suppress_could_not_find, content_replacement_transformed: content_replacement_transformed}
+    Scaffolding::FileManipulator.replace_line_in_file(file, content, transformed_content_to_replace, **options)
   end
 
   # if class_name isn't specified, we use `child`.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-super_scaffolding
 version: !ruby/object:Gem::Version
-  version: 1.2.19
+  version: 1.2.21
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard