rails_app_generator 0.2.41 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f266923a169ab15ff8606551f4e023723d947f785513dc89083e0762fd2d568
-  data.tar.gz: 55093884128eff848ef3a6b21e415c3739530110590d58308bb7037674022744
+  metadata.gz: 93b684c48a45efa3c3ed644b2908e1299bd0a26e58ae14e3483dd007c2128360
+  data.tar.gz: 7b263e75514434f35912bfb867674506839c0a4883bdb94d1427dbe899a7c396
 SHA512:
-  metadata.gz: aaf2fc71ee43c3d12c73b2ab6c91e1c7b5aacd31740a17284b845eb60aff94058634b7d346910242777d1e7ae17d4d75cde624002e6b67b2c5b73e530a6668d2
-  data.tar.gz: c2c8a7dbb9d0cf975b4e02d19309147a3a90ae5a58da010b007eba9f2713d8289b6e3dbe1ee5caa04b33ef95a9d6c9eae31f97ec4480cad7969d4fdb1796642f
+  metadata.gz: 2cc5173515c7d24338097773dcfd3a632e09cd71b9cfbbf2b991cad560d631417f1dde2c1a9cb35dc6accf9c7d1fe5e779a76da5b1bb40cce9f208036b4f6353
+  data.tar.gz: 2eadb9067e14ab8812186a03b49b5a04287b69efd6ecedbc5859ad6c5458cbfe4373fa9e74e7445316a77009570a1e1b8bc73eddb1f272245228a8cdd9b08d6c

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+## [0.2.43](https://github.com/klueless-io/rails_app_generator/compare/v0.2.42...v0.2.43) (2022-08-31)
+
+
+### Bug Fixes
+
+* add scenic profile ([dc309e6](https://github.com/klueless-io/rails_app_generator/commit/dc309e6f399cec7085de3133aa32989bc7ff7ed4))
+* add scenic profile ([44614f7](https://github.com/klueless-io/rails_app_generator/commit/44614f70d73fe41cee5fd9cb9af5d20f0aa4f915))
+
+## [0.2.42](https://github.com/klueless-io/rails_app_generator/compare/v0.2.41...v0.2.42) (2022-08-30)
+
+
+### Bug Fixes
+
+* add scenic addon ([93a9561](https://github.com/klueless-io/rails_app_generator/commit/93a9561131658399b91075e15c6d9680f1b73ece))
+* cops ([fe3e6b7](https://github.com/klueless-io/rails_app_generator/commit/fe3e6b7031a57b0f212fd91491ebc7f32928b9c1))
+
+## [0.2.41](https://github.com/klueless-io/rails_app_generator/compare/v0.2.40...v0.2.41) (2022-08-30)
+
+
+### Bug Fixes
+
+* update klueless profile ([e426b82](https://github.com/klueless-io/rails_app_generator/commit/e426b820b15e8e49d2cc6c6ec2ccfd4ed8ea1158))
+
 ## [0.2.40](https://github.com/klueless-io/rails_app_generator/compare/v0.2.39...v0.2.40) (2022-08-23)
 
 

data/after_templates/addons/scenic/_.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+# Ads methods to ActiveRecord:Migration to create and manage database views in Rails
+#
+# exe/rag addons/scenic
+
+self.local_template_path = File.dirname(__FILE__)
+
+gac 'base rails 7 image created'
+
+prepare_environment
+
+after_bundle do
+  force_copy
+  
+  create_db
+  scaffolds
+  setup_customizations
+  migrate_db
+end
+
+def scaffolds
+  add_scaffold('country', 'code', 'name')
+  add_scaffold('monument', 'name', 'description', 'country:references')
+  add_scaffold('visitor', 'name', 'monument:references')
+
+  generate('scenic:model visitors_by_monument')
+  generate('scenic:model individual_visitors_by_monument --materialized')
+
+  directory "db/views"
+end
+
+def setup_customizations
+  route("root 'home#index'")
+
+  add_controller('home', 'index', 'visitors_by_monument', 'individual_visitors_by_monument', 'reseed', 'refresh_material_view')
+
+  directory "app/controllers"
+  directory "app/models"
+  directory "app/views"
+  template  'app/views/layouts/application.html.erb'        , 'app/views/layouts/application.html.erb'
+  directory "app/services"
+end
+
+def create_db
+  gsub_file('config/database.yml', '  encoding: unicode', db_development_settings)
+  rails_command('db:environment:set RAILS_ENV=development')
+  db(drop: true, create: true)
+end
+
+def migrate_db
+  template  'db/seeds.rb'                                   , 'db/seeds.rb'
+
+  db(migrate: true, seed: true)
+end
+
+def db_development_settings
+  <<-'RUBY'
+  encoding: unicode
+  host: <%= ENV['DATABASE_HOST'] %>
+  username: <%= ENV['DATABASE_USERNAME'] %>
+  password: <%= ENV['DATABASE_PASSWORD'] %>
+  RUBY
+end

data/after_templates/addons/scenic/app/controllers/home_controller.rb

@@ -0,0 +1,24 @@
+class HomeController < ApplicationController
+  def index
+  end
+
+  def visitors_by_monument
+    @visitors = VisitorsByMonument.all.order(:visits)
+  end
+
+  def individual_visitors_by_monument
+    @visitors = IndividualVisitorsByMonument.all.order(:visits)
+  end
+
+  def reseed
+    SeedService.seed(variant: :refresh)
+
+    redirect_back_or_to root_path
+  end
+
+  def refresh_material_view
+    IndividualVisitorsByMonument.refresh
+
+    redirect_back_or_to root_path
+  end
+end

data/after_templates/addons/scenic/app/services/seed_service.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+class SeedService
+  class << self
+    def seed(variant: :reset)
+      service = SeedService.new
+      service.call(variant: variant)
+    end
+  end
+
+  NAMES = %w[
+    Adyson Aimee Aisha Akira Alani Albert Aleah Aleena Alena Alexus Alfred Ali Alia
+    Amelie Amina Amirah Amiya Anabella Anabelle Andrew Angeline Angelique Ann Annabel Aliana
+    Armani Arthur Aryana Ashanti Ashleigh Ashly Aspen Averie Avery Ayana Barbara
+    Brynlee Cailyn Cal Camilla Campbell Carina Carissa Carlee Carley Carlie Carolyn Cassie
+    Charlie Charlize Chaya Cherish Cierra Clair Clare Clarence Cloe Corinne Cristal
+    Destiney Dominique Dorsey Early Edith Edward Eileen Elaine Elisa Ellen Elmer Elsa Elsie
+    Fay Felicity Finley Frances Frank Fred Frederick Frida Gemma George Gia Giada Giana Gillian
+    Hana Harris Harry Haven Henderson Henry Herbert Hezekiah Hillary Iliana India
+    James Jamya Janae Janet Janiah Jaslyn Jaycee Jaylah Jaylee Jaylen Jaylene Jaylyn
+    John Johnie Joseph Joslyn Joyce Judith Julianne June Kaia Kaila Kailee Kaiya Kaley
+    Karma Kasey Katrina Kaya Kaylen Kayley Kaylyn Keely Kelsie Kendal Kenna Keyla Kierra
+    Leanna Lewis Leyla Libby Lilianna Lillianna Lilyana Lina Litzy Lizeth Lonzo Lorelai
+    Maeve Magdalena Maia Makena Maleah Maliyah Mara Mareli Mariam Marianna Mariela Marisa
+    Miah Micah Milagros Mina Mira Mollie Monique Monserrat Mont Moriah Mylie Natalya
+    Paloma Pamela Patience Paula Peter Phoenix Precious Raelynn Raina Raven Rayna Rayne Regan
+    Rollin Roselyn Rosemary Roy Ryann Saige Salma Sam Samuel Sanaa Sanai Sarahi Sariah Savanah
+    Shyann Shyanne Shyla Siena Sonia Stacy Stephany Susan Taliyah Tamara Taniya Taniyah
+    Tianna Tom Valery Walter Will William Willie Wilmer Xiomara Yadira Yamilet Yaritza Yasmine Yazmin
+    Yoselin Yuliana Zaniyah Zara Zaria Zion
+    %
+  ].freeze
+
+  attr_reader :au, :us, :gb, :monuments
+
+  def call(variant: :reset)
+    reset     if variant == :reset
+    refresh   if variant == :refresh
+    create
+  end
+
+  private
+
+  def reset
+    Visitor.delete_all
+    Monument.delete_all
+    Country.delete_all
+  end
+
+  def refresh
+    Visitor.delete_all
+  end
+
+  def create
+    upsert_countries
+    upsert_monuments
+    create_visitors
+  end
+
+  def upsert_countries
+    @au = Country.create_with(name: 'Australia').find_or_create_by(code: 'AU')
+    @us = Country.create_with(name: 'United States').find_or_create_by(code: 'US')
+    @gb = Country.create_with(name: 'United Kingdom').find_or_create_by(code: 'GB')
+  end
+
+  def upsert_monuments
+    @monuments = [
+      Monument.create_with(country: au,
+                           description: 'The Sydney Opera House is a multi-venue performing arts centre in Sydney, New South Wales, Australia. It is the largest performing arts centre in Australia and the second largest in the world.')
+              .find_or_create_by(name: 'Sydney Opera House'),
+      Monument.create_with(country: au,
+                           description: 'The Sydney Harbour Bridge is a viaduct bridge in Sydney, New South Wales, Australia. It is the longest viaduct bridge in Australia and the second longest in the world.')
+              .find_or_create_by(name: 'Sydney Harbour Bridge'),
+      Monument.create_with(country: au,
+                           description: 'The Big Banana is a large, round, fruit-bearing tree in the Australian bushland of the Great Barrier Reef. It is the largest tree in the world.')
+              .find_or_create_by(name: 'The Big Banana'),
+      Monument.create_with(country: us,
+                           description: 'The Statue of Liberty is a colossal neoclassical sculpture on Liberty Island in New York Harbor, New York, in the United States. The statue was a gift from the people of France to the people of the United States in 1886.')
+              .find_or_create_by(name: 'Statue of Liberty'),
+      Monument.create_with(country: us,
+                           description: 'The Golden Gate Bridge is a suspension bridge spanning the Golden Gate, the one-mile-wide strait connecting San Francisco Bay and the Pacific Ocean. The bridge was completed in 1937.')
+              .find_or_create_by(name: 'Golden Gate Bridge'),
+      Monument.create_with(country: us,
+                           description: 'The Empire State Building is a 102-story skyscraper in Midtown Manhattan, New York City. It is the world\'s tallest building, a structure that is the 4th-tallest building in the world.')
+              .find_or_create_by(name: 'Empire State Building'),
+      Monument.create_with(country: gb,
+                           description: 'The Tower of London is a historic London tower on the north bank of the River Thames in central London. It is the most-visited paid monument in the world.')
+              .find_or_create_by(name: 'Tower of London'),
+      Monument.create_with(country: gb, description: 'The Big Ben is a clock tower in the north of London. It is the world\'s tallest clock tower.')
+              .find_or_create_by(name: 'Big Ben'),
+      Monument.create_with(country: gb,
+                           description: 'The London Eye is a giant Ferris wheel situated on the South Bank of the River Thames in London, England. It is the world\'s largest Ferris wheel.')
+              .find_or_create_by(name: 'London Eye')
+    ]
+  end
+
+  def create_visitors
+    NAMES.each do |name|
+      rand(1..10).times do # number monuments to visited (duplicates are fine)
+        Visitor.create(name: name, monument: monuments.sample)
+      end
+    end
+  end
+end

data/after_templates/addons/scenic/app/views/home/index.html.erb

@@ -0,0 +1,3 @@
+<h1>Scenic</h1>
+
+<p>Ads methods to ActiveRecord:Migration to create and manage database views in Rails</p>

data/after_templates/addons/scenic/app/views/home/individual_visitors_by_monument.html.erb

@@ -0,0 +1,24 @@
+<h1>Individual Visitors by Monument</h1>
+
+<pre><code><%= File.read('db/views/individual_visitors_by_monuments_v01.sql') %></code></pre>
+
+<table>
+  <thead>
+    <tr>
+      <th>Person</th>
+      <th>Monument</th>
+      <th>Country</th>
+      <th>Visits</th>
+    </tr>
+  </thead>
+  <tbody>
+<% @visitors.each do |visitor| %>
+    <tr>
+      <td><%= visitor.person %></td>
+      <td><%= visitor.monument %></td>
+      <td><%= visitor.country %></td>
+      <td><%= visitor.visits %></td>
+    </tr>
+<% end %>
+  </tbody>
+</table>

data/after_templates/addons/scenic/app/views/home/reseed.html.erb

@@ -0,0 +1,3 @@
+<h1>Re-Seed</h1>
+
+<p>Database has been re-seeded</p>

data/after_templates/addons/scenic/app/views/home/visitors_by_monument.html.erb

@@ -0,0 +1,22 @@
+<h1>Visitors by Monument</h1>
+
+<pre><code><%= File.read('db/views/visitors_by_monuments_v01.sql') %></code></pre>
+
+<table>
+  <thead>
+    <tr>
+      <th>Monument</th>
+      <th>Country</th>
+      <th>Visits</th>
+    </tr>
+  </thead>
+  <tbody>
+<% @visitors.each do |visitor| %>
+    <tr>
+      <td><%= visitor.monument %></td>
+      <td><%= visitor.country %></td>
+      <td><%= visitor.visits %></td>
+    </tr>
+<% end %>
+  </tbody>
+</table>

data/after_templates/addons/scenic/app/views/layouts/_navbar.html.erb

@@ -0,0 +1,10 @@
+  <%= link_to 'Home', root_path %>
+| <%= link_to 'Countries', countries_path %>
+| <%= link_to 'Monuments', monuments_path %>
+| <%= link_to 'Visitors', visitors_path %>
+<br>
+  <%= link_to 'Visits (View)', home_visitors_by_monument_path %>
+| <%= link_to 'Visits (Materialized)', home_individual_visitors_by_monument_path %>
+| <%= link_to 'Re-Seed', home_reseed_path, style: 'color: blue; font-weight: 600;' %>
+| <%= link_to 'Refresh Material View', home_refresh_material_view_path, style: 'color: blue; font-weight: 600;' %>
+<hr />

data/after_templates/addons/scenic/app/views/layouts/application.html.erb

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title><%= camelized %></title>
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <%%= csrf_meta_tags %>
+    <%%= csp_meta_tag %>
+
+    <%- if options[:skip_hotwire] || options[:skip_javascript] -%>
+    <%%= stylesheet_link_tag "application" %>
+    <%- else -%>
+    <%%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
+    <%- end -%>
+  </head>
+
+  <body>
+    <header>
+      <%%= render 'layouts/navbar' %>
+      <hr />
+    </header>
+    <main>
+      <%%= yield %>
+    </main>
+    <footer>
+      <%%= render 'layouts/footer' %>
+    </footer>
+  </body>
+</html>
+

data/after_templates/addons/scenic/db/seeds.rb

@@ -0,0 +1 @@
+SeedService.seed

data/after_templates/addons/scenic/db/views/individual_visitors_by_monuments_v01.sql

@@ -0,0 +1,9 @@
+select
+  visitors.name as person,
+  monuments.name as monument,
+  countries.name as country,
+  count(*) as visits
+from visitors
+join monuments on visitors.monument_id = monuments.id
+join countries on monuments.country_id = countries.id
+group by person, monument, country

data/after_templates/addons/scenic/db/views/visitors_by_monuments_v01.sql

@@ -0,0 +1,8 @@
+select
+  monuments.name as monument,
+  countries.name as country,
+  count(*) as visits
+from visitors
+join monuments on visitors.monument_id = monuments.id
+join countries on monuments.country_id = countries.id
+group by monument, country

data/after_templates/application/klueless/_.rb

@@ -44,6 +44,10 @@ def scaffolds
   # add_scaffold('db_schema_foreign_key', 'left', 'right', 'name', 'on_update', 'on_delete', 'column', 'db_schema_table:references')
   # add_scaffold('db_schema_index', 'name', 'fields', 'using', 'order:jsonb', 'where', 'unique', 'db_schema_table:references')
   # add_scaffold('db_schema_view', 'name', 'materialized:boolean', 'sql_definition', 'db_schema_table:references')
+
+  generate('scenic:model rubocop_log --materialized')
+
+  directory "db/views"
 end
 
 def setup_customizations
@@ -51,13 +55,14 @@ def setup_customizations
 
   force_copy
   
-  add_controller('home', 'index', 'quick_signin', 'reseed')
+  add_controller('home', 'index', 'quick_signin', 'reseed', 'refresh_material_view')
   
   directory "app/controllers"
   directory "app/models"
   directory "app/views"
   template  'app/views/layouts/application.html.erb', 'app/views/layouts/application.html.erb'
   directory "app/queries"
+  directory "app/services"
 end
 
 def setup_avo

data/after_templates/application/klueless/app/avo/cards/amount_raised.rb

@@ -0,0 +1,14 @@
+class AmountRaised < Avo::Dashboards::MetricCard
+  self.id = "amount_raised"
+  self.label = "Amount raised"
+  # self.description = "Some description"
+  # self.cols = 1
+  # self.initial_range = 30
+  # self.ranges = [7, 30, 60, 365, "TODAY", "MTD", "QTD", "YTD", "ALL"]
+  self.prefix = "$"
+  # self.suffix = ""
+
+  query do
+    result 9001
+  end
+end

data/after_templates/application/klueless/app/avo/cards/example_custom_partial.rb

@@ -0,0 +1,7 @@
+class ExampleCustomPartial < Avo::Dashboards::PartialCard
+  self.id = "users_custom_card"
+  self.cols = 3
+  self.rows = 4
+  self.partial = "avo/cards/custom_card"
+  self.description = "This card has been loaded from a custom partial."
+end

data/after_templates/application/klueless/app/avo/cards/example_metric.rb

@@ -0,0 +1,38 @@
+class ExampleMetric < Avo::Dashboards::MetricCard
+  self.id = "users_metric"
+  self.label = "Users count"
+  self.description = "Users description"
+  self.cols = 1
+  self.initial_range = 30
+  self.ranges = [7, 30, 60, 365, "TODAY", "MTD", "QTD", "YTD", "ALL"]
+  # self.prefix = "$"
+  # self.suffix = "%"
+  self.refresh_every = 10.minutes
+
+  # You have access to context, params, range, current dashboard, and current card
+  query do
+    from = Date.today.midnight - 1.week
+    to = DateTime.current
+
+    if range.present?
+      if range.to_s == range.to_i.to_s
+        from = DateTime.current - range.to_i.days
+      else
+        case range
+        when "TODAY"
+          from = DateTime.current.beginning_of_day
+        when "MTD"
+          from = DateTime.current.beginning_of_month
+        when "QTD"
+          from = DateTime.current.beginning_of_quarter
+        when "YTD"
+          from = DateTime.current.beginning_of_year
+        when "ALL"
+          from = Time.at(0)
+        end
+      end
+    end
+
+    result User.where(created_at: from..to).count
+  end
+end

data/after_templates/application/klueless/app/avo/cards/percent_done.rb

@@ -0,0 +1,10 @@
+class PercentDone < Avo::Dashboards::MetricCard
+  self.id = "percent_done"
+  self.label = "Percent done"
+  self.description = "This is the progress we made so far..."
+  self.suffix = "%"
+
+  query do
+    result 42
+  end
+end

data/after_templates/application/klueless/app/avo/cards/rubocop_card.rb

@@ -0,0 +1,10 @@
+class RubocopCard < Avo::Dashboards::PartialCard
+  self.id = "percent_done"
+  self.label = "Percent done"
+  self.description = "This is the progress we made so far..."
+
+  self.cols = 3
+  self.rows = 20
+  self.partial = "avo/cards/rubocop_card"
+
+end

data/after_templates/application/klueless/app/avo/resources/rubocop_resource.rb

@@ -9,4 +9,12 @@ class RubocopResource < Avo::BaseResource
   field :id, as: :id
   # field :data, as: :textarea, only_on: [:edit]
   # field :user_name, as: :text
+
+  tabs do
+    tab "List of Cops" do
+      panel do
+        field :id, as: :id
+      end
+    end
+  end
 end

data/after_templates/application/klueless/app/controllers/home_controller.rb

@@ -7,6 +7,14 @@ class HomeController < ApplicationController
   end
 
   def reseed
-    SeedService.seed
+    SeedService.seed(variant: :refresh)
+
+    redirect_back_or_to root_path
+  end
+
+  def refresh_material_view
+    RubocopLog.refresh
+
+    redirect_back_or_to root_path
   end
 end

data/after_templates/application/klueless/app/services/seed_service.rb

@@ -1,7 +1,53 @@
+# frozen_string_literal: true
+
 class SeedService
+  PRINTSPEAK_DATA_PATH = "/Users/davidcruwys/dev/printspeak/printspeak-generator/.builders/.data/"
+
   class << self
-    def seed
-      puts 'sssssssssssssssssssssss'
+    def seed(variant: :reset)
+      service = SeedService.new
+      service.call(variant: variant)
     end
   end
-end
+
+  def call(variant: :reset)
+    reset     if variant == :reset
+    refresh   if variant == :refresh
+    create
+  end
+
+  private
+
+  def get_data(filename)
+    json = File.read(File.join(PRINTSPEAK_DATA_PATH, filename))
+    JSON.parse(json)
+  end
+
+  def reset
+    User.delete_all
+    RailsApp.delete_all
+    Rubocop.delete_all
+    TableCount.delete_all
+  end
+
+  def refresh
+  end
+
+  def create
+    refresh_printspeak
+
+    RubocopLog.refresh
+  end
+
+  def refresh_printspeak
+    david = User.create_with(name: 'david', password: 'password').find_or_create_by(email: 'david@site.com')
+
+    rails_app = RailsApp.create_with(user: david).find_or_create_by(name: 'Printspeak')
+
+    puts 'Create Rubocop Data'
+    Rubocop.create(rails_app: rails_app, data: get_data('rubocop.json'))
+
+    puts 'Create Table Count Data'
+    TableCount.create(rails_app: rails_app, data: get_data('sql_count.json'))
+  end
+end

data/after_templates/application/klueless/app/views/layouts/_navbar.html.erb

@@ -1,4 +1,10 @@
-<%= link_to 'Home', root_path %>
-<%= link_to 'Quick Sign In', home_quick_signin_path %> |
-<%= link_to 'Admin', avo_path %>
+  <%= link_to 'Home', root_path %>
+| <%= link_to 'Re-Seed', home_reseed_path, style: 'color: blue; font-weight: 600;' %>
+| <%= link_to 'Refresh Material View', home_refresh_material_view_path, style: 'color: blue; font-weight: 600;' %>
+| <%= link_to 'Quick Sign In', home_quick_signin_path %>
+| <%= link_to 'Admin', avo_path %>
+<hr />
+
+  <%= link_to 'Visits (View)', home_visitors_by_monument_path %>
+| <%= link_to 'Visits (Materialized)', home_individual_visitors_by_monument_path %>
 <hr />

data/after_templates/application/klueless/db/seeds.rb

@@ -1,18 +1 @@
-@data_path = "/Users/davidcruwys/dev/printspeak/printspeak-generator/.builders/.data/"
-
-david = User.create_with(name: 'david', password: 'password').find_or_create_by(email: 'david@site.com')
-
-def get_data(filename)
-  json = File.read(File.join(@data_path, filename))
-  JSON.parse(json)
-end
-
-rails_app = RailsApp.create(name: 'Printspeak', user: david)
-
-puts 'Create Rubocop Data'
-Rubocop.create(rails_app: rails_app, data: get_data('rubocop.json'))
-
-puts 'Create Table Count Data'
-TableCount.create(rails_app: rails_app, data: get_data('sql_count.json'))
-
-
+SeedService.seed

data/after_templates/application/klueless/db/views/rubocop_logs_v01.sql

@@ -0,0 +1,23 @@
+WITH
+
+files AS (
+  SELECT jsonb_array_elements(data->'files') FROM rubocops
+),
+lines AS (
+  SELECT 
+    jsonb_array_elements(files)->>'file' as file,
+    jsonb_array_elements(files)->'lines' as lines
+  FROM files 
+),
+rubocop_log AS (
+  SELECT
+    jsonb_array_elements(lines)->>'position' as position,
+    jsonb_array_elements(lines)->>'status' as status,
+    jsonb_array_elements(lines)->>'status_message' as status_message,
+    jsonb_array_elements(lines)->>'cop' as cop,
+    jsonb_array_elements(lines)->>'message' as message,
+    jsonb_array_elements(lines)->>'full_line' as full_line,
+    jsonb_array_elements(lines)->>'file_name' as file_name
+  FROM lines
+)
+select * from rubocop_log

data/docs/last_run/app_generator_class.json

@@ -70,6 +70,7 @@
     "add_pretender",
     "add_public_suffix",
     "add_rails_html_sanitizer",
+    "add_scenic",
     "add_ransack",
     "add_redcarpet",
     "add_rolify",
@@ -567,6 +568,13 @@
       "default": false,
       "required": false
     },
+    {
+      "name": "add_scenic",
+      "description": "Indicates when to generate add scenic",
+      "type": "boolean",
+      "default": false,
+      "required": false
+    },
     {
       "name": "add_ransack",
       "description": "Indicates when to generate add ransack",

data/docs/last_run/app_generator_data.json

@@ -60,6 +60,7 @@
     "add_pretender": false,
     "add_public_suffix": false,
     "add_rails_html_sanitizer": false,
+    "add_scenic": true,
     "add_ransack": false,
     "add_redcarpet": false,
     "add_rolify": false,

data/docs/last_run/rails_options_class.json

@@ -70,6 +70,7 @@
     "add_pretender",
     "add_public_suffix",
     "add_rails_html_sanitizer",
+    "add_scenic",
     "add_ransack",
     "add_redcarpet",
     "add_rolify",
@@ -567,6 +568,13 @@
       "default": false,
       "required": false
     },
+    {
+      "name": "add_scenic",
+      "description": "",
+      "type": "boolean",
+      "default": false,
+      "required": false
+    },
     {
       "name": "add_ransack",
       "description": "",

data/docs/last_run/rails_options_data.json

@@ -70,6 +70,7 @@
     "add_pretender": false,
     "add_public_suffix": false,
     "add_rails_html_sanitizer": false,
+    "add_scenic": true,
     "add_ransack": false,
     "add_redcarpet": false,
     "add_rolify": false,

data/lib/rails_app_generator/addons/scenic.rb

@@ -1,37 +1,14 @@
 # frozen_string_literal: true
 
-# lib/rails_app_generator/rag_initializer.rb
-# add_if(:scenic)
-# rag.add_option :add_scenic            , type: :boolean, default: false
-
 module RailsAppGenerator
   # Custom add-ons for RailsAppGenerator
   module AddOns
     # Add Scenic to rails application
     class Scenic < RailsAppGenerator::Addon
-      required_gem gem.version('scenic', '1.6.0', '')
+      required_gem gem.version('scenic', '1.6.0', 'Ads methods to ActiveRecord:Migration to create and manage database views in Rails')
 
       def apply
-        say 'Setting up Scenic'
-        # template('scenic_template.rb', 'target/scenic.rb', force: true)
-        # template('app/javascript/stylesheets/components.scss')
-        # create_file('target/scenic.rb', 'put your content here')
-        # directory 'app/template', 'app/target', force: true
-        # empty_directory 'app/target'
-        # inject_into_file('app/application.js', "some content")
-        # rails_command('tailwindcss:install')
-      end
-
-      def before_template
-        say 'Setting up Scenic - before custom template'
-      end
-
-      def before_bundle
-        say 'Setting up Scenic - before bundle install'
-      end
-
-      def after_bundle
-        say 'Setting up Scenic - after bundle install'
+        bundle_install
       end
     end
   end

data/lib/rails_app_generator/app_generator.rb

@@ -208,6 +208,7 @@ module RailsAppGenerator
       add_if(:rails_app_generator) # TODO: needs testing
       add_if(:redcarpet) # tested
       add_if(:rolify) # tested
+      add_if(:scenic)
       add_if(:services) # TODO: needs testing
       add_if(:shoulda) # TODO: needs testing
       add_if(:sidekiq) # TODO: needs testing

data/lib/rails_app_generator/cli/profile.rb

@@ -29,9 +29,7 @@ module RailsAppGenerator
         RailsAppGenerator::Util.write_last_run('rails_options_data.json', opts.to_h)
 
         starter = RailsAppGenerator::Starter.new(**args)
-
-        starter.delete_target_folder
-        starter.start(opts)
+        starter.start(opts) if starter.handle_target_folder_existence?
       end
       # rubocop:enable Metrics/AbcSize
     end

data/lib/rails_app_generator/gem_query.rb

@@ -23,7 +23,9 @@ module RailsAppGenerator
         info = Net::HTTP.get(URI.parse(link))
         json = JSON.parse(info)
 
-        Rails::Generators::AppBase::GemfileEntry.new(json['name'], json['version'], json['description'])
+        comment = (json['description'] || json['info'] || '').gsub(/(\r?\n|\r)/, ' ').squeeze.strip
+
+        Rails::Generators::AppBase::GemfileEntry.new(json['name'], json['version'], comment)
       rescue SocketError
         abort 'Internet connection cannot be established to RubyGems.org'
       rescue JSON::ParserError

data/lib/rails_app_generator/rag_initializer.rb

@@ -131,7 +131,7 @@ KConfig.configure do |config|
   rag.add_option :add_kaminari                , type: :boolean, default: false
   rag.add_option :add_lograge                 , type: :boolean, default: false
   rag.add_option :add_minimal_css             , type: :boolean, default: false
-  rag.add_option :minimal_css_library         , type: :string, default: 'water.css', description: "Minimal CSS library to get you started. [options: water.css (default)]"
+  rag.add_option :minimal_css_library         , type: :string , default: 'water.css', description: "Minimal CSS library to get you started. [options: water.css (default)]"
   rag.add_option :add_mini_magick             , type: :boolean, default: false
   rag.add_option :add_motor_admin             , type: :boolean, default: false
   rag.add_option :add_phony_rails             , type: :boolean, default: false
@@ -139,6 +139,7 @@ KConfig.configure do |config|
   rag.add_option :add_public_suffix           , type: :boolean, default: false
   # pundit
   rag.add_option :add_rails_html_sanitizer    , type: :boolean, default: false
+  rag.add_option :add_scenic                  , type: :boolean, default: false
   # rails_app_generator
   rag.add_option :add_ransack                 , type: :boolean, default: false
   rag.add_option :add_redcarpet               , type: :boolean, default: false

data/lib/rails_app_generator/starter.rb

@@ -28,17 +28,22 @@ module RailsAppGenerator
     # points to templates related to rails addons
     attr_reader :addon_template_path
 
+    attr_reader :target_folder_exist_action # [abort destroy keep_git overwrite]
+
     attr_reader :capture_output
     attr_reader :console_output
 
+    # rubocop:disable Metrics/CyclomaticComplexity
     def initialize(**args)
-      @app_path               = args[:app_path]                     || '.'
-      @destination_root       = args[:destination_root]             || Dir.pwd
-      @rails_template_path    = args[:rails_template_path]          || AppGenerator.rails_template_path
-      @override_template_path = args[:override_template_path]       || AppGenerator.override_template_path
-      @addon_template_path    = args[:addon_template_path]          || AppGenerator.addon_template_path
-      @capture_output         = args[:capture_output].nil? ? false : args[:capture_output]
+      @app_path                   = args[:app_path]                     || '.'
+      @destination_root           = args[:destination_root]             || Dir.pwd
+      @rails_template_path        = args[:rails_template_path]          || AppGenerator.rails_template_path
+      @override_template_path     = args[:override_template_path]       || AppGenerator.override_template_path
+      @addon_template_path        = args[:addon_template_path]          || AppGenerator.addon_template_path
+      @target_folder_exist_action = args[:target_folder_exist_action]   || 'abort'
+      @capture_output             = args[:capture_output].nil? ? false : args[:capture_output]
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
 
     def target_path
       File.expand_path(File.join(destination_root, app_path))
@@ -58,12 +63,45 @@ module RailsAppGenerator
       end
     end
 
-    def delete_target_folder
-      FileUtils.rm_rf(target_path)
+    def handle_target_folder_found?
+      return true unless File.directory?(target_path)
+
+      case target_folder_exist_action
+      when 'abort'
+        puts "Target folder [#{target_path}] already exists. Aborting"
+        false
+      when 'destroy'
+        puts "Target folder [#{target_path}] already exists. Destroying it"
+        FileUtils.rm_rf(target_path)
+        true
+      when 'keep_git'
+        puts "Target folder [#{target_path}] already exists. Wiping it but keeping git history"
+        clean_target_folder
+        true
+      when 'overwrite'
+        puts "Target folder [#{target_path}] already exists. Overwriting it"
+        true
+      else
+        raise "Invalid target_folder_exist_action: #{target_folder_exist_action}"
+      end
     end
 
     private
 
+    def clean_target_folder
+      Dir.entries(target_path).each do |entry|
+        entry_path = File.join(target_path, entry)
+
+        next if ['.', '..', '.git'].include?(entry)
+
+        if File.file?(entry_path)
+          File.delete(entry_path)
+        elsif File.directory?(entry_path)
+          FileUtils.rm_rf(entry_path)
+        end
+      end
+    end
+
     # Rails options returns a flat array of options
     #
     # It can work accept a flat array of options or a

data/lib/rails_app_generator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsAppGenerator
-  VERSION = '0.2.41'
+  VERSION = '0.3.0'
 end

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "rails_app_generator",
-  "version": "0.2.41",
+  "version": "0.3.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "rails_app_generator",
-      "version": "0.2.41",
+      "version": "0.3.0",
       "dependencies": {
         "daisyui": "^2.20.0"
       },

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rails_app_generator",
-  "version": "0.2.41",
+  "version": "0.3.0",
   "description": "Create new Rails Application with custom opinions",
   "scripts": {
     "release": "semantic-release"

data/profiles/addons/scenic.json

@@ -0,0 +1,14 @@
+{
+  "args": {
+    "app_path": "r7_scenic",
+    "destination_root": "/Users/davidcruwys/dev/kgems/rails_app_generator/a/addons"
+  },
+  "opts": {
+    "skip_git": true,
+    "skip_test": true,
+    "database": "postgresql",
+    "add_minimal_css": true,
+    "template": "/Users/davidcruwys/dev/kgems/rails_app_generator/after_templates/addons/scenic/_.rb",
+    "add_scenic": true
+  }
+}

data/profiles/application/klueless.json

@@ -2,7 +2,8 @@
   "args": {
     "app_path": "klueless",
     "destination_root": "/Users/davidcruwys/dev/kweb",
-    "note": "add sidekiq to handle the data import tasks, add impersonate"
+    "note": "add sidekiq to handle the data import tasks, add impersonate",
+    "target_folder_exists": "keep_git"
   },
   "opts": {
     "skip_test": true,
@@ -18,6 +19,7 @@
     "add_factory_bot_rails": true,
     "add_faker": true,
     "add_ransack": false,
-    "add_rubocop": true
+    "add_rubocop": true,
+    "add_scenic": true
   }
 }

data/tasks/profile.thor

@@ -42,6 +42,7 @@ class Profile < Thor
     template('profile/after_template.rb'                              , after_template_path('_.rb')                                   , force: options[:force])
     template('profile/app/controllers/home_controller.rb'             , after_template_path('app/controllers/home_controller.rb')     , force: options[:force])
     template('profile/app/views/home/index.html.erb'                  , after_template_path('app/views/home/index.html.erb')          , force: options[:force])
+    template('profile/app/services/seed_service.rb'                   , after_template_path('app/services/seed_service.rb') , force: options[:force])
 
     copy_file('profile/app/views/layouts/_navbar.html.erb'            , after_template_path('app/views/layouts/_navbar.html.erb')     , force: options[:force])
     copy_file('profile/app/views/layouts/_footer.html.erb'            , after_template_path('app/views/layouts/_footer.html.erb')     , force: options[:force])

data/templates/thor_task/profile/after_template.rb

@@ -11,9 +11,10 @@ gac 'base rails 7 image created'
 prepare_environment
 
 after_bundle do
+  create_db
   scaffolds
   setup_customizations
-  setup_db
+  migrate_db
 end
 
 def scaffolds
@@ -33,38 +34,26 @@ def setup_customizations
   directory "app/models"
   directory "app/views"
   template  'app/views/layouts/application.html.erb'        , 'app/views/layouts/application.html.erb'
+  directory "app/services"
 end
 
-def setup_db
+def create_db
+  # uncomment this if you need custom configuration in database.yml
+  # gsub_file('config/database.yml', '  encoding: unicode', db_development_settings)
+  db(drop: true, create: true)
+end
+
+def migrate_db
   template  'db/seeds.rb'                                   , 'db/seeds.rb'
 
-  db_migrate
-  db_seed
+  db(migrate: true, seed: true)
 end
 
-# Other template command examples
-# prepare_environment
-# bundle_install
-# css_install('tailwind')
-# rails_command('db:migrate')
-# rails_command('db:migrate')
-# bundle_add('hotwire-rails')
-# rails_command('hotwire:install')
-# run('bin/importmap pin sortablejs')
-# run('npm install daisyui')
-# rubocop
-#
-# directory         'app/assets/images'
-# create_file       'app/assets/stylesheets/custom-bootstrap-import.scss' , read_template('custom-bootstrap-import.scss')
-# append_to_file    'app/assets/config/manifest.js'                       , read_template('manifest.js')
-# insert_into_file  'app/views/layouts/application.html.erb', read_template('application.html.erb'),
-#     before: %(    <%%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %>)
-# gsub_file         'app/views/layouts/application.html.erb', %(container mx-auto mt-28 px-5 flex), 'container mx-auto px-5'
-# template 'home.css', 'app/assets/stylesheets/home.css'
-#
-# add_controller('page', 'benefits', 'faq', 'terms', 'privacy', '--skip-routes')
-# route(<<-'RUBY')
-# PageController.action_methods.each do |action|
-#   get "/#{action}", to: "page##{action}", as: "page_#{action}"
-# end
-# RUBY
+def db_development_settings
+  <<-'RUBY'
+  encoding: unicode
+  host: <%= ENV['DATABASE_HOST'] %>
+  username: <%= ENV['DATABASE_USERNAME'] %>
+  password: <%= ENV['DATABASE_PASSWORD'] %>
+  RUBY
+end

data/templates/thor_task/profile/app/controllers/home_controller.rb

@@ -1,4 +1,8 @@
 class HomeController < ApplicationController
   def index
   end
+
+  # def reseed
+  #   SeedService.seed
+  # end
 end

data/templates/thor_task/profile/app/services/seed_service.rb

@@ -0,0 +1,27 @@
+class SeedService
+  class << self
+    def seed
+      service = SeedService.new
+      service.call
+    end
+  end
+
+  def call
+    reset
+    create
+  end
+
+  private
+
+  def reset
+    # Person.delete_all
+    # Post.delete_all
+    # Project.delete_all
+  end
+
+  def create
+    # FactoryBot.create_list(:post, rand(10..20))
+    # FactoryBot.create_list(:person, rand(10..20))
+    # FactoryBot.create_list(:project, rand(10..20))
+  end
+end

data/templates/thor_task/profile/db/seeds.rb

@@ -1,3 +1,4 @@
+# SeedService.seed
 # david = User.create(email: 'david@site.com', name: 'david', password: 'password')
 # james = User.create(email: 'james@site.com', name: 'james', password: 'password')
 # sally = User.create(email: 'sally@site.com', name: 'sally', password: 'password')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_app_generator
 version: !ruby/object:Gem::Version
-  version: 0.2.41
+  version: 0.3.0
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-30 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootsnap
@@ -440,11 +440,29 @@ files:
 - after_templates/addons/rubocop/app/controllers/home_controller.rb
 - after_templates/addons/rubocop/app/views/home/index.html.erb
 - after_templates/addons/rubocop/app/views/layouts/application.html.erb
+- after_templates/addons/scenic/_.rb
+- after_templates/addons/scenic/app/controllers/home_controller.rb
+- after_templates/addons/scenic/app/services/seed_service.rb
+- after_templates/addons/scenic/app/views/home/index.html.erb
+- after_templates/addons/scenic/app/views/home/individual_visitors_by_monument.html.erb
+- after_templates/addons/scenic/app/views/home/reseed.html.erb
+- after_templates/addons/scenic/app/views/home/visitors_by_monument.html.erb
+- after_templates/addons/scenic/app/views/layouts/_footer.html.erb
+- after_templates/addons/scenic/app/views/layouts/_navbar.html.erb
+- after_templates/addons/scenic/app/views/layouts/application.html.erb
+- after_templates/addons/scenic/db/seeds.rb
+- after_templates/addons/scenic/db/views/individual_visitors_by_monuments_v01.sql
+- after_templates/addons/scenic/db/views/visitors_by_monuments_v01.sql
 - after_templates/addons/twilio_ruby/_.rb
 - after_templates/addons/twilio_ruby/app/controllers/home_controller.rb
 - after_templates/addons/twilio_ruby/app/views/home/index.html.erb
 - after_templates/addons/twilio_ruby/config/initializers/twilio.rb
 - after_templates/application/klueless/_.rb
+- after_templates/application/klueless/app/avo/cards/amount_raised.rb
+- after_templates/application/klueless/app/avo/cards/example_custom_partial.rb
+- after_templates/application/klueless/app/avo/cards/example_metric.rb
+- after_templates/application/klueless/app/avo/cards/percent_done.rb
+- after_templates/application/klueless/app/avo/cards/rubocop_card.rb
 - after_templates/application/klueless/app/avo/dashboards/dashboard.rb
 - after_templates/application/klueless/app/avo/resources/db_schema_resource.rb
 - after_templates/application/klueless/app/avo/resources/rails_app_resource.rb
@@ -468,6 +486,7 @@ files:
 - after_templates/application/klueless/config/initializers/avo.rb
 - after_templates/application/klueless/config/locales/en.yml
 - after_templates/application/klueless/db/seeds.rb
+- after_templates/application/klueless/db/views/rubocop_logs_v01.sql
 - after_templates/application/printspeak/_.rb
 - after_templates/application/printspeak/app/assets/images/.keep
 - after_templates/application/printspeak/app/assets/images/about/1.jpg
@@ -800,6 +819,7 @@ files:
 - profiles/addons/redcarpet.json
 - profiles/addons/rolify.json
 - profiles/addons/rubocop.json
+- profiles/addons/scenic.json
 - profiles/addons/twilio_ruby.json
 - profiles/application/klueless.json
 - profiles/application/printspeak.json
@@ -861,6 +881,7 @@ files:
 - templates/thor_task/addon/addon.tt
 - templates/thor_task/profile/after_template.rb
 - templates/thor_task/profile/app/controllers/home_controller.rb
+- templates/thor_task/profile/app/services/seed_service.rb
 - templates/thor_task/profile/app/views/home/index.html.erb.tt
 - templates/thor_task/profile/app/views/layouts/_footer.html.erb.tt
 - templates/thor_task/profile/app/views/layouts/_navbar.html.erb