rails_app_generator 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0537d791d3c10bc8073b5e9e923d9f3780afad431fad2d1caa4d8f52c9dc92b2
-  data.tar.gz: e798fbbc728bff9920c1974754052c435f25cc1426bde4a028c4bacd8e58b9b4
+  metadata.gz: 7fcac12a1550dd43ed855c200f83f4fcec96ec986735fbbde0f4524d304960a2
+  data.tar.gz: adc321839e7b83b5544f64657ddc9b33a9cf0206e1fa13a030cf9e5aa72b4bcc
 SHA512:
-  metadata.gz: c46126c1818d49d73f0732beff5975546c5f3c3c7c4f63377f4b240b2cc186179f3a675c1330c0c87f47f0dcd1a47d487c31253678890036af5d9663290e5978
-  data.tar.gz: 33633fa8eb13f610dbfed6d07d0f03678f1a33de1abfc768b5d31e977dc9df3abd6a742717ee15ad7e926072fb7dbaf25ddf1811440547e44d241ce9edbcd852
+  metadata.gz: 8967d4f2630dc7a6165c465ac8b85f5f3118630e6da671c210853184221a8062904643c1fe3bcf8d8dbfc77d3dba6cb05d209b96b9fafe18a9a13e616075db0b
+  data.tar.gz: 4c7d0230ea47a7274f6223fb0f8d0d3034cd546cd21741162ab4d301da08dc9365ff80c06251f6130a103a7b691dd95b227409210f59d4fdda1ac4bf8b79abfb

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.1.17](https://github.com/klueless-io/rails_app_generator/compare/v0.1.16...v0.1.17) (2022-08-05)
+
+
+### Bug Fixes
+
+* addon browser ([a1fae1d](https://github.com/klueless-io/rails_app_generator/commit/a1fae1d3ee5e5ecabe53fb5ac60d8067477f39b1))
+
 ## [0.1.16](https://github.com/klueless-io/rails_app_generator/compare/v0.1.15...v0.1.16) (2022-08-05)
 
 

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

@@ -9,15 +9,3 @@
 <h1>Acts as list</h1>
 
 <h2>This "acts_as" extension provides the capabilities for sorting and reordering a number of objects in a list. The class that has this specified needs to have a "position" column defined as an integer on the mapped database table.</h2>
-
-<!-- 
-Add/Remove as needed
--->
-
-<!--
-<= link_to 'Some Action', home_some_action_path %>
-
-<= link_to 'Products', products_path %> |
-<= link_to 'Posts', posts_path %> |
-<= link_to 'People', people_path %>
--->

data/after_templates/addons/chartkick/_.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+# require 'pry'
+
+# Create beautiful JavaScript charts with one line of Ruby
+#
+# exe/rag addons/chartkick
+
+self.local_template_path = File.dirname(__FILE__)
+
+gac 'base rails 7 image created'
+
+add_controller('home', 'index')
+route("root 'home#index'")
+
+force_copy
+
+copy_file 'app/controllers/home_controller.rb'            , 'app/controllers/home_controller.rb'
+copy_file 'app/views/home/index.html.erb'                 , 'app/views/home/index.html.erb'
+
+copy_file 'app/views/layouts/_alerts.html.erb'            , 'app/views/layouts/_alerts.html.erb'
+copy_file 'app/views/layouts/_navbar.html.erb'            , 'app/views/layouts/_navbar.html.erb'
+copy_file 'app/views/layouts/_footer.html.erb'            , 'app/views/layouts/_footer.html.erb'
+template  'app/views/layouts/application.html.erb'        , 'app/views/layouts/application.html.erb'
+
+template  'db/seeds.rb'                                   , 'db/seeds.rb'
+
+copy_file 'config/initializers/chartkick.rb' , 'config/initializers/chartkick.rb'
+
+after_bundle do
+  setup_db
+  db_seed
+end
+
+def setup_db
+  add_scaffold('yogurt', 'flavour')
+  # add_scaffold('post', 'title', 'body:text')
+  add_scaffold('people', 'name')
+  copy_file 'app/views/people/_person.html.erb'             , 'app/views/people/_person.html.erb'
+  
+  # add_scaffold('product', 'name', 'price:integer')
+
+  db_migrate
+end
+
+# Other template command examples
+# css_install('tailwind')
+# rails_command('db:migrate')
+# bundle_add('hotwire-rails')
+# rails_command('hotwire:install')
+# run('bin/importmap pin sortablejs')
+# run('npm install daisyui')
+# 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'

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

@@ -0,0 +1,4 @@
+class HomeController < ApplicationController
+  def index
+  end
+end

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

@@ -0,0 +1,38 @@
+<style>
+.alert { color: red; }
+.notice { color: green; }
+</style>
+
+<% flash.each do |type, msg| %><div class="<%= type %>"><%= msg %></div><% end %>
+<% if flash.any? %><hr /><% end %>
+
+<h1>Chartkick</h1>
+
+<h2>Create beautiful JavaScript charts with one line of Ruby</h2>
+
+<p>
+  <a href="https://chartkick.com/">Chartkick</a> is a simple, yet powerful library for creating beautiful charts with one line of Ruby.
+  It is built on top of the <a href="http://www.chartjs.org/">Chart.js</a> library.</p>
+
+<h3>Line Chart</h3><br /><br />
+<%= line_chart Person.group_by_day(:updated_at).count %>
+
+<br /><br />
+<h3>Pie Chart via Query</h3><br /><br />
+<%= pie_chart Yogurt.group(:flavour).count %>
+
+<h3>Pie Chart (Manual)</h3><br /><br />
+
+<%= pie_chart [
+    ['Task', 'Hours per Day'],
+    ['Work',11],
+    ['Eat',2],
+    ['Commute',2],
+    ['Watch TV', 2],
+    ['Sleep',7]
+  ]
+%>
+
+<h3>Column Chart</h3><br /><br />
+
+<%= column_chart Person.group_by_hour_of_day(:updated_at, format: "%l %P").count %>

data/after_templates/addons/chartkick/app/views/layouts/_alerts.html.erb

@@ -0,0 +1,2 @@
+<% flash.each do |type, msg| %><div class="<%= type %>"><%= msg %></div><% end %>
+<% if flash.any? %><hr /><% end %>

data/after_templates/addons/chartkick/app/views/layouts/_footer.html.erb

@@ -0,0 +1,3 @@
+<footer>
+  <hr />
+</footer>

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

@@ -0,0 +1,7 @@
+<header>
+  <%= link_to 'Home', root_path %> |
+  <%= link_to 'Yogurt', yogurts_path %> |
+  <%# link_to 'Posts', posts_path %> |
+  <%= link_to 'People', people_path %>
+  <hr />
+</header>

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

@@ -0,0 +1,28 @@
+<!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 -%>
+    <style>
+    .alert { color: red; }
+    .notice { color: green; }
+    </style>
+  </head>
+
+  <body>
+    <%%= render 'layouts/navbar' %>
+    <main>
+      <%%= render 'layouts/alerts' %>
+      <%%= yield %>
+    </main>
+    <%%= render 'layouts/footer' %>
+  </body>
+</html>

data/after_templates/addons/chartkick/app/views/people/_person.html.erb

@@ -0,0 +1,6 @@
+<div id="<%= dom_id person %>">
+  <p>
+    <strong>Name:</strong>
+    <%= person.name %> - <%= person.updated_at %>
+  </p>
+</div>

data/after_templates/addons/chartkick/config/initializers/chartkick.rb

@@ -0,0 +1 @@
+# Custom initializer for rails application

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

@@ -0,0 +1,17 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the bin/rails db:seed command (or created alongside the database with db:setup).
+#
+# User.find_or_create_by(email: "admin@admin.com") do |user|
+#   user.name = 'Admin'
+#   user.password = 'password'
+#   user.admin = true
+# end
+
+flavours = %w[Blueberry Strawberry Banana Raspberry Apple Grape]
+50.times do
+  Yogurt.create(flavour: flavours.sample)
+end
+50.times do
+  person = Person.create(name: Faker::Name.name)
+  person.update!(updated_at: Faker::Time.between_dates(from: 20.days.ago, to: Date.today, period: :day) + 10.hours)
+end

data/lib/rails_app_generator/add_on.rb

@@ -82,12 +82,23 @@ module RailsAppGenerator
     # rubocop:enable Metrics/BlockLength
 
     class << self
-      def apply(context = Context.new({}))
-        instance = new(context)
-        return unless instance.uses?
+      # attr_reader :before_bundle_callback
+      # attr_reader :after_bundle_callback
 
-        instance.apply
-      end
+      # def before_bundle(&block)
+      #   @before_bundle_callback = block
+      # end
+
+      # def after_bundle(&block)
+      #   @after_bundle_callback = block
+      # end
+
+      # def apply(context = Context.new({}))
+      #   instance = new(context)
+      #   return unless instance.uses?
+
+      #   instance.apply
+      # end
 
       def get(addon)
         addon = addon.to_s.capitalize.camelize

data/lib/rails_app_generator/addons/chartkick.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module RailsAppGenerator
+  # Custom add-ons for RailsAppGenerator
+  module AddOns
+    # Add Chartkick to rails application
+    class Chartkick < AddOn
+      required_gem gem.version('chartkick', '4.2.1', 'Create beautiful JavaScript charts with one line of Ruby')
+
+      def apply
+        puts 'Applying Chartkick'
+        # say 'Setting up Chartkick'
+        # template('chartkick_template.rb', 'target/chartkick.rb', force: true)
+        # template('app/javascript/stylesheets/components.scss')
+        # create_file('target/chartkick.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_bundle
+        puts 'Setting up Chartkick (before bundle)'
+      end
+
+      def after_bundle
+        puts 'Setting up Chartkick (after bundle)'
+        append_to_file('config/importmap.rb', <<~RUBY)
+          pin "chartkick", to: "chartkick.js"
+          pin "Chart.bundle", to: "Chart.bundle.js"
+        RUBY
+
+        append_to_file('app/javascript/application.js', <<~RUBY)
+          import "chartkick"
+          import "Chart.bundle"
+        RUBY
+      end
+    end
+  end
+end

data/lib/rails_app_generator/addons/groupdate.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module RailsAppGenerator
+  # Custom add-ons for RailsAppGenerator
+  module AddOns
+    # Add Groupdate to rails application
+    class Groupdate < AddOn
+      required_gem gem.version('groupdate', '6.1.0', 'The simplest way to group temporal data')
+
+      # NOTE: in the examples, the Groupdate gem is used in conjunction with Chartkick.
+      def apply
+        say 'Setting up Groupdate'
+        # template('groupdate_template.rb', 'target/groupdate.rb', force: true)
+        # template('app/javascript/stylesheets/components.scss')
+        # create_file('target/groupdate.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_bundle
+        say 'Setting up Groupdate - before bundle install'
+      end
+
+      def after_bundle
+        say 'Setting up Groupdate - after bundle install'
+      end
+    end
+  end
+end

data/lib/rails_app_generator/app_generator.rb

@@ -14,7 +14,6 @@ module RailsAppGenerator
     # aws-sdk-personalize              1.42.0   1.43.0
     # aws-sdk-resources                3.136.0  3.137.0
     # aws-sdk-wafv2                    1.40.0   1.41.0
-    # browser                          2.7.1    5.3.1    ~> 2.3     default
     # capistrano-bundler               1.6.0    2.1.0    ~> 1.2     development, test
     # capybara                         3.33.0   3.37.1   = 3.33.0   development, test
     # chartkick                        2.3.5    4.2.1    ~> 2.3     default
@@ -160,6 +159,8 @@ module RailsAppGenerator
     # NEW GEM ADDONS
     class_option :add_acts_as_list            , type: :boolean, default: false
     class_option :add_browser                 , type: :boolean, default: false
+    class_option :add_chartkick               , type: :boolean, default: false
+    class_option :add_groupdate               , type: :boolean, default: false
     class_option :add_faker                   , type: :boolean, default: false
     class_option :add_honeybadger             , type: :boolean, default: false
     class_option :add_rails_html_sanitizer    , type: :boolean, default: false
@@ -208,10 +209,18 @@ module RailsAppGenerator
       end
     end
 
+    attr_reader :addon_instances
+
+    # attr_reader :before_bundle_addon_callbacks
+    # attr_reader :after_bundle_addon_callbacks
+
     def initialize(*args)
       super
 
       @force_copy = false
+      @addon_instances = []
+      # @before_bundle_addon_callbacks = []
+      # @after_bundle_addon_callbacks = []
 
       # puts '----------------------------------------------------'
       # puts options
@@ -298,8 +307,10 @@ module RailsAppGenerator
       add_if(:acts_as_list)
       add_if(:annotate)
       add_if(:browser)
+      add_if(:chartkick)
       add_if(:continuous_integration)
       add_if(:devise)
+      add_if(:groupdate)
       add_if(:factory_bot)
       add_if(:faker)
       add_if(:generators)
@@ -319,6 +330,12 @@ module RailsAppGenerator
     end
     # rubocop:enable Metrics/AbcSize
 
+    def run_after_bundle_callbacks
+      addon_instances.select { |addon| addon.respond_to?(:before_bundle) }.each(&:before_bundle)
+      super
+      addon_instances.select { |addon| addon.respond_to?(:after_bundle) }.each(&:after_bundle)
+    end
+
     no_commands do
       # https://codingpackets.com/blog/rails-generators-cheat-sheet/
 
@@ -472,10 +489,22 @@ module RailsAppGenerator
           addon = addon.to_s.capitalize.camelize
           addon = "RailsAppGenerator::AddOns::#{addon}"
 
-          addon.constantize.apply(context)
+          addon_instance = addon.constantize.new(context)
+
+          if addon_instance.uses?
+            addon_instance.apply
+            @addon_instances << addon_instance
+          end
         end
       end
 
+      # def apply(context = Context.new({}))
+      #   instance = new(context)
+      #   return unless instance.uses?
+
+      #   instance.apply
+      # end
+
       def add_if(addon)
         add(addon) if active?(addon)
       end
@@ -528,6 +557,14 @@ module RailsAppGenerator
       def addon_gemfile_entries
         active_addon_classes.flat_map(&:gem_entries)
       end
+
+      # def addon_before_bundle_callbacks
+      #   active_addon_classes.flat_map(&:before_bundle_callback).compact
+      # end
+
+      # def addon_after_bundle_callbacks
+      #   active_addon_classes.flat_map(&:after_bundle_callback).compact
+      # end
     end
 
     protected

data/lib/rails_app_generator/options/rails_options.rb

@@ -61,7 +61,9 @@ module RailsAppGenerator
     # NEW GEM ADDONS
     register_option :add_acts_as_list           , type: :boolean, default: false
     register_option :add_browser                , type: :boolean, default: false
+    register_option :add_chartkick              , type: :boolean, default: false
     register_option :add_faker                  , type: :boolean, default: false
+    register_option :add_groupdate              , type: :boolean, default: false
     register_option :add_honeybadger            , type: :boolean, default: false
     register_option :add_rails_html_sanitizer   , type: :boolean, default: false
     register_option :add_twilio_ruby            , type: :boolean, default: false

data/lib/rails_app_generator/version.rb

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

data/package-lock.json

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

data/package.json

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

data/profiles/addons/chartkick.json

@@ -0,0 +1,14 @@
+{
+  "args": {
+    "app_path": "chartkick",
+    "destination_root": "/Users/davidcruwys/dev/kgems/rails_app_generator/a/addons"
+  },
+  "opts": {
+    "skip_git": true,
+    "skip_test": true,
+    "template": "/Users/davidcruwys/dev/kgems/rails_app_generator/after_templates/addons/chartkick/_.rb",
+    "add_chartkick": true,
+    "add_groupdate": true,
+    "add_faker": true
+  }
+}

data/templates/thor_task/addon/addon.tt

@@ -14,7 +14,7 @@ module RailsAppGenerator
     class <%= data.name_camel %> < AddOn
 <%= data.addon_config_code %>
       def apply
-        # say 'Setting up <%= data.name_camel %>'
+        say 'Setting up <%= data.name_camel %>'
         # template('<%= data.name_snake%>_template.rb', 'target/<%= data.name_snake%>.rb', force: true)
         # template('app/javascript/stylesheets/components.scss')
         # create_file('target/<%= data.name_snake%>.rb', 'put your content here')
@@ -23,6 +23,14 @@ module RailsAppGenerator
         # inject_into_file('app/application.js', "some content")
         # rails_command('tailwindcss:install')
       end
+
+      def before_bundle
+        say 'Setting up <%= data.name_camel %> - before bundle install'
+      end
+
+      def after_bundle
+        say 'Setting up <%= data.name_camel %> - after bundle install'
+      end
     end
   end
 end

data/templates/thor_task/profile/app/views/home/index.html.erb.tt

@@ -9,15 +9,3 @@
 <h1><%= data.name_human %></h1>
 
 <h2><%= data.description %></h2>
-
-<!-- 
-Add/Remove as needed
--->
-
-<!--
-<= link_to 'Some Action', home_some_action_path %>
-
-<= link_to 'Products', products_path %> |
-<= link_to 'Posts', posts_path %> |
-<= link_to 'People', people_path %>
--->

data/templates/thor_task/profile/app/views/layouts/_navbar.html.erb

@@ -1,7 +1,7 @@
 <header>
-  <= link_to 'Home', home_path %> |
-  <= link_to 'Products', products_path %> |
-  <= link_to 'Posts', posts_path %> |
-  <= link_to 'People', people_path %>
+  <%= link_to 'Home', root_path %> |
+  <%# link_to 'Products', products_path %> |
+  <%# link_to 'Posts', posts_path %> |
+  <%# link_to 'People', people_path %>
   <hr />
 </header>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_app_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-05 00:00:00.000000000 Z
+date: 2022-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootsnap
@@ -177,6 +177,16 @@ files:
 - after_templates/addons/browser/_.rb
 - after_templates/addons/browser/app/controllers/home_controller.rb
 - after_templates/addons/browser/app/views/home/index.html.erb
+- after_templates/addons/chartkick/_.rb
+- after_templates/addons/chartkick/app/controllers/home_controller.rb
+- after_templates/addons/chartkick/app/views/home/index.html.erb
+- after_templates/addons/chartkick/app/views/layouts/_alerts.html.erb
+- after_templates/addons/chartkick/app/views/layouts/_footer.html.erb
+- after_templates/addons/chartkick/app/views/layouts/_navbar.html.erb
+- after_templates/addons/chartkick/app/views/layouts/application.html.erb
+- after_templates/addons/chartkick/app/views/people/_person.html.erb
+- after_templates/addons/chartkick/config/initializers/chartkick.rb
+- after_templates/addons/chartkick/db/seeds.rb
 - after_templates/addons/faker/_.rb
 - after_templates/addons/faker/app/controllers/home_controller.rb
 - after_templates/addons/faker/app/views/home/index.html.erb
@@ -331,6 +341,7 @@ files:
 - lib/rails_app_generator/addons/acts_as_list.rb
 - lib/rails_app_generator/addons/annotate.rb
 - lib/rails_app_generator/addons/browser.rb
+- lib/rails_app_generator/addons/chartkick.rb
 - lib/rails_app_generator/addons/continuous_integration.rb
 - lib/rails_app_generator/addons/devise.rb
 - lib/rails_app_generator/addons/docker.rb
@@ -340,6 +351,7 @@ files:
 - lib/rails_app_generator/addons/faker.rb
 - lib/rails_app_generator/addons/foreman.rb
 - lib/rails_app_generator/addons/generators.rb
+- lib/rails_app_generator/addons/groupdate.rb
 - lib/rails_app_generator/addons/high_voltage.rb
 - lib/rails_app_generator/addons/honeybadger.rb
 - lib/rails_app_generator/addons/inline_svg.rb
@@ -393,6 +405,7 @@ files:
 - package.json
 - profiles/addons/acts_as_list.json
 - profiles/addons/browser.json
+- profiles/addons/chartkick.json
 - profiles/addons/faker.json
 - profiles/addons/honeybadger.json
 - profiles/addons/rails-html-sanitizer.json