utopia-project 0.33.1 → 0.33.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 243e6190a11eda87e544917c3bdd9eac032751d59cbf6774c4d9306674fa2b77
-  data.tar.gz: d46a3f7228757feeb5e093bcfc5f257a11d2c73607b1488cc604a2d2f2ffe45a
+  metadata.gz: b026a55470cb43f0e15336c742d109cdc868d3f60c98b4628d6bfe39b14ed156
+  data.tar.gz: 723621437bf6b318120fe1a8260482f3eb1a6809a199af50c9571bc224df1729
 SHA512:
-  metadata.gz: b47e681830588383eb8ac12c7da593859835cb6141acbc413d73915102dc919d9294c033c92ea4e986d3258e0594984a14afbec40cb142f63e630a08c6493874
-  data.tar.gz: 16e76eaa43ef6edf0a18dbb7e1e4ca52b2fd6cb1ae806df8bdd8c451225e7c56773d1ed308eb82ed865c139f0ec20a4bfc583be7886067b62c076368f679214e
+  metadata.gz: b2b39d0c3dd6927baf8d106723b949d870f772b91d67494d2ee23bf077c06f93477bbf94fc7ff7c1669d25dc227f3d4f9a22e6a099dc495f15b96b19defc9908
+  data.tar.gz: ceff9c6369bd465f9a4da7120be81e3c2b81a3f58cb01181e1823e6c07cffcee8cd21f329387d0510b6613a89af84de1f57aab6cebb310892c78488dc9e5a8b4

data/bake/utopia/project/readme/update.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2023-2024, by Samuel Williams.
+# Copyright, 2023-2025, by Samuel Williams.
 
-require 'utopia/project'
-require 'xrb'
+require "utopia/project"
+require "xrb"
 
 def update(path: "readme.md", documentation_url: nil)
 	project = Utopia::Project::Base.new(context.root)
@@ -52,7 +52,7 @@ end
 # The public documentation URL if it can be determined.
 def public_documentation_url
 	if metadata = gemspec.metadata
-		if documentation_uri = metadata['documentation_uri']
+		if documentation_uri = metadata["documentation_uri"]
 			return documentation_uri
 		end
 	end
@@ -66,7 +66,14 @@ def usage_section(documentation_url, project)
 	buffer << "Please see the [project documentation](#{documentation_url}) for more details.\n"
 	
 	project.guides.each do |guide|
-		buffer << "  - [#{guide.title}](#{guide.href(documentation_url)}) - #{guide.description.to_markdown}\n"
+		if description = guide.description
+			buffer << "  - [#{guide.title}](#{guide.href(documentation_url)}) - #{description.to_markdown}\n"
+		elsif documentation = guide.documentation
+			document = project.document(documentation.text, language: guide.documentation.language)
+			buffer << "  - [#{guide.title}](#{guide.href(documentation_url)}) - #{document.to_markdown}\n"
+		else
+			buffer << "  - [#{guide.title}](#{guide.href(documentation_url)})\n"
+		end
 	end
 	
 	return Markly.parse(buffer)

data/bake/utopia/project.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2022, by Samuel Williams.
+# Copyright, 2020-2024, by Samuel Williams.
 
 # Create an empty project in the current directory.
 def create
@@ -38,7 +38,7 @@ end
 # @parameter output_path [String] The output path for the static site.
 # @parameter force [Boolean] Remove the output directory before generating the static content.
 def static(output_path: "docs", force: true)
-	require 'rackula/command'
+	require "rackula/command"
 	
 	config_path = File.expand_path("../../template/config.ru", __dir__)
 	public_path = File.expand_path("../../public", __dir__)
@@ -60,7 +60,7 @@ end
 
 # Extract a description for the project.
 def description(root: context.root)
-	require 'markly'
+	require "markly"
 	
 	readme_path = File.join(root, "readme.md")
 	if File.exist?(readme_path)

data/lib/utopia/project/base.rb

@@ -1,22 +1,22 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2024, by Samuel Williams.
+# Copyright, 2020-2025, by Samuel Williams.
 # Copyright, 2023, by Michael Adams.
 
-require 'utopia/path'
-require 'utopia/content/links'
+require "utopia/path"
+require "utopia/content/links"
 
-require 'xrb/reference'
-require 'decode'
+require "xrb/reference"
+require "decode"
 
-require 'thread/local'
+require "thread/local"
 
-require_relative 'document'
-require_relative 'releases_document'
+require_relative "document"
+require_relative "releases_document"
 
-require_relative 'guide'
-require_relative 'linkify'
+require_relative "guide"
+require_relative "linkify"
 
 module Utopia
 	module Project
@@ -120,13 +120,6 @@ module Utopia
 			# See {document} for details.
 			# @returns [XRB::MarkupString]
 			def format(text, definition = nil, language: definition&.language, **options)
-				case text
-				when Enumerable
-					text = text.to_a.join("\n")
-				when nil
-					return nil
-				end
-				
 				if document = self.document(text, definition, language: language)
 					return XRB::Markup.raw(
 						document.to_html(**options)
@@ -140,6 +133,13 @@ module Utopia
 			#
 			# @returns [Document]
 			def document(text, definition = nil, language: definition&.language)
+				case text
+				when Enumerable
+					text = text.to_a.join("\n")
+				when nil
+					return nil
+				end
+				
 				Document.new(text, self, definition: definition, default_language: language)
 			end
 			
@@ -183,7 +183,7 @@ module Utopia
 			end
 			
 			def readme_document
-				if path = self.path_for('readme.md') || self.path_for('README.md')
+				if path = self.path_for("readme.md") || self.path_for("README.md")
 					Document.new(File.read(path), self)
 				end
 			end
@@ -193,7 +193,7 @@ module Utopia
 			end
 			
 			def releases_document
-				if path = self.path_for('releases.md')
+				if path = self.path_for("releases.md")
 					ReleasesDocument.new(File.read(path), self)
 				end
 			end

data/lib/utopia/project/document.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2024, by Samuel Williams.
+# Copyright, 2020-2025, by Samuel Williams.
 
-require_relative 'renderer'
-require 'xrb'
+require_relative "renderer"
+require "xrb"
 
 module Utopia
 	module Project
@@ -72,6 +72,10 @@ module Utopia
 				end
 			end
 			
+			def to_markdown(**options)
+				self.root.to_markdown(**options)
+			end
+			
 			def to_html(node = self.root, **options)
 				renderer = Renderer.new(ids: true, flags: Markly::UNSAFE, **options)
 				XRB::Markup.raw(renderer.render(node))

data/lib/utopia/project/guide.rb

@@ -3,9 +3,9 @@
 # Released under the MIT License.
 # Copyright, 2020-2024, by Samuel Williams.
 
-require 'utopia/path'
-require 'xrb/reference'
-require 'decode'
+require "utopia/path"
+require "xrb/reference"
+require "decode"
 
 module Utopia
 	module Project

data/lib/utopia/project/linkify.rb

@@ -3,7 +3,7 @@
 # Released under the MIT License.
 # Copyright, 2020-2024, by Samuel Williams.
 
-require 'decode/syntax/rewriter'
+require "decode/syntax/rewriter"
 
 module Utopia
 	module Project
@@ -24,14 +24,14 @@ module Utopia
 			
 			def link_to(definition, text)
 				XRB::Builder.fragment do |builder|
-					builder.inline('a', href: @base.link_for(definition), title: definition.qualified_name) do
+					builder.inline("a", href: @base.link_for(definition), title: definition.qualified_name) do
 						builder.text(text)
 					end
 				end
 			end
 			
 			def apply(output = XRB::Builder.new)
-				output.inline('code', class: "language-#{@language.name}") do
+				output.inline("code", class: "language-#{@language.name}") do
 					super
 				end
 				

data/lib/utopia/project/releases_document.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2024, by Samuel Williams.
+# Copyright, 2024, by Samuel Williams.
 
-require_relative 'document'
+require_relative "document"
 
 module Utopia
 	module Project

data/lib/utopia/project/renderer.rb

@@ -3,8 +3,8 @@
 # Released under the MIT License.
 # Copyright, 2022, by Samuel Williams.
 
-require 'markly'
-require 'markly/renderer/html'
+require "markly"
+require "markly/renderer/html"
 
 module Utopia
 	module Project

data/lib/utopia/project/version.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2024, by Samuel Williams.
+# Copyright, 2020-2025, by Samuel Williams.
 
 module Utopia
 	module Project
-		VERSION = "0.33.1"
+		VERSION = "0.33.2"
 	end
 end

data/lib/utopia/project.rb

@@ -5,11 +5,11 @@
 
 require "utopia/project/version"
 
-require 'variant'
+require "variant"
 
-require 'utopia/localization'
+require "utopia/localization"
 
-require_relative 'project/base'
+require_relative "project/base"
 
 module Utopia
 	module Project
@@ -43,13 +43,13 @@ module Utopia
 			builder.use Utopia::Static, root: PUBLIC_ROOT
 			
 			builder.use Utopia::Redirection::Rewrite, {
-				'/' => '/index'
+				"/" => "/index"
 			}
 			
 			builder.use Utopia::Redirection::DirectoryIndex
 			
 			builder.use Utopia::Redirection::Errors, {
-				404 => '/errors/file-not-found'
+				404 => "/errors/file-not-found"
 			}
 			
 			if locales
@@ -66,7 +66,7 @@ module Utopia
 				# 'gallery' => Utopia::Gallery::Tags.new
 			}
 			
-			builder.run lambda { |env| [404, {}, []] }
+			builder.run lambda {|env| [404, {}, []]}
 		end
 	end
 end

data/license.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright, 2020-2024, by Samuel Williams.  
+Copyright, 2020-2025, by Samuel Williams.  
 Copyright, 2020, by Olle Jonsson.  
 Copyright, 2022-2023, by dependabot[bot].  
 Copyright, 2023, by Michael Adams.  

data/pages/controller.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2022, by Samuel Williams.
+# Copyright, 2020-2024, by Samuel Williams.
 
 prepend Actions
 
-on '**' do
+on "**" do
 	@base = Utopia::Project::Base.instance
 end
 
-on 'index' do
+on "index" do
 	if @document = @base.readme_document
 		@document.replace_section("Usage") do |header|
 			header.insert_after(@document.html_node("<content:usage/>"))

data/pages/guides/controller.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2023, by Samuel Williams.
+# Copyright, 2020-2024, by Samuel Williams.
 
 prepend Actions
 
-on '**/*/index' do |request, path|
+on "**/*/index" do |request, path|
 	name = path.components[-2]
 	
 	@guide = @base.guides.find do |guide|

data/pages/releases/controller.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2022, by Samuel Williams.
+# Copyright, 2024, by Samuel Williams.
 
 prepend Actions
 
-on 'index' do
+on "index" do
 	@document = @base.releases_document
 end

data/pages/source/controller.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2022, by Samuel Williams.
+# Copyright, 2020-2024, by Samuel Williams.
 
 prepend Actions
 
-on '**/*/index' do |request, path|
+on "**/*/index" do |request, path|
 	@lexical_path = path.components.dup
 	# Remove the last "index" part:
 	@lexical_path.pop

data/readme.md

@@ -31,6 +31,10 @@ Please see the [project documentation](https://socketry.github.io/utopia-project
 
 Please see the [project releases](https://socketry.github.io/utopia-project/releases/index) for all releases.
 
+### v0.33.2
+
+  - Fixed handling of segmented code guides when rendered into a `readme.md` file.
+
 ### v0.33.0
 
   - Fix presentation of release notes on releases page.

data/releases.md

@@ -1,6 +1,8 @@
 # Changes
 
-This document outlines major changes and new features in each release of the project.
+## v0.33.2
+
+  - Fixed handling of segmented code guides when rendered into a `readme.md` file.
 
 ## v0.33.0
 

data/template/config.ru

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 
-require 'utopia/setup'
+require "utopia/setup"
 UTOPIA ||= Utopia.setup(Dir.pwd)
 
-require 'utopia/project'
+require "utopia/project"
 Utopia::Project.call(self)

data/template/{Gemfile → gems.rb}

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 source "https://rubygems.org"
 

data/template/preload.rb

@@ -3,4 +3,4 @@
 # Released under the MIT License.
 # Copyright, 2020-2023, by Samuel Williams.
 
-require 'utopia/project'
+require "utopia/project"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utopia-project
 version: !ruby/object:Gem::Version
-  version: 0.33.1
+  version: 0.33.2
 platform: ruby
 authors:
 - Samuel Williams
@@ -39,7 +39,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2025-02-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decode
@@ -254,8 +254,8 @@ files:
 - public/robots.txt
 - readme.md
 - releases.md
-- template/Gemfile
 - template/config.ru
+- template/gems.rb
 - template/preload.rb
 homepage: https://socketry.github.io/utopia-project
 licenses:
@@ -271,14 +271,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: A project documentation tool based on Utopia.
 test_files: []