rails_app_generator 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c53c84982de8f9b1f3180f4c84b7527a04cc623dac815cdec90d325f7e56183f
-  data.tar.gz: 0f2d44fc8597836b396faa7b3ef6995896e41222b34362a0cb73802bd2fbd70d
+  metadata.gz: ef1f0bf022c581955784c2ecc4d00b04f540e0a8b9f58b18ab2d17276bb239df
+  data.tar.gz: 85813cddac2bf9605a60cf023f72d2cf98b373696d1831b09ae721b3e47dd9e4
 SHA512:
-  metadata.gz: 0d2f6fe3d00ca2befc5acaf668f58f655c60e7f0a0d14f7670067f5e3847861e92cf93a927d284d36546a26bf85ea8beebb7ac76cc183d88c0bf2b06e8c60d18
-  data.tar.gz: 24704cce18d58445b1a1d69122df8e098e3f2b87627030df4b1e863931e7320e0da89e71b8e5d4ac7e886c03c01d7b593aec20da3cc3165703771e8b5945c4c9
+  metadata.gz: 89d2992e46e616679ff1e8f9647a2af229d47f44b87a6290f25d225c219a77a421d3185d0269a69b65c282404432a6dd0b09e733be3a797cfbde591809cb3b44
+  data.tar.gz: 115d98ec35bc7819a9c87b6fe886a85d016df1abefd5baa1b0876c053b9f9ced2fb0716152df7171322b4797b22497a614ae38d53577f45834d4c95e27e598fc

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [0.3.3](https://github.com/klueless-io/rails_app_generator/compare/v0.3.2...v0.3.3) (2022-10-05)
+
+
+### Bug Fixes
+
+* update factory_bot profile ([f782f42](https://github.com/klueless-io/rails_app_generator/commit/f782f424fdfb90b5f7634e6ff12985ef10cdbdf5))
+
+## [0.3.2](https://github.com/klueless-io/rails_app_generator/compare/v0.3.1...v0.3.2) (2022-09-11)
+
+
+### Bug Fixes
+
+* update factory_bot profile ([aa121e3](https://github.com/klueless-io/rails_app_generator/commit/aa121e35efd88b9ed5704cacf4f348e50e4c7dc2))
+* update factory_bot profile ([7b5247d](https://github.com/klueless-io/rails_app_generator/commit/7b5247dd44e239ec20eff74dd64be9d5d05d0e72))
+
 ## [0.3.1](https://github.com/klueless-io/rails_app_generator/compare/v0.3.0...v0.3.1) (2022-09-02)
 
 

data/after_templates/addons/factory_bot/_.rb

@@ -17,47 +17,33 @@ after_bundle do
   migrate_db
 end
 
-# Goals:
-# - Store Factories in subfolder under spec
-# -
-# - Use the faker GEM with both standard and custom data
-# - Custom data goes in custom locales folder, see: https://stackoverflow.com/questions/28153540/extending-faker-in-a-gem-where-do-i-put-the-yaml-file
-# - Use associations to affectively create related records
-# - Create default and NULL factory example
-# - Create Seed Data services
-# - Add support for STI
-# - Add support for polymorphic associations
-# Things to be aware of in faker
-# - Random focused data is better then sequence
-#   sequence(:name) { |n| "Category #{n}" }
-#   vs
-#   name { Faker::Hipster.word }
-# - 
-
-
 def scaffolds
-  add_scaffold('app', 'title', 'description', 'settings:json')
-  add_scaffold('tenant', 'name', 'slug', 'active:boolean', 'app:references')
-  add_scaffold('role', 'code') # contributor, moderator, admin
-  add_scaffold('employee', 'first_name', 'last_name', 'address:text', 'email', 'password', 'tenant:references', 'role:references')
-  add_scaffold('project', 'name', 'status', 'budget:decimal', 'country', 'progress:integer', 'tenant:references')
-  add_scaffold('article', 'title', 'body:text', 'is_featured:boolean', 'employee:references', 'tenant:references')
+  add_scaffold('region', 'name', 'settings:json')
+  add_scaffold('company', 'name', 'slug', 'active:boolean', 'region:references')
+  add_scaffold('role', 'code', 'description') # contributor, moderator, admin
+  add_scaffold('employee', 'first_name', 'last_name', 'address:text', 'email', 'password', 'company:references')
+  add_scaffold('employee_role', 'employee:references', 'role:references')
+  add_scaffold('project', 'name', 'status', 'budget:decimal', 'country', 'progress:integer', 'company:references')
+  add_scaffold('article', 'title', 'body:text', 'is_featured:boolean', 'published:datetime', 'employee:references', 'company:references')
   add_scaffold('video', 'title', 'youtube_id', '', 'article:references')
+  add_scaffold('reserved', 'new', 'do', 'end')
 end
 
+# https://speakerdeck.com/toshimaru/factorybot-the-right-way
 def setup_customizations
   route("root 'home#index'")
 
   force_copy
   
-  add_controller('home', 'index', 'reseed')
+  add_controller('home', 'index', 'test_data', 'sample_data')
 
   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"
-  copy_file 'factories.rb'
+  directory 'config'
+  directory 'custom_factories'
 end
 
 def create_db

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

@@ -2,8 +2,14 @@ class HomeController < ApplicationController
   def index
   end
 
-  def reseed
-    SeedService.seed(variant: :reset)
+  def test_data
+    SeedService.seed(variant: :test_data)
+
+    redirect_back_or_to root_path
+  end
+
+  def seed_data
+    SeedService.seed(variant: :seed_data)
 
     redirect_back_or_to root_path
   end

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

@@ -1,35 +1,68 @@
 class SeedService
+  include FactoryBot::Syntax::Methods
+
   class << self
-    def seed(variant: :reset)
+    def seed(variant: :test_data)
       service = SeedService.new
       service.call(variant: variant)
     end
   end
 
   def call(variant: :reset)
-    reset     if variant == :reset
-    refresh   if variant == :refresh
-    create
+    reset
+    generate_test_data    if variant == :test_data
+    generate_sample_data  if variant == :sample_data
   end
 
   private
 
   def reset
+    Video.delete_all
     Article.delete_all
     Project.delete_all
+    EmployeeRole.delete_all
     Employee.delete_all
-    Tenant.delete_all
-    App.delete_all
+    Role.delete_all
+    Company.delete_all
+    Region.delete_all
+  end
+
+  # add_scaffold('region', 'name', 'settings:json')
+  # add_scaffold('company', 'name', 'slug', 'active:boolean', 'region:references')
+  # add_scaffold('role', 'code', 'description') # contributor, moderator, admin
+  # add_scaffold('employee', 'first_name', 'last_name', 'address:text', 'email', 'password', 'company:references')
+  # add_scaffold('employee_role', 'employee:references', 'role:references')
+  # add_scaffold('project', 'name', 'status', 'budget:decimal', 'country', 'progress:integer', 'company:references')
+  # add_scaffold('article', 'title', 'body:text', 'is_featured:boolean', 'published:datetime', 'employee:references', 'company:references')
+  # add_scaffold('video', 'title', 'youtube_id', '', 'article:references')
+
+  def generate_test_data
+    test_data_regions
+    # companies = create_list(:company, rand(3..5))#, region: region)
+    # companies = create_list(:company, rand(3..5))#, region: region)
+    # employees = create_list(:employee, rand(10..20), company: companies.sample)
+    # _articles = create_list(:article, rand(10..20), company: companies.sample, employee: employees.sample)
+    # _projects = create_list(:project, rand(10..20), company: companies.sample)
   end
 
-  def refresh
+  def generate_sample_data
+    regions = create_list(:region, rand(2..5))
+    companies = create_list(:company, rand(3..5))#, region: region)
+    # companies = create_list(:company, rand(3..5))#, region: region)
+    # employees = create_list(:employee, rand(10..20), company: companies.sample)
+    # _articles = create_list(:article, rand(10..20), company: companies.sample, employee: employees.sample)
+    # _projects = create_list(:project, rand(10..20), company: companies.sample)
   end
 
-  def create
-    app = FactoryBot.create(:app)
-    tenants = FactoryBot.create_list(:tenant, rand(10..20), app: app)
-    employees = FactoryBot.create_list(:employee, rand(10..20), tenant: tenants.sample)
-    _articles = FactoryBot.create_list(:article, rand(10..20), tenant: tenants.sample, employee: employees.sample)
-    _projects = FactoryBot.create_list(:project, rand(10..20), tenant: tenants.sample)
+  private
+
+  def test_data_regions
+    @region_western_sydney = create(:region, :western_sydney)
+    @region_western_sydney2 = create(:region, :western_sydney) # create it again Sam
+    @region_sydney = create(:region, :sydney)
+    @region_eastern_suburbs = create(:region, :eastern_suburbs)
+    @region_inner_west = create(:region, :inner_west)
+    @region_north_shore = create(:region, :north_shore)
+    @regions_random = create_list(:region, 4)
   end
 end

data/after_templates/addons/factory_bot/app/views/articles/index.html.erb

@@ -0,0 +1,32 @@
+<p style="color: green"><%= notice %></p>
+
+<h1>Articles</h1>
+
+<div id="articles">
+  <table>
+    <thead>
+      <tr>
+        <th>title</th>
+        <th>Youtube ID</th>
+        <th>Article</th>
+      </tr>
+    </thead>
+    <tbody>
+
+    <% @videos.each do |video| %>
+      <tr>
+        <td><%= video.name %></td>
+        <td><%= video.status %></td>
+        <td><%= video.budget %></td>
+        <td><%= video.country %></td>
+        <td><%= video.company&.name %></td>
+        <td><%= link_to "Show", video %></td>
+      </tr>
+    <% end %>
+
+    </tbody>
+  </table>
+  
+</div>
+
+<%= link_to "New article", new_article_path %>

data/after_templates/addons/factory_bot/app/views/companies/index.html.erb

@@ -0,0 +1,33 @@
+<p style="color: green"><%= notice %></p>
+
+<h1>Companies</h1>
+
+<div id="companies">
+
+  <table>
+    <thead>
+      <tr>
+        <th>Name</th>
+        <th>Slug</th>
+        <th>Active</th>
+        <th>Region</th>
+      </tr>
+    </thead>
+    <tbody>
+
+    <% @companies.each do |company| %>
+      <tr>
+        <td><%= company.name %></td>
+        <td><%= company.slug %></td>
+        <td><%= company.active %></td>
+        <td><%= company.region&.name %></td>
+        <td><%= link_to "Show", company %></td>
+      </tr>
+    <% end %>
+
+    </tbody>
+  </table>
+
+</div>
+
+<%= link_to "New company", new_company_path %>

data/after_templates/addons/factory_bot/app/views/employee_roles/index.html.erb

@@ -0,0 +1,30 @@
+<p style="color: green"><%= notice %></p>
+
+<h1>Employee roles</h1>
+
+<div id="employee_roles">
+
+  <table>
+    <thead>
+      <tr>
+        <th>Employee</th>
+        <th>Role</th>
+      </tr>
+    </thead>
+    <tbody>
+
+    <% @employee_roles.each do |employee_role| %>
+      <tr>
+        <td><%= employee_role.employee&.name %></td>
+        <td><%= employee_role.role&.name %></td>
+        <td><%= link_to "Show", employee_role %></td>
+      </tr>
+    <% end %>
+
+    </tbody>
+  </table>
+
+
+</div>
+
+<%= link_to "New employee role", new_employee_role_path %>

data/after_templates/addons/factory_bot/app/views/employees/index.html.erb

@@ -0,0 +1,36 @@
+<p style="color: green"><%= notice %></p>
+
+<h1>Employees</h1>
+
+<div id="employees">
+  <table>
+    <thead>
+      <tr>
+        <th>First Name</th>
+        <th>Last Name</th>
+        <th>Address</th>
+        <th>Email</th>
+        <th>Password</th>
+        <th>Company</th>
+      </tr>
+    </thead>
+    <tbody>
+
+    <% @employees.each do |employee| %>
+      <tr>
+        <td><%= employee.first_name %></td>
+        <td><%= employee.last_name %></td>
+        <td><%= employee.address %></td>
+        <td><%= employee.email %></td>
+        <td><%= employee.password %></td>
+        <td><%= employee.company&.name %></td>
+        <td><%= link_to "Show", employee %></td>
+      </tr>
+    <% end %>
+
+    </tbody>
+  </table>
+
+</div>
+
+<%= link_to "New employee", new_employee_path %>

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

@@ -1,10 +1,17 @@
 <%= link_to 'Home', root_path %>
-| <%= link_to 'Apps', apps_path %>
-| <%= link_to 'Tenants', tenants_path %>
-| <%= link_to 'Employees', employees_path %>
-| <%= link_to 'Roles', roles_path %>
-| <%= link_to 'Projects', projects_path %>
-| <%= link_to 'Articles', articles_path %>
-| <%= link_to 'Videos', videos_path %>
-| <%= link_to 'Re-Seed', home_reseed_path, style: 'color: blue; font-weight: 600;' %>
+| <%= link_to 'Region', regions_path %>
+| <%= link_to 'Company', companies_path %>
+
+
+
+| <%= link_to 'Video', videos_path %>
+| <%= link_to 'Article', articles_path %>
+| <%= link_to 'Project', projects_path %>
+| <%= link_to 'EmployeeRole', employee_roles_path %>
+| <%= link_to 'Employee', employees_path %>
+| <%= link_to 'Role', roles_path %>
+| <%= link_to 'Reserved', reserveds_path %>
+
+| <%= link_to 'Test Data', home_test_data_path, style: 'color: blue; font-weight: 600;' %>
+| <%= link_to 'Sample Data', home_sample_data_path, style: 'color: blue; font-weight: 600;' %>
 <hr />

data/after_templates/addons/factory_bot/app/views/projects/index.html.erb

@@ -0,0 +1,36 @@
+<p style="color: green"><%= notice %></p>
+
+<h1>Projects</h1>
+
+<div id="projects">
+  <table>
+    <thead>
+      <tr>
+        <th>Name</th>
+        <th>Status</th>
+        <th>Budget</th>
+        <th>Country</th>
+        <th>Progress</th>
+        <th>Project</th>
+      </tr>
+    </thead>
+    <tbody>
+
+    <% @projects.each do |project| %>
+      <tr>
+        <td><%= project.name %></td>
+        <td><%= project.status %></td>
+        <td><%= project.budget %></td>
+        <td><%= project.country %></td>
+        <td><%= project.progress %></td>
+        <td><%= project.project&.name %></td>
+        <td><%= link_to "Show", project %></td>
+      </tr>
+    <% end %>
+
+    </tbody>
+  </table>
+
+</div>
+
+<%= link_to "New project", new_project_path %>

data/after_templates/addons/factory_bot/app/views/regions/index.html.erb

@@ -0,0 +1,29 @@
+<p style="color: green"><%= notice %></p>
+
+<h1>Regions</h1>
+
+<div id="regions">
+
+  <table>
+    <thead>
+      <tr>
+        <th>Name</th>
+        <th>Settings</th>
+      </tr>
+    </thead>
+    <tbody>
+
+    <% @regions.each do |region| %>
+      <tr>
+        <td><%= region.name %></td>
+        <td><%= region.settings %></td>
+        <td><%= link_to "Show", region %></td>
+      </tr>
+    <% end %>
+
+    </tbody>
+  </table>
+
+</div>
+
+<%= link_to "New region", new_region_path %>

data/after_templates/addons/factory_bot/app/views/roles/index.html.erb

@@ -0,0 +1,29 @@
+<p style="color: green"><%= notice %></p>
+
+<h1>Roles</h1>
+
+<div id="roles">
+  <table>
+    <thead>
+      <tr>
+        <th>title</th>
+        <th>Youtube ID</th>
+        <th>Article</th>
+      </tr>
+    </thead>
+    <tbody>
+
+    <% @roles.each do |role| %>
+      <tr>
+        <td><%= role.code %></td>
+        <td><%= role.description %></td>
+        <td><%= link_to "Show", role %></td>
+      </tr>
+    <% end %>
+
+    </tbody>
+  </table>
+
+</div>
+
+<%= link_to "New role", new_role_path %>

data/after_templates/addons/factory_bot/app/views/videos/index.html.erb

@@ -0,0 +1,31 @@
+<p style="color: green"><%= notice %></p>
+
+<h1>Videos</h1>
+
+<div id="videos">
+
+  <table>
+    <thead>
+      <tr>
+        <th>title</th>
+        <th>Youtube ID</th>
+        <th>Article</th>
+      </tr>
+    </thead>
+    <tbody>
+
+    <% @videos.each do |video| %>
+      <tr>
+        <td><%= video.name %></td>
+        <td><%= video.slug %></td>
+        <td><%= video.article&.title %></td>
+        <td><%= link_to "Show", video %></td>
+      </tr>
+    <% end %>
+
+    </tbody>
+  </table>
+
+</div>
+
+<%= link_to "New video", new_video_path %>