charming 0.1.3 → 0.1.4

data/lib/charming/presentation/markdown/style_config.rb

@@ -0,0 +1,215 @@
+# frozen_string_literal: true
+
+module Charming
+  module Markdown
+    class StyleConfig
+      ELEMENTS = %i[
+        document paragraph block_quote list heading h1 h2 h3 h4 h5 h6 text
+        strikethrough emph strong hr item enumeration task link link_text image
+        image_text code code_block table definition_list definition_term
+        definition_description html_block html_span
+      ].freeze
+
+      BUILT_INS = {
+        notty: {
+          block_quote: {indent: 1, indent_token: "| "},
+          list: {level_indent: 2},
+          h1: {prefix: "# "},
+          h2: {prefix: "## "},
+          h3: {prefix: "### "},
+          h4: {prefix: "#### "},
+          h5: {prefix: "##### "},
+          h6: {prefix: "###### "},
+          emph: {block_prefix: "*", block_suffix: "*"},
+          strong: {block_prefix: "**", block_suffix: "**"},
+          strikethrough: {block_prefix: "~~", block_suffix: "~~"},
+          hr: {format: "--------"},
+          item: {block_prefix: "- "},
+          enumeration: {block_prefix: ". "},
+          task: {ticked: "[x] ", unticked: "[ ] "},
+          code: {block_prefix: "`", block_suffix: "`"},
+          code_block: {margin: 1},
+          table: {column_separator: "|", row_separator: "-"},
+          image_text: {format: "Image: {{text}} ->"}
+        },
+        dark: {
+          document: {color: "252"},
+          block_quote: {color: "244", indent: 1, indent_token: "│ "},
+          list: {level_indent: 2},
+          heading: {color: "39", bold: true},
+          h1: {prefix: " ", suffix: " ", color: "228", background_color: "63", bold: true},
+          h2: {prefix: "## "},
+          h3: {prefix: "### "},
+          h4: {prefix: "#### "},
+          h5: {prefix: "##### "},
+          h6: {prefix: "###### ", color: "35", bold: false},
+          strikethrough: {crossed_out: true},
+          emph: {italic: true},
+          strong: {bold: true},
+          hr: {color: "240", format: "--------"},
+          item: {block_prefix: "• "},
+          enumeration: {block_prefix: ". "},
+          task: {ticked: "[✓] ", unticked: "[ ] "},
+          link: {color: "30", underline: true},
+          link_text: {color: "35", bold: true},
+          image: {color: "212", underline: true},
+          image_text: {color: "243", format: "Image: {{text}} ->"},
+          code: {prefix: " ", suffix: " ", color: "203", background_color: "236"},
+          code_block: {color: "244", margin: 1},
+          table: {column_separator: "|", row_separator: "-"}
+        },
+        light: {
+          document: {color: "236"},
+          block_quote: {color: "244", indent: 1, indent_token: "│ "},
+          list: {level_indent: 2},
+          heading: {color: "25", bold: true},
+          h1: {prefix: " ", suffix: " ", color: "255", background_color: "33", bold: true},
+          h2: {prefix: "## "},
+          h3: {prefix: "### "},
+          h4: {prefix: "#### "},
+          h5: {prefix: "##### "},
+          h6: {prefix: "###### ", color: "30", bold: false},
+          strikethrough: {crossed_out: true},
+          emph: {italic: true},
+          strong: {bold: true},
+          hr: {color: "250", format: "--------"},
+          item: {block_prefix: "• "},
+          enumeration: {block_prefix: ". "},
+          task: {ticked: "[✓] ", unticked: "[ ] "},
+          link: {color: "25", underline: true},
+          link_text: {color: "90", bold: true},
+          image: {color: "162", underline: true},
+          image_text: {color: "244", format: "Image: {{text}} ->"},
+          code: {prefix: " ", suffix: " ", color: "161", background_color: "255"},
+          code_block: {color: "244", margin: 1},
+          table: {column_separator: "|", row_separator: "-"}
+        }
+      }.freeze
+
+      ATTRIBUTES = %i[bold faint italic underline reverse strikethrough].freeze
+
+      Style = Data.define(
+        :block_prefix, :block_suffix, :prefix, :suffix, :color, :background_color,
+        :bold, :faint, :italic, :underline, :reverse, :strikethrough, :format,
+        :indent, :indent_token, :margin, :level_indent, :ticked, :unticked,
+        :column_separator, :row_separator
+      ) do
+        def self.from(value)
+          value = symbolize_keys(value || {})
+          new(
+            block_prefix: value[:block_prefix].to_s,
+            block_suffix: value[:block_suffix].to_s,
+            prefix: value[:prefix].to_s,
+            suffix: value[:suffix].to_s,
+            color: normalize_color(value[:color] || value[:foreground] || value[:fg]),
+            background_color: normalize_color(value[:background_color] || value[:background] || value[:bg]),
+            bold: value[:bold],
+            faint: value[:faint],
+            italic: value[:italic],
+            underline: value[:underline],
+            reverse: value[:reverse] || value[:inverse],
+            strikethrough: value[:strikethrough] || value[:crossed_out],
+            format: value[:format].to_s,
+            indent: value[:indent]&.to_i,
+            indent_token: value[:indent_token]&.to_s,
+            margin: value[:margin]&.to_i,
+            level_indent: value[:level_indent]&.to_i,
+            ticked: value[:ticked]&.to_s,
+            unticked: value[:unticked]&.to_s,
+            column_separator: value[:column_separator]&.to_s,
+            row_separator: value[:row_separator]&.to_s
+          )
+        end
+
+        def inherit_visual(child)
+          child = self.class.from(child) unless child.is_a?(self.class)
+          self.class.new(**child.to_h.merge(
+            color: child.color || color,
+            background_color: child.background_color || background_color,
+            bold: child.bold.nil? ? bold : child.bold,
+            faint: child.faint.nil? ? faint : child.faint,
+            italic: child.italic.nil? ? italic : child.italic,
+            underline: child.underline.nil? ? underline : child.underline,
+            reverse: child.reverse.nil? ? reverse : child.reverse,
+            strikethrough: child.strikethrough.nil? ? strikethrough : child.strikethrough
+          ))
+        end
+
+        def render(value)
+          ansi_codes.apply("#{block_prefix}#{prefix}#{value}#{suffix}#{block_suffix}")
+        end
+
+        def apply_block_layout(value)
+          lines = value.to_s.lines(chomp: true)
+          lines = [""] if lines.empty?
+
+          if indent&.positive?
+            indentation = (indent_token || " ") * indent
+            lines = lines.map { |line| "#{indentation}#{line}" }
+          end
+
+          rendered = lines.join("\n")
+          return rendered unless margin.to_i.positive?
+
+          blank = Array.new(margin.to_i, "").join("\n")
+          "#{blank}\n#{rendered}\n#{blank}"
+        end
+
+        private
+
+        def ansi_codes
+          UI::ANSICodes.new(
+            attributes: ATTRIBUTES.select { |attribute| public_send(attribute) },
+            foreground: color,
+            background: background_color
+          )
+        end
+
+        def self.symbolize_keys(value)
+          value.to_h.each_with_object({}) { |(key, item), result| result[key.to_sym] = item }
+        end
+
+        def self.normalize_color(value)
+          return if value.nil?
+          return value if value.is_a?(Integer)
+          return value.to_i if value.to_s.match?(/\A\d+\z/)
+
+          value
+        end
+      end
+
+      def self.builtin(name)
+        key = name.to_s.tr("-", "_").to_sym
+        raise ArgumentError, "unknown markdown style: #{name.inspect}" unless BUILT_INS.key?(key)
+
+        from_hash(BUILT_INS.fetch(key))
+      end
+
+      def self.from(value)
+        return value if value.is_a?(self)
+        return builtin(value) if value.is_a?(String) || value.is_a?(Symbol)
+
+        from_hash(value || BUILT_INS.fetch(:dark))
+      end
+
+      def self.from_hash(value)
+        new(value.to_h)
+      end
+
+      def initialize(styles = {})
+        styles = styles.transform_keys(&:to_sym)
+        @styles = ELEMENTS.each_with_object({}) do |element, result|
+          result[element] = Style.from(styles[element] || {})
+        end.freeze
+      end
+
+      def [](name)
+        @styles.fetch(name.to_sym) { Style.from({}) }
+      end
+
+      def heading(level)
+        self[:heading].inherit_visual(self[:"h#{level}"])
+      end
+    end
+  end
+end

data/lib/charming/presentation/markdown/syntax_highlighter.rb

@@ -10,8 +10,9 @@ module Charming
     # base style (muted italic for comments, title for keywords, etc.).
     class SyntaxHighlighter
       # *theme* is the active Charming theme. Defaults to UI::Theme.default.
-      def initialize(theme: UI::Theme.default)
+      def initialize(theme: UI::Theme.default, style: nil)
         @theme = theme || UI::Theme.default
+        @style = style
       end
 
       # Highlights *code* (using Rouge) for the given *language* (auto-detected when nil)
@@ -27,7 +28,7 @@ module Charming
       private
 
       # The Charming theme used for token styling.
-      attr_reader :theme
+      attr_reader :theme, :style
 
       # Picks a Rouge lexer for *language* and *code*, falling back to plain text.
       def lexer_for(language, code)

data/lib/charming/presentation/markdown.rb

@@ -2,8 +2,8 @@
 
 module Charming
   # Markdown is the namespace for the Markdown rendering pipeline. Parsing is delegated to
-  # Kramdown; per-block and per-inline element rendering is handled by `BlockRenderer`
-  # and `InlineRenderer`; code blocks are highlighted by `SyntaxHighlighter` (Rouge-backed).
+  # Commonmarker; `Renderer` renders the AST, and code blocks are highlighted by
+  # `SyntaxHighlighter` (Rouge-backed).
   module Markdown
   end
 end

data/lib/charming/presentation/view.rb

@@ -81,6 +81,7 @@ module Charming
     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
 
@@ -129,5 +130,11 @@ module Charming
 
       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

@@ -186,6 +186,7 @@ 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
 
@@ -200,6 +201,7 @@ module Charming
     # 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.3"
+  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,8 +11,6 @@ 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",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: charming
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  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
@@ -305,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