raindeer 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d42828c094ed42e854e71771f9ead3dfe12ff79322bf8348fe35eb3c96caec94
-  data.tar.gz: 2aa21a01220ecad0e959e8edd05e535482bfe4afb3204703ae82460979d0cd89
+  metadata.gz: 53220880f52ce3a7fbeec96659fbf6388bc614072b1a759175d3f99f0e5fe572
+  data.tar.gz: 0f4a1ea786f9bc421936ea0fced8f233d60376279160a006799748ff12991c95
 SHA512:
-  metadata.gz: 8625736bca1b2f5ef9ff7f139a4b8172989fcd302816a5f3216f8b8c4c44c08f90b33b118c85ce4f6b242711be07a5b75c46bc7b475b3bbc9cb75641b122ea0e
-  data.tar.gz: b2b025031b825409cbfe418fdf336e5b8747cab209e45d2c935ac0ad5a2028194a3063c9cb48138e0889d3506a174d22d15d76044b8a875ed9711e0ccf700818
+  metadata.gz: 9bf8b3a92b44923653298d24b2b33a614213c96edd7db24d92bcd6f9c8ac1218f4390b3dfc5312ac431506b21aaf54e65762d7af13962dffc1314ff9b2f3fafc
+  data.tar.gz: 57d336165d6d774a968ecd744c73516022c439bd2cfab66b044dbaf1af9ffadd8aa58921b775791db56903dcfa4f86bdb301b589ed8a77830b86c02ae13517ea

data/lib/cli/cli.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'trees'
-require_relative 'static/static'
+require_relative 'static'
 
 module Rain
   module CLI

data/lib/cli/{static/static.rb → static.rb}

@@ -7,12 +7,14 @@ require 'async'
 require 'async/http/internet'
 require 'fileutils'
 
+require_relative '../pages/pages'
+
 module Rain
   module CLI
     module Static
       extend self
 
-      Result = Data.define(:path, :html)
+      RequestResult = Data.define(:path, :html)
 
       def build(application_path:)
         metadata = LowLoad.dirload(File.expand_path('app', application_path))
@@ -32,7 +34,12 @@ module Rain
       private
 
       def request_paths(metadata:, application_path:)
-        tasks = metadata.url_paths.keys.compact.map do |file_path|
+        file_paths = metadata.file_types.values_at('md', 'rd', 'markdown', 'raindown').flat_map { it }.compact
+        url_paths = file_paths.map { |file_path| Rain::Pages.url_path(file_path:) }.compact
+        # Skip files that became solely metadata due to underscores hiding the entire file path.
+        url_paths.reject! { |url_path| url_path == '' }
+
+        tasks = url_paths.map do |file_path|
           Async do
             request_path = request_path(application_path:, file_path:)
             request_url = endpoint + request_path
@@ -41,7 +48,7 @@ module Rain
             response_html = response.read
             response.close
 
-            Result.new(path: request_path, html: response_html)
+            RequestResult.new(path: request_path, html: response_html)
           end
         end
 

data/lib/pages/pages.rb

@@ -11,7 +11,7 @@ module Rain
     Page = Struct.new(:metadata, :html)
 
     def initialize(metadata:)
-      @file_paths = [*metadata.file_types['md'], *metadata.file_types['markdown']]
+      @file_paths = metadata.file_types.values_at('md', 'rd', 'markdown', 'raindown').flat_map { it }.compact
       @url_paths = {}
       @tags = {}
 
@@ -20,8 +20,7 @@ module Rain
 
     def page(path:)
       path = '/home' if path == '/'
-      url_path = File.expand_path("app/pages#{path}", Dir.pwd)
-      file_path = @url_paths[url_path] || return
+      file_path = @url_paths[path] || return
 
       metadata, markdown = parse_file(file_path:)
       raindown = Raindown.render(markdown:)
@@ -29,32 +28,28 @@ module Rain
       Page.new(metadata, raindown)
     end
 
-    def list(file_paths:)
+    def list(**typed_tags)
+      file_paths = tagged(**typed_tags)
       sorted_paths = file_paths.sort_by { order(it) }
-
-      sorted_paths.map do |file_path|
-        metadata, markdown = parse_file(file_path:)
-        metadata[:content] = markdown.empty? ? '' : Raindown.render(markdown:)
-        OpenStruct.new(metadata)
-      end
+      sorted_paths.map { |file_path| present_file(file_path:) }
     end
 
     def tagged(**typed_tags)
-      results = []
+      file_paths = []
 
       typed_tags.each do |type, tag|
-        results = [*results, *@tags.dig(type, tag)]
+        file_paths = [*file_paths, *@tags.dig(type, tag)]
       end
 
-      results
+      file_paths
     end
 
     private
 
     def process_files
       @file_paths.each do |file_path|
-        url_path = url_path(file_path:)
-        @url_paths[url_path] = file_path
+        url_path = Pages.url_path(file_path:)
+        @url_paths[url_path] = file_path unless url_path.empty?
 
         tag(type: :folder, tag: folders(file_path:).last, file_path:)
 
@@ -65,19 +60,6 @@ module Rain
       end
     end
 
-    # Remove segments beginning with "_" and ending with "/" or "-".
-    # Example: app/pages/docs/_basics/_1-getting-started.md => app/pages/docs/getting-started.md
-    def url_path(file_path:)
-      url_path = file_path.split('/').map do |segment|
-        next segment.sub(/^_\d\W/, '') if segment.sub(/^_\d\W/, '') != segment
-        next nil if segment.sub(/^_/, '') != segment
-
-        segment
-      end.compact.join('/')
-
-      url_path.delete_suffix(File.extname(url_path))
-    end
-
     def tag(type:, tag:, file_path:)
       @tags[type] ||= {}
       @tags[type][tag] ||= []
@@ -86,7 +68,7 @@ module Rain
 
     def folders(file_path:)
       File.dirname(file_path)
-        .split(Regexp.union(['/', '-']))
+        .split(Regexp.union(['/', '&', '-']))
         .filter { it.start_with?('_') }
         .map { it.delete_prefix('_') }
         .filter { !number?(it) }
@@ -94,7 +76,7 @@ module Rain
 
     def order(file_path)
       file_path
-        .split(Regexp.union(['/', '-']))
+        .split(Regexp.union(['/', '&', '-']))
         .filter { it.start_with?('_') }
         .map { it.delete_prefix('_') }
         .filter { number?(it) }
@@ -105,6 +87,14 @@ module Rain
       !Float(string, exception: false).nil?
     end
 
+    def present_file(file_path:)
+      metadata, markdown = parse_file(file_path:)
+      metadata[:content] = markdown.empty? ? '' : Raindown.render(markdown:)
+      metadata[:path] = Pages.url_path(file_path:)
+
+      OpenStruct.new(metadata)
+    end
+
     def parse_file(file_path:, parse_content: true)
       dash_lines = []
       data_lines = []
@@ -126,5 +116,24 @@ module Rain
 
       [YAML.safe_load(data_lines.join, symbolize_names: true), text_lines.join.strip]
     end
+
+    class << self
+      # Remove segments beginning with "_" and ending with "&", "-" or "/".
+      # Example: app/pages/docs/_basics/_1-getting-started.md => app/pages/docs/getting-started.md
+      def url_path(file_path:)
+        url_path = file_path.split(Regexp.union(['/', '&'])).map do |segment|
+          next segment.sub(/^_\d\W/, '') if segment.sub(/^_\d\W/, '') != segment
+          next nil if segment.sub(/^_/, '') != segment
+
+          segment
+        end.compact.join('/')
+
+        url_path.delete_prefix(pages_path).delete_suffix(File.extname(url_path))
+      end
+
+      def pages_path
+        File.expand_path('app/pages', Dir.pwd)
+      end
+    end
   end
 end

data/lib/pages/raindown/nodes/toc_node.rb

@@ -23,8 +23,8 @@ module Rain
                 "<li class='#{h.name}'><a href='\##{h['id']}'>#{h.text.strip}</a></li>"
               }.join("\n")}
             </ul>
-          </div>
-        </details>
+          </details>
+        </div>
       HTML
     end
 

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Raindeer
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raindeer
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - maedi
@@ -246,7 +246,7 @@ extra_rdoc_files: []
 files:
 - bin/rain
 - lib/cli/cli.rb
-- lib/cli/static/static.rb
+- lib/cli/static.rb
 - lib/matrix/cursor.rb
 - lib/matrix/effects/color_effect.rb
 - lib/matrix/effects/effect.rb