rails_app_generator 0.2.20 → 0.2.23

data/lib/rails_app_generator/rag_initializer.rb

@@ -86,17 +86,12 @@ KConfig.configure do |config|
 
   # rag.add_option :add_irbrc                   , type: :boolean, default: false
   # rag.add_option :add_foreman                 , type: :boolean, default: false
-  rag.add_option :add_devise                  , type: :boolean, default: false
-  rag.add_option :add_dotenv                  , type: :boolean, default: false
   # rag.add_option :add_docker                  , type: :boolean, default: false
   # rag.add_option :add_docker_compose          , type: :boolean, default: false
-  rag.add_option :add_rubocop                 , type: :boolean, default: false
-  rag.add_option :add_annotate                , type: :boolean, default: false
   # rag.add_option :add_continuous_integration  , type: :boolean, default: false
   # rag.add_option :add_high_voltage            , type: :boolean, default: false
   # rag.add_option :add_generators              , type: :boolean, default: false
-  rag.add_option :add_lograge                 , type: :boolean, default: false
-  # rag.add_option :add_pundit                  , type: :boolean, default: false
+  # rag.add_option :add_pundit                  , type: :boolean, default: false # cancancan vs action_policy vs pundit
   # rag.add_option :add_services                , type: :boolean, default: false
   # rag.add_option :add_sidekiq                 , type: :boolean, default: false
   # rag.add_option :add_views                   , type: :boolean, default: false
@@ -104,24 +99,43 @@ KConfig.configure do |config|
   # rag.add_option :add_scaffold                , type: :boolean, default: false
   # rag.add_option :add_factory_bot             , type: :boolean, default: false
   # rag.add_option :add_shoulda                 , type: :boolean, default: false
+  # letter_opener
 
   # NEW GEM ADDONS
   rag.add_option :add_acts_as_list            , type: :boolean, default: false
   rag.add_option :add_administrate            , type: :boolean, default: false
-  rag.add_option :add_browser                 , type: :boolean, default: false
+  rag.add_option :add_annotate                , type: :boolean, default: false
+  rag.add_option :add_avo                     , type: :boolean, default: false
   rag.add_option :add_bcrypt                  , type: :boolean, default: false
+  rag.add_option :add_browser                 , type: :boolean, default: false
   rag.add_option :add_chartkick               , type: :boolean, default: false
+  # continuous_integration
+  rag.add_option :add_devise                  , type: :boolean, default: false
+  # docker_compose
+  # docker
+  rag.add_option :add_dotenv                  , type: :boolean, default: false
+  # factory_bot
   rag.add_option :add_faker                   , type: :boolean, default: false
+  # generators
   rag.add_option :add_groupdate               , type: :boolean, default: false
   rag.add_option :add_hexapdf                 , type: :boolean, default: false
   rag.add_option :add_httparty                , type: :boolean, default: false
+  # high_voltage
   rag.add_option :add_honeybadger             , type: :boolean, default: false
+  rag.add_option :add_lograge                 , type: :boolean, default: false
   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
   rag.add_option :add_public_suffix           , type: :boolean, default: false
+  rag.add_option :add_phony_rails             , type: :boolean, default: false
+  # pundit
   rag.add_option :add_rails_html_sanitizer    , type: :boolean, default: false
+  # rails_app_generator
+  # RANSACK
   rag.add_option :add_redcarpet               , type: :boolean, default: false
+  # services
+  # shoulda
+  # sidekiq
+  rag.add_option :add_rubocop                 , type: :boolean, default: false
   rag.add_option :add_twilio_ruby             , type: :boolean, default: false
 end
 

data/lib/rails_app_generator/version.rb

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

data/lib/rails_app_generator.rb

@@ -28,6 +28,7 @@ require 'rails_app_generator/options/options_builder'
 require 'rails_app_generator/options/rails_options'
 require 'rails_app_generator/context'
 require 'rails_app_generator/dependencies'
+require 'rails_app_generator/gem_query'
 require 'rails_app_generator/addon'
 require 'rails_app_generator/addon_util'
 require 'rails_app_generator/formatted_gem_entry'

data/package-lock.json

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

data/package.json

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

data/profiles/addons/annotate.json

@@ -0,0 +1,12 @@
+{
+  "args": {
+    "app_path": "annotate",
+    "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/annotate/_.rb",
+    "add_annotate": true
+  }
+}

data/profiles/addons/avo.json

@@ -0,0 +1,16 @@
+{
+  "args": {
+    "app_path": "avo",
+    "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/avo/_.rb",
+    "add_annotate": true,
+    "add_avo": true,
+    "add_devise": true,
+    "add_faker": true,
+    "add_rubocop": true
+  }
+}

data/profiles/addons/devise.json

@@ -0,0 +1,16 @@
+{
+  "args": {
+    "app_path": "devise",
+    "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/devise/_.rb",
+    "notes": "javascript: esbuild is used for the demonstration of this addon so that the destroy_user_session_path can be used as a link using turbo_method: :delete",
+    "javascript": "esbuild",
+    "add_annotate": true,
+    "add_devise": true,
+    "add_faker": true
+  }
+}

data/profiles/rag/testy.json

@@ -0,0 +1,12 @@
+{
+  "args": {
+    "app_path": "testy",
+    "destination_root": "/Users/davidcruwys/dev/kgems/rails_app_generator/a/rag"
+  },
+  "opts": {
+    "skip_git": true,
+    "skip_test": true,
+    "template": "/Users/davidcruwys/dev/kgems/rails_app_generator/after_templates/rag/testy/_.rb",
+    "javascript": "esbuild"
+  }
+}

data/tasks/addon.thor

@@ -4,7 +4,9 @@
 
 require 'net/http'
 require 'json'
-require_relative 'gem_info'
+require 'pry'
+require 'cmdlet'
+require 'rails_app_generator'
 
 # Thor task to create a new Addon for Rails App Generator
 class Addon < Thor
@@ -46,9 +48,11 @@ class Addon < Thor
     end
 
     def build_required_gem_code
+      return nil unless options[:gem]
+
       info = gem_info
 
-      "      required_gem gem.version('#{info.name}', '#{info.version}', '#{info.description}')"
+      "      required_gem gem.version('#{info.name}', '#{info.version}', '#{info.comment}')"
     end
 
     # example: 'https://rubygems.org/api/v1/gems/draper.json'
@@ -57,7 +61,7 @@ class Addon < Thor
 
       gem_name = options[:gem] == 'gem' ? name : options[:gem]
 
-      ::GemInfo.get(gem_name)
+      RailsAppGenerator::GemQuery.get(gem_name)
     end
 
     def build_data

data/tasks/profile.thor

@@ -2,8 +2,8 @@
 
 # https://codecrate.com/2014/01/replace-rake-with-thor.html
 
-require_relative 'gem_info'
 require 'cmdlet'
+require 'rails_app_generator'
 
 # Thor task to create a new Profile for Rails App Generator
 class Profile < Thor
@@ -70,7 +70,7 @@ class Profile < Thor
     def build_data
       gi = gem_info(name)
 
-      description = gi ? gi.description : 'Description goes here'
+      description = gi ? gi.comment : 'Description goes here'
 
       Data.new(
         name: name,
@@ -104,7 +104,7 @@ class Profile < Thor
 
       gem_name = options[:gem] == 'gem' ? name : options[:gem]
 
-      GemInfo.get(gem_name)
+      RailsAppGenerator::GemQuery.get(gem_name)
     end
 
     def human(value)

data/templates/Gemfile.erb

@@ -1,6 +1,7 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
+# xmen
 ruby <%= "'#{RUBY_VERSION}'" -%>
 
 <% gems.each do |gem| %><%= gem %>

data/{after_templates/rag/devise/turbo_controller.rb → templates/addons/devise/app/controllers/turbo_devise_controller.rb}

@@ -1,16 +1,10 @@
-class TurboController < ApplicationController
-
-  # This is required for Devise to work.
-  # See: https://youtu.be/m3uhldUGVes?t=1432
-  #
-  # Having issues with devise/turbo.
-  # See: https://gorails.com/episodes/devise-hotwire-turbo
+class TurboDeviseController < ApplicationController
   class Responder < ActionController::Responder
     def to_turbo_stream
       controller.render(options.merge(formats: :html))
-    rescue ActionView::MissingTemplate => error
+    rescue ActionView::MissingTemplate => e
       if get?
-        raise error
+        raise e
       elsif has_errors? && default_action
         render rendering_options.merge(formats: :html, status: :unprocessable_entity)
       else
@@ -21,4 +15,4 @@ class TurboController < ApplicationController
 
   self.responder = Responder
   respond_to :html, :turbo_stream
-end
+end

data/templates/addons/devise/app/controllers/users/registrations_controller.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+class Users::RegistrationsController < Devise::RegistrationsController
+  before_action :configure_sign_up_params, only: [:create]
+  before_action :configure_account_update_params, only: [:update]
+
+  # GET /resource/sign_up
+  # def new
+  #   super
+  # end
+
+  # POST /resource
+  # def create
+  #   super
+  # end
+
+  # GET /resource/edit
+  # def edit
+  #   super
+  # end
+
+  # PUT /resource
+  # def update
+  #   super
+  # end
+
+  # DELETE /resource
+  # def destroy
+  #   super
+  # end
+
+  # GET /resource/cancel
+  # Forces the session data which is usually expired after sign
+  # in to be expired now. This is useful if the user wants to
+  # cancel oauth signing in/up in the middle of the process,
+  # removing all OAuth session data.
+  # def cancel
+  #   super
+  # end
+
+  # protected
+
+  # If you have extra params to permit, append them to the sanitizer.
+  def configure_sign_up_params
+    devise_parameter_sanitizer.permit(:sign_up, keys: [:name])
+  end
+
+  # If you have extra params to permit, append them to the sanitizer.
+  def configure_account_update_params
+    devise_parameter_sanitizer.permit(:account_update, keys: [:name])
+  end
+
+  # The path used after sign up.
+  # def after_sign_up_path_for(resource)
+  #   super(resource)
+  # end
+
+  # The path used after sign up for inactive accounts.
+  # def after_inactive_sign_up_path_for(resource)
+  #   super(resource)
+  # end
+end

data/templates/addons/devise/app/views/devise/registrations/edit.html.erb

@@ -1,62 +1,48 @@
-<% content_for :devise_form do %>
-  <h2 class="pt-4 mb-8 text-4xl font-bold heading">Edit <%= resource_name.to_s.humanize %></h2>
-
-  <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
-
-    <%= render "devise/shared/error_messages", resource: resource %>
-
-    <div class="input-group">
-      <%= f.label :name, class:"label" %>
-      <%= f.text_field :name, class:"input" %>
-    </div>
-
-    <div class="input-group">
-      <%= f.label :email, class:"label" %>
-      <%= f.email_field :email, autocomplete: "email", class:"input" %>
-    </div>
-
-    <div class="input-group">
-      <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
-        <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
-      <% end %>
-    </div>
-
-    <div class="input-group">
-      <%= f.label :password, class:"label" %>
-      <%= f.password_field :password, autocomplete: "new-password", class:"input" %>
-      <p class="pt-1 text-sm italic text-grey-dark"> <% if @minimum_password_length %>
-          <%= @minimum_password_length %> characters minimum <% end %> (leave blank if you don't want to change it) </p>
-
-    </div>
-
-    <div class="input-group">
-      <%= f.label :password_confirmation, class: "label" %>
-      <%= f.password_field :password_confirmation, autocomplete: "new-password", class: "input" %>
-    </div>
-
-    <div class="input-group">
-      <%= f.label :current_password, class: "label" %>
-      <%= f.password_field :current_password, autocomplete: "current-password", class: "input" %>
-      <p class="pt-2 text-sm italic text-grey-dark">(we need your current password to confirm your changes)</p>
-    </div>
-
-    <div class="input-group">
-      <%= f.submit "Update", class: "btn btn-default" %>
-    </div>
-  <% end %>
+<h2>Edit <%= resource_name.to_s.humanize %></h2>
+
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
+
+  <div class="field">
+    <%= f.label :name %><br />
+    <%= f.text_field :name, autofocus: true %>
+  </div>
+
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autocomplete: "email" %>
+  </div>
 
-  <hr class="mt-6 mb-3 border" />
+  <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
+    <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
+  <% end %>
 
-  <h3 class="mb-4 text-xl font-bold heading">Cancel my account</h3>
+  <div class="field">
+    <%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
+    <%= f.password_field :password, autocomplete: "new-password" %>
+    <% if @minimum_password_length %>
+      <br />
+      <em><%= @minimum_password_length %> characters minimum</em>
+    <% end %>
+  </div>
 
-  <div class="flex items-center justify-between">
-    <div class="flex-1">
-      <p class="py-4">Unhappy?</p>
-    </div>
+  <div class="field">
+    <%= f.label :password_confirmation %><br />
+    <%= f.password_field :password_confirmation, autocomplete: "new-password" %>
+  </div>
 
-    <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete, class: "btn btn-red" %>
+  <div class="field">
+    <%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
+    <%= f.password_field :current_password, autocomplete: "current-password" %>
   </div>
 
+  <div class="actions">
+    <%= f.submit "Update" %>
+  </div>
 <% end %>
 
-<%= render 'devise/shared/form_wrap' %>
+<h3>Cancel my account</h3>
+
+<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p>
+
+<%= link_to "Back", :back %>

data/templates/addons/devise/app/views/devise/registrations/new.html.erb

@@ -1,45 +1,34 @@
-<% content_for :devise_form do %>
-
-  <h2 class="pt-4 mb-8 text-4xl font-bold heading">Sign up</h2>
-
-  <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
-    <%= render "devise/shared/error_messages", resource: resource %>
-
-    <div class="input-group">
-      <%= f.label :name, class:"label" %>
-      <%= f.text_field :name, class:"input" %>
-    </div>
-
-    <div class="input-group">
-      <%= f.label :email, class:"label" %>
-      <%= f.email_field :email, autocomplete: "email", class:"input" %>
-    </div>
-
-    <div class="input-group">
-      <div class="flex">
-        <%= f.label :password, class: "label" %>
-        <% if @minimum_password_length %>
-          <span class="pl-1 text-xs text-grey-dark"><em>(<%= @minimum_password_length %> characters minimum)</em></span>
-        <% end %>
-      </div>
-      <%= f.password_field :password, autocomplete: "new-password", class: "input" %>
-    </div>
-
-    <div class="input-group">
-      <%= f.label :password_confirmation, class:"label" %>
-      <%= f.password_field :password_confirmation, autocomplete: "new-password", class: "input" %>
-    </div>
-
-    <div class="input-group">
-      <%= f.submit "Sign up", class: "btn btn-default" %>
-    </div>
-
-    <hr class="mt-6 border" />
-
-  <% end %>
-
-  <%= render "devise/shared/links" %>
-
+<h2>Sign up</h2>
+
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
+  <%= render "devise/shared/error_messages", resource: resource %>
+
+  <div class="field">
+    <%= f.label :name %><br />
+    <%= f.text_field :name, autofocus: true %>
+  </div>
+
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autocomplete: "email" %>
+  </div>
+
+  <div class="field">
+    <%= f.label :password %>
+    <% if @minimum_password_length %>
+    <em>(<%= @minimum_password_length %> characters minimum)</em>
+    <% end %><br />
+    <%= f.password_field :password, autocomplete: "new-password" %>
+  </div>
+
+  <div class="field">
+    <%= f.label :password_confirmation %><br />
+    <%= f.password_field :password_confirmation, autocomplete: "new-password" %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit "Sign up" %>
+  </div>
 <% end %>
 
-<%= render "devise/shared/form_wrap" %>
+<%= render "devise/shared/links" %>

data/templates/addons/devise/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/rag → templates/addons}/devise/config/initializers/devise_turbo.rb

@@ -19,7 +19,7 @@ end
 Devise.setup do |config|
   # ==> Controller configuration
   # Configure the parent class to the devise controllers.
-  config.parent_controller = 'TurboController'
+  config.parent_controller = 'TurboDeviseController'
 
   config.navigational_formats = ['*/*', :html, :turbo_stream]
 

data/templates/thor_task/profile/after_template.rb

@@ -8,7 +8,7 @@ self.local_template_path = File.dirname(__FILE__)
 
 gac 'base rails 7 image created'
 
-bundle_install
+prepare_environment
 
 add_controller('home', 'index')
 
@@ -28,7 +28,7 @@ after_bundle do
 end
 
 def setup_db
-  # add_scaffold('post', 'title', 'body:text')
+  # add_scaffold('post', 'title', 'body:text', 'user:references')
   # add_scaffold('people', 'first_name', 'last_name', 'age:integer', 'address:text')
   # add_scaffold('product', 'name', 'price:integer')
 
@@ -37,6 +37,7 @@ def setup_db
 end
 
 # Other template command examples
+# prepare_environment
 # bundle_install
 # css_install('tailwind')
 # rails_command('db:migrate')

data/templates/thor_task/profile/app/views/layouts/_footer.html.erb.tt

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

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

@@ -1,8 +1,5 @@
-<header>
-  <%= link_to 'Home', root_path %> |
-  <%# link_to 'Some Action', home_some_action_path %> |
-  <%# link_to 'Products', products_path %> |
-  <%# link_to 'Posts', posts_path %> |
-  <%# link_to 'People', people_path %>
-  <hr />
-</header>
+<%= link_to 'Home', root_path %>
+<%# link_to 'Products', products_path %>
+<%# link_to 'Posts', posts_path %>
+<%# link_to 'People', people_path %>
+<hr />

data/templates/thor_task/profile/app/views/layouts/application.html.erb.tt

@@ -14,10 +14,16 @@
   </head>
 
   <body>
-    <%%= render 'layouts/navbar' %>
+    <header>
+      <%%= render 'layouts/navbar' %>
+      <hr />
+    </header>
     <main>
       <%%= yield %>
     </main>
-    <%%= render 'layouts/footer' %>
+    <footer>
+      <%%= render 'layouts/footer' %>
+    </footer>
   </body>
 </html>
+

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

@@ -1,15 +1,6 @@
-# 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
-
 # david = User.create(email: 'david@site.com', name: 'david', password: 'password')
-# bob   = User.create(email: 'bob@site.com', name: 'bob', password: 'password')
-# lisa  = User.create(email: 'lisa@site.com', name: 'lisa', password: 'password')
+# james = User.create(email: 'james@site.com', name: 'james', password: 'password')
+# sally = User.create(email: 'sally@site.com', name: 'sally', password: 'password')
 
 # 10.times do |i|
 #   Post.create(title: "Post #{i}", body: "This is the body of post #{i}", user: User.all.sample)