supercharts-bullet_train 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6753fdf7667abbfab39cfae072cc6700125ea7a728e551be8db5b34385e35de7
-  data.tar.gz: 1d179f8527014cc41ddecc50f327ae71de2894e3a7b303b1f77521a5a9791506
+  metadata.gz: c1429840047519504e809947dd42379f44ed7f20217d329460bbde9d6e84bb3d
+  data.tar.gz: '0564496b17145084063209a2a9fc1ab4b13995335d92b4fde91127bafe6a45a6'
 SHA512:
-  metadata.gz: bd24f82296ceaeb1bc8e62c2c7da8999668198a441b862b430c54d802cda5823093ccfbe73c2ccb817ce42dea96c7dfa0fe224cbaddc47638325da5f3dd92119
-  data.tar.gz: 8d992be3d5b7648fd6f2f75f37b14b03956f89364549540b77de972a7b2bb81bf11e791e2e1ca2e98b6a59145aaf368b5be208ae21a7189cb36bbce85c11e4ba
+  metadata.gz: 5ec2707c55a76fd064424b1c85eead89f829d2f619eef6aa9004ef6efd3288ed414165f0ca254cf45f06f40650a59632840501cc1c57e4d14468b152f4c4d7aa
+  data.tar.gz: 2f439fcc3f94d76e8c02923941b04af5d3057c8076f0c8c855519b5069ce539910fba3b2d09ffa5cfe2fa8c08bafb8fced72cce8491f08e9fe446d09bc014933

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

@@ -0,0 +1,42 @@
+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
+
+  # GET /account/scaffolding/absolutely_abstract/creative_concepts/:absolutely_abstract_creative_concept_id/completely_concrete/charts/tangible_things
+  def index
+    @timespan = params[:timespan]
+    case @timespan
+    when "ytd"
+      range = Time.now.beginning_of_year..Time.now
+      range_days = (range.max - range.min).seconds.in_days
+      if range_days > 4.months.in_days
+        @period = :month
+      elsif range_days > 1.month.in_days
+        @period = :week
+      else
+        @period = :day
+      end
+      data = @tangible_things.group_by_period(@period, :created_at, range: range, expand_range: true).count
+    else
+      @period = :day
+      data = @tangible_things.group_by_period(@period, :created_at, last: 30).count
+    end
+    
+    @total = data.values.reduce(:+)
+    
+    date_format = if @period == :day
+      "%e"
+    elsif @period == :week
+      "%b %e"
+    elsif @period == :month
+      "%b"
+    end
+    
+    @csv = CSV.generate(" ", headers: %w[date value], write_headers: true, encoding: "UTF-8") do |csv|
+      data.each do |date, value|
+        csv.add_row [date.strftime(date_format), value]
+      end
+    end
+  end
+end

data/app/javascript/controllers/superchart_controller.js

@@ -16,6 +16,7 @@ export default class extends SuperchartChartjsController {
   
   static defaultCssProperties = {
     '--animation-duration': 200, // milliseconds
+    '--axis-color': '#00000066'
   }
   
   connect() {
@@ -63,7 +64,7 @@ export default class extends SuperchartChartjsController {
 
   // You can set default options in this getter for all your charts.
   get defaultOptions() {
-    const transparentWhite = '#ffffff66'
+    const axisColor = this.cssPropertyValue('--axis-color')
     return {
       maintainAspectRatio: false,
       animation: {
@@ -99,7 +100,7 @@ export default class extends SuperchartChartjsController {
           display: false,
         }
       },
-      color: transparentWhite,
+      color: axisColor,
       borderColor: 'rgb(4, 123, 248)',
       fill: false,
       lineTension: 0.3,
@@ -122,20 +123,20 @@ export default class extends SuperchartChartjsController {
       scales: {
         x: {
           grid: {
-            borderColor: transparentWhite
+            borderColor: axisColor
           },
           ticks: {
-            color: transparentWhite,
-            tickColor: transparentWhite
+            color: axisColor,
+            tickColor: axisColor
           }
         },
         y: {
           grid: {
-            borderColor: transparentWhite,
-            tickColor: transparentWhite
+            borderColor: axisColor,
+            tickColor: axisColor
           },
           ticks: {
-            color: transparentWhite
+            color: axisColor
           }
         }
       }

data/app/views/account/scaffolding/completely_concrete/charts/tangible_things/_breadcrumbs.html.erb

@@ -0,0 +1,2 @@
+<% absolutely_abstract_creative_concept ||= @absolutely_abstract_creative_concept || tangible_thing&.absolutely_abstract_creative_concept %>
+<%= render 'account/scaffolding/absolutely_abstract/creative_concepts/breadcrumbs', creative_concept: absolutely_abstract_creative_concept %>

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

@@ -0,0 +1,50 @@
+<%= turbo_frame_tag :charts_tangible_things do %>
+  <div class="bg-white dark:bg-sealBlue-400 p-8 rounded-md shadow"
+    data-controller="supercharts--filterable"
+    data-action="superchart:update-chart->supercharts--filterable#updateChart"
+  >
+    <%= turbo_frame_tag :charts_tangible_things_filters do %>
+      <div class="flex justify-start">
+        <div class="">
+          <h2 class="text-xs uppercase dark:text-white/50">
+            <% if @timespan == "1m" %>
+              Tangible Things last 31 days
+            <% elsif @timespan == "ytd" %>
+              Tangible Things since start of year
+            <% end %>
+          </h2>
+          <p class="font-semibold dark:text-white mt-2" style="font-size: 1.8rem;">
+            <%= @total %>
+          </p>
+        </div>
+        <div class="ml-auto">
+          <div
+            data-controller="supercharts--filters" data-supercharts--filters-event-name="superchart:update-chart"
+          >
+            <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 %>
+              </div>
+            </div>
+            <template data-supercharts--filters-target="data">
+              <%= @csv.lstrip.html_safe %>
+            </template>
+          </div>
+        </div>
+      </div>
+    <% end %>
+    
+    <div
+      class="mt-4"
+      data-controller="superchart"
+      data-superchart-type-value="line"
+      data-superchart-label-value="Tangible Things per <%= @period.to_s.capitalize %>"
+      data-supercharts--filterable-target="chart"
+      data-action="update-chart->superchart#updateChart"
+    >
+      <canvas data-superchart-target="chartjsCanvas" style="height: 200px"></canvas>
+      <template data-superchart-target="csvData" data-supercharts--filterable-target="chartSourceData" />
+    </div>
+  </div>
+<% end %>

data/app/views/shared/supercharts/_filter_button.html.erb

@@ -0,0 +1,9 @@
+<%
+  first ||= false
+  last ||= false
+  label ||= "link"
+  path ||= ""
+  button_classes = "px-5 py-1.5 dark:text-white font-small text-xs leading-tight uppercase hover:bg-blue-800/50 hover:text-white focus:bg-blue-700 focus:outline-none focus:ring-0 active:bg-blue-800 transition duration-150 ease-in-out rounded-lg"
+%>
+
+<%= link_to label, path, class: [button_classes, "bg-gray-400 dark:bg-blue-800 text-white hover:bg-blue-400 dark:hover:bg-blue-800/100": current_page?(path)] %>

data/lib/bullet_train/supercharts/engine.rb

@@ -1,7 +1,7 @@
 module BulletTrain
   module Supercharts
     class Engine < ::Rails::Engine
-      initializer "bullet_train.super_scaffolding.supercharts.templates.register_template_path" do |app|
+      initializer "bullet_train.super_scaffolding.templates.register_template_path" do |app|
         # Register the base path of this package with the Super Scaffolding engine.
         BulletTrain::SuperScaffolding.template_paths << File.expand_path('../../../..', __FILE__)
         BulletTrain::SuperScaffolding.scaffolders.merge!({

data/lib/bullet_train/supercharts/scaffolders/chart_scaffolder.rb

@@ -1,4 +1,5 @@
 require "scaffolding/supercharts_chart_transformer"
+require "scaffolding/supercharts_routes_file_manipulator"
 
 module BulletTrain
   module Supercharts

data/lib/bullet_train/supercharts/version.rb

@@ -1,5 +1,5 @@
 module BulletTrain
   module Supercharts
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/lib/bullet_train/supercharts.rb

@@ -3,6 +3,7 @@ require "bullet_train/supercharts/engine"
 require "scaffolding"
 require "scaffolding/transformer"
 require "scaffolding/block_manipulator"
+require "scaffolding/routes_file_manipulator"
 require "bullet_train/supercharts/scaffolders/chart_scaffolder"
 
 module BulletTrain

data/lib/scaffolding/supercharts_chart_transformer.rb

@@ -4,11 +4,27 @@ class Scaffolding::SuperchartsChartTransformer < Scaffolding::SuperchartsTransfo
   def scaffold_supercharts
     super
     
+    # 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/views/shared/supercharts",
+    ].compact
+    
+    files.each do |name|
+      if File.directory?(resolve_template_path(name))
+        scaffold_directory(name)
+      else
+        scaffold_file(name)
+      end
+    end
+    
     # add children to the show page of their parent.
     unless cli_options["skip-parent"] || parent == "None"
       lines_to_add = <<~RUBY
         <div class="mt-4">
-          Insert #{child} chart here
+          <%= turbo_frame_tag :charts_tangible_things, src: polymorphic_path([:account, @creative_concept, :charts, :tangible_things], timespan: "1m") do %>
+          <% end %>
         </div>
       RUBY
       scaffold_add_line_to_file(
@@ -18,9 +34,81 @@ class Scaffolding::SuperchartsChartTransformer < Scaffolding::SuperchartsTransfo
         prepend: true
       )
     end
+    
+    # apply routes.
+    unless cli_options["skip-routes"]
+      routes_namespace = cli_options["namespace"] || "account"
+    
+      begin
+        routes_path = if routes_namespace == "account"
+          "config/routes.rb"
+        else
+          "config/routes/#{routes_namespace}.rb"
+        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
+    
+    restart_server unless ENV["CI"].present?
   end
   
   def parent_show_file
     @target_show_file ||= "./app/views/account/scaffolding/absolutely_abstract/creative_concepts/show.html.erb"
   end
+  
+  def transform_string(string)
+    [
+      "Scaffolding::CompletelyConcrete::Charts::TangibleThings",
+      "scaffolding/completely_concrete/charts/tangible_things",
+    ].each do |needle|
+      # TODO There might be more to do here?
+      # What method is this calling?
+      string = string.gsub(needle, encode_double_replacement_fix(replacement_for(needle)))
+    end
+    
+    string = super(string)
+    decode_double_replacement_fix(string)
+  end
+  
+  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
+    else
+      "🛑"
+    end
+  end
 end

data/lib/scaffolding/supercharts_routes_file_manipulator.rb

@@ -0,0 +1,85 @@
+class Scaffolding::SuperchartsRoutesFileManipulator < Scaffolding::RoutesFileManipulator
+  
+  def apply(base_namespaces, prepend_namespace_to_child: nil)
+    child_namespaces, child_resource, parent_namespaces, parent_resource = divergent_parts
+  
+    within = find_or_create_namespaces(base_namespaces)
+    
+    # e.g. Project and Projects::Deliverable
+    if parent_namespaces.empty? && child_namespaces.one? && parent_resource == child_namespaces.first
+  
+      # resources :projects do
+      #   scope module: 'projects' do
+      #     resources :deliverables, only: collection_actions
+      #   end
+      # end
+      
+      parent_within = find_or_convert_resource_block(parent_resource, within: within)
+  
+      # add the new resource within that namespace.
+      line = "scope module: '#{parent_resource}' do"
+      # TODO you haven't tested this yet.
+      unless (scope_within = find(/#{line}/, parent_within))
+        scope_within = insert([line, "end"], parent_within)
+      end
+  
+      find_or_create_resource([child_resource], options: "only: collection_actions", within: scope_within)
+  
+      # namespace :projects do
+      #   resources :deliverables, except: collection_actions
+      # end
+  
+      # We want to see if there are any namespaces one level above the parent itself,
+      # because namespaces with the same name as the resource can exist on the same level.
+      parent_block_start = find_block_parent(parent_within)
+      namespace_line_within = find_or_create_namespaces(child_namespaces, parent_block_start)
+      
+      if prepend_namespace_to_child.present?
+        namespace_line_within = find_or_create_namespaces([prepend_namespace_to_child], namespace_line_within)
+      end
+      
+      find_or_create_resource([child_resource], options: "except: collection_actions", 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
+  
+    # e.g. Projects::Deliverable and Objective Under It, Abstract::Concept and Concrete::Thing
+    elsif parent_namespaces.any?
+  
+      # namespace :projects do
+      #   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)
+  
+      # resources :projects_deliverables, path: 'projects/deliverables' do
+      #   resources :objectives
+      # end
+      block_parent_within = find_block_parent(top_parent_namespace)
+      parent_namespaces_and_resource = (parent_namespaces + [parent_resource]).join("_")
+      parent_within = find_or_create_resource_block([parent_namespaces_and_resource], options: "path: '#{parent_namespaces_and_resource.tr("_", "/")}'", within: block_parent_within)
+      
+      if prepend_namespace_to_child.present?
+        parent_within = find_or_create_namespaces([prepend_namespace_to_child], parent_within)
+      end
+      
+      find_or_create_resource(child_namespaces + [child_resource], within: parent_within)
+    else
+  
+      begin
+        within = find_or_convert_resource_block(parent_resource, within: within)
+      rescue
+        within = find_or_convert_resource_block(parent_resource, options: "except: collection_actions", within: within)
+      end
+      
+      if prepend_namespace_to_child.present?
+        within = find_or_create_namespaces([prepend_namespace_to_child], within)
+      end
+      
+      find_or_create_resource(child_namespaces + [child_resource], options: define_concerns, within: within)
+  
+    end
+  end
+  
+end

data/lib/supercharts/bullet_train.rb

@@ -0,0 +1,8 @@
+require "bullet_train/supercharts"
+
+module Supercharts
+  module BulletTrain
+    # This file is loaded automatically by bundler
+    # It's required so we can keep the BulletTrain::Supercharts sub-module as the default structure (and inherit super scaffolding from BulletTrain)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: supercharts-bullet_train
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Pascal Laliberté
@@ -31,6 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".bt-link"
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -43,18 +44,24 @@ 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/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/shared/supercharts/_filter_button.html.erb
 - config/routes.rb
 - lib/bullet_train/supercharts.rb
 - lib/bullet_train/supercharts/engine.rb
 - lib/bullet_train/supercharts/scaffolders/chart_scaffolder.rb
 - lib/bullet_train/supercharts/version.rb
 - lib/scaffolding/supercharts_chart_transformer.rb
+- lib/scaffolding/supercharts_routes_file_manipulator.rb
 - lib/scaffolding/supercharts_transformer.rb
+- lib/supercharts/bullet_train.rb
 - lib/tasks/bullet_train/supercharts_tasks.rake
 homepage: https://github.com/supercharts-dev/supercharts-bullet_train
 licenses: