impression 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79fca9e0a9d2a2e782bd3168384e752009776b82d50c285f14f7a2951dae0e5c
-  data.tar.gz: 9d2d433216ca25fcd23b66e7f545520b8433abc076efde2c919d4e0dc8fd980c
+  metadata.gz: 871b003a25f9dd74ea137c483c2c208bdad9cf505d544c085f1f84eff394a278
+  data.tar.gz: 55623ee42bbc7213ef37c6632b1d4807b882301d133bc324607878857b7110c4
 SHA512:
-  metadata.gz: 84105ef65c86fefc2babdb7d44e3c89f9b6562d8c1bd4e3bdffa62b279e6e3b236841c5574de57fba4e7fe870f7a183659c636834af93b6d93df3d60f1818fcc
-  data.tar.gz: df125e64c903affa9946704e0c559d45848c89879621d764aa98b66fecaa1fcf27ff899ddb36c11e489f816792345252fe4e08df85c2796773affc88b0f95e9a
+  metadata.gz: 29437cfb294efff3d90c7bcfa82bf05bba184b0ea4f68f13097650c2af17440e2d1294d95e06c17b981a4066c58dde70ac77fd3b8fbacb9ca7a676d08dfc71be
+  data.tar.gz: a787832534b192c37bc936f96a0c7b92c97b516dc2857b49fbefedab3a152c73301b6ce09e6b1bf581a77dd14bd8a2fa455c84e693b1ac29d5eb74208058bf33

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.7 2022-01-23
+
+- Update Papercraft, Refactor Jamstack resource
+
 # 0.6 2022-01-22
 
 - Unify page_list entries and page_info cache entries (#10)

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    impression (0.5)
+    impression (0.7)
       modulation (~> 1.1)
-      papercraft (~> 0.15)
+      papercraft (~> 0.17)
       polyphony (~> 0.73.1)
       qeweney (~> 0.16)
       tipi (~> 0.45)
@@ -52,7 +52,7 @@ GEM
     modulation (1.1)
     msgpack (1.4.4)
     multipart-post (2.1.1)
-    papercraft (0.15)
+    papercraft (0.17)
       escape_utils (~> 1.2.1)
       kramdown (~> 2.3.1)
       kramdown-parser-gfm (~> 1.1.0)

data/impression.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency      'qeweney',              '~>0.16'
   
   # s.add_runtime_dependency      'rb-inotify',           '~>0.10.1'
-  s.add_runtime_dependency      'papercraft',            '~>0.15'
+  s.add_runtime_dependency      'papercraft',            '~>0.17'
   s.add_runtime_dependency      'modulation',           '~>1.1'
 
   

data/lib/impression/jamstack.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'fileutils'
-require 'yaml'
 require 'date'
+require 'yaml'
 require 'modulation'
 require 'papercraft'
 
@@ -36,10 +36,13 @@ module Impression
     private
 
     DATE_REGEXP = /(\d{4}\-\d{2}\-\d{2})/.freeze
-    MARKDOWN_PAGE_REGEXP = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m.freeze
+    FRONT_MATTER_REGEXP = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m.freeze
     MD_EXT_REGEXP = /\.md$/.freeze
     PAGE_EXT_REGEXP = /^(.+)\.(md|html|rb)$/.freeze
     INDEX_PAGE_REGEXP = /^(.+)?\/index$/.freeze
+    YAML_OPTS = {
+      permitted_classes: [Date]
+    }.freeze
 
     # Returns the path info for the given file path.
     #
@@ -51,7 +54,7 @@ module Impression
       when '.md'
         atts, content = parse_markdown_file(path)
         info = info.merge(atts)
-        info[:markdown_content] = content
+        info[:html_content] = Papercraft.markdown(content)
       when '.rb'
         info[:module] = import(path)
       end
@@ -99,8 +102,9 @@ module Impression
     # @param path_info [Hash] path info
     # @return [void]
     def render_papercraft_module(req, path_info)
-      html = H(path_info[:module]).render(request: req, resource: self)
-      req.respond(html, 'Content-Type' => Qeweney::MimeTypes[:html])
+      template = Papercraft.html(path_info[:module])
+      body = template.render(request: req, resource: self)
+      req.respond(body, 'Content-Type' => template.mime_type)
     end
 
     # Renders a markdown file using a layout.
@@ -112,7 +116,7 @@ module Impression
       layout = get_layout(path_info[:layout])
 
       html = layout.render(request: req, resource: self, **path_info) {
-        emit_markdown path_info[:markdown_content]
+        emit path_info[:html_content]
       }
       req.respond(html, 'Content-Type' => Qeweney::MimeTypes[:html])
     end
@@ -135,7 +139,7 @@ module Impression
     # @param path [String] file path
     # @return [Array] an tuple containing properties<Hash>, contents<String>
     def parse_markdown_file(path)
-      data = IO.read(path) || ''
+      content = IO.read(path) || ''
       atts = {}
 
       # Parse date from file name
@@ -143,16 +147,17 @@ module Impression
         atts[:date] ||= Date.parse(m[1])
       end
 
-      if (m = data.match(MARKDOWN_PAGE_REGEXP))
+      if (m = content.match(FRONT_MATTER_REGEXP))
         front_matter = m[1]
-        data = m.post_match
+        content = m.post_match
         
-        YAML.load(front_matter).each_with_object(atts) do |(k, v), h|
+        yaml = YAML.load(front_matter, **YAML_OPTS)
+        yaml.each_with_object(atts) do |(k, v), h|
           h[k.to_sym] = v
         end
       end
         
-      [atts, data]
+      [atts, content]
     end
 
     # Returns the supported path extensions used for searching for files based

data/lib/impression/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Impression
-  VERSION = '0.6'
+  VERSION = '0.7'
 end

data/test/jamstack/_layouts/default.rb

@@ -1,6 +1,6 @@
 require 'papercraft'
 
-export_default H { |**props|
+export_default Papercraft.html { |**props|
   html5 {
     head {
       title props[:title]

data/test/test_jamstack.rb

@@ -48,7 +48,7 @@ class JamstackTest < MiniTest::Test
     req = mock_req(':method' => 'GET', ':path' => '/foo')
     @jamstack.route_and_call(req)
 
-    foo = H {
+    foo = Papercraft.html {
       html5 {
         head {
           title 'Foo title'
@@ -63,7 +63,7 @@ class JamstackTest < MiniTest::Test
     req = mock_req(':method' => 'GET', ':path' => '/index')
     @jamstack.route_and_call(req)
 
-    index = H {
+    index = Papercraft.html {
       html5 {
         head {
           title 'Hello'
@@ -86,7 +86,7 @@ class JamstackTest < MiniTest::Test
     req = mock_req(':method' => 'GET', ':path' => '/baz')
     @jamstack.route_and_call(req)
 
-    baz_index = H {
+    baz_index = Papercraft.html {
       html5 {
         head {
           title 'BarBar'
@@ -101,7 +101,7 @@ class JamstackTest < MiniTest::Test
     req = mock_req(':method' => 'GET', ':path' => '/articles/a')
     @jamstack.route_and_call(req)
 
-    a = H {
+    a = Papercraft.html {
       html5 {
         head {
           title 'AAA'
@@ -138,7 +138,7 @@ class JamstackTest < MiniTest::Test
     req = mock_req(':method' => 'GET', ':path' => '/app/foo')
     @jamstack.route_and_call(req)
 
-    foo = H {
+    foo = Papercraft.html {
       html5 {
         head {
           title 'Foo title'
@@ -153,7 +153,7 @@ class JamstackTest < MiniTest::Test
     req = mock_req(':method' => 'GET', ':path' => '/app/index')
     @jamstack.route_and_call(req)
 
-    index = H {
+    index = Papercraft.html {
       html5 {
         head {
           title 'Hello'
@@ -176,7 +176,7 @@ class JamstackTest < MiniTest::Test
     req = mock_req(':method' => 'GET', ':path' => '/app/baz')
     @jamstack.route_and_call(req)
 
-    baz_index = H {
+    baz_index = Papercraft.html {
       html5 {
         head {
           title 'BarBar'
@@ -191,7 +191,7 @@ class JamstackTest < MiniTest::Test
     req = mock_req(':method' => 'GET', ':path' => '/app/articles/a')
     @jamstack.route_and_call(req)
 
-    a = H {
+    a = Papercraft.html {
       html5 {
         head {
           title 'AAA'
@@ -213,7 +213,7 @@ class JamstackTest < MiniTest::Test
     assert_equal [
       { kind: :file, path: File.join(JAMSTACK_PATH, 'bar.html'), ext: '.html', url: '/app/bar' },
       { kind: :file, path: File.join(JAMSTACK_PATH, 'index.md'), ext: '.md', url: '/app', 
-        title: 'Hello', foo: 'BarBar', markdown_content: '<h1>Index</h1>' },
+        title: 'Hello', foo: 'BarBar', html_content: "<h1>Index</h1>\n" },
     ], list
 
 
@@ -227,7 +227,7 @@ class JamstackTest < MiniTest::Test
         ext: '.md',
         title: 'MMM',
         layout: 'article',
-        markdown_content: "## BBB\n",
+        html_content: "<h2 id=\"bbb\">BBB</h2>\n",
         date: Date.new(2008, 06, 14)
       },
       {
@@ -237,7 +237,7 @@ class JamstackTest < MiniTest::Test
         ext: '.md',
         title: 'NNN',
         layout: 'article',
-        markdown_content: "## CCC\n",
+        html_content: "<h2 id=\"ccc\">CCC</h2>\n",
         date: Date.new(2009, 06, 12)
       },
       { 
@@ -247,7 +247,7 @@ class JamstackTest < MiniTest::Test
         ext: '.md',
         title: 'AAA',
         layout: 'article',
-        markdown_content: "## ZZZ\n"
+        html_content: "<h2 id=\"zzz\">ZZZ</h2>\n",
       },
     ], list
   end
@@ -256,7 +256,7 @@ class JamstackTest < MiniTest::Test
     req = mock_req(':method' => 'GET', ':path' => '/foobar?q=42')
     @jamstack.route_and_call(req)
   
-    foo = H {
+    foo = Papercraft.html {
       html5 {
         head {
           title 'Foobar'
@@ -284,7 +284,7 @@ class JamstackTest < MiniTest::Test
       url:  '/',
       title: 'Hello',
       foo: 'BarBar',
-      markdown_content: '<h1>Index</h1>'
+      html_content: "<h1>Index</h1>\n"
     },  path_info('/index'))
 
     assert_equal({
@@ -294,7 +294,7 @@ class JamstackTest < MiniTest::Test
       url:  '/',
       title: 'Hello',
       foo: 'BarBar',
-      markdown_content: '<h1>Index</h1>'
+      html_content: "<h1>Index</h1>\n"
     },  path_info('/'))
 
     assert_equal({

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: impression
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-22 00:00:00.000000000 Z
+date: 2022-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: modulation
   requirement: !ruby/object:Gem::Requirement