bullet_train-super_scaffolding 1.6.34 → 1.6.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 348e2d1c3d553ea106a60c2e600a3f886f2a851f12b1e7c628325e290af9ac6f
-  data.tar.gz: fdae29e7f29e70a45dca618d0caeb6c6d2b3d90aecd4130918fe758f349e47cc
+  metadata.gz: 78fc168b87086abdff9a77f6fca18414f48ecfa480b96675e5d57d5b15461834
+  data.tar.gz: 3a219e7452a7d1cee87498fff9626636758efbd9c6276b38fc8071689271299c
 SHA512:
-  metadata.gz: 50231140243f71280e6dfc7ce8388d1e892d83c79a791b3b6b0a20d31d55fd33bb768c0613eefb02e5c82af623b1e79d0a6f0d7ca4fbb6bf7b65555c66aba2c3
-  data.tar.gz: f2f991e16c416add60d8c0571ec45dce46aa28303f176b1e5fd9dde1fd8950cc63010c65bbcc313a84d236ab202bf517a175e216b06b84c2547d6bed66aff8e6
+  metadata.gz: 86f8893e04227ba822300e981e1a606ccb8242d22c6e3c628fa226b044f50c060dc1a4401b9ae1150bfc9be67718d349d3a8ab23e6c0b12a4d682a8babcd9c00
+  data.tar.gz: 89ea52f90b89ffde18b3458ccbb20df62848be892c823feb8fe69508b09a46dd451b376e9ec6e298f98dfe6bcfa0d78ff365e292000e470ae1750cd74b684097

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

@@ -40,7 +40,7 @@
 
         <%# 🚅 super scaffolding will insert new targets one parent action model buttons above this line. %>
         <%# 🚅 super scaffolding will insert new bulk action model buttons above this line. %>
-        <%= render "shared/bulk_action_select" if creative_concepts.many? %>
+        <%= render "shared/bulk_action_select" if creative_concepts.any? %>
 
         <%= link_to t('global.buttons.back'), [:account, context], class: "#{first_button_primary(:absolutely_abstract_creative_concept)} back" unless hide_back %>
       <% end %>

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

@@ -51,7 +51,7 @@
 
           <%# 🚅 super scaffolding will insert new targets one parent action model buttons above this line. %>
           <%# 🚅 super scaffolding will insert new bulk action model buttons above this line. %>
-          <%= render "shared/bulk_action_select" if tangible_things.many? %>
+          <%= render "shared/bulk_action_select" if tangible_things.any? %>
 
           <% unless hide_back %>
             <%= link_to t('global.buttons.back'), [:account, context], class: "#{first_button_primary(:completely_concrete_tangible_thing)} back" %>

data/lib/bullet_train/super_scaffolding/scaffolders/oauth_provider_scaffolder.rb

@@ -45,16 +45,41 @@ module BulletTrain
           unless File.exist?(oauth_transform_string("./app/models/oauth/stripe_account.rb", options)) &&
               File.exist?(oauth_transform_string("./app/models/integrations/stripe_installation.rb", options)) &&
               File.exist?(oauth_transform_string("./app/models/webhooks/incoming/oauth/stripe_account_webhook.rb", options))
-            puts ""
-            puts oauth_transform_string("🚨 Before doing the actual Super Scaffolding, you'll need to generate the models like so:", options).red
-            puts ""
-            puts oauth_transform_string("  rails g model Oauth::StripeAccount uid:string data:jsonb user:references", options).red
-            puts oauth_transform_string("  rails g model Integrations::StripeInstallation team:references oauth_stripe_account:references name:string", options).red
-            puts oauth_transform_string("  rails g model Webhooks::Incoming::Oauth::StripeAccountWebhook data:jsonb processed_at:datetime verified_at:datetime oauth_stripe_account:references", options).red
-            puts ""
-            puts "However, don't do the `rake db:migrate` until after you re-run Super Scaffolding, as it will need to update some settings in those migrations.".red
-            puts ""
-            return
+
+            oauth_model_data = {
+              "Oauth::StripeAccount": "rails generate model Oauth::StripeAccount uid:string data:jsonb user:references",
+              "Integrations::StripeInstallation": "rails generate model Integrations::StripeInstallation team:references oauth_stripe_account:references name:string",
+              "Webhooks::Incoming::Oauth::StripeAccountWebhook": "rails generate model Webhooks::Incoming::Oauth::StripeAccountWebhook data:jsonb processed_at:datetime verified_at:datetime oauth_stripe_account:references"
+            }
+
+            # Transform class names and model migrations.
+            transformed_data = {}
+            oauth_model_data.each do |key, value|
+              transformed_data[oauth_transform_string(key.to_s, options)] = oauth_transform_string(value, options)
+            end
+
+            if @options["skip-migration-generation"]
+              undefined_models = transformed_data.keys.each { |key| key.safe_constantize.nil? }
+              if undefined_models.any?
+                puts ""
+                puts "We could not find the following models:".red
+                undefined_models.each { |model| puts "  #{model}".red }
+                puts ""
+                puts "🚨 Before doing the actual Super Scaffolding, you'll need to generate the models like so:".red
+                puts ""
+                transformed_data.each { |_, migration| puts "  #{migration}".red }
+                puts ""
+                puts "However, don't do the `rake db:migrate` until after you re-run Super Scaffolding, as it will need to update some settings in those migrations.".red
+                puts ""
+                return
+              end
+            else
+              transformed_data.each do |klass, generation_command|
+                puts "Generating #{klass} model with '#{generation_command}'".green
+                generation_thread = Thread.new { `#{generation_command}` }
+                generation_thread.join # Wait for the process to finish.
+              end
+            end
           end
 
           icon_name = nil

data/lib/bullet_train/super_scaffolding/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module SuperScaffolding
-    VERSION = "1.6.34"
+    VERSION = "1.6.36"
   end
 end

data/lib/scaffolding/class_names_transformer.rb

@@ -37,6 +37,19 @@ class Scaffolding::ClassNamesTransformer
     parts.last
   end
 
+  # "In context" here means all of the parts in a namespace
+  # without reference to the parts that overlap.
+  #
+  # For example:
+  # Returns everything because there is no overlap.
+  #   Parent: Team
+  #   Child: Projects::Site
+  #   Return value: [["Projects", "Site"], ["Team"]]
+  #
+  # Returns the namespaces/classes without the parts that overlap.
+  #   Parent: Projects::Site
+  #   Child:  Projects::Sites::Url
+  #   Return value: [["Url"], ["Site"]]
   def all_parts_in_context
     working_parts = parts
     working_parent_parts = parent_parts

data/lib/scaffolding/routes_file_manipulator.rb

@@ -316,6 +316,9 @@ class Scaffolding::RoutesFileManipulator
 
     within = find_or_create_namespaces(base_namespaces)
 
+    # Add any concerns passed as options.
+    add_concern(:sortable) if transformer_options["sortable"]
+
     # e.g. Project and Projects::Deliverable
     if parent_namespaces.empty? && child_namespaces.any? && parent_resource == child_namespaces.first
 
@@ -352,9 +355,13 @@ class Scaffolding::RoutesFileManipulator
         child_namespaces_without_parent = child_namespaces.dup
         child_namespaces_without_parent.shift
         deeply_nested_within = find_or_create_namespaces(child_namespaces_without_parent, scope_within)
-        find_or_create_resource([child_resource], options: "shallow: false", within: deeply_nested_within)
+        routing_options = "shallow: false"
+        routing_options += ", #{formatted_concerns}" if formatted_concerns
+        find_or_create_resource([child_resource], options: routing_options, within: deeply_nested_within)
       else
-        find_or_create_resource([child_resource], options: "only: collection_actions", within: scope_within)
+        routing_options = "only: collection_actions"
+        routing_options += ", #{formatted_concerns}" if formatted_concerns
+        find_or_create_resource([child_resource], options: routing_options, within: scope_within)
 
         # namespace :projects do
         #   resources :deliverables, except: collection_actions
@@ -364,7 +371,9 @@ class Scaffolding::RoutesFileManipulator
         # because namespaces with the same name as the resource can exist on the same level.
         parent_block_start = Scaffolding::BlockManipulator.find_block_parent(parent_within, lines)
         namespace_line_within = find_or_create_namespaces(child_namespaces, parent_block_start)
-        find_or_create_resource([child_resource], options: "except: collection_actions", within: namespace_line_within)
+        routing_options = "except: collection_actions"
+        routing_options += ", #{formatted_concerns}" if formatted_concerns
+        find_or_create_resource([child_resource], options: routing_options, within: namespace_line_within)
         unless find_namespaces(child_namespaces, within)[child_namespaces.last]
           raise "tried to insert `namespace :#{child_namespaces.last}` but it seems we failed"
         end
@@ -377,7 +386,7 @@ class Scaffolding::RoutesFileManipulator
       #   resources :deliverables
       # end
       top_parent_namespace = find_namespaces(parent_namespaces, within)[parent_namespaces.first]
-      find_or_create_resource(child_namespaces + [child_resource], within: top_parent_namespace)
+      find_or_create_resource(child_namespaces + [child_resource], options: formatted_concerns, within: top_parent_namespace)
 
       # resources :projects_deliverables, path: 'projects/deliverables' do
       #   resources :objectives
@@ -394,7 +403,6 @@ class Scaffolding::RoutesFileManipulator
         within = find_or_convert_resource_block(parent_resource, options: "except: collection_actions", within: within)
       end
 
-      add_concern(:sortable) if transformer_options["sortable"]
       find_or_create_resource(child_namespaces + [child_resource], options: formatted_concerns, within: within)
 
     end

data/lib/scaffolding/script.rb

@@ -174,7 +174,8 @@ def check_required_options_for_attributes(scaffolding_type, attributes, child, p
   # Generate the models/migrations with the attributes passed.
   if attributes_to_generate.any?
     case scaffolding_type
-    # "join-model" is not here because the `rails g` command is written inline in its own scaffolder.
+    # "join-model" and "oauth-provider" are not here because the
+    # `rails g` command is written inline in their own respective scaffolders.
     when "crud"
       puts "Generating #{child} model with '#{generation_command}'".green
     when "crud-field"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-super_scaffolding
 version: !ruby/object:Gem::Version
-  version: 1.6.34
+  version: 1.6.36
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-27 00:00:00.000000000 Z
+date: 2024-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard