charming 0.1.0 → 0.1.1

data/lib/charming/generators/app_generator/component_templates.rb

@@ -8,7 +8,7 @@ module Charming
           %(# frozen_string_literal: true
 
 module #{name.class_name}
-  class AppFrameComponent < Charming::Component
+  class AppFrameComponent < Charming::Presentation::Component
     def render
       column(title_line, help_line, gap: 1)
     end

data/lib/charming/generators/app_generator/controller_template.rb

@@ -9,7 +9,7 @@ module Charming
 
 module #{name.class_name}
   class ApplicationController < Charming::Controller
-    layout Layouts::Application
+    layout "layouts/application"
     focus_ring :sidebar, :content
 
     key "p", :open_command_palette, scope: :global
@@ -42,7 +42,7 @@ end
         def controller_actions
           %(
     def show
-      render_home
+      render :show, home: home, palette: command_palette
     end)
         end
 
@@ -50,17 +50,8 @@ end
           %(
 
     private
-#{render_helpers})
-        end
-
-        def render_helpers
-          %(
-    def render_home
-      render HomeView.new(home: home, palette: command_palette, screen: screen, theme: theme)
-    end
-
     def home
-      model(:home, HomeModel)
+      state(:home, HomeState)
     end)
         end
       end

data/lib/charming/generators/app_generator/database_templates.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Charming
+  module Generators
+    class AppGenerator
+      module DatabaseTemplates
+        def database_config
+          %(# frozen_string_literal: true
+
+require "active_record"
+require "fileutils"
+
+database_path = File.expand_path("../db/development.sqlite3", __dir__)
+FileUtils.mkdir_p(File.dirname(database_path))
+
+ActiveRecord::Base.establish_connection(
+  adapter: "sqlite3",
+  database: database_path
+)
+)
+        end
+
+        def application_record
+          %(# frozen_string_literal: true
+
+module #{name.class_name}
+  class ApplicationRecord < ActiveRecord::Base
+    self.abstract_class = true
+  end
+end
+)
+        end
+
+        def keep
+          ""
+        end
+
+        def seeds
+          %(# frozen_string_literal: true
+)
+        end
+      end
+    end
+  end
+end

data/lib/charming/generators/app_generator/layout_template.rb

@@ -5,155 +5,61 @@ module Charming
     class AppGenerator
       module LayoutTemplate
         def layout
-          %(# frozen_string_literal: true
-
-module #{name.class_name}
-  module Layouts
-    class Application < Charming::View
-      def render
-        body = Charming::UI.place(app_frame, width: screen.width, height: screen.height)
-        return body unless palette
-
-        Charming::UI.overlay(body, command_palette_modal)
-      end
-#{layout_helpers}
-    end
+          %(<%
+palette_component = assigns.fetch(:palette, nil)
+sidebar_focused = controller.sidebar_focused?
+content_focused = controller.content_focused?
+sidebar_index = controller.sidebar_index
+narrow = screen.narrow?(below: 72, min_height: 20)
+layout = Charming::Presentation::Layout
+sidebar_width = narrow ? layout.available_width(screen, reserved: 6, min: 20) : 22
+main_content_width = narrow ? layout.available_width(screen, reserved: 6, min: 20) : layout.clamp_size(screen.width - sidebar_width - 13, min: 20)
+panel_height = narrow ? nil : layout.available_height(screen, reserved: 4, min: 5)
+
+app_title = text "#{name.class_name}", style: theme.header_accent.align(:center).width(sidebar_width)
+nav_items = controller.sidebar_routes.each_with_index.map do |route, index|
+  current_route = controller.current_route?(route)
+  cursor = sidebar_focused && index == sidebar_index ? ">" : " "
+  active = current_route ? "●" : " "
+  item_style = if sidebar_focused && index == sidebar_index
+    theme.selected
+  elsif current_route
+    theme.title
+  else
+    theme.muted
   end
+
+  text "\#{cursor} \#{active} \#{route.title}", style: item_style
+end
+navigation = column(*nav_items)
+shortcuts = text "tab focus\np commands\nq quit", style: theme.muted
+
+sidebar_style = sidebar_focused ? theme.title : theme.border
+sidebar_style = sidebar_style.border(:rounded).padding(1, 2).width(sidebar_width).height(panel_height)
+sidebar_style = sidebar_style.faint if palette_component
+
+main_content_style = content_focused ? theme.title : theme.border
+main_content_style = main_content_style.border(:rounded).padding(1, 2).width(main_content_width).height(panel_height)
+main_content_style = main_content_style.faint if palette_component
+
+sidebar = box(column(app_title, navigation, shortcuts, gap: 1), style: sidebar_style)
+main_content = box(yield_content, style: main_content_style)
+app_frame = layout.stack_or_row(sidebar, main_content, narrow: narrow, gap: 1)
+body = Charming::Presentation::UI.place(app_frame, width: screen.width, height: screen.height)
+
+if palette_component
+  command_palette_modal = render_component Charming::Presentation::Components::Modal.new(
+    content: palette_component,
+    title: "Command palette",
+    help: "Type to filter. Enter selects. Escape closes.",
+    width: 52,
+    theme: theme
+  )
+  body = Charming::Presentation::UI.overlay(body, command_palette_modal)
 end
+%><%= body %>
 )
         end
-
-        def layout_helpers
-          %(
-      private
-#{layout_frame_helpers}
-#{layout_navigation_helpers}
-#{layout_modal_helpers}
-#{layout_style_helpers})
-        end
-
-        def layout_frame_helpers
-          %(
-      def app_frame
-        narrow? ? column(sidebar, main_content, gap: 1) : row(sidebar, main_content, gap: 1)
-      end
-
-      def sidebar
-        box(column(app_title, navigation, shortcuts, gap: 1), style: sidebar_style)
-      end
-
-      def main_content
-        box(yield_content, style: main_content_style)
-      end)
-        end
-
-        def layout_navigation_helpers
-          %(
-
-      def app_title
-        text "#{name.class_name}", style: theme.header_accent.align(:center).width(sidebar_width)
-      end
-
-      def navigation
-        column(*nav_items)
-      end
-
-      def nav_items
-        controller.application.routes.all.each_with_index.map do |route, index|
-          text nav_label(route, index), style: nav_style(route, index)
-        end
-      end
-
-      def nav_label(route, index)
-        cursor = sidebar_focused? && index == sidebar_index ? ">" : " "
-        active = current_route?(route) ? "●" : " "
-        "\#{cursor} \#{active} \#{route.title}"
-      end
-
-      def nav_style(route, index)
-        return theme.selected if sidebar_focused? && index == sidebar_index
-        return theme.title if current_route?(route)
-
-        theme.muted
-      end
-
-      def shortcuts
-        text "tab focus\\np commands\\nq quit", style: theme.muted
-      end
-
-      def sidebar_focused?
-        controller.sidebar_focused?
-      end
-
-      def content_focused?
-        controller.content_focused?
-      end
-
-      def sidebar_index
-        controller.sidebar_index
-      end
-
-      def current_route?(route)
-        route.controller_class == controller.class && route.action == :show
-      end)
-        end
-
-        def layout_modal_helpers
-          %(
-
-      def command_palette_modal
-        render_component Charming::Components::Modal.new(
-          content: palette,
-          title: "Command palette",
-          help: "Type to filter. Enter selects. Escape closes.",
-          width: 52,
-          theme: theme
-        )
-      end)
-        end
-
-        def layout_style_helpers
-          %(
-#{layout_frame_style_helpers}
-#{layout_dimension_helpers})
-        end
-
-        def layout_frame_style_helpers
-          %(
-      def sidebar_style
-        base = sidebar_focused? ? theme.title : theme.border
-        base = base.border(:rounded).padding(1, 2).width(sidebar_width).height(panel_height)
-        palette ? base.faint : base
-      end
-
-      def main_content_style
-        base = content_focused? ? theme.title : theme.border
-        base = base.border(:rounded).padding(1, 2).width(main_content_width).height(panel_height)
-        palette ? base.faint : base
-      end)
-        end
-
-        def layout_dimension_helpers
-          %(
-
-      def narrow?
-        screen.width < 72 && screen.height >= 20
-      end
-
-      def sidebar_width
-        narrow? ? [screen.width - 6, 20].max : 22
-      end
-
-      def main_content_width
-        narrow? ? [screen.width - 6, 20].max : [screen.width - sidebar_width - 13, 20].max
-      end
-
-      def panel_height
-        return nil if narrow?
-
-        [screen.height - 4, 5].max
-      end)
-        end
       end
     end
   end

data/lib/charming/generators/app_generator/screen_spec_templates.rb

@@ -4,12 +4,12 @@ module Charming
   module Generators
     class AppGenerator
       module ScreenSpecTemplates
-        def spec_model
+        def spec_state
           %(# frozen_string_literal: true
 
 require "#{app_name.snake_name}"
 
-RSpec.describe #{app_name.class_name}::#{name.class_name}Model do
+RSpec.describe #{app_name.class_name}::#{name.class_name}State do
   describe "#title" do
     it "has the correct default string value" do
       instance = described_class.new
@@ -36,7 +36,7 @@ RSpec.describe #{app_name.class_name}::#{name.controller_class_name} do
   subject(:controller) { described_class.new(application: application) }
 
   describe "#show" do
-    it "renders the view with the model" do
+    it "renders the view with the state" do
       response = controller.dispatch(:show)
 
       expect(response).to respond_to(:body)
@@ -51,12 +51,11 @@ end
 
 require "#{app_name.snake_name}"
 
-RSpec.describe #{app_name.class_name}::#{name.view_class_name} do
+RSpec.describe "#{name.snake_name}/show template" do
   describe "#render" do
-    it "renders the model title" do
-      view = described_class.new(
-        #{name.snake_name}: double(title: "#{name.class_name}")
-       )
+    it "renders the state title" do
+      template = Charming::Presentation::Templates.resolve("#{name.snake_name}/show", root: #{app_name.class_name}::Application.root)
+      view = Charming::Presentation::TemplateView.new(template: template, #{name.snake_name}: double(title: "#{name.class_name}"))
 
       expect(view.render).to eq("#{name.class_name}")
     end

data/lib/charming/generators/app_generator/{model_templates.rb → state_templates.rb}

@@ -3,22 +3,22 @@
 module Charming
   module Generators
     class AppGenerator
-      module ModelTemplates
-        def application_model
+      module StateTemplates
+        def application_state
           %(# frozen_string_literal: true
 
 module #{name.class_name}
-  class ApplicationModel < Charming::ApplicationModel
+  class ApplicationState < Charming::ApplicationState
   end
 end
 )
         end
 
-        def home_model
+        def home_state
           %(# frozen_string_literal: true
 
 module #{name.class_name}
-  class HomeModel < ApplicationModel
+  class HomeState < ApplicationState
     attribute :title, :string, default: "#{name.class_name}"
   end
 end

data/lib/charming/generators/app_generator/view_template.rb

@@ -20,6 +20,7 @@ Charming.run(#{name.class_name}::Application.new)
 
 require "charming"
 require "zeitwerk"
+#{database_require}
 
 module #{name.class_name}
 end
@@ -28,7 +29,7 @@ loader = Zeitwerk::Loader.new
 loader.tag = "#{name.snake_name}"
 loader.inflector.inflect("version" => "VERSION")
 loader.push_dir(File.expand_path("#{name.snake_name}", __dir__), namespace: #{name.class_name})
-loader.push_dir(File.expand_path("../app/models", __dir__), namespace: #{name.class_name})
+#{model_loader}loader.push_dir(File.expand_path("../app/state", __dir__), namespace: #{name.class_name})
 loader.push_dir(File.expand_path("../app/components", __dir__), namespace: #{name.class_name})
 loader.push_dir(File.expand_path("../app/views", __dir__), namespace: #{name.class_name})
 loader.push_dir(File.expand_path("../app/controllers", __dir__), namespace: #{name.class_name})
@@ -43,7 +44,9 @@ require_relative "../config/routes"
 
 module #{name.class_name}
   class Application < Charming::Application
-    Charming::UI::Theme.built_in_names.each do |theme_name|
+    root File.expand_path("../..", __dir__)
+
+    Charming::Presentation::UI::Theme.built_in_names.each do |theme_name|
       theme theme_name.to_sym, built_in: theme_name
     end
 
@@ -63,26 +66,17 @@ end
         end
 
         def view
-          %(# frozen_string_literal: true
-
-module #{name.class_name}
-  class HomeView < Charming::View
-    def render
-      app_frame
-    end
-#{view_helpers}
-  end
-end
+          %(<%= render_component AppFrameComponent.new(title: home.title, theme: theme) %>
 )
         end
 
-        def view_helpers
-          %(
-    private
+        def database_require
+          database? ? %(require_relative "../config/database") : ""
+        end
 
-    def app_frame
-      render_component AppFrameComponent.new(title: home.title, theme: theme)
-    end)
+        def model_loader
+          database? ? %(loader.push_dir(File.expand_path("../app/models", __dir__), namespace: #{name.class_name})
+) : ""
         end
       end
     end

data/lib/charming/generators/app_generator.rb

@@ -6,13 +6,14 @@ module Charming
       include BasicTemplates
       include ComponentTemplates
       include ControllerTemplate
+      include DatabaseTemplates
       include LayoutTemplate
-      include ModelTemplates
+      include StateTemplates
       include ScreenSpecTemplates
       include ViewTemplate
       include AppSpecTemplates
 
-      FILE_TEMPLATES = [
+      BASE_FILE_TEMPLATES = [
         ["Gemfile", :gemfile],
         ["Rakefile", :rakefile],
         ["README.md", :readme],
@@ -22,36 +23,53 @@ module Charming
         ["lib/%<name>s/application.rb", :application],
         ["lib/%<name>s/version.rb", :version],
         ["config/routes.rb", :routes],
-        ["app/models/application_model.rb", :application_model],
-        ["app/models/home_model.rb", :home_model],
+        ["app/state/application_state.rb", :application_state],
+        ["app/state/home_state.rb", :home_state],
         ["app/controllers/application_controller.rb", :application_controller],
         ["app/controllers/home_controller.rb", :controller],
-        ["app/views/layouts/application.rb", :layout],
-        ["app/views/home_view.rb", :view],
+        ["app/views/layouts/application.tui.erb", :layout],
+        ["app/views/home/show.tui.erb", :view],
         ["app/components/app_frame_component.rb", :component],
         ["spec/spec_helper.rb", :spec_helper],
-        ["spec/models/home_model_spec.rb", :spec_model],
+        ["spec/state/home_state_spec.rb", :spec_state],
         ["spec/controllers/home_controller_spec.rb", :spec_controller],
-        ["spec/views/home_view_spec.rb", :spec_view],
+        ["spec/views/home/show_template_spec.rb", :spec_view],
         ["spec/components/app_frame_component_spec.rb", :spec_component]
       ].freeze
 
-      def initialize(name, out:, destination:, force: false)
+      DATABASE_FILE_TEMPLATES = [
+        ["config/database.rb", :database_config],
+        ["app/models/application_record.rb", :application_record],
+        ["db/migrate/.keep", :keep],
+        ["db/seeds.rb", :seeds]
+      ].freeze
+
+      def initialize(name, out:, destination:, force: false, database: nil)
         super(out: out, destination: File.join(destination, name), force: force)
         @name = Name.new(name)
+        @database = database
       end
 
       def generate
-        FILE_TEMPLATES.each do |path, template|
+        file_templates.each do |path, template|
           create_file(file_path(path), send(template), executable: template == :executable)
         end
+        initialize_git_repository
       end
 
       private
 
-      attr_reader :name
+      attr_reader :name, :database
       alias_method :app_name, :name
 
+      def database?
+        !!database
+      end
+
+      def file_templates
+        database? ? BASE_FILE_TEMPLATES + DATABASE_FILE_TEMPLATES : BASE_FILE_TEMPLATES
+      end
+
       def file_path(path)
         format(path, name: name.snake_name)
       end
@@ -71,6 +89,14 @@ end
 require "#{name.snake_name}"
 )
       end
+
+      def initialize_git_repository
+        unless system("git", "init", chdir: destination, out: File::NULL, err: File::NULL)
+          raise Error, "Could not initialize git repository"
+        end
+
+        out.puts "init git"
+      end
     end
   end
 end

data/lib/charming/generators/component_generator.rb

@@ -17,7 +17,7 @@ module Charming
         %(# frozen_string_literal: true
 
 module #{app_name.class_name}
-  class #{name.component_class_name} < Charming::Component
+  class #{name.component_class_name} < Charming::Presentation::Component
     def render
       text "#{name.class_name}"
     end

data/lib/charming/generators/controller_generator.rb

@@ -38,10 +38,7 @@ end
 
       def action_method(action)
         %(    def #{action}
-      render #{name.view_class_name}.new(
-        palette: command_palette,
-        screen: screen
-      )
+      render :#{action}, palette: command_palette
     end
 )
       end

data/lib/charming/generators/model_generator.rb

@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+module Charming
+  module Generators
+    class ModelGenerator < AppFileGenerator
+      Field = Data.define(:name, :type)
+      VALID_TYPES = %w[string text integer float decimal boolean date datetime time].freeze
+
+      def initialize(name, args, out:, destination:, force: false)
+        super
+        @fields = args.map { |arg| parse_field(arg) }
+      end
+
+      def generate
+        raise Error, "Database support is not configured. Generate the app with --database sqlite3 first." unless database_configured?
+
+        create_file(model_path, model)
+        create_file(migration_path, migration)
+        create_file(spec_path, spec)
+      end
+
+      private
+
+      attr_reader :fields
+
+      def suffix
+        nil
+      end
+
+      def model_path
+        File.join("app", "models", "#{name.snake_name}.rb")
+      end
+
+      def migration_path
+        File.join("db", "migrate", "#{timestamp}_create_#{table_name}.rb")
+      end
+
+      def spec_path
+        File.join("spec", "models", "#{name.snake_name}_spec.rb")
+      end
+
+      def model
+        %(# frozen_string_literal: true
+
+module #{app_name.class_name}
+  class #{name.class_name} < ApplicationRecord
+  end
+end
+)
+      end
+
+      def migration
+        %(# frozen_string_literal: true
+
+class Create#{table_class_name} < ActiveRecord::Migration[8.1]
+  def change
+    create_table :#{table_name} do |t|
+#{field_lines}      t.timestamps
+    end
+  end
+end
+)
+      end
+
+      def spec
+        %(# frozen_string_literal: true
+
+require "#{app_name.snake_name}"
+
+RSpec.describe #{app_name.class_name}::#{name.class_name} do
+  it "inherits from ApplicationRecord" do
+    expect(described_class.superclass).to eq(#{app_name.class_name}::ApplicationRecord)
+  end
+end
+)
+      end
+
+      def field_lines
+        fields.map { |field|
+          %(      t.#{field.type} :#{field.name}
+)
+        }.join
+      end
+
+      def parse_field(value)
+        field_name, type = value.split(":", 2)
+        raise Error, "Invalid field: #{value.inspect}" unless field_name && type
+        raise Error, "Invalid field name: #{field_name.inspect}" unless Name::VALID_NAME.match?(field_name)
+        raise Error, "Unsupported field type: #{type.inspect}" unless VALID_TYPES.include?(type)
+
+        Field.new(name: field_name, type: type)
+      end
+
+      def database_configured?
+        File.exist?(File.join(destination, "config", "database.rb")) &&
+          File.exist?(File.join(destination, "app", "models", "application_record.rb"))
+      end
+
+      def table_name
+        pluralize(name.snake_name)
+      end
+
+      def table_class_name
+        table_name.split("_").map(&:capitalize).join
+      end
+
+      def pluralize(value)
+        return value.sub(/y\z/, "ies") if value.end_with?("y")
+        return "#{value}es" if value.match?(/(?:s|x|z|ch|sh)\z/)
+
+        "#{value}s"
+      end
+
+      def timestamp
+        Time.now.utc.strftime("%Y%m%d%H%M%S")
+      end
+    end
+  end
+end

data/lib/charming/generators/name.rb

@@ -20,10 +20,6 @@ module Charming
         "#{class_name}Controller"
       end
 
-      def view_class_name
-        "#{class_name}View"
-      end
-
       def component_class_name
         "#{class_name}Component"
       end