troy 0.0.40 → 0.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75124a7a67018ad7d680458cf50208524f02df66837a923f7d38c78713ad0b96
-  data.tar.gz: 310a90f7c1d4cc78c593edc168bd69213ebb735ee3ad6795599bc42d4d834acd
+  metadata.gz: aea1ae6e2d9d8bbbd7c0c631649ac05801b822d4c0b08aade0ff88699233d769
+  data.tar.gz: bff4d30c2137c56cc01f197d716884e861ff699a81f697e28a28deacba8c69d6
 SHA512:
-  metadata.gz: 9e1f10c4c527cd869169aed1a21c5d0868edb00cddd4bdf909bcc6466733e8eadbbab36d29448071d10edd73945954bfa3f68b7d995c4081f9f9bd2befb88bca
-  data.tar.gz: 7350351be857a3eecd0da49a54acff32500cf375d1b608e43e9597b21f773e59e92017db334074f82f2c6bf47c78a4a1dee864256021f38562ad4e35d7a4e83d
+  metadata.gz: 79b936d7f8350bcd98933b286395d40fbb12a278c6b45758d1fc45ac67f3ec2cff4f2a532bf7d9430c4c6973c4eff2eba138868e4f477f4d1a28d22cf0f51ed7
+  data.tar.gz: 8339a8bf138547add8b4871c745e32b2c3ada40dfce7be721b00f114fd75a91711e6288fe546ae7dad6258447ef658fe12fdea093c3a75fdcb4f779fb9cc4a68

data/.rubocop.yml

@@ -8,3 +8,6 @@ AllCops:
   Exclude:
     - vendor/**/*
     - gemfiles/**/*
+
+Style/OpenStructUse:
+  Enabled: false

data/lib/troy/cli.rb

@@ -9,7 +9,11 @@ module Troy
     end
 
     def initialize(args = [], options = {}, config = {})
-      if (config[:current_task] || config[:current_command]).name == "new" && args.empty?
+      has_error =
+        (config[:current_task] || config[:current_command]).name == "new" &&
+        args.empty?
+
+      if has_error
         raise Error, "The site path is required. For details run: troy help new"
       end
 
@@ -62,9 +66,10 @@ module Troy
     def server
       begin
         handler = Rackup::Handler.pick(%i[puma thin webrick])
-      rescue Exception
+      rescue StandardError
         raise Error,
-              "No Rack handler found. Install a Rack handler (e.g. puma, thing, unicorn, webrick)"
+              "No Rack handler found. Install a Rack handler " \
+              "(e.g. puma, thing, webrick)"
       end
 
       handler.run Troy::Server.new(File.join(Dir.pwd, "public")),

data/lib/troy/extension_matcher.rb

@@ -21,7 +21,7 @@ module Troy
 
     def match
       matchers.each do |ext, handler|
-        return handler.call if File.extname(path) == ext
+        return handler.call if File.basename(path).end_with?(ext)
       end
 
       matchers["default"]&.call

data/lib/troy/helpers.rb

@@ -22,7 +22,7 @@ module Troy
       path = site.root.join("partials/#{partial}")
       locals = locals.merge(site: site, page: page)
       EmbeddedRuby.new(path.read, locals).render
-    rescue Exception => error
+    rescue StandardError => error
       raise "Unable to render #{path}; #{error.message}"
     end
 

data/lib/troy/markdown.rb

@@ -2,12 +2,16 @@
 
 module Troy
   class Markdown
+    # Match the id portion of a header, as in `# Title {#custom-id}`.
+    HEADING_ID = /^(?<text>.*?)(?: {#(?<id>.*?)})?$/
+
     # Create a new Redcarpet renderer, that prepares the code block
     # to use Prisme.js syntax.
     #
     module PrismJs
       def block_code(code, language)
-        %[<pre class="language-#{language}"><code>#{CGI.escapeHTML(code)}</code></pre>]
+        code = CGI.escapeHTML(code)
+        %[<pre class="language-#{language}"><code>#{code}</code></pre>]
       end
     end
 
@@ -16,6 +20,73 @@ module Troy
     #
     module Rouge
       include ::Rouge::Plugins::Redcarpet
+
+      # Be more flexible than github and support any arbitrary name.
+      ALERT_MARK = /^\[!(?<type>[A-Z]+)\](?<title>.*?)?$/
+
+      # Support alert boxes just like github.
+      # https://github.com/orgs/community/discussions/16925
+      def block_quote(quote)
+        html = Nokogiri::HTML.fragment(quote)
+        element = html.children.first
+        matches = element.text.to_s.match(ALERT_MARK) if element
+        return "<blockquote>#{quote}</blockquote>" unless matches
+
+        element.remove
+
+        type = matches[:type].downcase
+        title = matches[:title].to_s.strip
+        title = I18n.t(type, scope: :alerts, default: title)
+
+        html = Nokogiri::HTML.fragment <<~HTML
+          <div class="alert-message #{type}">
+            <p class="alert-message--title"></p>
+            #{html}
+          </div>
+        HTML
+
+        if title.empty?
+          html.css(".alert-message--title").first.remove
+        else
+          html.css(".alert-message--title").first.content = title
+        end
+
+        html.to_s
+      end
+
+      def header(text, level)
+        matches = text.strip.match(HEADING_ID)
+        title = matches[:text].strip
+        html = Nokogiri::HTML.fragment("<h#{level}>#{title}</h#{level}>")
+        heading = html.first_element_child
+        title = heading.text
+
+        id = matches[:id]
+        id ||= permalink(title)
+
+        heading_counter[id] += 1
+        id = "#{id}-#{heading_counter[id]}" if heading_counter[id] > 1
+
+        heading.add_child %[<a class="anchor" href="##{id}" aria-hidden="true" tabindex="-1"></a>] # rubocop:disable Style/LineLength
+        heading.set_attribute :tabindex, "-1"
+        heading.set_attribute(:id, id)
+
+        heading.to_s
+      end
+
+      def permalink(text)
+        str = text.dup.unicode_normalize(:nfkd)
+        str = str.gsub(/[^\x00-\x7F]/, "").to_s
+        str.gsub!(/[^-\w]+/xim, "-")
+        str.gsub!(/-+/xm, "-")
+        str.gsub!(/^-?(.*?)-?$/, '\1')
+        str.downcase!
+        str
+      end
+
+      def heading_counter
+        @heading_counter ||= Hash.new {|h, k| h[k] = 0 }
+      end
     end
 
     class Renderer < Redcarpet::Render::HTML
@@ -37,7 +108,10 @@ module Troy
                                             autolink: true,
                                             space_after_headers: true,
                                             fenced_code_blocks: true,
-                                            footnotes: true)
+                                            footnotes: true,
+                                            tables: true,
+                                            strikethrough: true,
+                                            highlight: true)
     end
 
     def to_html

data/lib/troy/page.rb

@@ -44,6 +44,7 @@ module Troy
         .new(path)
         .default { meta.content }
         .on("builder") { XML.new(meta.content, to_context).to_xml }
+        .on("md.erb") { Markdown.new(EmbeddedRuby.new(meta.content, to_context).render).to_html } # rubocop:disable Layout/LineLength
         .on("erb") { EmbeddedRuby.new(meta.content, to_context).render }
         .on("md") { Markdown.new(meta.content).to_html }
         .on("txt") { EmbeddedRuby.new(meta.content, to_context).render }

data/lib/troy/server.rb

@@ -46,16 +46,18 @@ module Troy
 
       if request.path != "/" && request.path.end_with?("/")
         redirect normalized_path
-      elsif (_path = Pathname.new("#{path}.html")).file?
-        render(200, "text/html; charset=utf-8", _path)
-      elsif (_path = Pathname.new("#{path}.xml")).file?
-        render(200, "text/xml; charset=utf-8", _path)
+      elsif (file_path = Pathname.new("#{path}.html")).file?
+        render(200, "text/html; charset=utf-8", file_path)
+      elsif (file_path = Pathname.new("#{path}/index.html")).file?
+        render(200, "text/html; charset=utf-8", file_path)
+      elsif (file_path = Pathname.new("#{path}.xml")).file?
+        render(200, "text/xml; charset=utf-8", file_path)
       elsif path.file?
         render(200, Rack::Mime.mime_type(path.extname, "text/plain"), path)
       else
         render(404, "text/html; charset=utf-8", root.join("404.html"))
       end
-    rescue Exception => error
+    rescue StandardError
       render(500, "text/html; charset=utf-8", root.join("500.html"))
     end
   end

data/lib/troy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Troy
-  VERSION = "0.0.40"
+  VERSION = "0.0.42"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: troy
 version: !ruby/object:Gem::Version
-  version: 0.0.40
+  version: 0.0.42
 platform: ruby
 authors:
 - Nando Vieira
 bindir: bin
 cert_chain: []
-date: 2025-03-13 00:00:00.000000000 Z
+date: 2025-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -294,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.4
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A static site generator
 test_files: []