rails_app_generator 0.2.38 → 0.2.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acc731854bb8ac95ec84859705ef81a8b9858802d9675a54dc02a6af5a9ee676
-  data.tar.gz: 3be6aedc699c1f8078aaa54e465658b17ed4e9b66f56e63832e187c0119e9afa
+  metadata.gz: be981683729c562f221e7f00120145d345ea0111fbe80aa5f4cf9f2d03eaff03
+  data.tar.gz: 4a1a65620ae0fcecd12f0c27cd88fe0cb51da1c57843fc7afced0508cf31dfb1
 SHA512:
-  metadata.gz: 520c0072f1fa27c043d4af71667cc486e67cae7606d19daa558482c6e7892322f1b7ab89d2ce685098d635b4d307d3f34ab035ce132b0eb131e625f2071f1f39
-  data.tar.gz: 57781bbb63ea180fb25aac7727d5ae0c88e8f2948d46e2d14635accb78a750c589462075cdfb2368f95eac8eb1da416150644370497e4c4c56b25b39a5bd5ee8
+  metadata.gz: d1fe4dfc123fb768fde98d6e40ed82e51955f3612751afa0241a05868d31d7fe7e209036bac26f42573cd7b7ef2f099415ab4e6e8177cd00322c59746f11e486
+  data.tar.gz: f79cefc7816b714aac7717d35b7a6d64ccc3302d5b90c31e7747e4e0897bd0c1a2820f87017ca86de4221ca9c593735e34eb8d52bd55a85906e08fcef5652fb9

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.2.38](https://github.com/klueless-io/rails_app_generator/compare/v0.2.37...v0.2.38) (2022-08-22)
+
+
+### Bug Fixes
+
+* add friendly_id addon ([5c34df5](https://github.com/klueless-io/rails_app_generator/commit/5c34df5fdbca8bc6810bd3cc9343d8b799d63ac3))
+
 ## [0.2.37](https://github.com/klueless-io/rails_app_generator/compare/v0.2.36...v0.2.37) (2022-08-22)
 
 

data/after_templates/addons/avo/_.rb

@@ -18,13 +18,19 @@ after_bundle do
   setup_customizations
   setup_db
   setup_avo
+
+  swap1 = '  resources :users'
+  swap2 = "  devise_for :users, controllers: { sessions: 'users/sessions', registrations: 'users/registrations' }"
+
+  swap_lines('config/routes.rb', swap1, swap2)
 end
 
 def scaffolds
   add_scaffold_controller('users', 'name', 'email')
-  # add_scaffold('author', 'name', 'email', 'bio:text')
   add_scaffold('category', 'title', 'description:text')
-  add_scaffold('post', 'title content:text', 'published:boolean', 'user:references', 'category:references')
+  add_scaffold('post', 'title', 'content:text', 'published:boolean', 'user:references', 'category:references')
+  add_scaffold('comment', 'body:text', 'commentable:references{polymorphic}', 'user:references')
+
   add_scaffold('location', 'name', 'description:text') #, 'photo:file')
   add_scaffold('room', 'name', 'description:text', 'location:references') #, 'photo:file'
   add_scaffold('booking', 'user:references', 'room:references', 'booked_at:datetime', 'booked_for:integer')
@@ -35,11 +41,12 @@ def setup_customizations
 
   force_copy
   
-  add_controller('home', 'index', 'quick_signin')
+  add_controller('home', 'index', 'quick_signin', 'reseed')
   
   directory "app/controllers"
   directory "app/models"
   directory "app/views"
+  directory "app/services"
   template  'app/views/layouts/application.html.erb'        , 'app/views/layouts/application.html.erb'
 end
 
@@ -55,6 +62,7 @@ def setup_avo
 
   generate('avo:resource Category')
   generate('avo:resource Post')
+  generate('avo:resource Comment')
   generate('avo:resource Location')
   generate('avo:resource Room')
   generate('avo:resource Booking')

data/after_templates/addons/avo/app/avo/resources/post_resource.rb

@@ -22,4 +22,7 @@ class PostResource < Avo::BaseResource
 
   # tutorial (related category): https://youtu.be/WgNK-oINFww?t=328
   field :category, as: :belongs_to
+
+  # tutorial (related category with custom name): https://youtu.be/WgNK-oINFww?t=722
+  field :user, name: "Author", as: :belongs_to
 end

data/after_templates/addons/avo/app/avo/resources/user_resource.rb

@@ -20,4 +20,5 @@ class UserResource < Avo::BaseResource
   field :name, as: :text
   field :email, as: :text, as_description: true
   field :password, as: :text
+  field :posts, as: :has_many
 end

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

@@ -5,4 +5,8 @@ class HomeController < ApplicationController
   def quick_signin
     sign_in(:user, User.first)
   end
+
+  def reseed
+    SeedService.seed
+  end
 end

data/after_templates/addons/avo/app/models/post.rb

@@ -1,9 +1,10 @@
 class Post < ApplicationRecord
-  belongs_to :author, class_name: 'User', foreign_key: :user_id
+  # belongs_to :author, class_name: 'User', foreign_key: :user_id
+  belongs_to :user
   belongs_to :category
 
   # tutorial: https://youtu.be/WgNK-oINFww?t=209
   def excerpt
-    ActionView::Base.full_sanitizer.sanitize(content).truncate(100)
+    ActionView::Base.full_sanitizer.sanitize(content).truncate(50)
   end
 end

data/after_templates/addons/avo/app/models/user.rb

@@ -0,0 +1,6 @@
+class User < ApplicationRecord
+  devise :database_authenticatable, :registerable, :recoverable, :rememberable, :validatable
+
+  has_many :posts
+  has_many :comments
+end

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

@@ -0,0 +1,9 @@
+require 'open-uri'
+
+class SeedService
+  class << self
+    def seed
+      puts 'sssssssssssssssssssssss'
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
-<h1>I18n.t('application_name')</h1>
+<h1><%= I18n.t('application_name') %></h1>
 
-<p>Avo abstracts away the common parts of building apps, letting your engineers work on your app's essential components. The result is a full-featured admin panel that works out of the box, ready to give to your end-users.</p>
+<p>Avo abstracts away the common parts of building apps, letting your engineers work on your app's essential components.</p>
+
+<p>The result is a full-featured admin panel that works out of the box, ready to give to your end-users.</p>

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

@@ -1,13 +1,19 @@
 <%= link_to 'Home', root_path %> |
+<%= link_to 'Re-Seed', home_reseed_path %> |
 <%= link_to 'Quick Sign In', home_quick_signin_path %> |
 <%= link_to 'AVO', avo_path %>
+<% if current_user %>
+<br>
 (
-<%= link_to 'Posts', posts_path, class: 'simple_scaffold' %> |
 <%= link_to 'Categories', categories_path, class: 'simple_scaffold' %> |
+<%= link_to 'Posts', posts_path, class: 'simple_scaffold' %> |
+<%= link_to 'Comments', comments_path, class: 'simple_scaffold' %> |
 <%= link_to 'Authors', users_path, class: 'simple_scaffold' %>
 )
 (
 <%= link_to 'Locations', locations_path, class: 'simple_scaffold' %> |
 <%= link_to 'Rooms', rooms_path, class: 'simple_scaffold' %> |
+<%= link_to 'Comments', comments_path, class: 'simple_scaffold' %> |
 <%= link_to 'Bookings', bookings_path, class: 'simple_scaffold' %>
 )
+<% end %>

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

@@ -176,7 +176,7 @@ end
                     content: Faker::Lorem.sentences(number: 5).join('<br />'),
                     published: Faker::Boolean.boolean(true_ratio: 0.6),
                     category: Category.all.sample,
-                    author: User.all.sample)
+                    user: User.all.sample)
 end
 
 # 200.times do

data/after_templates/addons/friendly_id/app/views/posts/_form.html.erb

@@ -0,0 +1,32 @@
+<%= form_with(model: post) do |form| %>
+  <% if post.errors.any? %>
+    <div style="color: red">
+      <h2><%= pluralize(post.errors.count, "error") %> prohibited this post from being saved:</h2>
+
+      <ul>
+        <% post.errors.each do |error| %>
+          <li><%= error.full_message %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div>
+    <%= form.label :title, style: "display: block" %>
+    <%= form.text_field :title %>
+  </div>
+
+  <div>
+    <%= form.label :body, style: "display: block" %>
+    <%= form.text_area :body %>
+  </div>
+
+  <div>
+    <%= form.label :slug, style: "display: block" %>
+    <%= form.text_field :slug %>
+  </div>
+
+  <div>
+    <%= form.submit %>
+  </div>
+<% end %>

data/after_templates/addons/friendly_id/app/views/posts/_post.html.erb

@@ -0,0 +1,17 @@
+<div id="<%= dom_id post %>">
+  <p>
+    <strong>Title:</strong>
+    <%= post.title %>
+  </p>
+
+  <p>
+    <strong>Body:</strong>
+    <%= post.body %>
+  </p>
+
+  <p>
+    <strong>Slug:</strong>
+    <%= post.slug %>
+  </p>
+
+</div>

data/after_templates/addons/friendly_id/app/views/posts/_post.json.jbuilder

@@ -0,0 +1,2 @@
+json.extract! post, :id, :title, :body, :slug, :created_at, :updated_at
+json.url post_url(post, format: :json)

data/after_templates/addons/friendly_id/app/views/posts/edit.html.erb

@@ -0,0 +1,10 @@
+<h1>Editing post</h1>
+
+<%= render "form", post: @post %>
+
+<br>
+
+<div>
+  <%= link_to "Show this post", @post %> |
+  <%= link_to "Back to posts", posts_path %>
+</div>

data/after_templates/addons/friendly_id/app/views/posts/index.html.erb

@@ -0,0 +1,14 @@
+<p style="color: green"><%= notice %></p>
+
+<h1>Posts</h1>
+
+<div id="posts">
+  <% @posts.each do |post| %>
+    <%= render post %>
+    <p>
+      <%= link_to "Show this post", post %>
+    </p>
+  <% end %>
+</div>
+
+<%= link_to "New post", new_post_path %>

data/after_templates/addons/friendly_id/app/views/posts/index.json.jbuilder

@@ -0,0 +1 @@
+json.array! @posts, partial: "posts/post", as: :post

data/after_templates/addons/friendly_id/app/views/posts/new.html.erb

@@ -0,0 +1,9 @@
+<h1>New post</h1>
+
+<%= render "form", post: @post %>
+
+<br>
+
+<div>
+  <%= link_to "Back to posts", posts_path %>
+</div>

data/after_templates/addons/friendly_id/app/views/posts/show.json.jbuilder

@@ -0,0 +1 @@
+json.partial! "posts/post", post: @post

data/docs/last_run/app_generator_data.json

@@ -32,23 +32,23 @@
     "test": "rspec",
     "add_acts_as_list": false,
     "add_administrate": false,
-    "add_annotate": false,
-    "add_avo": false,
+    "add_annotate": true,
+    "add_avo": true,
     "add_bcrypt": false,
     "add_brakeman": false,
     "add_browser": false,
     "add_bundler_audit": false,
     "add_chartkick": false,
-    "add_devise": false,
+    "add_devise": true,
     "add_devise_masquerade": false,
     "add_dotenv": false,
     "add_faker": true,
-    "add_friendly_id": true,
+    "add_friendly_id": false,
     "add_groupdate": false,
     "add_hexapdf": false,
     "add_httparty": false,
     "add_honeybadger": false,
-    "add_image_processing": false,
+    "add_image_processing": true,
     "add_kaminari": false,
     "add_lograge": false,
     "add_minimal_css": true,
@@ -59,11 +59,11 @@
     "add_pretender": false,
     "add_public_suffix": false,
     "add_rails_html_sanitizer": false,
-    "add_ransack": false,
+    "add_ransack": true,
     "add_redcarpet": false,
     "add_rolify": false,
-    "add_rubocop": false,
+    "add_rubocop": true,
     "add_twilio_ruby": false,
-    "template": "/Users/davidcruwys/dev/kgems/rails_app_generator/after_templates/addons/friendly_id/_.rb"
+    "template": "/Users/davidcruwys/dev/kgems/rails_app_generator/after_templates/addons/avo/_.rb"
   }
 }

data/docs/last_run/rails_options_data.json

@@ -7,7 +7,7 @@
     "quiet": false,
     "skip": false,
     "ruby": "/Users/davidcruwys/.asdf/installs/ruby/3.1.1/bin/ruby",
-    "template": "/Users/davidcruwys/dev/kgems/rails_app_generator/after_templates/addons/friendly_id/_.rb",
+    "template": "/Users/davidcruwys/dev/kgems/rails_app_generator/after_templates/addons/avo/_.rb",
     "database": "sqlite3",
     "skip_git": true,
     "skip_keeps": false,
@@ -42,23 +42,23 @@
     "test": "rspec",
     "add_acts_as_list": false,
     "add_administrate": false,
-    "add_annotate": false,
-    "add_avo": false,
+    "add_annotate": true,
+    "add_avo": true,
     "add_bcrypt": false,
     "add_brakeman": false,
     "add_browser": false,
     "add_bundler_audit": false,
     "add_chartkick": false,
-    "add_devise": false,
+    "add_devise": true,
     "add_devise_masquerade": false,
     "add_dotenv": false,
     "add_faker": true,
-    "add_friendly_id": true,
+    "add_friendly_id": false,
     "add_groupdate": false,
     "add_hexapdf": false,
     "add_httparty": false,
     "add_honeybadger": false,
-    "add_image_processing": false,
+    "add_image_processing": true,
     "add_kaminari": false,
     "add_lograge": false,
     "add_minimal_css": true,
@@ -69,10 +69,10 @@
     "add_pretender": false,
     "add_public_suffix": false,
     "add_rails_html_sanitizer": false,
-    "add_ransack": false,
+    "add_ransack": true,
     "add_redcarpet": false,
     "add_rolify": false,
-    "add_rubocop": false,
+    "add_rubocop": true,
     "add_twilio_ruby": false
   }
 }

data/lib/rails_app_generator/addons/factory_bot_rails.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module RailsAppGenerator
+  # Custom add-ons for RailsAppGenerator
+  module AddOns
+    # Add FactoryBotRails to rails application
+    class FactoryBotRails < RailsAppGenerator::Addon
+      required_gem gem.version('factory_bot_rails', '6.2.0', 'Provides Rails integration for factory_bot.')
+
+      def apply
+        say 'Setting up FactoryBotRails'
+      end
+    end
+  end
+end

data/lib/rails_app_generator/app_generator.rb

@@ -184,6 +184,7 @@ module RailsAppGenerator
       # docker
       add_if(:dotenv) # tested
       add_if(:factory_bot) # TODO: needs testing
+      add_if(:factory_bot_rails) # tested
       add_if(:faker) # tested
       add_if(:friendly_id) # tested
       add_if(:generators) # TODO: needs testing
@@ -365,6 +366,14 @@ module RailsAppGenerator
         template_files.map { |template_file| read_template(template_file) }.join(join)
       end
 
+      # swap two lines using the gsub_file
+      def swap_lines(file, swap1, swap2)
+        swap_temp = '##SWAP_IT##'
+        gsub_file(file, swap1, swap_temp)
+        gsub_file(file, swap2, swap1)
+        gsub_file(file, swap_temp, swap2)
+      end
+
       # Moves a file at given location, to another location. Both files are relative to the destination_root
       #
       # ==== Parameters

data/lib/rails_app_generator/rag_initializer.rb

@@ -118,6 +118,7 @@ KConfig.configure do |config|
   # docker
   rag.add_option :add_dotenv                  , type: :boolean, default: false
   # factory_bot
+  rag.add_option :add_factory_bot_rails       , type: :boolean, default: false
   rag.add_option :add_faker                   , type: :boolean, default: false
   rag.add_option :add_friendly_id             , type: :boolean, default: false
   # generators

data/lib/rails_app_generator/version.rb

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

data/package-lock.json

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

data/package.json

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

data/profiles/addons/avo.json

@@ -1,6 +1,6 @@
 {
   "args": {
-    "app_path": "avo",
+    "app_path": "r7_avo",
     "destination_root": "/Users/davidcruwys/dev/kgems/rails_app_generator/a/addons"
   },
   "opts": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_app_generator
 version: !ruby/object:Gem::Version
-  version: 0.2.38
+  version: 0.2.39
 platform: ruby
 authors:
 - David Cruwys
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootsnap
@@ -214,6 +214,8 @@ files:
 - after_templates/addons/avo/app/controllers/home_controller.rb
 - after_templates/addons/avo/app/models/category.rb
 - after_templates/addons/avo/app/models/post.rb
+- after_templates/addons/avo/app/models/user.rb
+- after_templates/addons/avo/app/services/seed_service.rb
 - after_templates/addons/avo/app/views/home/index.html.erb
 - after_templates/addons/avo/app/views/home/quick_signin.html.erb
 - after_templates/addons/avo/app/views/layouts/_footer.html.erb
@@ -307,7 +309,15 @@ files:
 - after_templates/addons/friendly_id/app/views/layouts/_footer.html.erb
 - after_templates/addons/friendly_id/app/views/layouts/_navbar.html.erb
 - after_templates/addons/friendly_id/app/views/layouts/application.html.erb
+- after_templates/addons/friendly_id/app/views/posts/_form.html.erb
+- after_templates/addons/friendly_id/app/views/posts/_post.html.erb
+- after_templates/addons/friendly_id/app/views/posts/_post.json.jbuilder
+- after_templates/addons/friendly_id/app/views/posts/edit.html.erb
+- after_templates/addons/friendly_id/app/views/posts/index.html.erb
+- after_templates/addons/friendly_id/app/views/posts/index.json.jbuilder
+- after_templates/addons/friendly_id/app/views/posts/new.html.erb
 - after_templates/addons/friendly_id/app/views/posts/show.html.erb
+- after_templates/addons/friendly_id/app/views/posts/show.json.jbuilder
 - after_templates/addons/friendly_id/db/seeds.rb
 - after_templates/addons/hexapdf/_.rb
 - after_templates/addons/hexapdf/app/controllers/home_controller.rb
@@ -654,6 +664,7 @@ files:
 - lib/rails_app_generator/addons/docker_compose.rb
 - lib/rails_app_generator/addons/dotenv.rb
 - lib/rails_app_generator/addons/factory_bot.rb
+- lib/rails_app_generator/addons/factory_bot_rails.rb
 - lib/rails_app_generator/addons/faker.rb
 - lib/rails_app_generator/addons/foreman.rb
 - lib/rails_app_generator/addons/friendly_id.rb