supercharts-bullet_train 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e2df38424956da302e03bd4ce4ccf361f3926e27495f38bbbdbe33da0716690
-  data.tar.gz: 6282792b2772504a4ca23ad76768226b09105738ea4b2a8ec1b61b190d8f3c27
+  metadata.gz: 45c0bd86dbe047792cab708063e2c7e6184ea4c17631c505c4eff8b3631bd80c
+  data.tar.gz: d4613278a0aca3aa0930984e91b1081342dbd9aaa7967214114e824dabbd2e38
 SHA512:
-  metadata.gz: 797a24c3ff61e9012f8e50d14670c0da3623e422b5ad3c2d3d4d83513e3c65251437b82dfd91ad66863f5c2c4cb5ccf5a73600877f5e162d5f775a17e47ba822
-  data.tar.gz: fd87d162795f35228f843e1523cdb008189ccfb7e65e6a521f5ec575cb00fca335317ea9ef1a6b2b851cc72d04cff9b79feb9e7248ef2dd2055c3fbe8b256bba
+  metadata.gz: 1076e3c5d9eb36bb6c15e270a765a64391f9744ca1740e3629b94461e5a8809eee6c8c04a1d75c91a53c306b311664b535af4c79c0f2d5161f154856494164ee
+  data.tar.gz: 6b334f93446421ca5be46ae2dae2c574534d2433968df7fcd796fbfe4e87ec88488fc0c1d11ce3f30c825e993afe9c536adb889c3b1d1a86e306a13c807c6d1b

data/app/controllers/account/scaffolding/completely_concrete/{charts/tangible_things_controller.rb → tangible_things/tangible_things_chart_controller.rb}

@@ -1,10 +1,12 @@
 require 'csv'
 
-class Account::Scaffolding::CompletelyConcrete::Charts::TangibleThingsController < Account::ApplicationController
-  account_load_and_authorize_resource :tangible_thing, through: :absolutely_abstract_creative_concept, through_association: :completely_concrete_tangible_things
+class Account::Scaffolding::CompletelyConcrete::TangibleThings::TangibleThingsChartController < Account::ApplicationController
+  account_load_and_authorize_resource :tangible_thing, through: :absolutely_abstract_creative_concept, through_association: :completely_concrete_tangible_things, collection_actions: [:show]
 
-  # GET /account/scaffolding/absolutely_abstract/creative_concepts/:absolutely_abstract_creative_concept_id/completely_concrete/charts/tangible_things
-  def index
+  # GET /account/scaffolding/absolutely_abstract/creative_concepts/:absolutely_abstract_creative_concept_id/completely_concrete/tangible_things/chart
+  def show
+    @tangible_things = @absolutely_abstract_creative_concept.completely_concrete_tangible_things
+    
     @timespan = params[:timespan]
     case @timespan
     when "ytd"

data/app/views/account/scaffolding/completely_concrete/{charts/tangible_things/index.html.erb → tangible_things/tangible_things_chart/show.html.erb}

@@ -23,8 +23,8 @@
           >
             <div class="flex items-center justify-center">
               <div class="inline-flex space-x-1" role="group">
-                <%= render "shared/supercharts/filter_button", path: polymorphic_path([:account, @absolutely_abstract_creative_concept, :charts, :tangible_things], timespan: "1m"), label: "1m", first: true %>
-                <%= render "shared/supercharts/filter_button", path: polymorphic_path([:account, @absolutely_abstract_creative_concept, :charts, :tangible_things], timespan: "ytd"), label: "ytd", last: true %>
+                <%= render "shared/supercharts/filter_button", path: polymorphic_path([:account, @absolutely_abstract_creative_concept, :tangible_things, :chart], timespan: "1m"), label: "1m", first: true %>
+                <%= render "shared/supercharts/filter_button", path: polymorphic_path([:account, @absolutely_abstract_creative_concept, :tangible_things, :chart], timespan: "ytd"), label: "ytd", last: true %>
               </div>
             </div>
             <template data-supercharts--filters-target="data">

data/lib/bullet_train/supercharts/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module Supercharts
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/lib/scaffolding/supercharts_chart_transformer.rb

@@ -6,8 +6,8 @@ class Scaffolding::SuperchartsChartTransformer < Scaffolding::SuperchartsTransfo
     
     # copy files over and do the appropriate string replace.
     files = [
-      "./app/controllers/account/scaffolding/completely_concrete/charts/tangible_things_controller.rb",
-      "./app/views/account/scaffolding/completely_concrete/charts/tangible_things",
+      "./app/controllers/account/scaffolding/completely_concrete/tangible_things/tangible_things_chart_controller.rb",
+      "./app/views/account/scaffolding/completely_concrete/tangible_things/tangible_things_chart",
       "./app/views/shared/supercharts",
     ].compact
     
@@ -23,7 +23,7 @@ class Scaffolding::SuperchartsChartTransformer < Scaffolding::SuperchartsTransfo
     unless cli_options["skip-parent"] || parent == "None"
       lines_to_add = <<~RUBY
         <div class="mt-4">
-          <%= turbo_frame_tag :charts_tangible_things, src: polymorphic_path([:account, @creative_concept, :charts, :tangible_things], timespan: "1m") do %>
+          <%= turbo_frame_tag :charts_tangible_things, src: polymorphic_path([:account, @creative_concept, :tangible_things, :chart], timespan: "1m") do %>
           <% end %>
         </div>
       RUBY
@@ -36,50 +36,27 @@ class Scaffolding::SuperchartsChartTransformer < Scaffolding::SuperchartsTransfo
     end
     
     # apply routes.
-    unless cli_options["skip-routes"]
-      routes_namespace = cli_options["namespace"] || "account"
+    # TODO this is a hack and should be in its own RouteFileManipulator class
+    lines = File.read("config/routes.rb").lines.map(&:chomp)
+    account_namespace_found = false
     
-      begin
-        routes_path = if routes_namespace == "account"
-          "config/routes.rb"
+    lines.each_with_index do |line, index|
+      if line.match?("namespace :account do")
+        account_namespace_found = true
+      elsif account_namespace_found && line.match?(transform_string("resources :tangible_things"))
+        chart_resource_lines = transform_string("collection do\nresource :chart, only: :show, module: :tangible_things, as: :tangible_things_chart, controller: :tangible_things_chart\nend")
+        if line.match? /do$/
+          lines[index] = "#{line}\n#{chart_resource_lines}\n"
         else
-          "config/routes/#{routes_namespace}.rb"
+          lines[index] = "#{line} do\n#{chart_resource_lines}\nend"
         end
-        routes_manipulator = Scaffolding::SuperchartsRoutesFileManipulator.new(routes_path, child, parent, cli_options)
-      rescue Errno::ENOENT => _
-        puts "Creating '#{routes_path}'.".green
-    
-        unless File.directory?("config/routes")
-          FileUtils.mkdir_p("config/routes")
-        end
-    
-        File.write(routes_path, <<~RUBY)
-          collection_actions = [:index, :new, :create]
-    
-          # 🚅 Don't remove this block, it will break Super Scaffolding.
-          begin do
-            namespace :#{routes_namespace} do
-              shallow do
-                resources :teams do
-                end
-              end
-            end
-          end
-        RUBY
-    
-        retry
       end
-    
-      begin
-        routes_manipulator.apply([routes_namespace], prepend_namespace_to_child: "charts")
-      rescue StandardError => e
-        p e
-        add_additional_step :yellow, "We weren't able to automatically add your `#{routes_namespace}` routes for you. In theory this should be very rare, so if you could reach out on Slack, you could probably provide context that will help us fix whatever the problem was. In the meantime, to add the routes manually, we've got a guide at https://blog.bullettrain.co/nested-namespaced-rails-routing-examples/ ."
-      end
-      
-      Scaffolding::FileManipulator.write("config/routes.rb", routes_manipulator.lines)
     end
     
+    File.write("config/routes.rb", lines.join("\n"))
+    
+    puts `standardrb --fix ./config/routes.rb`
+    
     restart_server unless ENV["CI"].present?
   end
   
@@ -89,8 +66,7 @@ class Scaffolding::SuperchartsChartTransformer < Scaffolding::SuperchartsTransfo
   
   def transform_string(string)
     [
-      "Scaffolding::CompletelyConcrete::Charts::TangibleThings",
-      "scaffolding/completely_concrete/charts/tangible_things",
+      "Scaffolding::CompletelyConcrete::TangibleThings::TangibleThingsChart",
     ].each do |needle|
       # TODO There might be more to do here?
       # What method is this calling?
@@ -103,10 +79,8 @@ class Scaffolding::SuperchartsChartTransformer < Scaffolding::SuperchartsTransfo
   
   def replacement_for(string)
     case string
-    when "Scaffolding::CompletelyConcrete::Charts::TangibleThings"
-      "Charts::" + child.pluralize
-    when "scaffolding/completely_concrete/charts/tangible_things"
-      "charts/" + child.underscore.pluralize
+    when "Scaffolding::CompletelyConcrete::TangibleThings::TangibleThingsChart"
+      child.pluralize + "::" + child.pluralize + "Chart"
     else
       "🛑"
     end

data/lib/scaffolding/supercharts_transformer.rb

@@ -4,5 +4,16 @@ class Scaffolding::SuperchartsTransformer < Scaffolding::Transformer
   end
   
   def scaffold_supercharts
+    begin
+      # Update the routes to add the namespace and base resource
+      routes_manipulator = Scaffolding::RoutesFileManipulator.new("config/routes.rb", transform_string("Scaffolding::CompletelyConcrete::TangibleThings"), transform_string("Scaffolding::AbsolutelyAbstract::CreativeConcept"))
+      routes_manipulator.apply(["account"])
+      Scaffolding::FileManipulator.write("config/routes.rb", routes_manipulator.lines)
+    rescue BulletTrain::SuperScaffolding::CannotFindParentResourceException => exception
+      # TODO It would be great if we could automatically generate whatever the structure of the route needs to be and
+      # tell them where to try and inject it. Obviously we can't calculate the line number, otherwise the robots would
+      # have already inserted the routes, but at least we can try to do some of the complicated work for them.
+      add_additional_step :red, "We were not able to generate the routes for your Action Model automatically because: \"#{exception.message}\" You'll need to add them manually, which admittedly can be complicated. See https://blog.bullettrain.co/nested-namespaced-rails-routing-examples/ for guidance. 🙇🏻‍♂️"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: supercharts-bullet_train
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Pascal Laliberté
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2022-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,14 +44,14 @@ files:
 - app/assets/javascripts/supercharts-bullet-train.modern.mjs.map
 - app/assets/javascripts/supercharts-bullet-train.umd.js
 - app/assets/javascripts/supercharts-bullet-train.umd.js.map
-- app/controllers/account/scaffolding/completely_concrete/charts/tangible_things_controller.rb
+- app/controllers/account/scaffolding/completely_concrete/tangible_things/tangible_things_chart_controller.rb
 - app/javascript/controllers/index.js
 - app/javascript/controllers/superchart_controller.js
 - app/javascript/controllers/supercharts/filterable_controller.js
 - app/javascript/controllers/supercharts/filters_controller.js
 - app/javascript/index.js
-- app/views/account/scaffolding/completely_concrete/charts/tangible_things/_breadcrumbs.html.erb
-- app/views/account/scaffolding/completely_concrete/charts/tangible_things/index.html.erb
+- app/views/account/scaffolding/completely_concrete/tangible_things/tangible_things_chart/_breadcrumbs.html.erb
+- app/views/account/scaffolding/completely_concrete/tangible_things/tangible_things_chart/show.html.erb
 - app/views/shared/supercharts/_filter_button.html.erb
 - config/routes.rb
 - lib/bullet_train/supercharts.rb