frozen_rails 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a88e369b28d7f01071814ba007495f9a1d573d3b8c0b0c59b0e48decb22637d
-  data.tar.gz: ea76d23b0fcedf87e504189e8019e39d21dc6ffe7b203cac5446a07d84cebe97
+  metadata.gz: a3e70fbae47b9cfd6742a06eb54721f5f1f182afd4ab044b19d796d3a36a08b0
+  data.tar.gz: 468e981b06f99a821b3a58bdd8bb02f6c7fc51abdb97ea73ead08e6f93ed5f66
 SHA512:
-  metadata.gz: b8d60e302866a07592e7f2b1c5605583cffa49f2084c31a390441eb3f69a50859565ec0e0c72211ad551bb0715bc754d45be654552cea32e162f0afb99bb99dd
-  data.tar.gz: 2dd187e1d486d6b299fd731a7575d8e6560674ffe0e3e99479ff92fa0432c6c699c3d3085368d97a010bd63a8bf8527e79f37731d926ad03c92b697f2bd51679
+  metadata.gz: 14f2cfa35628c1837d58828ba17ca68eefe82a6b1294e13532352000735f9ed0586cac0e55f61ca29a27f52d9ae043261dab742a04b186b7478e53b1af5170ee
+  data.tar.gz: 3637971df5425a6dd75e9f8ccd6ceeafca2d86dffb131f29eb57788cc698460b5d3edc5aadaba69f1923640ce38d319fd8915643b506f674349f4aa8b9c1ccdc

data/README.md

@@ -1,6 +1,5 @@
-[![Gem Version](https://badge.fury.io/rb/dunkelziffer.svg)](https://rubygems.org/gems/dunkelziffer)
+[![Gem Version](https://badge.fury.io/rb/frozen_rails.svg)](https://rubygems.org/gems/frozen_rails)
 [![Build](https://github.com/dunkelziffer/frozen_rails/workflows/Build/badge.svg)](https://github.com/dunkelziffer/frozen_rails/actions)
-[![JRuby Build](https://github.com/dunkelziffer/frozen_rails/workflows/JRuby%20Build/badge.svg)](https://github.com/dunkelziffer/frozen_rails/actions)
 
 # Frozen Rails
 
@@ -33,8 +32,8 @@ gem "frozen_rails"
 
 ### Supported Ruby versions
 
-- Ruby (MRI) >= 2.7.0
-- JRuby >= 9.3.0
+- Ruby (MRI) >= 3.2.0
+- Rails >= 8.1
 
 ## Usage
 
@@ -54,18 +53,20 @@ bin/rails g frozen:md
 ```bash
 # ✅ passes, ✅ works correctly, ❌ has test suite
 
-# - Adds `parklife`
-# - Adds `.gitlab-ci.yml` and tweaks parklife config.
+# - Adds `parklife` and configures ActiveStorage support
+# - Adds support for GitLab CI
 
 bin/rails g frozen:ssg
 ```
 
 ```bash
-# ✅ passes, ❓ works correctly, ❌ has test suite
+# ✅ passes, ✅ works correctly, ❌ has test suite
 
-# - sqlite uuid patch
-# - static_db initializer
-# - friendly_id and Avo configuration
+# - Adds `sqlite_extensions-uuid`
+# - Adds `static_db`
+# - Adds `friendly_id`
+# - Adds `avo`
+# - Adjusts Rails scaffold generator and migration generator to be more helpful
 
 bin/rails g frozen:db
 ```
@@ -79,6 +80,14 @@ bin/rails g frozen:db
 bin/rails g frozen:seo
 ```
 
+```bash
+# FUTURE: frozen:erb
+
+# - view_component
+# - herb
+# - lookbook
+```
+
 ```bash
 # ✅ passes, ❓ works correctly, ❌ has test suite
 
@@ -93,15 +102,6 @@ bin/rails g frozen:ui
 ```bash
 # ✅ passes, ❓ works correctly, ❌ has test suite
 
-# - copy custom lib templates
-# - add autoload/generator config to application.rb
-
-bin/rails g frozen:dx
-```
-
-```bash
-# ✅ passes, ❓ works correctly, ❌ has test suite
-
 # Full Rails setup (runs all frozen generators in order)
 
 bin/rails g frozen:rails
@@ -115,9 +115,6 @@ bin/rails g frozen:rails
 
 Bug reports and pull requests are welcome on GitHub at [https://github.com/dunkelziffer/frozen_rails](https://github.com/dunkelziffer/frozen_rails).
 
-## Credits
-
-This gem is generated via [`newgem` template](https://github.com/palkan/newgem) by [@palkan](https://github.com/palkan).
 
 ## License
 

data/RELEASING.md

@@ -0,0 +1,11 @@
+# How to release this gem
+
+Have `gem-release` installed:
+```bash
+gem install gem-release
+```
+
+1. Don't forget to update the `CHANGELOG.md`!
+2. Bump version with `gem bump`
+3. Push and wait for CI to pass
+4. Relase with `gem release`

data/Rakefile

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+begin
+  require "rubocop/rake_task"
+  RuboCop::RakeTask.new
+
+  RuboCop::RakeTask.new("rubocop:md") do |task|
+    task.options << %w[-c .rubocop-md.yml]
+  end
+rescue LoadError
+  task(:rubocop) { }
+  task("rubocop:md") { }
+end
+
+task default: %w[rubocop rubocop:md spec]

data/lib/frozen_rails/appendable.rb

@@ -10,5 +10,4 @@ module Appendable
   def append_to_routes(content)
     inject_into_file "config/routes.rb", optimize_indentation("\n#{content}", 2), before: /end(?:\n)\z/, verbose: false
   end
-
 end

data/lib/frozen_rails/copyable.rb

@@ -0,0 +1,14 @@
+module Copyable
+  extend ActiveSupport::Concern
+
+  private
+
+  def copy_directory(source, target, **options)
+    base = File.join(self.class.source_root, source)
+    Dir.glob("#{base}/**/*").each do |path|
+      next if File.directory?(path)
+      rel = path.delete_prefix("#{base}/")
+      copy_file "#{source}/#{rel}", "#{target}/#{rel}", **options
+    end
+  end
+end

data/lib/frozen_rails/generator.rb

@@ -3,12 +3,14 @@
 require "rails/generators"
 require "frozen_rails/appendable"
 require "frozen_rails/bundleable"
+require "frozen_rails/copyable"
 require "frozen_rails/taggable"
 
 module FrozenRails
   class Generator < Rails::Generators::Base
     include Appendable
     include Bundleable
+    include Copyable
     include Taggable
   end
 end

data/lib/frozen_rails/taggable.rb

@@ -19,7 +19,7 @@ module Taggable
   end
 
   def frozen_end_tag(env: nil)
-    frozen_start_tag(env:).gsub('# <', '# </')
+    frozen_start_tag(env:).gsub("# <", "# </")
   end
 
   def add_frozen_gemfile_tags(env: nil)
@@ -34,9 +34,9 @@ module Taggable
     case env
     when nil
       /frozen_rails[^\n]*\n/
-    when 'local'
+    when "local"
       "group :development, :test do\n"
-    when 'development'
+    when "development"
       "group :development do\n"
     else
       raise "Unsupported env!"
@@ -45,15 +45,14 @@ module Taggable
 
   def cleanup_frozen_tags!(env: nil)
     if options[:cleanup_frozen_tags]
-      gsub_file! "Gemfile", /[^\n]*#{frozen_start_tag(env:)}[^\n]*\n/, ''
-      gsub_file! "Gemfile", /[^\n]*#{frozen_end_tag(env:)}[^\n]*\n/, ''
+      gsub_file! "Gemfile", /[^\n]*#{frozen_start_tag(env:)}[^\n]*\n/, ""
+      gsub_file! "Gemfile", /[^\n]*#{frozen_end_tag(env:)}[^\n]*\n/, ""
     end
   end
 
   def cleanup_all_frozen_tags!
     cleanup_frozen_tags!
-    cleanup_frozen_tags!(env: 'local')
-    cleanup_frozen_tags!(env: 'development')
+    cleanup_frozen_tags!(env: "local")
+    cleanup_frozen_tags!(env: "development")
   end
-
 end

data/lib/frozen_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FrozenRails # :nodoc:
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/lib/generators/frozen/db_generator.rb

@@ -5,19 +5,19 @@ require "frozen_rails/generator"
 module Frozen
   module Generators
     class DbGenerator < FrozenRails::Generator
-      source_root File.expand_path("templates", __dir__)
+      source_root File.expand_path("templates/db", __dir__)
 
-      desc "Prepare a Rails app for SQLite UUIDs, static_db, Avo and FriendlyId"
+      desc "Prepare a Rails app for static_db with SQLite UUIDs, Avo and FriendlyId"
 
       def add_gems
         add_frozen_gems <<~RUBY
           # frozen:db
-          gem "sqlite_extensions-uuid"
           gem "static_db"
+          gem "sqlite_extensions-uuid"
           gem "friendly_id"
         RUBY
 
-        add_frozen_gems <<~RUBY, env: "local"
+        add_frozen_gems <<~RUBY, env: "development"
           # frozen:db
           gem "avo", ">= 3.2"
         RUBY
@@ -27,41 +27,101 @@ module Frozen
         bundle!
       end
 
-      # configure database.yml for sqlite uuid extension
-      def configure_database_yml
-        return unless File.exist?("config/database.yml")
+      def add_routes
+        append_to_routes <<~RUBY
+          # frozen:db
+          if Rails.env.development?
+            mount_avo at: "/avo"
+          end
+        RUBY
+      end
+
+      def copy_files
+        copy_file "database.yml", "config/database.yml", force: true
+        copy_directory "initializers", "config/initializers"
+        copy_directory "lib", "lib"
+      end
+
+      def configure_application
+        gsub_file "config/application.rb", /(config\.autoload_lib\(ignore: %w\[).*(\]\))/, '\1assets generators tasks templates\2'
 
-        inject_into_file "config/database.yml", after: "adapter: sqlite3\n" do
-          <<~YML
-            extensions:
-              - <%= SqliteExtensions::UUID.to_path %>
-          YML
-        end
+        append_to_application_config <<~RUBY
+          # frozen:db
+          config.generators do |g|
+            g.orm :active_record, primary_key_type: :uuid
+            g.test_framework nil
+            g.helper nil
+          end
+          config.active_storage.draw_routes = true
+        RUBY
       end
 
-      # create initializer for sqlite uuid generator patch
-      def create_sqlite_uuid_initializer
-        template "db/sqlite_uuid.rb", "config/initializers/sqlite_uuid.rb"
+      def prepare_db
+        rails_command "db:create"
+        rails_command "db:schema:load"
       end
 
-      # create initializer for static_db configuration
-      def create_static_db_initializer
-        template "db/static_db.rb", "config/initializers/static_db.rb"
+      def setup_active_storage
+        rails_command "active_storage:install"
+
+        active_storage_migration = in_root { Dir.glob("db/migrate/*.active_storage.rb").first }
+
+        gsub_file active_storage_migration, /# Use.*\n.*primary_and_foreign_key_types/, <<~RUBY.chomp.lines.map(&:chomp).join("\n    ")
+          # Use custom primary and foreign key types to support SQLite UUIDs.
+          primary_key_type = { id: :string, default: -> { "uuid()" }, limit: 36 }
+          foreign_key_type = { type: :string, limit: 36 }
+        RUBY
+        gsub_file active_storage_migration, "id: primary_key_type", "**primary_key_type"
+        gsub_file active_storage_migration, "type: foreign_key_type", "**foreign_key_type"
+        gsub_file active_storage_migration, /\n\s*private.*end(?=\nend)/m, ""
       end
 
-      # create friendly_id initializer
-      def create_friendly_id_initializer
-        template "db/friendly_id.rb", "config/initializers/friendly_id.rb"
+      def setup_friendly_id
+        rails_command "g migration create_friendly_id_slugs"
+
+        friendly_id_migration = in_root { Dir.glob("db/migrate/*create_friendly_id_slugs.rb").first }
+
+        gsub_file friendly_id_migration, /create_table.*?end(?=\n)/m, <<~RUBY.chomp.lines.map(&:chomp).join("\n    ")
+          create_table :friendly_id_slugs, id: :string, default: -> { "uuid()" }, limit: 36 do |t|
+            t.string :slug, null: false
+            t.string :sluggable_id, limit: 36, null: false
+            t.string :sluggable_type, limit: 50
+            t.string :scope
+            t.datetime :created_at
+          end
+          add_index :friendly_id_slugs, [ :sluggable_type, :sluggable_id ]
+          add_index :friendly_id_slugs, [ :slug, :sluggable_type ], length: { slug: 140, sluggable_type: 50 }
+          add_index :friendly_id_slugs, [ :slug, :sluggable_type, :scope ], length: { slug: 70, sluggable_type: 50, scope: 70 }, unique: true
+        RUBY
       end
 
-      # create a minimal avo initializer stub
-      def create_avo_initializer
-        template "db/avo.rb", "config/initializers/avo.rb"
+      def setup_avo
+        rails_command "g avo:install"
+
+        prepend_to_file "config/initializers/avo.rb", <<~RUBY + "\n"
+          if Rails.env.development?
+            # Allow moving Avo controllers into `app/avo/controllers/`
+            Rails.autoloaders.main.collapse(
+              Rails.root.join("app/avo/controllers")
+            )
+          else
+            # Don't load Avo
+            Rails.autoloaders.main.ignore(
+              Rails.root.join("app/avo"),
+              Rails.root.join("app/controllers/avo")
+            )
+
+            # Don't configure Avo
+            return
+          end
+        RUBY
+
+        run "b rubocop -a config/initializers/avo.rb"
       end
 
-      # reminder to run generators
-      def post_install_reminders
-        say_status :info, "Run `rails generate friendly_id` to create slug migrations."
+      def migrate_and_cleanup_db
+        rails_command "db:migrate"
+        rails_command "db:drop"
       end
     end
   end

data/lib/generators/frozen/md_generator.rb

@@ -5,7 +5,7 @@ require "frozen_rails/generator"
 module Frozen
   module Generators
     class MdGenerator < FrozenRails::Generator
-      source_root File.expand_path("templates", __dir__)
+      source_root File.expand_path("templates/md", __dir__)
 
       # When absent, the generator will prompt interactively (unless running non-interactively).
       class_option :rouge_theme, type: :string, desc: "Rouge theme to install (runs non-interactive if provided)"
@@ -26,44 +26,13 @@ module Frozen
         bundle!
       end
 
-      def create_content_directory
-        empty_directory "content/pages"
-      end
-
       def copy_files
-        app_files = [
-          "controllers/categories_controller.rb",
-          "controllers/pages_controller.rb",
-          "helpers/markdown_helper.rb",
-          "models/concerns/linkable.rb",
-          "models/category.rb",
-          "models/page.rb",
-          "views/categories/index.html.erb",
-          "views/categories/show.html.erb",
-          "views/pages/show.html.erb",
-        ]
-
-        app_files.each do |app_file|
-          copy_file "md/#{app_file}", "app/#{app_file}"
-        end
-
-        config_files = [
-          "initializers/decant_extensions.rb",
-        ]
-
-        config_files.each do |config_file|
-          copy_file "md/#{config_file}", "config/#{config_file}"
-        end
-
-        content_files = [
-          "pages/frozen-rails.md",
-          "pages/rails-static.md",
-          "pages/rails-static/rails-static-logo.webp",
-        ]
-
-        content_files.each do |content_file|
-          copy_file "md/#{content_file}", "content/#{content_file}"
-        end
+        copy_directory "controllers", "app/controllers"
+        copy_directory "helpers", "app/helpers"
+        copy_directory "models", "app/models"
+        copy_directory "views", "app/views"
+        copy_directory "initializers", "config/initializers"
+        copy_directory "pages", "content/pages"
       end
 
       def add_config
@@ -74,19 +43,15 @@ module Frozen
         RUBY
       end
 
-      # Add routes for pages
       def add_routes
         append_to_routes <<~RUBY
-          # frozen:md
           root "categories#index"
 
-          # Use `Regexp.union` instead of array for constraints!
-          # https://github.com/rails/rails/issues/47726
+          # frozen:md
           constraints slug: Regexp.union(Category.all.map(&:slug)) do
-            resources :categories, param: :slug, only: [:index, :show]
+            resources :categories, param: :slug, only: [ :index, :show ]
           end
-
-          resources :pages, param: :slug, only: [:show]
+          resources :pages, param: :slug, only: [ :show ]
         RUBY
       end
 

data/lib/generators/frozen/ssg_generator.rb

@@ -5,7 +5,7 @@ require "frozen_rails/generator"
 module Frozen
   module Generators
     class SsgGenerator < FrozenRails::Generator
-      source_root File.expand_path("templates", __dir__)
+      source_root File.expand_path("templates/ssg", __dir__)
 
       desc "Set up Parklife static site generation with CI workflows and helper scripts"
 
@@ -21,16 +21,28 @@ module Frozen
       end
 
       def run_parklife_init
-        unless system("bundle exec parklife init --rails --github-pages")
-          say_status :warn, "Unable to run parklife init. Please execute manually!"
-        end
+        run "bundle exec parklife init --rails --github-pages"
+        append_to_file ".gitignore", "# frozen:ssg\n/build\n"
       end
 
       def setup_gitlab_pages
-        copy_file "ssg/.gitlab-ci.yml", ".gitlab-ci.yml"
+        copy_file ".gitlab-ci.yml"
         comment_lines "Parkfile", /config\.nested_index = false/
       end
 
+      def configure_parklife_active_storage_integration
+        copy_file "storage.yml", "config/storage.yml", force: true
+
+        uncomment_lines "config/environments/production.rb", /config\.assume_ssl = true/
+        gsub_file "config/environments/production.rb", /config\.active_storage\.service = :\w+/, "config.active_storage.service = :parklife"
+
+        insert_into_file "config/application.rb", "\n" + <<~RUBY, before: /(\n#.*)?\n#.*\nBundler\.require/
+          # frozen:ssg
+          if ARGV.first == "build"
+            require "parklife-rails/activestorage"
+          end
+        RUBY
+      end
     end
   end
 end

data/lib/generators/frozen/templates/db/database.yml

@@ -0,0 +1,18 @@
+default: &default
+  adapter: sqlite3
+  extensions:
+    - <%= SqliteExtensions::UUID.to_path %>
+  max_connections: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+  timeout: 5000
+
+development:
+  <<: *default
+  database: storage/development.sqlite3
+
+test:
+  <<: *default
+  database: storage/test.sqlite3
+
+production:
+  <<: *default
+  database: storage/production.sqlite3

data/lib/generators/frozen/templates/db/initializers/friendly_id.rb

@@ -0,0 +1,13 @@
+FriendlyId.defaults do |config|
+  config.use :slugged
+  config.use :finders
+  config.use :history
+  config.use :reserved
+
+  config.reserved_words = %w[
+    new edit index
+    session login logout users admin
+    stylesheets assets javascripts images
+    avo pages
+  ]
+end

data/lib/generators/frozen/templates/db/initializers/readonly_routes.rb

@@ -0,0 +1,14 @@
+ActiveSupport.on_load(:active_record) do
+  require "rails/generators"
+  require "rails/generators/erb/scaffold/scaffold_generator"
+
+  Erb::Generators::ScaffoldGenerator.prepend(
+    Module.new do
+      private
+
+      def available_views
+        [ "index", "show" ]
+      end
+    end
+  )
+end

data/lib/generators/frozen/templates/db/{sqlite_uuid.rb → initializers/sqlite_uuid.rb}

@@ -1,9 +1,3 @@
-# frozen_string_literal: true
-
-# generated by frozen:db
-# Monkey-patch ActiveRecord generators to produce string primary keys with
-# uuid defaults when using SQLite.
-
 ActiveSupport.on_load(:active_record) do
   require "rails/generators"
   require "rails/generators/active_record/model/model_generator"

data/lib/generators/frozen/templates/db/{static_db.rb → initializers/static_db.rb}

@@ -1,6 +1,3 @@
-# frozen_string_literal: true
-
-# generated by frozen:db
 StaticDb.configure do |config|
   config.fixture_path = Rails.root.join("content", "data")
 end

data/lib/generators/frozen/templates/db/lib/generators/avo/controller/controller_generator.rb

@@ -0,0 +1,13 @@
+require "generators/avo/controller_generator"
+
+module Generators
+  module Avo
+    class ControllerGenerator
+      def create
+        return if override_controller?
+
+        template "resource/controller.tt", "app/avo/controllers/#{controller_name}.rb"
+      end
+    end
+  end
+end

data/lib/generators/frozen/templates/db/lib/generators/avo/install/install_generator.rb

@@ -0,0 +1,11 @@
+require "generators/avo/install_generator"
+
+module Generators
+  module Avo
+    class InstallGenerator
+      def create_initializer_file
+        template "initializer/avo.tt", "config/initializers/avo.rb"
+      end
+    end
+  end
+end

data/lib/generators/frozen/templates/db/lib/generators/avo/resource/resource_generator.rb

@@ -0,0 +1,30 @@
+require "generators/avo/resource_generator"
+
+module Generators
+  module Avo
+    class ResourceGenerator
+      no_tasks do
+        def field_string(name, type, options)
+          return "field :slug, as: :id, format_using: -> { link_to value, main_app.polymorphic_path(record) }" if name.to_sym == :slug
+          "field :#{name}, as: :#{type}#{options}"
+        end
+
+        def generate_fields_from_args
+          @args.each do |arg|
+            name, type = arg.split(":")
+            type = "string" if type.blank?
+            fields[name] = field(name, type.to_sym)
+          end
+
+          ", format_index_using: -> { content_tag(:span, \"#\", title: value) }#{generated_fields_template}"
+        end
+
+        def field(name, type)
+          return { field: "id" } if name.to_sym == :id
+          return { field: "id" } if name.to_sym == :slug
+          ::Avo::Mappings::NAMES_MAPPING[name.to_sym] || ::Avo::Mappings::FIELDS_MAPPING[type&.to_sym] || { field: "text" }
+        end
+      end
+    end
+  end
+end

data/lib/generators/frozen/templates/db/lib/templates/active_record/model/model.rb.tt

@@ -0,0 +1,26 @@
+<% module_namespacing do -%>
+class <%= class_name %> < <%= parent_class_name.classify %>
+<% if attributes.any? { |a| a.name.to_s == "slug" } -%>
+  include FriendlyId
+  friendly_id :<%= attributes.reject { |a| a.name.to_s == "slug" }.select { |a| a.type.to_s == "string" }.first.name  %>
+<% end -%>
+<% attributes.select(&:reference?).each do |attribute| -%>
+  belongs_to :<%= attribute.name %><%= ", polymorphic: true" if attribute.polymorphic? %>
+<% end -%>
+<% attributes.select(&:rich_text?).each do |attribute| -%>
+  has_rich_text :<%= attribute.name %>
+<% end -%>
+<% attributes.select(&:attachment?).each do |attribute| -%>
+  has_one_attached :<%= attribute.name %>
+<% end -%>
+<% attributes.select(&:attachments?).each do |attribute| -%>
+  has_many_attached :<%= attribute.name %>
+<% end -%>
+<% attributes.select(&:token?).each do |attribute| -%>
+  has_secure_token<% if attribute.name != "token" %> :<%= attribute.name %><% end %>
+<% end -%>
+<% if attributes.any?(&:password_digest?) -%>
+  has_secure_password
+<% end -%>
+end
+<% end -%>

data/lib/generators/frozen/templates/db/lib/templates/erb/scaffold/index.html.erb.tt

@@ -0,0 +1,14 @@
+<p style="color: green"><%%= notice %></p>
+
+<%% content_for :title, "<%= human_name.pluralize %>" %>
+
+<h1><%= human_name.pluralize %></h1>
+
+<div id="<%= plural_table_name %>">
+  <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
+    <%%= render <%= singular_table_name %> %>
+    <p>
+      <%%= link_to "Show this <%= human_name.downcase %>", <%= model_resource_name(singular_table_name) %> %>
+    </p>
+  <%% end %>
+</div>

data/lib/generators/frozen/templates/db/lib/templates/erb/scaffold/partial.html.erb.tt

@@ -0,0 +1,17 @@
+<div id="<%%= dom_id <%= singular_name %> %>">
+<% attributes.reject(&:password_digest?).each do |attribute| -%>
+  <p>
+    <strong><%= attribute.human_name %>:</strong>
+<% if attribute.attachment? -%>
+    <%%= link_to <%= singular_name %>.<%= attribute.column_name %>.filename, <%= singular_name %>.<%= attribute.column_name %> if <%= singular_name %>.<%= attribute.column_name %>.attached? %>
+<% elsif attribute.attachments? -%>
+    <%% <%= singular_name %>.<%= attribute.column_name %>.each do |<%= attribute.singular_name %>| %>
+      <div><%%= link_to <%= attribute.singular_name %>.filename, <%= attribute.singular_name %> %></div>
+    <%% end %>
+<% else -%>
+    <%%= <%= singular_name %>.<%= attribute.column_name %> %>
+<% end -%>
+  </p>
+
+<% end -%>
+</div>

data/lib/generators/frozen/templates/db/lib/templates/erb/scaffold/show.html.erb.tt

@@ -0,0 +1,10 @@
+<p style="color: green"><%%= notice %></p>
+
+<%%= render @<%= singular_table_name %> %>
+
+<div>
+  <%%= link_to "Back to <%= human_name.pluralize.downcase %>", <%= index_helper(type: :path) %> %>
+  <%% if Rails.env.development? %>
+    <%%= link_to "Edit", avo.resources_<%= show_helper(type: :path) %> %>
+  <%% end %>
+</div>

data/lib/generators/frozen/templates/db/lib/templates/rails/scaffold_controller/controller.rb.tt

@@ -0,0 +1,11 @@
+<% module_namespacing do -%>
+class <%= controller_class_name %>Controller < ApplicationController
+  def index
+    @<%= plural_table_name %> = <%= orm_class.all(class_name) %>
+  end
+
+  def show
+    @<%= singular_table_name %> = <%= orm_class.find(class_name, "params.expect(:id)") %>
+  end
+end
+<% end -%>

data/lib/generators/frozen/templates/md/controllers/categories_controller.rb

@@ -1,5 +1,4 @@
 class CategoriesController < ApplicationController
-
   def index
     @categories = Category.all
   end
@@ -7,5 +6,4 @@ class CategoriesController < ApplicationController
   def show
     @category = Category.find(params[:slug])
   end
-
 end

data/lib/generators/frozen/templates/md/controllers/pages_controller.rb

@@ -1,7 +1,5 @@
 class PagesController < ApplicationController
-
   def show
     @page = Page.find(params[:slug])
   end
-
 end

data/lib/generators/frozen/templates/md/helpers/markdown_helper.rb

@@ -1,5 +1,4 @@
 module MarkdownHelper
-
   def render_content_from(page)
     erb_processed_content = render(inline: page.content, layout: false)
     Kramdown::Document.new(
@@ -12,5 +11,4 @@ module MarkdownHelper
   def pages_image_tag(path, **kwargs)
     image_tag "pages/#{@page.slug}/#{path}", **kwargs
   end
-
 end

data/lib/generators/frozen/templates/md/initializers/decant_extensions.rb

@@ -1,8 +1,7 @@
-require 'decant/content'
+require "decant/content"
 
 module Decant
   class Content
-
     def self.where(**kwargs)
       scope = all
       kwargs.each do |key, value|
@@ -12,6 +11,5 @@ module Decant
       end
       scope
     end
-
   end
 end

data/lib/generators/frozen/templates/md/models/category.rb

@@ -11,7 +11,7 @@ Category = Data.define(:slug, :title) do
   def self.all
     [
       new(slug: "intro", title: "How it began"),
-      new(slug: "outro", title: "How it ended"),
+      new(slug: "outro", title: "How it ended")
     ]
   end
 
@@ -32,5 +32,4 @@ Category = Data.define(:slug, :title) do
   def pages
     Page.where(category_slugs: slug)
   end
-
 end

data/lib/generators/frozen/templates/md/models/concerns/linkable.rb

@@ -38,5 +38,4 @@ module Linkable
   def persisted?
     true
   end
-
 end

data/lib/generators/frozen/templates/md/models/page.rb

@@ -10,5 +10,4 @@ Page = Decant.define(dir: "content/pages", ext: "md") do
   def categories
     Category.where(slug: category_slugs)
   end
-
 end

data/lib/generators/frozen/templates/ssg/.gitlab-ci.yml

@@ -0,0 +1,34 @@
+image: ruby:3.4
+
+cache:
+  paths:
+  - vendor
+
+stages:
+  - build
+  - deploy
+
+build:
+  stage: build
+  script:
+    - apt-get update -yqqq
+    - apt-get install -y nodejs
+    - bundle config set path 'vendor'
+    - bundle install
+    - bin/static-build
+  artifacts:
+    paths:
+      - build
+    expire_in: 1 hour
+
+pages:
+  stage: deploy
+  script:
+    - rm -rf public/*
+    - cp -R build/* public
+    - echo "Deploying to GitLab Pages"
+  artifacts:
+    paths:
+      - public
+  rules:
+    - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH

data/lib/generators/frozen/templates/ssg/storage.yml

@@ -0,0 +1,12 @@
+# Intentionally use same storage location for local and parklife!!!
+local: &default
+  service: Disk
+  root: <%= Rails.root.join("content/storage") %>
+
+parklife:
+  <<: *default
+  service: Parklife
+
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: frozen_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Klaus Weidinger
-bindir: bin
+bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
@@ -15,73 +15,17 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.2'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.15'
-- !ruby/object:Gem::Dependency
-  name: combustion
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '8.1'
 description: Generators for turning Rails into an SSG
 email:
-- Klaus Weidinger
+- weidkl@gmx.de
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -89,30 +33,33 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
+- RELEASING.md
+- Rakefile
 - lib/frozen_rails.rb
 - lib/frozen_rails/appendable.rb
 - lib/frozen_rails/bundleable.rb
+- lib/frozen_rails/copyable.rb
 - lib/frozen_rails/generator.rb
 - lib/frozen_rails/taggable.rb
 - lib/frozen_rails/version.rb
 - lib/generators/frozen/db_generator.rb
-- lib/generators/frozen/dx_generator.rb
 - lib/generators/frozen/md_generator.rb
 - lib/generators/frozen/rails_generator.rb
 - lib/generators/frozen/seo_generator.rb
 - lib/generators/frozen/ssg_generator.rb
-- lib/generators/frozen/templates/db/avo.rb
-- lib/generators/frozen/templates/db/friendly_id.rb
-- lib/generators/frozen/templates/db/sqlite_uuid.rb
-- lib/generators/frozen/templates/db/static_db.rb
-- lib/generators/frozen/templates/dx/lib/templates/erb/scaffold/_form.html.erb.tt
-- lib/generators/frozen/templates/dx/lib/templates/erb/scaffold/edit.html.erb.tt
-- lib/generators/frozen/templates/dx/lib/templates/erb/scaffold/index.html.erb.tt
-- lib/generators/frozen/templates/dx/lib/templates/erb/scaffold/new.html.erb.tt
-- lib/generators/frozen/templates/dx/lib/templates/erb/scaffold/partial.html.erb.tt
-- lib/generators/frozen/templates/dx/lib/templates/erb/scaffold/show.html.erb.tt
-- lib/generators/frozen/templates/dx/lib/templates/rails/scaffold_controller/api_controller.rb.tt
-- lib/generators/frozen/templates/dx/lib/templates/rails/scaffold_controller/controller.rb.tt
+- lib/generators/frozen/templates/db/database.yml
+- lib/generators/frozen/templates/db/initializers/friendly_id.rb
+- lib/generators/frozen/templates/db/initializers/readonly_routes.rb
+- lib/generators/frozen/templates/db/initializers/sqlite_uuid.rb
+- lib/generators/frozen/templates/db/initializers/static_db.rb
+- lib/generators/frozen/templates/db/lib/generators/avo/controller/controller_generator.rb
+- lib/generators/frozen/templates/db/lib/generators/avo/install/install_generator.rb
+- lib/generators/frozen/templates/db/lib/generators/avo/resource/resource_generator.rb
+- lib/generators/frozen/templates/db/lib/templates/active_record/model/model.rb.tt
+- lib/generators/frozen/templates/db/lib/templates/erb/scaffold/index.html.erb.tt
+- lib/generators/frozen/templates/db/lib/templates/erb/scaffold/partial.html.erb.tt
+- lib/generators/frozen/templates/db/lib/templates/erb/scaffold/show.html.erb.tt
+- lib/generators/frozen/templates/db/lib/templates/rails/scaffold_controller/controller.rb.tt
 - lib/generators/frozen/templates/md/controllers/categories_controller.rb
 - lib/generators/frozen/templates/md/controllers/pages_controller.rb
 - lib/generators/frozen/templates/md/helpers/markdown_helper.rb
@@ -130,6 +77,8 @@ files:
 - lib/generators/frozen/templates/seo/robots_generatable.rb
 - lib/generators/frozen/templates/seo/sitemap.rb
 - lib/generators/frozen/templates/seo/sitemap_entry.rb
+- lib/generators/frozen/templates/ssg/.gitlab-ci.yml
+- lib/generators/frozen/templates/ssg/storage.yml
 - lib/generators/frozen/templates/ui/cable.yml
 - lib/generators/frozen/templates/ui/hotkey_controller.js
 - lib/generators/frozen/ui_generator.rb
@@ -137,12 +86,12 @@ homepage: https://github.com/dunkelziffer/frozen_rails
 licenses:
 - MIT
 metadata:
+  source_code_uri: https://github.com/dunkelziffer/frozen_rails
   homepage_uri: https://github.com/dunkelziffer/frozen_rails
   changelog_uri: https://github.com/dunkelziffer/frozen_rails/blob/main/CHANGELOG.md
   bug_tracker_uri: https://github.com/dunkelziffer/frozen_rails/issues
   documentation_uri: https://github.com/dunkelziffer/frozen_rails/blob/main/README.md
-  source_code_uri: https://github.com/dunkelziffer/frozen_rails
-  custom_attribute: a, b, c
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib

data/lib/generators/frozen/dx_generator.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require "frozen_rails/generator"
-
-module Frozen
-  module Generators
-    class DxGenerator < FrozenRails::Generator
-      source_root File.expand_path("templates", __dir__)
-
-      desc "Install developer experience helpers: custom lib templates and generator config"
-
-      # copy over the lib folder content from static example
-      def copy_lib_templates
-        directory "dx/lib", "lib"
-      end
-
-      # inject configuration into config/application.rb
-      def configure_application
-        return unless File.exist?("config/application.rb")
-
-        inject_into_file "config/application.rb",
-          after: "class Application < Rails::Application\n" do
-          <<~RUBY
-            # Please, add to the `ignore` list any other `lib` subdirectories that do
-            # not contain `.rb` files, or that should not be reloaded or eager loaded.
-            # Common ones are `templates`, `generators`, or `middleware`, for example.
-            config.autoload_lib(ignore: %w[assets tasks])
-
-            config.generators do |g|
-              g.orm :active_record, primary_key_type: :uuid
-              g.test_framework false
-            end
-
-            config.active_storage.draw_routes = true
-
-          RUBY
-        end
-      end
-    end
-  end
-end

data/lib/generators/frozen/templates/db/avo.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-# generated by frozen:db
-# Minimal Avo configuration; adjust as needed.
-Avo.configure do |config|
-  config.root_path = "/avo"
-  config.authorization_client = nil
-  config.explicit_authorization = true
-  config.click_row_to_view_record = true
-end

data/lib/generators/frozen/templates/db/friendly_id.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-# generated by frozen:db
-FriendlyId.defaults do |config|
-  # enable the most common modules
-  config.use :reserved
-  config.use :slugged
-  config.use :finders
-  config.use :history
-
-  # a UUID will be appended automatically when a unique slug cannot be generated
-  # suitable reserved words to avoid can be declared here.
-  config.reserved_words = %w[new edit index session login logout users admin]
-end

data/lib/generators/frozen/templates/dx/lib/templates/erb/scaffold/_form.html.erb.tt

@@ -1 +0,0 @@
-# TODO: delete

data/lib/generators/frozen/templates/dx/lib/templates/erb/scaffold/edit.html.erb.tt

@@ -1 +0,0 @@
-# TODO: delete

data/lib/generators/frozen/templates/dx/lib/templates/erb/scaffold/index.html.erb.tt

@@ -1,14 +0,0 @@
-<p style="color: green"><%%= notice %></p>
-
-<%% content_for :title, "<%%= human_name.pluralize %>" %>
-
-<h1><%%= human_name.pluralize %></h1>
-
-<div id="<%%= plural_table_name %>">
-  <%% @<%%= plural_table_name %>.each do |<%%= singular_table_name %>| %>
-    <%%= render <%%= singular_table_name %> %>
-    <p>
-      <%%= link_to "Show this <%%= human_name.downcase %>", <%%= model_resource_name(singular_table_name) %> %>
-    </p>
-  <%% end %>
-</div>

data/lib/generators/frozen/templates/dx/lib/templates/erb/scaffold/new.html.erb.tt

@@ -1 +0,0 @@
-# TODO: delete

data/lib/generators/frozen/templates/dx/lib/templates/erb/scaffold/partial.html.erb.tt

@@ -1,17 +0,0 @@
-<div id="<%%= dom_id <%%= singular_name %> %>">
-<%% attributes.reject(&:password_digest?).each do |attribute| -%>
-  <p>
-    <strong><%%= attribute.human_name %>:</strong>
-<%% if attribute.attachment? -%>
-    <%%= link_to <%%= singular_name %>.<%%= attribute.column_name %>.filename, <%%= singular_name %>.<%%= attribute.column_name %> if <%%= singular_name %>.<%%= attribute.column_name %>.attached? %>
-<%% elsif attribute.attachments? -%>
-    <%% <%%= singular_name %>.<%%= attribute.column_name %>.each do |<%%= attribute.singular_name %>| %>
-      <div><%%= link_to <%%= attribute.singular_name %>.filename, <%%= attribute.singular_name %> %></div>
-    <%% end %>
-<%% else -%>
-    <%%= <%%= singular_name %>.<%%= attribute.column_name %> %>
-<%% end -%>
-  </p>
-
-<%% end -%>
-</div>

data/lib/generators/frozen/templates/dx/lib/templates/erb/scaffold/show.html.erb.tt

@@ -1,7 +0,0 @@
-<p style="color: green"><%%= notice %></p>
-
-<%%= render @<%%= singular_table_name %> %>
-
-<div>
-  <%%= link_to "Back to <%%= human_name.pluralize.downcase %>", <%%= index_helper(type: :path) %> %>
-</div>

data/lib/generators/frozen/templates/dx/lib/templates/rails/scaffold_controller/api_controller.rb.tt

@@ -1,22 +0,0 @@
-<%% module_namespacing do -%>
-class <%%= controller_class_name %>Controller < ApplicationController
-  before_action :set_<%%= singular_table_name %>, only: :show
-
-  def index
-    @<%%= plural_table_name %> = <%%= orm_class.all(class_name) %>
-
-    render json: <%%= "@#{plural_table_name}" %>
-  end
-
-  def show
-    render json: <%%= "@#{singular_table_name}" %>
-  end
-
-  private
-
-  def set_<%%= singular_table_name %>
-    @<%%= singular_table_name %> = <%%= orm_class.find(class_name, "params.expect(:id)") %>
-  end
-
-end
-<%% end -%>

data/lib/generators/frozen/templates/dx/lib/templates/rails/scaffold_controller/controller.rb.tt

@@ -1,19 +0,0 @@
-<%% module_namespacing do -%>
-class <%%= controller_class_name %>Controller < ApplicationController
-  before_action :set_<%%= singular_table_name %>, only: :show
-
-  def index
-    @<%%= plural_table_name %> = <%%= orm_class.all(class_name) %>
-  end
-
-  def show
-  end
-
-  private
-
-  def set_<%%= singular_table_name %>
-    @<%%= singular_table_name %> = <%%= orm_class.find(class_name, "params.expect(:id)") %>
-  end
-
-end
-<%% end -%>