archival 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71c5bb3b87870dd8146038f624251b7a9ef351a7d69f8da16c214c91ea740cfb
-  data.tar.gz: 6978ae618a2e5312178e5c0d1eb7174c13f3ef0512d0ef31d83f5012e0bd9712
+  metadata.gz: 7c29406fcec39c52b6876b805dba5509d6f43da5805944a344b2c771214cd8ed
+  data.tar.gz: 7319f9d6dace6b20c57e318d4df1c4dc80c1bd67673cee1b37d9a17ba35f823b
 SHA512:
-  metadata.gz: df27c765403ac93aa5bd762ca7693b589aa86a0a80e31a93226fce2a0a756f2167417036cd76e4c96fda55071f3af92884628ac56f2c42bac8995a799432c32d
-  data.tar.gz: 4e785cf1c9bc97a152a737bbc03da981a65b8ea68e0b98fe6fc71196da82fbe928170c983f4dd11a857a9b51c4a1e854f268c42137c184ce15312e4dc9f5cc72
+  metadata.gz: e05e6573f3e580d3a364826b7fd604559f2513e609a5436ba4170d606112d913e91d3cc0ec5498f4e0c418212b85068d7d859829030ee8b113a8909b04020e64
+  data.tar.gz: 8c227320c6d961595b5ce545559df4cdddf42e1d27819c1e5013b1e8189932bb50b4047e47bc5f85c8af1b0109a9b582063e487fb926132248d766b19fc98498

data/archival.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'archival'
-  s.version     = '0.0.4'
+  s.version     = '0.0.5'
   s.summary     = 'An incredibly simple CMS for durable websites'
   s.description = 'https://jesseditson.com/the-simplest-cms-part-1'
   s.authors     = ['Jesse Ditson']
@@ -24,5 +24,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'liquid', '~> 5.1.0'
   s.add_dependency 'listen', '~> 3.7.0'
+  s.add_dependency 'redcarpet', '~> 3.5.1'
   s.add_dependency 'tomlrb', '~> 2.0.1'
 end

data/bin/redcarpet

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'redcarpet' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("redcarpet", "redcarpet")

data/lib/archival/builder.rb

@@ -3,6 +3,7 @@
 require 'liquid'
 require 'tomlrb'
 require 'tags/layout'
+require 'redcarpet'
 
 Liquid::Template.error_mode = :strict
 Liquid::Template.register_tag('layout', Layout)
@@ -13,23 +14,33 @@ module Archival
 
     def initialize(config, *_args)
       @config = config
+      @markdown = Redcarpet::Markdown.new(
+        Redcarpet::Render::HTML.new(prettify: true,
+                                    hard_wrap: true), no_intra_emphasis: true,
+                                                      fenced_code_blocks: true,
+                                                      autolink: true,
+                                                      strikethrough: true,
+                                                      underline: true
+      )
       refresh_config
     end
 
     def refresh_config
       @file_system = Liquid::LocalFileSystem.new(
-        @config.root, '%s.liquid'
+        File.join(@config.root, @config.pages_dir), '%s.liquid'
       )
       @variables = {}
       @object_types = {}
       @page_templates = {}
 
-      Liquid::Template.file_system = @file_system
+      Liquid::Template.file_system = Liquid::LocalFileSystem.new(
+        File.join(@config.root, @config.pages_dir), '_%s.liquid'
+      )
 
       objects_definition_file = File.join(@config.root,
                                           'objects.toml')
       if File.file? objects_definition_file
-        @object_types = read_toml(objects_definition_file)
+        @object_types = Tomlrb.load_file(objects_definition_file)
       end
 
       update_pages
@@ -61,10 +72,7 @@ module Archival
           if entry.end_with?('.liquid') && !(entry.start_with? '_')
             page_name = File.basename(entry,
                                       '.liquid')
-            template_file = File.join(
-              @config.pages_dir,
-              add_prefix.call(page_name)
-            )
+            template_file = add_prefix.call(page_name)
             content = @file_system.read_template_file(template_file)
             content += dev_mode_content if @config.dev_mode
             @page_templates[add_prefix.call(page_name)] =
@@ -81,30 +89,48 @@ module Archival
 
     def do_update_objects(dir)
       objects = {}
-      @object_types.each do |name, _definition|
-        objects[name] = []
+      @object_types.each do |name, definition|
+        objects[name] = {}
         obj_dir = File.join(dir, name)
         if File.directory? obj_dir
           Dir.foreach(obj_dir) do |file|
             if file.end_with? '.toml'
-              object = read_toml(File.join(
-                                   obj_dir, file
-                                 ))
+              object = Tomlrb.load_file(File.join(
+                                          obj_dir, file
+                                        ))
               object[:name] =
                 File.basename(file, '.toml')
-              objects[name].push object
+              objects[name][object[:name]] = parse_object(object, definition)
             end
           end
         end
-        objects[name] = objects[name].sort do |a, b|
-          (a['order'] || a[:name]).to_s <=> (b['order'] || b[:name]).to_s
-        end
+        objects[name] = sort_objects(objects[name])
       end
       @variables['objects'] = objects
     end
 
-    def read_toml(file_path)
-      Tomlrb.load_file(file_path)
+    def sort_objects(objects)
+      # Since objects are hashes but we'd like them to be iterable based on
+      # arbitrary "order" keys, and in ruby hashes enumerate in insert order,
+      # we just need to re-insert in the correct order.
+      sorted_keys = objects.sort_by do |name, obj|
+        obj['order'].to_s || name
+      end
+      sorted_objects = {}
+      sorted_keys.each do |d|
+        sorted_objects[d[0]] = d[1]
+      end
+      sorted_objects
+    end
+
+    def parse_object(object, definition)
+      definition.each do |name, type|
+        case type
+        when 'markdown'
+          object[name] = @markdown.render(object[name]) if object[name]
+        end
+      end
+      object
     end
 
     def set_var(name, value)

data/lib/archival/helper_server.rb

@@ -129,7 +129,7 @@ module Archival
       end
       #   warn "Unmasked the data: #{unmasked_data.inspect}"
 
-      unmasked_data.to_s.pack('C*').force_encoding('utf-8')
+      unmasked_data.pack('C*').force_encoding('utf-8')
     end
 
     def ws_sendmessage(message)

data/lib/archival/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Archival
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "archival",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "An incredibly simple CMS for durable websites",
   "bin": "build.rb",
   "directories": {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: archival
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jesse Ditson
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.7.0
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: tomlrb
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +90,7 @@ files:
 - bin/ldiff
 - bin/listen
 - bin/rake
+- bin/redcarpet
 - bin/rspec
 - bin/rubocop
 - bin/ruby-parse