impression 0.5 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8db17f3627f0b8de2ed13a81effd9689f8a292b0861104c276d343bf5ec23e8f
-  data.tar.gz: 79cc272aed0503e1514723815f7019002c780a890995ef7c6f2d4718d9704000
+  metadata.gz: 33edd48c3f1fbbabd726045828fbe2e2bb1a06910bf43d3959b07a9781a52e68
+  data.tar.gz: 59f6c0c1183f11fa558e6f2ba821c7ccd590c933f6137d60d965ac5133da9b5b
 SHA512:
-  metadata.gz: 46112700200e6018c10b9a84b3a90184ce590e0da7369096a787467af4c84aba6578c043c1c9ad520cfa6da83638492def2c53b8cc9d51407d74695e3c12af4f
-  data.tar.gz: 94b1e171d6161bdd452ce27a6ee5effde4c9a1fdb2fd0247b72449fcb7048a8c1800dc616c6e291d56ea639dcec8a4d2d2dad5e9aa6865ccc0cb96cac4525688
+  metadata.gz: '09c8e1b06c237554c2536a4e134d6d64aac604da5036c84f3feb757a802049c3b4b5596980e32a949a4ae9fe6a2cd524510dc61429a4782bb4f4364a34f27c38'
+  data.tar.gz: b942a1a7925feb5084adb35049d44f9b794777d78785d5b7dd0252c1a193304d19416cae2a3c2ce4eedf3ca924fc3e22040ec5e5262505261e61d20c9ff4d9c8

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 0.8 2022-02-01
+
+- Update dependencies
+
+# 0.7.1 2022-01-24
+
+- Improve YAML front matter loading
+
+# 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)
+- Refactor FileTree#path_info to return more information
+
 # 0.5 2022-01-20
 
 - Pass resource and request to rendered templates (#8)

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    impression (0.5)
+    impression (0.7.1)
       modulation (~> 1.1)
-      papercraft (~> 0.14)
-      polyphony (~> 0.73.1)
-      qeweney (~> 0.15)
-      tipi (~> 0.45)
+      papercraft (~> 0.17)
+      polyphony (~> 0.74)
+      qeweney (~> 0.16)
+      tipi (~> 0.46)
 
 GEM
   remote: https://rubygems.org/
@@ -50,27 +50,27 @@ GEM
     localhost (1.1.9)
     minitest (5.11.3)
     modulation (1.1)
-    msgpack (1.4.3)
+    msgpack (1.4.4)
     multipart-post (2.1.1)
-    papercraft (0.14)
-      escape_utils (= 1.2.1)
-      kramdown (~> 2.3.0)
+    papercraft (0.17)
+      escape_utils (~> 1.2.1)
+      kramdown (~> 2.3.1)
       kramdown-parser-gfm (~> 1.1.0)
-      rouge (~> 3.26.0)
-    polyphony (0.73.1)
-    qeweney (0.15)
+      rouge (~> 3.27.0)
+    polyphony (0.74)
+    qeweney (0.16)
       escape_utils (~> 1.2.1)
     rack (2.2.3)
     rake (12.3.3)
     rexml (3.2.5)
-    rouge (3.26.1)
+    rouge (3.27.0)
     ruby2_keywords (0.0.5)
     simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    tipi (0.45)
+    tipi (0.46)
       acme-client (~> 2.0.8)
       ever (~> 0.1)
       extralite (~> 1.2)
@@ -85,7 +85,7 @@ GEM
     websocket (1.2.9)
 
 PLATFORMS
-  x86_64-linux
+  ruby
 
 DEPENDENCIES
   impression!

data/examples/hello.rb

@@ -0,0 +1,13 @@
+require 'impression'
+
+app = Impression.app do
+  mount '/' => text_response('Hello, world!')
+end
+
+# class App < Impression::Resource
+#   def route(req)
+#     @response ||= text_response('Hello, world!')
+#   end
+# end
+
+# run { |req| req.respond_text('Hello, world!') }

data/impression.gemspec

@@ -22,12 +22,12 @@ Gem::Specification.new do |s|
 
   # s.executables   = ['impression']
 
-  s.add_runtime_dependency      'polyphony',            '~>0.73.1'
-  s.add_runtime_dependency      'tipi',                 '~>0.45'
-  s.add_runtime_dependency      'qeweney',              '~>0.15'
+  s.add_runtime_dependency      'polyphony',            '~>0.74'
+  s.add_runtime_dependency      'tipi',                 '~>0.46'
+  s.add_runtime_dependency      'qeweney',              '~>0.16'
   
   # s.add_runtime_dependency      'rb-inotify',           '~>0.10.1'
-  s.add_runtime_dependency      'papercraft',            '~>0.14'
+  s.add_runtime_dependency      'papercraft',            '~>0.17'
   s.add_runtime_dependency      'modulation',           '~>1.1'
 
   

data/lib/impression/file_tree.rb

@@ -27,8 +27,6 @@ module Impression
       render_from_path_info(req, path_info)
     end
 
-    private
-
     # Renders a response from the given response kind and path.
     #
     # @param req [Qeweney::Request] request
@@ -47,6 +45,9 @@ module Impression
 
     private
 
+    PAGE_EXT_REGEXP = /^(.+)\.html$/.freeze
+    INDEX_PAGE_REGEXP = /^(.+)?\/index$/.freeze
+
     # Renders a file response for the given request and the given path info.
     #
     # @param req [Qeweney::Request] request
@@ -89,8 +90,37 @@ module Impression
       elsif stat.directory?
         return directory_path_info(path)
       else
-        return { kind: :file, path: path, ext: File.extname(path) }
+        file_info(path)
+      end
+    end
+
+    # Returns the path info for the given file path.
+    #
+    # @param path [String] file path
+    # @return [Hash] path info
+    def file_info(path)
+      relative_path = path.gsub(/^#{@directory}/, '')
+      {
+        kind: :file,
+        path: path,
+        ext: File.extname(path),
+        url: pretty_url(relative_path)
+      }
+    end
+
+    # Returns the pretty URL for the given relative path. For pages, the
+    # extension is removed. For index pages, the index suffix is removed.
+    #
+    # @param relative_path [String] relative path
+    # @return [String] pretty URL
+    def pretty_url(relative_path)
+      if (m = relative_path.match(PAGE_EXT_REGEXP))
+        relative_path = m[1]
+      end
+      if (m = relative_path.match(INDEX_PAGE_REGEXP))
+        relative_path = m[1] || '/'
       end
+      relative_path == '/' ? absolute_path : File.join(absolute_path, relative_path)
     end
 
     # Calculates the path info for a directory. If an index file exists, its

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'
 
@@ -29,39 +29,41 @@ module Impression
     def page_list(dir)
       base = File.join(@directory, dir)
       Dir.glob('*.{html,md}', base: base)
-        .map { |fn| page_entry(fn, dir) }
+        .map { |fn| get_path_info(File.join(dir, fn)) }# page_entry(fn, dir) }
         .sort_by { |i| i[:path] }
     end
 
     private
 
-    DATE_REGEXP = /^(\d{4}\-\d{2}\-\d{2})/.freeze
-    MARKDOWN_PAGE_REGEXP = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m.freeze
+    DATE_REGEXP = /(\d{4}\-\d{2}\-\d{2})/.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
+    INDEX_PAGE_REGEXP = /^(.+)?\/index$/.freeze
+
+    YAML_OPTS = {
+      permitted_classes: [Date],
+      symbolize_names: true
+    }.freeze
 
-    # Returns a page entry for the given file.
+    # Returns the path info for the given file path.
     #
-    # @param fn [String] file name
-    # @param dir [String] relative directory
-    # @return [Hash] page entry
-    def page_entry(fn, dir)
-      relative_path = File.join(dir, fn)
-      absolute_path = File.join(@directory, relative_path)
-      info = {
-        path: absolute_path,
-        url: pretty_url(relative_path)
-      }
-      if fn =~ MD_EXT_REGEXP
-        atts, _ = parse_markdown_file(absolute_path)
-        info.merge!(atts)
+    # @param path [String] file path
+    # @return [Hash] path info
+    def file_info(path)
+      info = super
+      case info[:ext]
+      when '.md'
+        atts, content = parse_markdown_file(path)
+        info = info.merge(atts)
+        info[:html_content] = Papercraft.markdown(content)
+      when '.rb'
+        info[:module] = import(path)
       end
-
-      if (m = fn.match(DATE_REGEXP))
+      if (m = path.match(DATE_REGEXP))
         info[:date] ||= Date.parse(m[1])
       end
-
+  
       info
     end
 
@@ -75,9 +77,9 @@ module Impression
         relative_path = m[1]
       end
       if (m = relative_path.match(INDEX_PAGE_REGEXP))
-        relative_path = m[1]
+        relative_path = m[1] || '/'
       end
-      File.join(absolute_path, relative_path)
+      relative_path == '/' ? absolute_path : File.join(absolute_path, relative_path)
     end
 
     # Renders a file response for the given request and the given path info.
@@ -88,9 +90,9 @@ module Impression
     def render_file(req, path_info)
       case path_info[:ext]
       when '.rb'
-        render_papercraft_module(req, path_info[:path])
+        render_papercraft_module(req, path_info)
       when '.md'
-        render_markdown_file(req, path_info[:path])
+        render_markdown_file(req, path_info)
       else
         req.serve_file(path_info[:path])
       end
@@ -99,27 +101,26 @@ module Impression
     # Renders a Papercraft module. The module is loaded using Modulation.
     #
     # @param req [Qeweney::Request] reqest
-    # @param path [String] file path
+    # @param path_info [Hash] path info
     # @return [void]
-    def render_papercraft_module(req, path)
-      mod = import path
-
-      html = H(mod).render(request: req, resource: self)
-      req.respond(html, 'Content-Type' => Qeweney::MimeTypes[:html])
+    def render_papercraft_module(req, path_info)
+      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.
     #
     # @param req [Qeweney::Request] reqest
-    # @param path [String] file path
+    # @param path_info [Hash] path info
     # @return [void]
-    def render_markdown_file(req, path)
-      attributes, markdown = parse_markdown_file(path)
+    def render_markdown_file(req, path_info)
+      layout = get_layout(path_info[:layout])
 
-      layout = get_layout(attributes[:layout])
-
-      html = layout.render(request: req, resource: self, **attributes) { emit_markdown markdown }
-      req.respond(html, 'Content-Type' => Qeweney::MimeTypes[:html])
+      html = layout.render(request: req, resource: self, **path_info) {
+        emit path_info[:html_content]
+      }
+      req.respond(html, 'Content-Type' => layout.mime_type)
     end
 
     # Returns a layout component based on the given name. The given name
@@ -140,7 +141,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
@@ -148,24 +149,15 @@ 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|
-          h[k.to_sym] = v
-        end
+        yaml = YAML.safe_load(front_matter, **YAML_OPTS)
+        atts = atts.merge(yaml)
       end
         
-      [atts, data]
-    end
-
-    # Converts a hash with string keys to one with symbol keys.
-    #
-    # @param hash [Hash] input hash
-    # @return [Hash] output hash
-    def symbolize_keys(hash)
-      
+      [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.5'
+  VERSION = '0.8'
 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/jamstack/articles/2008-06-14-manu.md

@@ -1,6 +1,9 @@
 ---
 title: MMM
 layout: article
+foo:
+  bar:
+    baz: 42
 ---
 
 ## BBB

data/test/jamstack/articles/2009-06-12-noatche.md

@@ -3,4 +3,4 @@ title: NNN
 layout: article
 ---
 
-## BBB
+## CCC

data/test/jamstack/articles/a.md

@@ -3,4 +3,4 @@ title: AAA
 layout: article
 ---
 
-## BBB
+## ZZZ

data/test/jamstack/index.md

@@ -1,4 +1,5 @@
 ---
 title: Hello
+foo: BarBar
 ---
 <h1>Index</h1>

data/test/test_file_tree.rb

@@ -113,4 +113,42 @@ class FileTreeTest < MiniTest::Test
     @file_tree.route_and_call(req)
     assert_response static('bar/index.html'), :html, req
   end
+
+  def path_info(path)
+    @file_tree.send(:get_path_info, path)
+  end
+
+  def test_path_info
+    assert_equal({
+      kind: :file,
+      path: File.join(__dir__, 'static/index.html'),
+      ext: '.html',
+      url:  '/'
+    },  path_info('/index.html'))
+
+    assert_equal({
+      kind: :file,
+      path: File.join(__dir__, 'static/index.html'),
+      ext: '.html',
+      url:  '/'
+    },  path_info('/index'))
+
+    assert_equal({
+      kind: :file,
+      path: File.join(__dir__, 'static/index.html'),
+      ext: '.html',
+      url:  '/'
+    },  path_info('/'))
+
+    assert_equal({
+      kind: :file,
+      path: File.join(__dir__, 'static/js/a.js'),
+      ext: '.js',
+      url:  '/js/a.js'
+    },  path_info('/js/a.js'))
+
+    assert_equal({
+      kind: :not_found,
+    },  path_info('/js/b.js'))
+  end
 end

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,14 +101,14 @@ 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'
         }
         body {
           article {
-            h2 'BBB', id: 'bbb'
+            h2 'ZZZ', id: 'zzz'
           }
         }
       }
@@ -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,14 +191,14 @@ 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'
         }
         body {
           article {
-            h2 'BBB', id: 'bbb'
+            h2 'ZZZ', id: 'zzz'
           }
         }
       }
@@ -211,32 +211,48 @@ class JamstackTest < MiniTest::Test
 
     list = @jamstack.page_list('/')
     assert_equal [
-      { path: File.join(JAMSTACK_PATH, 'bar.html'), url: '/app/bar' },
-      { path: File.join(JAMSTACK_PATH, 'index.md'), title: 'Hello', url: '/app/index' },
+      { 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', html_content: "<h1>Index</h1>\n" },
     ], list
 
 
     list = @jamstack.page_list('/articles')
+
     assert_equal [
       {
+        kind: :file,
         path: File.join(JAMSTACK_PATH, 'articles/2008-06-14-manu.md'),
         url: '/app/articles/2008-06-14-manu',
+        ext: '.md',
         title: 'MMM',
         layout: 'article',
+        foo: {
+          bar: {
+            baz: 42
+          }
+        },
+        html_content: "<h2 id=\"bbb\">BBB</h2>\n",
         date: Date.new(2008, 06, 14)
       },
       {
+        kind: :file,
         path: File.join(JAMSTACK_PATH, 'articles/2009-06-12-noatche.md'),
         url: '/app/articles/2009-06-12-noatche',
+        ext: '.md',
         title: 'NNN',
         layout: 'article',
+        html_content: "<h2 id=\"ccc\">CCC</h2>\n",
         date: Date.new(2009, 06, 12)
       },
       { 
+        kind: :file,
         path: File.join(JAMSTACK_PATH, 'articles/a.md'),
         url: '/app/articles/a',
+        ext: '.md',
         title: 'AAA',
-        layout: 'article'
+        layout: 'article',
+        html_content: "<h2 id=\"zzz\">ZZZ</h2>\n",
       },
     ], list
   end
@@ -245,7 +261,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'
@@ -260,4 +276,41 @@ class JamstackTest < MiniTest::Test
     }
     assert_response foo.render, :html, req
   end
+
+  def path_info(path)
+    @jamstack.send(:get_path_info, path)
+  end
+
+  def test_path_info
+    assert_equal({
+      kind: :file,
+      path: File.join(JAMSTACK_PATH, 'index.md'),
+      ext: '.md',
+      url:  '/',
+      title: 'Hello',
+      foo: 'BarBar',
+      html_content: "<h1>Index</h1>\n"
+    },  path_info('/index'))
+
+    assert_equal({
+      kind: :file,
+      path: File.join(JAMSTACK_PATH, 'index.md'),
+      ext: '.md',
+      url:  '/',
+      title: 'Hello',
+      foo: 'BarBar',
+      html_content: "<h1>Index</h1>\n"
+    },  path_info('/'))
+
+    assert_equal({
+      kind: :file,
+      path: File.join(JAMSTACK_PATH, 'assets/js/a.js'),
+      ext: '.js',
+      url:  '/assets/js/a.js'
+    },  path_info('/assets/js/a.js'))
+
+    assert_equal({
+      kind: :not_found,
+    },  path_info('/js/b.js'))
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: impression
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.8'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.73.1
+        version: '0.74'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.73.1
+        version: '0.74'
 - !ruby/object:Gem::Dependency
   name: tipi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.45'
+        version: '0.46'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.45'
+        version: '0.46'
 - !ruby/object:Gem::Dependency
   name: qeweney
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: papercraft
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: modulation
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +139,7 @@ files:
 - README.md
 - Rakefile
 - TODO.md
+- examples/hello.rb
 - examples/markdown/_assets/style.css
 - examples/markdown/app.rb
 - examples/markdown/docs/index.md