charming 0.1.2 → 0.1.4

data/lib/charming/presentation/view.rb

@@ -1,135 +1,140 @@
 # frozen_string_literal: true
 
 module Charming
-  module Presentation
-    # View is the base class for all screen view implementations. It provides assign injection (via `initialize`),
-    # rendering hooks, layout composition helpers (`row`, `column`, `render_component`, `yield_content`),
-    # and access to controller theme, style, and focus state from within views.
-    class View
-      # Initializes the view with named assigns injected as instance-local accessor methods via
-      # `define_singleton_method`. Called when a controller instantiates a view for rendering.
-      def initialize(**assigns)
-        @assigns = assigns
-        define_assign_readers
-      end
+  # View is the base class for all screen view implementations. It provides assign injection (via `initialize`),
+  # rendering hooks, layout composition helpers (`row`, `column`, `render_component`, `yield_content`),
+  # and access to controller theme, style, and focus state from within views.
+  class View
+    # Initializes the view with named assigns injected as instance-local accessor methods via
+    # `define_singleton_method`. Called when a controller instantiates a view for rendering.
+    def initialize(**assigns)
+      @assigns = assigns
+      define_assign_readers
+    end
 
-      # Returns all view assigns as a hash, used by layouts to compose the full template (content + screen + controller).
-      def layout_assigns
-        assigns
-      end
+    # Returns all view assigns as a hash, used by layouts to compose the full template (content + screen + controller).
+    def layout_assigns
+      assigns
+    end
 
-      # Renders the view's body. Default is empty — subclasses override to return visible text.
-      def render
-        ""
-      end
+    # Renders the view's body. Default is empty — subclasses override to return visible text.
+    def render
+      ""
+    end
 
-      # Delegates focus checking to the controller in assigns, allowing views to determine which slot (sidebar, content) has focus.
-      def focused?(slot)
-        ctrl = assigns[:focus_controller] || assigns[:controller]
-        ctrl ? ctrl.focused?(slot) : false
-      end
+    # Delegates focus checking to the controller in assigns, allowing views to determine which slot (sidebar, content) has focus.
+    def focused?(slot)
+      ctrl = assigns[:focus_controller] || assigns[:controller]
+      ctrl ? ctrl.focused?(slot) : false
+    end
 
-      private
+    private
 
-      attr_reader :assigns
+    attr_reader :assigns
 
-      # Returns the shared UI style configuration used by components and views for visual rendering (colors, borders).
-      def style
-        UI.style
-      end
+    # Returns the shared UI style configuration used by components and views for visual rendering (colors, borders).
+    def style
+      UI.style
+    end
 
-      # Returns the active theme: uses `theme` from assigns or controller, falling back to `UI::Theme.default`.
-      def theme
-        assigns[:theme] || assigns[:controller]&.theme || UI::Theme.default
-      end
+    # Returns the active theme: uses `theme` from assigns or controller, falling back to `UI::Theme.default`.
+    def theme
+      assigns[:theme] || assigns[:controller]&.theme || UI::Theme.default
+    end
 
-      # Outputs styled text through the view's rendering pipeline. Accepts a named `style:` for inline formatting.
-      # Appends the rendered value to the output buffer and returns it.
-      def text(value, style: nil)
-        rendered = apply_style(value.to_s, style)
-        append_to_buffer(rendered)
-        rendered
-      end
+    # Outputs styled text through the view's rendering pipeline. Accepts a named `style:` for inline formatting.
+    # Appends the rendered value to the output buffer and returns it.
+    def text(value, style: nil)
+      rendered = apply_style(value.to_s, style)
+      append_to_buffer(rendered)
+      rendered
+    end
 
-      # Renders a box with optional styling. Accepts an inline block for complex content or a plain value.
-      # Used for bordered containers and field groups in views.
-      def box(value = nil, style: nil, &)
-        content = block_given? ? capture(&) : value.to_s
-        apply_style(content, style)
-      end
+    # Renders a box with optional styling. Accepts an inline block for complex content or a plain value.
+    # Used for bordered containers and field groups in views.
+    def box(value = nil, style: nil, &)
+      content = block_given? ? capture(&) : value.to_s
+      apply_style(content, style)
+    end
 
-      # Joins items horizontally (side-by-side) using the UI rendering engine. Supports a `gap:` parameter.
-      def row(*items, gap: 0)
-        UI.join_horizontal(*items, gap: gap)
-      end
+    # Joins items horizontally (side-by-side) using the UI rendering engine. Supports a `gap:` parameter.
+    def row(*items, gap: 0)
+      UI.join_horizontal(*items, gap: gap)
+    end
 
-      # Stacks items vertically using the UI rendering engine. Supports a `gap:` parameter for spacing.
-      def column(*items, gap: 0)
-        UI.join_vertical(*items, gap: gap)
-      end
+    # Stacks items vertically using the UI rendering engine. Supports a `gap:` parameter for spacing.
+    def column(*items, gap: 0)
+      UI.join_vertical(*items, gap: gap)
+    end
 
-      # Renders a component (e.g., a ProgressBar, Spinner, Modal) and returns its string output.
-      def render_component(component)
-        component.render.to_s
-      end
+    # Renders a component (e.g., a ProgressBar, Spinner, Modal) and returns its string output.
+    def render_component(component)
+      component.render.to_s
+    end
 
-      # Renders a partial view component. An alias for `render_component` used in layout templates.
-      def render_partial(partial)
-        render_component(partial)
-      end
+    # Renders a partial view component. An alias for `render_component` used in layout templates.
+    def render_partial(partial)
+      render_component(partial)
+    end
 
-      # Builds a declarative layout tree for the current terminal screen and renders it.
-      def screen_layout(background: nil, &)
-        layout = Layout::Builder.build(screen: layout_screen, view: self, background: background, &)
-        register_layout_focus(layout)
-        layout.render
-      end
+    # Builds a declarative layout tree for the current terminal screen and renders it.
+    def screen_layout(background: nil, &)
+      layout = Layout::Builder.build(screen: layout_screen, view: self, background: background, &)
+      register_layout_focus(layout)
+      register_layout_mouse_targets(layout)
+      layout.render
+    end
 
-      # Yields the layout's `content` slot — used by view templates to inject their body into a layout wrapper (e.g., sidebar).
-      def yield_content
-        assigns.fetch(:content, "")
-      end
+    # Yields the layout's `content` slot — used by view templates to inject their body into a layout wrapper (e.g., sidebar).
+    def yield_content
+      assigns.fetch(:content, "")
+    end
 
-      # Evaluates a block in the view's context with a clean output buffer. Captures text written via `text`/`box`
-      # and returns joined content. Resets buffer afterward for parent rendering.
-      def capture(&)
-        previous_buffer = @output_buffer
-        @output_buffer = []
-        result = instance_eval(&)
-        @output_buffer.empty? ? result.to_s : @output_buffer.join("\n")
-      ensure
-        @output_buffer = previous_buffer
-      end
+    # Evaluates a block in the view's context with a clean output buffer. Captures text written via `text`/`box`
+    # and returns joined content. Resets buffer afterward for parent rendering.
+    def capture(&)
+      previous_buffer = @output_buffer
+      @output_buffer = []
+      result = instance_eval(&)
+      @output_buffer.empty? ? result.to_s : @output_buffer.join("\n")
+    ensure
+      @output_buffer = previous_buffer
+    end
 
-      # Appends a value to the current output buffer (if one is active). Used by rendering helpers.
-      def append_to_buffer(value)
-        @output_buffer << value if @output_buffer
-      end
+    # Appends a value to the current output buffer (if one is active). Used by rendering helpers.
+    def append_to_buffer(value)
+      @output_buffer << value if @output_buffer
+    end
 
-      # Applies a style object's `render` method to a string, returning styled output or raw text when style is nil.
-      def apply_style(value, style_object)
-        style_object ? style_object.render(value) : value
-      end
+    # Applies a style object's `render` method to a string, returning styled output or raw text when style is nil.
+    def apply_style(value, style_object)
+      style_object ? style_object.render(value) : value
+    end
 
-      # Dynamically defines read-only accessor methods for each assign key as singleton methods on self.
-      # Skips keys where the view already responds (controller methods take precedence).
-      def define_assign_readers
-        assigns.each_key do |name|
-          next if respond_to?(name, true)
+    # Dynamically defines read-only accessor methods for each assign key as singleton methods on self.
+    # Skips keys where the view already responds (controller methods take precedence).
+    def define_assign_readers
+      assigns.each_key do |name|
+        next if respond_to?(name, true)
 
-          define_singleton_method(name) { assigns.fetch(name) }
-        end
+        define_singleton_method(name) { assigns.fetch(name) }
       end
+    end
 
-      def layout_screen
-        assigns[:screen] || assigns[:controller]&.screen || Charming::Screen.new(width: 80, height: 24)
-      end
+    def layout_screen
+      assigns[:screen] || assigns[:controller]&.screen || Charming::Screen.new(width: 80, height: 24)
+    end
 
-      def register_layout_focus(layout)
-        return unless assigns[:controller]
+    def register_layout_focus(layout)
+      return unless assigns[:controller]
 
-        assigns[:controller].focus.define_layout(layout.focusable_names)
-      end
+      assigns[:controller].focus.define_layout(layout.focusable_names)
+    end
+
+    def register_layout_mouse_targets(layout)
+      return unless assigns[:controller]
+
+      assigns[:controller].register_mouse_targets(layout.mouse_targets)
     end
   end
 end

data/lib/charming/router.rb

@@ -108,20 +108,15 @@ module Charming
       end
     end
 
-    # Splits a camel-case string into words for title derivation (e.g., "my_route" → ["my", "route"]).
-    def camelize(value)
-      value.split("_").map(&:capitalize).join
-    end
-
     # Looks up a constant by name in Object. Used to resolve controller strings from route definitions.
     def constantize(name)
-      Object.const_get(name)
+      ActiveSupport::Inflector.constantize(name)
     end
 
     # Builds the full controller constant name, prepending the namespace if present.
-    # For example: "HomeController" with namespace "Admin" → "Admin::HomeController".
+    # For example: "home" with namespace "Admin" → "Admin::HomeController".
     def controller_constant_name(controller_name)
-      name = "#{camelize(controller_name)}Controller"
+      name = "#{ActiveSupport::Inflector.camelize(controller_name)}Controller"
       @namespace.to_s.empty? ? name : "#{@namespace}::#{name}"
     end
 

data/lib/charming/runtime.rb

@@ -26,19 +26,21 @@ module Charming
     # restores terminal state on exit.
     def run
       setup_terminal
-      render(resolve_response(dispatch(@route.action)))
-      loop do
-        event = next_task_event || next_timer_event || @backend.read_event(timeout: read_timeout)
-        next unless event
+      with_raw_input do
+        render(resolve_response(dispatch(@route.action)))
+        loop do
+          event = next_task_event || next_timer_event || @backend.read_event(timeout: read_timeout)
+          next unless event
 
-        response = dispatch_event(event)
-        next unless response
-        break if response.quit?
+          response = dispatch_event(event)
+          next unless response
+          break if response.quit?
 
-        response = resolve_response(response)
-        break if response.quit?
+          response = resolve_response(response)
+          break if response.quit?
 
-        render(response)
+          render(response)
+        end
       end
     ensure
       @task_executor&.shutdown(timeout: 0.0)
@@ -93,8 +95,12 @@ module Charming
     end
 
     # Dispatches a resize event: updates screen dimensions and re-renders the current action.
+    # The renderer's cached previous frame is invalidated and the backend is cleared so the
+    # new-dimension frame paints onto a clean alt-screen instead of overlaying stale rows.
     def dispatch_resize(event)
       @screen = Screen.new(width: event.width, height: event.height)
+      @renderer.invalidate if @renderer.respond_to?(:invalidate)
+      @backend.clear if @backend.respond_to?(:clear)
       dispatch(@route.action, event: event)
     end
 
@@ -180,13 +186,22 @@ module Charming
     def setup_terminal
       @backend.enter_alt_screen
       @backend.hide_cursor
+      @backend.enable_mouse_tracking if @backend.respond_to?(:enable_mouse_tracking)
       @backend.install_resize_handler if @backend.respond_to?(:install_resize_handler)
     end
 
+    # Keeps input raw/no-echo across rendering and dispatch, not just during reads.
+    def with_raw_input(&block)
+      return yield unless @backend.respond_to?(:with_raw_input)
+
+      @backend.with_raw_input(&block)
+    end
+
     # Restores terminal state: reinstalls any previous resize handler, shows
     # the cursor, and leaves the alternative screen buffer.
     def restore_terminal
       @backend.restore_resize_handler if @backend.respond_to?(:restore_resize_handler)
+      @backend.disable_mouse_tracking if @backend.respond_to?(:disable_mouse_tracking)
       @backend.show_cursor
       @backend.leave_alt_screen
     end

data/lib/charming/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Charming
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/lib/charming.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "active_support/inflector"
+require "logger"
 require "zeitwerk"
 
 loader = Zeitwerk::Loader.for_gem
@@ -9,14 +11,13 @@ loader.inflector.inflect(
   "ansi_codes" => "ANSICodes",
   "ansi_slicer" => "ANSISlicer",
   "border_painter" => "BorderPainter",
-  "block_renderers" => "BlockRenderer",
-  "inline_renderers" => "InlineRenderer",
   "render_context" => "RenderContext",
   "erb_handler" => "ErbHandler",
   "key_normalizer" => "KeyNormalizer",
   "mouse_parser" => "MouseParser",
   "tty_backend" => "TTYBackend"
 )
+loader.collapse("#{__dir__}/charming/presentation")
 loader.setup
 
 module Charming
@@ -37,5 +38,5 @@ module Charming
   end
 end
 
-Charming::Presentation::Templates.register ".tui.erb", Charming::Presentation::Templates::ErbHandler
-Charming::Presentation::Templates.register ".txt.erb", Charming::Presentation::Templates::ErbHandler
+Charming::Templates.register ".tui.erb", Charming::Templates::ErbHandler
+Charming::Templates.register ".txt.erb", Charming::Templates::ErbHandler

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: charming
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - pando
@@ -50,19 +50,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 8.1.2
 - !ruby/object:Gem::Dependency
-  name: kramdown
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '8.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 8.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 8.1.2
+- !ruby/object:Gem::Dependency
+  name: commonmarker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
@@ -210,23 +244,23 @@ files:
 - lib/charming/controller/command_palette.rb
 - lib/charming/controller/component_dispatching.rb
 - lib/charming/controller/dispatching.rb
+- lib/charming/controller/focus.rb
 - lib/charming/controller/focus_management.rb
 - lib/charming/controller/rendering.rb
 - lib/charming/controller/session_state.rb
 - lib/charming/controller/sidebar_navigation.rb
-- lib/charming/database_commands.rb
-- lib/charming/database_installer.rb
+- lib/charming/database/commands.rb
 - lib/charming/events/key_event.rb
 - lib/charming/events/mouse_event.rb
 - lib/charming/events/resize_event.rb
 - lib/charming/events/task_event.rb
 - lib/charming/events/timer_event.rb
-- lib/charming/focus.rb
 - lib/charming/generators/app_file_generator.rb
 - lib/charming/generators/app_generator.rb
 - lib/charming/generators/base.rb
 - lib/charming/generators/component_generator.rb
 - lib/charming/generators/controller_generator.rb
+- lib/charming/generators/database_installer.rb
 - lib/charming/generators/error.rb
 - lib/charming/generators/model_generator.rb
 - lib/charming/generators/name.rb
@@ -277,6 +311,7 @@ files:
 - lib/charming/presentation/component.rb
 - lib/charming/presentation/components/activity_indicator.rb
 - lib/charming/presentation/components/command_palette.rb
+- lib/charming/presentation/components/command_palette_modal.rb
 - lib/charming/presentation/components/empty_state.rb
 - lib/charming/presentation/components/form.rb
 - lib/charming/presentation/components/form/builder.rb
@@ -304,10 +339,9 @@ files:
 - lib/charming/presentation/layout/screen_layout.rb
 - lib/charming/presentation/layout/split.rb
 - lib/charming/presentation/markdown.rb
-- lib/charming/presentation/markdown/block_renderers.rb
-- lib/charming/presentation/markdown/inline_renderers.rb
 - lib/charming/presentation/markdown/render_context.rb
 - lib/charming/presentation/markdown/renderer.rb
+- lib/charming/presentation/markdown/style_config.rb
 - lib/charming/presentation/markdown/syntax_highlighter.rb
 - lib/charming/presentation/template_view.rb
 - lib/charming/presentation/templates.rb

data/lib/charming/database_commands.rb

@@ -1,103 +0,0 @@
-# frozen_string_literal: true
-
-require "fileutils"
-
-module Charming
-  # DatabaseCommands implements the runtime side of `charming db:COMMAND` (other than
-  # `db:install`, which lives in DatabaseInstaller). It loads the app's `config/database.rb`,
-  # delegates the actual work to ActiveRecord, and prints a short status line on success.
-  class DatabaseCommands
-    # *command* is the subcommand string (e.g., "db:create"). *out* is the status-output
-    # stream. *destination* is the app root for resolving `config/database.rb` and `db/`.
-    def initialize(command, out:, destination:)
-      @command = command
-      @out = out
-      @destination = destination
-    end
-
-    # Dispatches the configured command. Raises Generators::Error for unknown commands.
-    def run
-      case command
-      when "db:create" then create
-      when "db:migrate" then migrate
-      when "db:rollback" then rollback
-      when "db:drop" then drop
-      when "db:seed" then seed
-      else raise Generators::Error, "Unknown database command: #{command}"
-      end
-    end
-
-    private
-
-    # The subcommand, output stream, and app destination.
-    attr_reader :command, :out, :destination
-
-    # Creates the SQLite database file (touch) and establishes the connection.
-    def create
-      load_database
-      FileUtils.mkdir_p(File.dirname(database_path)) if database_path
-      FileUtils.touch(database_path) if database_path
-      ActiveRecord::Base.connection
-      out.puts "create #{relative_database_path}"
-    end
-
-    # Runs all pending migrations from `db/migrate`.
-    def migrate
-      load_database
-      migration_context.migrate
-      out.puts "migrate db/migrate"
-    end
-
-    # Rolls back the most recent migration.
-    def rollback
-      load_database
-      migration_context.rollback(1)
-      out.puts "rollback db/migrate"
-    end
-
-    # Disconnects ActiveRecord, then deletes the database file.
-    def drop
-      load_database
-      ActiveRecord::Base.connection.disconnect!
-      File.delete(database_path) if database_path && File.exist?(database_path)
-      out.puts "drop #{relative_database_path}"
-    end
-
-    # Loads `db/seeds.rb` (raises if missing).
-    def seed
-      load_database
-      seed_path = File.join(destination, "db", "seeds.rb")
-      raise Generators::Error, "Missing file: db/seeds.rb" unless File.exist?(seed_path)
-
-      load seed_path
-      out.puts "seed db/seeds.rb"
-    end
-
-    # Loads the app's `config/database.rb` (raises if missing) which establishes the connection.
-    def load_database
-      database_config = File.join(destination, "config", "database.rb")
-      raise Generators::Error, "Database support is not configured. Missing config/database.rb." unless File.exist?(database_config)
-
-      require database_config
-    end
-
-    # The ActiveRecord migration context rooted at `db/migrate` inside the app.
-    def migration_context
-      ActiveRecord::MigrationContext.new(File.join(destination, "db", "migrate"))
-    end
-
-    # The configured database file path (nil when ActiveRecord isn't connected to a file).
-    def database_path
-      ActiveRecord::Base.connection_db_config.database
-    end
-
-    # The database path relative to the app root, used for human-friendly status output.
-    def relative_database_path
-      return "database" unless database_path
-
-      base = File.realpath(destination)
-      path = File.expand_path(database_path)
-      path.start_with?("#{base}/") ? path.delete_prefix("#{base}/") : path
-    end
-  end
-end