charming 0.1.2 → 0.1.4

data/lib/charming/generators/database_installer.rb

@@ -0,0 +1,154 @@
+# frozen_string_literal: true
+
+require "fileutils"
+
+module Charming
+  module Generators
+    # DatabaseInstaller implements `charming db:install sqlite3`. It adds database support
+    # to an existing Charming app by creating `config/database.rb`, `app/models/application_record.rb`,
+    # `db/migrate/`, and `db/seeds.rb`, and patching the gemspec and root loader to include
+    # the new dependencies and the `app/models` autoload directory.
+    class DatabaseInstaller
+      # *database* is the adapter name (only "sqlite3" is currently supported). *out* is the
+      # status-output stream. *destination* is the app root.
+      def initialize(database, out:, destination:)
+        @database = database
+        @out = out
+        @destination = destination
+        @app_name = Name.new(app_name_from_gemspec)
+      end
+
+      # Performs the install: writes the database config, application record, migrate directory,
+      # seeds file, and patches the gemspec + root loader. Idempotent: existing files are
+      # reported with "exist <path>" instead of being overwritten.
+      def install
+        raise Error, "Unsupported database: #{database.inspect}" unless database == "sqlite3"
+
+        create_file("config/database.rb", database_config)
+        create_file("app/models/application_record.rb", application_record)
+        create_file("db/migrate/.keep", "")
+        create_file("db/seeds.rb", %(# frozen_string_literal: true
+))
+        update_gemspec
+        update_root_file
+      end
+
+      private
+
+      # The database adapter, status stream, app destination, and derived app name.
+      attr_reader :database, :out, :destination, :app_name
+
+      # Writes *content* to *path* (relative to the app root), creating intermediate directories.
+      # Reports "exist <path>" without overwriting when the file already exists.
+      def create_file(path, content)
+        absolute_path = File.join(destination, path)
+        if File.exist?(absolute_path)
+          out.puts "exist #{path}"
+          return
+        end
+
+        FileUtils.mkdir_p(File.dirname(absolute_path))
+        File.write(absolute_path, content)
+        out.puts "create #{path}"
+      end
+
+      # Patches the gemspec to include the `db` directory in the gem files glob and to add
+      # activerecord + sqlite3 dependencies.
+      def update_gemspec
+        update_file(gemspec_path) do |current|
+          updated = current.sub('Dir.glob("{app,config,exe,lib}/**/*")', 'Dir.glob("{app,config,db,exe,lib}/**/*")')
+          updated = insert_dependency(updated, "activerecord", "~> 8.1")
+          insert_dependency(updated, "sqlite3", "~> 2.0")
+        end
+      end
+
+      # Patches the root loader file (`lib/<app>.rb`) to require `config/database` and to push
+      # the `app/models` autoload directory. Both edits are no-ops when already applied.
+      def update_root_file
+        update_file(root_file_path) do |current|
+          updated = current
+          updated = updated.sub(%(require "zeitwerk"\n), %(require "zeitwerk"\nrequire_relative "../config/database"\n)) unless updated.include?(%(require_relative "../config/database"))
+          unless updated.include?(%[loader.push_dir(File.expand_path("../app/models", __dir__), namespace: #{app_name.class_name})])
+            updated = updated.sub(
+              %[loader.push_dir(File.expand_path("../app/state", __dir__), namespace: #{app_name.class_name})\n],
+              %[loader.push_dir(File.expand_path("../app/models", __dir__), namespace: #{app_name.class_name})\nloader.push_dir(File.expand_path("../app/state", __dir__), namespace: #{app_name.class_name})\n]
+            )
+          end
+          updated
+        end
+      end
+
+      # Reads *path*, yields its contents to the block, and writes the result back when it
+      # differs. Raises Error when the file is missing.
+      def update_file(path)
+        raise Error, "Missing file: #{relative_path(path)}" unless File.exist?(path)
+
+        current = File.read(path)
+        updated = yield current
+        return if updated == current
+
+        File.write(path, updated)
+        out.puts "update #{relative_path(path)}"
+      end
+
+      # Inserts a `spec.add_dependency "name", "version"` line after the `charming` dependency
+      # when it's not already present.
+      def insert_dependency(content, gem_name, version)
+        return content if content.include?(%(spec.add_dependency "#{gem_name}"))
+
+        dependency = %(  spec.add_dependency "#{gem_name}", "#{version}")
+        content.sub(%(  spec.add_dependency "charming"\n), %(  spec.add_dependency "charming"\n#{dependency}\n))
+      end
+
+      # The contents of the new `config/database.rb` (establishes an SQLite connection to
+      # `db/development.sqlite3`).
+      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
+
+      # The contents of the new `app/models/application_record.rb` (abstract ActiveRecord base).
+      def application_record
+        %(# frozen_string_literal: true
+
+module #{app_name.class_name}
+  class ApplicationRecord < ActiveRecord::Base
+    self.abstract_class = true
+  end
+end
+)
+      end
+
+      # Reads the app's gemspec filename to derive the app name.
+      def app_name_from_gemspec
+        File.basename(gemspec_path, ".gemspec")
+      end
+
+      # The path to the app's gemspec (raises when not found).
+      def gemspec_path
+        @gemspec_path ||= Dir.glob(File.join(destination, "*.gemspec")).first || raise(Error, "Run this command from a Charming app root")
+      end
+
+      # The path to the app's root loader file (`lib/<app_name>.rb`).
+      def root_file_path
+        File.join(destination, "lib", "#{app_name.snake_name}.rb")
+      end
+
+      # Strips the app destination prefix from *path* for human-friendly status output.
+      def relative_path(path)
+        path.delete_prefix("#{destination}/")
+      end
+    end
+  end
+end

data/lib/charming/generators/model_generator.rb

@@ -103,20 +103,12 @@ module Charming
 
       # The pluralized table name (e.g., "user" → "users", "category" → "categories").
       def table_name
-        pluralize(name.snake_name)
+        ActiveSupport::Inflector.pluralize(name.snake_name)
       end
 
       # The CamelCase migration class name (e.g., "users" → "Users").
       def table_class_name
-        table_name.split("_").map(&:capitalize).join
-      end
-
-      # Minimal English pluralization for the model name (covers the common -y, -s/x/z/ch/sh cases).
-      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"
+        ActiveSupport::Inflector.camelize(table_name)
       end
 
       # The current UTC timestamp in the format ActiveRecord uses for migration filenames.

data/lib/charming/generators/name.rb

@@ -21,7 +21,7 @@ module Charming
 
       # The CamelCase class name (e.g., "user" → "User").
       def class_name
-        snake_name.split("_").map(&:capitalize).join
+        ActiveSupport::Inflector.camelize(snake_name)
       end
 
       # The controller class name (e.g., "user" → "UserController").

data/lib/charming/generators/templates/app/application.template

@@ -4,7 +4,7 @@ module __APP_CLASS__
   class Application < Charming::Application
     root File.expand_path("../..", __dir__)
 
-    Charming::Presentation::UI::Theme.built_in_names.each do |theme_name|
+    Charming::UI::Theme.built_in_names.each do |theme_name|
       theme theme_name.to_sym, built_in: theme_name
     end
 

data/lib/charming/generators/templates/app/layout.template

@@ -2,7 +2,7 @@
 
 module __APP_CLASS__
   module Layouts
-    class ApplicationLayout < Charming::Presentation::View
+    class ApplicationLayout < Charming::View
       def render
         screen_layout(background: theme.background) do
           split(narrow? ? :vertical : :horizontal, gap: 1) do
@@ -54,7 +54,7 @@ module __APP_CLASS__
       def nav_item_label(route, index)
         cursor = (sidebar_focused? && index == sidebar_index) ? ">" : " "
         active = current_route?(route) ? "\u{25cf}" : " "
-        "\#{cursor} \#{active} \#{route.title}"
+        "#{cursor} #{active} #{route.title}"
       end
 
       def nav_item_style(route, index)
@@ -84,11 +84,8 @@ module __APP_CLASS__
       def command_palette_modal
         return unless palette_component
 
-        render_component Charming::Presentation::Components::Modal.new(
+        render_component Charming::Components::CommandPaletteModal.new(
           content: palette_component,
-          title: "Command palette",
-          help: "Type to filter. Enter selects. Escape closes.",
-          width: 52,
           theme: theme
         )
       end

data/lib/charming/generators/templates/app/view.template

@@ -2,7 +2,7 @@
 
 module __APP_CLASS__
   module Home
-    class ShowView < Charming::Presentation::View
+    class ShowView < Charming::View
       def render
         column(title_line, help_line, gap: 1)
       end

data/lib/charming/generators/templates/component/component.rb.template

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module __APP_CLASS__
-  class __COMPONENT_CLASS__ < Charming::Presentation::Component
+  class __COMPONENT_CLASS__ < Charming::Component
     def render
       text "__RESOURCE_NAME__"
     end

data/lib/charming/generators/templates/screen/view.rb.template

@@ -2,7 +2,7 @@
 
 module __APP_CLASS__
   module __RESOURCE_MODULE__
-    class ShowView < Charming::Presentation::View
+    class ShowView < Charming::View
       def render
         __SCREEN_NAME__.title
       end

data/lib/charming/generators/templates/view/view.rb.template

@@ -2,7 +2,7 @@
 
 module __APP_CLASS__
   module __RESOURCE_MODULE__
-    class __ACTION_VIEW_CLASS__View < Charming::Presentation::View
+    class __ACTION_VIEW_CLASS__View < Charming::View
       def render
         "__RESOURCE_NAME__"
       end

data/lib/charming/generators/view_generator.rb

@@ -40,7 +40,7 @@ module Charming
 
       # CamelCase rendering of the action name (e.g., "user_settings" → "UserSettings").
       def action_class_name
-        action.split("_").map(&:capitalize).join
+        ActiveSupport::Inflector.camelize(action)
       end
     end
   end

data/lib/charming/internal/renderer/differential.rb

@@ -27,6 +27,12 @@ module Charming
           render_changes(frame)
         end
 
+        # Discards the cached previous frame so the next render performs a full repaint.
+        # Call this when the screen contents are no longer trustworthy (e.g. terminal resize).
+        def invalidate
+          @previous_frame = nil
+        end
+
         private
 
         # Performs the initial full repaint and records the first frame.
@@ -35,7 +41,7 @@ module Charming
           @previous_frame = frame
         end
 
-        # Computes the per-line diff against the previous frame, writes the changed lines,
+        # Computes the per-line diff against the previous frame, writes only changed lines,
         # and records the new frame. Falls back to a full repaint when the output backend
         # doesn't support partial writes.
         def render_changes(frame)
@@ -50,15 +56,17 @@ module Charming
           @previous_frame = frame
         end
 
-        # Returns an array of [1-based-row, line] tuples covering the larger of the two
-        # frames' line counts, with empty strings padding the shorter frame.
+        # Returns an array of [1-based-row, line] tuples for rows whose content changed.
+        # Empty strings clear rows that existed in the previous frame but not the new one.
         def changed_lines(previous_frame, frame)
           previous_lines = previous_frame.lines(chomp: true)
           lines = frame.lines(chomp: true)
           line_count = [previous_lines.length, lines.length].max
 
-          line_count.times.map do |index|
-            [index + 1, lines[index] || ""]
+          line_count.times.filter_map do |index|
+            line = lines[index] || ""
+            previous_line = previous_lines[index] || ""
+            [index + 1, line] unless line == previous_line
           end
         end
       end

data/lib/charming/internal/terminal/tty_backend.rb

@@ -51,6 +51,20 @@ module Charming
           nil
         end
 
+        # Keeps terminal input in raw/no-echo mode for the duration of a TUI run. Reading a
+        # single keypress in raw mode is not enough: keys pressed while rendering or dispatching
+        # events can otherwise be echoed into the alternate screen before the next read.
+        def with_raw_input
+          return yield unless @input.respond_to?(:tty?) && @input.tty?
+          return yield unless @input.respond_to?(:raw) && @input.respond_to?(:noecho)
+
+          @input.raw do
+            @input.noecho do
+              yield
+            end
+          end
+        end
+
         # Installs a SIGWINCH handler that sets the internal `@resized` flag, returning
         # the previous handler so it can be restored on teardown.
         def install_resize_handler
@@ -120,7 +134,7 @@ module Charming
         # Writes a partial frame composed of [row, line] tuples (1-based rows).
         def write_lines(line_changes, **)
           without_auto_wrap do
-            write_control(line_changes.map { |row, line| "\e[#{row};1H\e[2K#{line}" }.join)
+            write_control(line_changes.map { |row, line| positioned_line(row, line) }.join)
           end
         end
 
@@ -180,7 +194,13 @@ module Charming
         # Writes *lines* one row at a time, with each line preceded by an ANSI cursor
         # position and a clear-to-end-of-line sequence.
         def write_positioned_lines(lines)
-          write_control(lines.each_with_index.map { |line, index| "\e[#{index + 1};1H\e[2K#{line}" }.join)
+          write_control(lines.each_with_index.map { |line, index| positioned_line(index + 1, line) }.join)
+        end
+
+        # Resets SGR before and after each row so partial repaint rows cannot inherit
+        # colors/backgrounds from the previous physical terminal line.
+        def positioned_line(row, line)
+          "\e[0m\e[#{row};1H\e[2K#{line}\e[0m"
         end
 
         # Disables auto-wrap, yields, then re-enables it and flushes the output.

data/lib/charming/presentation/component.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
 module Charming
-  module Presentation
-    # Component is the base class for all reusable terminal widgets. It inherits from View to gain assigns,
-    # helper methods (text, box, row, column, etc.), and rendering via render.
-    class Component < View
-    end
+  # Component is the base class for all reusable terminal widgets. It inherits from View to gain assigns,
+  # helper methods (text, box, row, column, etc.), and rendering via render.
+  class Component < View
   end
 end