bullet_train-super_scaffolding 1.3.21 → 1.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69049eecf69e00aaebd2891815d7b886490558fd2d8bc9b8eeb1aa93c040fc00
-  data.tar.gz: 533dd02a66be62440945a35370519e6b1ab5fd628a76334049c30a456d702f2d
+  metadata.gz: bbcde213b30f69abe18110f85a59c1e5b19d7f4bdfcb31cf587fbe28918c382e
+  data.tar.gz: c64d0d9b5e650e198fc25694ad24e53d914e3e3fee3954d87bcbe3e384989def
 SHA512:
-  metadata.gz: a010c23a22da1aca8c235e391ec202f472de91ed0318d6351960b9c3938a88b806236dc98d0f85b00abe69339cca1a392a3b6f1f62b3ce90b7bf852beaf4d4b7
-  data.tar.gz: 3197605e945e7bf4b28b36110aa06ba4ce51a6e7b2abd16f2f5c05aa62cbf958e963f99401844fab014a13552c06fad97d6e3dbd222b44fcc45daad1f2038208
+  metadata.gz: 981b5c308a58f8ad114892237c98d9ef1c4e93e59126ddc55eba47b4cc14aaef974f41a46f3932d64736a09dd3c36d499b31160a9c5c023901a79f13e4aafe72
+  data.tar.gz: e66e54444da188afcfbc8756d16bfb17e9f0178056cd57adf85dabeb5699b22489f9a9ef6f9a02c60086e17bcdd29889fc0d9c2f4ab91beeaac0e6d716bb5e0d

data/app/controllers/account/scaffolding/completely_concrete/tangible_things_controller.rb

@@ -15,10 +15,16 @@ class Account::Scaffolding::CompletelyConcrete::TangibleThingsController < Accou
 
   # GET /account/scaffolding/absolutely_abstract/creative_concepts/:absolutely_abstract_creative_concept_id/completely_concrete/tangible_things/new
   def new
+    # 🚅 skip this section when scaffolding.
+    @tangible_thing.address_value = Address.new
+    # 🚅 stop any skipping we're doing now.
   end
 
   # GET /account/scaffolding/completely_concrete/tangible_things/:id/edit
   def edit
+    # 🚅 skip this section when scaffolding.
+    @tangible_thing.address_value ||= Address.new
+    # 🚅 stop any skipping we're doing now.
   end
 
   # POST /account/scaffolding/absolutely_abstract/creative_concepts/:absolutely_abstract_creative_concept_id/completely_concrete/tangible_things

data/app/controllers/api/v1/scaffolding/completely_concrete/tangible_things_controller.rb

@@ -67,6 +67,16 @@ if defined?(Api::V1::ApplicationController)
           # 🚅 skip this section when scaffolding.
           multiple_button_values: [],
           multiple_option_values: [],
+          address_value_attributes: [
+            :id,
+            :address_one,
+            :address_two,
+            :city,
+            :region_id,
+            :region_name,
+            :country_id,
+            :postal_code
+          ],
           multiple_super_select_values: []
           # 🚅 stop any skipping we're doing now.
           # 🚅 super scaffolding will insert new arrays above this line.

data/app/models/scaffolding/completely_concrete/tangible_thing.rb

@@ -13,7 +13,10 @@ class Scaffolding::CompletelyConcrete::TangibleThing < ApplicationRecord
   # 🚅 add oauth providers above.
 
   has_one_attached :file_field_value
+
   has_one :team, through: :absolutely_abstract_creative_concept
+  has_one :address_value, class_name: "Address", as: :addressable
+  accepts_nested_attributes_for :address_value
   # 🚅 add has_one associations above.
 
   # 🚅 add scopes above.

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

@@ -49,6 +49,8 @@
           <%= render 'shared/fields/super_select', method: :multiple_super_select_values, other_options: {search: true}, html_options: {multiple: true}  %>
         </div>
       </div>
+      
+      <%= render 'shared/fields/address_field', method: :address_value %>
 
       <%= render 'shared/fields/text_area', method: :text_area_value %>
       <%= render 'shared/fields/trix_editor', method: :action_text_value %>

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

@@ -23,6 +23,7 @@
             <%= render 'shared/attributes/email', attribute: :email_field_value %>
             <%= render 'shared/attributes/text', attribute: :password_field_value %>
             <%= render 'shared/attributes/phone_number', attribute: :phone_field_value %>
+            <%= render 'shared/attributes/address', attribute: :address_value %>
             <%= render 'shared/attributes/option', attribute: :option_value %>
             <%= render 'shared/attributes/options', attribute: :multiple_option_values %>
             <%= render 'shared/attributes/option', attribute: :super_select_value %>

data/config/locales/en/scaffolding/completely_concrete/tangible_things.en.yml

@@ -95,6 +95,10 @@ en:
         _: &phone_field_value Phone Field Value
         label: *phone_field_value
         heading: *phone_field_value
+      address_value:
+        _: &address_value Address Value
+        label: *address_value
+        heading: *address_value
       option_value:
         _: &option_value Option Value
         label: *option_value
@@ -215,6 +219,7 @@ en:
         file_field_value: *file_field_value
         password_field_value: *password_field_value
         phone_field_value: *phone_field_value
+        address_value: *address_value
         option_value: *option_value
         multiple_option_values: *multiple_option_values
         super_select_value: *super_select_value

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.3.21"
+    VERSION = "1.3.23"
   end
 end

data/lib/scaffolding/attribute.rb

@@ -111,8 +111,8 @@ class Scaffolding::Attribute
     if is_ids?
       # user_ids should be 'Users'
       name_without_ids.humanize.titlecase
-    elsif is_id?
-      name_without_id.humanize.titlecase
+    elsif is_id? && is_vanilla?
+      "#{name.humanize.titlecase} ID"
     else
       name.humanize.titlecase
     end

data/lib/scaffolding/transformer.rb

@@ -820,7 +820,7 @@ class Scaffolding::Transformer
 
         # this gets stripped and is one line, so indentation isn't a problem.
         field_content = <<-ERB
-          <%= render 'shared/attributes/#{attribute.partial_name}', attribute: :#{attribute.name_without_id_suffix} %>
+          <%= render 'shared/attributes/#{attribute.partial_name}', attribute: :#{attribute.is_vanilla? ? attribute.name : attribute.name_without_id_suffix} %>
         ERB
 
         if attribute.type == "password_field"
@@ -839,7 +839,7 @@ class Scaffolding::Transformer
       unless cli_options["skip-table"]
 
         # table header.
-        field_content = "<th#{cell_attributes.present? ? " " + cell_attributes : ""}><%= t('.fields.#{attribute.name_without_id_suffix}.heading') %></th>"
+        field_content = "<th#{cell_attributes.present? ? " " + cell_attributes : ""}><%= t('.fields.#{attribute.is_vanilla? ? attribute.name : attribute.name_without_id_suffix}.heading') %></th>"
 
         unless ["Team", "User"].include?(child)
           scaffold_add_line_to_file("./app/views/account/scaffolding/completely_concrete/tangible_things/_index.html.erb", field_content, "<%# 🚅 super scaffolding will insert new field headers above this line. %>", prepend: true)
@@ -867,7 +867,7 @@ class Scaffolding::Transformer
 
         # this gets stripped and is one line, so indentation isn't a problem.
         field_content = <<-ERB
-          <td#{cell_attributes}><%= render 'shared/attributes/#{attribute.partial_name}', attribute: :#{attribute.name_without_id_suffix}#{", #{table_cell_options.join(", ")}" if table_cell_options.any?} %></td>
+          <td#{cell_attributes}><%= render 'shared/attributes/#{attribute.partial_name}', attribute: :#{attribute.is_vanilla? ? attribute.name : attribute.name_without_id_suffix}#{", #{table_cell_options.join(", ")}" if table_cell_options.any?} %></td>
         ERB
 
         if attribute.type == "password_field"

metadata

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