impression 0.3 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5644ebb122c166a8a5579a950b3e64fde5d3d332eea8299aa4c4023af8b85cb6
-  data.tar.gz: b89065d1cd8c14d5ddad28f1fc3ff90cc48d43354698e339715f3b6d172af671
+  metadata.gz: 871b003a25f9dd74ea137c483c2c208bdad9cf505d544c085f1f84eff394a278
+  data.tar.gz: 55623ee42bbc7213ef37c6632b1d4807b882301d133bc324607878857b7110c4
 SHA512:
-  metadata.gz: 45ab7c1f4e3c9f920175acc8bce2417932571ceca8946cf1fd0b784a6280413514587bc998d467808023c56e054a0edc2c821e6dc700289a4a02f4e2372dfe05
-  data.tar.gz: d3b57e4089e0473e508f5a67c52db12be7a62850897bc79a27871b4ea7a3d2b3b3062f214980a98d5e842033b62496ae9024416c37b00ca05b527b01c088b53e
+  metadata.gz: 29437cfb294efff3d90c7bcfa82bf05bba184b0ea4f68f13097650c2af17440e2d1294d95e06c17b981a4066c58dde70ac77fd3b8fbacb9ca7a676d08dfc71be
+  data.tar.gz: a787832534b192c37bc936f96a0c7b92c97b516dc2857b49fbefedab3a152c73301b6ce09e6b1bf581a77dd14bd8a2fa455c84e693b1ac29d5eb74208058bf33

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+# 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)
+- Implement Jamstack#page_list method (#7)
+
+# 0.4 2022-01-19
+
+- Remove deprecated Pages code (#6)
+
 # 0.3 2022-01-19
 
 - Implement basic Jamstack resource (#5)

data/Gemfile.lock

@@ -1,14 +1,11 @@
 PATH
   remote: .
   specs:
-    impression (0.3)
-      kramdown (~> 2.3.0)
-      kramdown-parser-gfm (~> 1.1.0)
+    impression (0.7)
       modulation (~> 1.1)
-      papercraft (~> 0.14)
+      papercraft (~> 0.17)
       polyphony (~> 0.73.1)
-      qeweney (~> 0.15)
-      rouge (~> 3.26.0)
+      qeweney (~> 0.16)
       tipi (~> 0.45)
 
 GEM
@@ -53,20 +50,20 @@ GEM
     localhost (1.1.9)
     minitest (5.11.3)
     modulation (1.1)
-    msgpack (1.4.2)
+    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)
+      rouge (~> 3.27.0)
     polyphony (0.73.1)
-    qeweney (0.15)
+    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)

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

@@ -10,7 +10,10 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split
   s.homepage    = 'http://github.com/digital-fabric/impression'
   s.metadata    = {
-    "source_code_uri" => "https://github.com/digital-fabric/impression"
+    "source_code_uri" => "https://github.com/digital-fabric/impression",
+    "documentation_uri" => "https://www.rubydoc.info/gems/impression",
+    "homepage_uri" => "https://github.com/digital-fabric/impression",
+    "changelog_uri" => "https://github.com/digital-fabric/impression/blob/master/CHANGELOG.md"
   }
   s.rdoc_options = ["--title", "impression", "--main", "README.md"]
   s.extra_rdoc_files = ["README.md"]
@@ -21,14 +24,10 @@ Gem::Specification.new do |s|
 
   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      'qeweney',              '~>0.16'
   
-  s.add_runtime_dependency      'kramdown',             '~>2.3.0'
-  s.add_runtime_dependency      'rouge',                '~>3.26.0'
-  s.add_runtime_dependency      'kramdown-parser-gfm',  '~>1.1.0'
-
   # 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,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'fileutils'
+require 'date'
 require 'yaml'
 require 'modulation'
 require 'papercraft'
@@ -17,8 +18,68 @@ module Impression
       @layouts = {}
     end
 
+    # Returns a list of pages found in the given directory (relative to the base
+    # directory). Each entry containins the absolute file path, the pretty URL,
+    # the possible date parsed from the file name, and any other front matter
+    # attributes (for .md files). This method will detect only pages with the
+    # extensions .html, .md, .rb. The returned entries are sorted by file path.
+    #
+    # @param dir [String] relative directory
+    # @return [Array<Hash>] array of page entries
+    def page_list(dir)
+      base = File.join(@directory, dir)
+      Dir.glob('*.{html,md}', base: base)
+        .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
+    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.
+    #
+    # @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 = path.match(DATE_REGEXP))
+        info[:date] ||= Date.parse(m[1])
+      end
+  
+      info
+    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
+
     # Renders a file response for the given request and the given path info.
     #
     # @param req [Qeweney::Request] request
@@ -27,9 +88,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
@@ -38,26 +99,25 @@ 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
-      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(**attributes) { emit_markdown markdown }
+      html = layout.render(request: req, resource: self, **path_info) {
+        emit path_info[:html_content]
+      }
       req.respond(html, 'Content-Type' => Qeweney::MimeTypes[:html])
     end
 
@@ -73,30 +133,31 @@ module Impression
       
       import path
     end
-
-    MARKDOWN_PAGE_REGEXP = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m.freeze
   
     # Parses the markdown file at the given path.
     #
     # @param path [String] file path
     # @return [Array] an tuple containing properties<Hash>, contents<String>
     def parse_markdown_file(path)
-      data = IO.read(path) || ''
-      if (m = data.match(MARKDOWN_PAGE_REGEXP))
-        front_matter = m[1]
+      content = IO.read(path) || ''
+      atts = {}
 
-        [symbolize_keys(YAML.load(front_matter)), m.post_match]
-      else
-        [{}, data]
+      # Parse date from file name
+      if (m = path.match(DATE_REGEXP))
+        atts[:date] ||= Date.parse(m[1])
       end
-    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)
-      hash.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      if (m = content.match(FRONT_MATTER_REGEXP))
+        front_matter = m[1]
+        content = m.post_match
+        
+        yaml = YAML.load(front_matter, **YAML_OPTS)
+        yaml.each_with_object(atts) do |(k, v), h|
+          h[k.to_sym] = v
+        end
+      end
+        
+      [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.3'
+  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/jamstack/articles/2008-06-14-manu.md

@@ -0,0 +1,6 @@
+---
+title: MMM
+layout: article
+---
+
+## BBB

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

@@ -0,0 +1,6 @@
+---
+title: NNN
+layout: article
+---
+
+## CCC

data/test/jamstack/articles/a.md

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

data/test/jamstack/foobar.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+layout = import('./_layouts/default')
+
+export_default layout.apply(title: 'Foobar') { |resource:, request:, **props|
+  h1 request.query[:q]
+  resource.page_list('/articles').each do |i|
+    a i[:title], href: i[:url]
+  end
+}

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'
           }
         }
       }
@@ -116,7 +116,7 @@ class JamstackTest < MiniTest::Test
     assert_response a.render, :html, req
   end
 
-  def test_non_root_file_tree_response
+  def test_non_root_jamstack_response
     @jamstack = Impression::Jamstack.new(path: '/app', directory: JAMSTACK_PATH)
 
     req = mock_req(':method' => 'GET', ':path' => '/app/roo')
@@ -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,18 +191,121 @@ 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'
           }
         }
       }
     }
     assert_response a.render, :html, req
   end
+
+  def test_page_list
+    @jamstack = Impression::Jamstack.new(path: '/app', directory: JAMSTACK_PATH)
+
+    list = @jamstack.page_list('/')
+    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', 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',
+        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',
+        html_content: "<h2 id=\"zzz\">ZZZ</h2>\n",
+      },
+    ], list
+  end
+
+  def test_template_resource_and_request
+    req = mock_req(':method' => 'GET', ':path' => '/foobar?q=42')
+    @jamstack.route_and_call(req)
+  
+    foo = Papercraft.html {
+      html5 {
+        head {
+          title 'Foobar'
+        }
+        body {
+          h1 '42'
+          a 'MMM', href: '/articles/2008-06-14-manu'
+          a 'NNN', href: '/articles/2009-06-12-noatche'
+          a 'AAA', href: '/articles/a'
+        }
+      }
+    }
+    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.3'
+  version: '0.7'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-19 00:00:00.000000000 Z
+date: 2022-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony
@@ -44,70 +44,28 @@ dependencies:
     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'
-- !ruby/object:Gem::Dependency
-  name: kramdown
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-- !ruby/object:Gem::Dependency
-  name: rouge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.26.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.26.0
-- !ruby/object:Gem::Dependency
-  name: kramdown-parser-gfm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
+        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
@@ -181,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
@@ -192,7 +151,6 @@ files:
 - lib/impression/file_tree.rb
 - lib/impression/file_watcher.rb
 - lib/impression/jamstack.rb
-- lib/impression/pages.rb
 - lib/impression/request_extensions.rb
 - lib/impression/request_extensions/responses.rb
 - lib/impression/request_extensions/routing.rb
@@ -201,11 +159,14 @@ files:
 - test/helper.rb
 - test/jamstack/_layouts/article.rb
 - test/jamstack/_layouts/default.rb
+- test/jamstack/articles/2008-06-14-manu.md
+- test/jamstack/articles/2009-06-12-noatche.md
 - test/jamstack/articles/a.md
 - test/jamstack/assets/js/a.js
 - test/jamstack/bar.html
 - test/jamstack/baz/index.md
 - test/jamstack/foo.rb
+- test/jamstack/foobar.rb
 - test/jamstack/index.md
 - test/run.rb
 - test/static/bar/index.html
@@ -222,6 +183,9 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/digital-fabric/impression
+  documentation_uri: https://www.rubydoc.info/gems/impression
+  homepage_uri: https://github.com/digital-fabric/impression
+  changelog_uri: https://github.com/digital-fabric/impression/blob/master/CHANGELOG.md
 post_install_message:
 rdoc_options:
 - "--title"

data/lib/impression/pages.rb

@@ -1,239 +0,0 @@
-# frozen_string_literal: true
-
-require 'kramdown'
-require 'rouge'
-require 'kramdown-parser-gfm'
-require 'yaml'
-require 'rb-inotify'
-require 'papercraft'
-
-require_relative './errors'
-
-module Impression
-  class Pages
-    module RequestMethods
-      def serve_page(pages)
-        pages.serve(self)
-      end
-    end
-
-    def initialize(base_path, opts = {})
-      @base_path = base_path
-      @opts = opts
-      @opts[:pages] = self
-
-      load
-
-      if opts[:auto_reload]
-        start_automatic_reloader
-      end
-    end
-
-    def start_automatic_reloader
-      notifier = INotify::Notifier.new
-      watched = {}
-      @map.each_value do |entry|
-        path = entry[:full_path]
-        next if watched[path]
-
-        notifier.watch(path, :modify, :delete_self) { |e| handle_changed_file(path) }
-        watched[path] = true
-      end
-      notifier.watch(@base_path, :moved_to, :create) do |event|
-        path = event.absolute_name
-        if File.file?(path)
-          notifier.watch(path, :modify, :delete_self) { |e| handle_changed_file(path) }
-        end
-        handle_changed_file(path)
-      end
-      @reloader = spin do
-        notify_io = notifier.to_io
-        loop do
-          notify_io.wait_readable
-          notifier.process
-        end
-      end
-    end
-
-    def handle_changed_file(full_path)
-      p handle_changed_file: full_path
-      if !File.file?(full_path)
-        @map.reject! { |k, v| v[:full_path] == full_path }
-        return
-      end
-
-      path = File.basename(full_path)
-      page = Page.new(path, full_path, @opts)
-      permalink = page.permalink
-      @map[permalink] = { page: page, full_path: full_path }
-      @map['/'] = @map[permalink] if permalink == '/index'
-    end
-
-    def load
-      @map = {}
-      Dir['**/*', base: @base_path].each do |path|
-        next if path =~ /\/_.+/
-
-        full_path = File.join(@base_path, path)
-        next unless File.file?(full_path)
-
-        page = Page.new(path, full_path, @opts)
-        @map[page.permalink] = { page: page, full_path: full_path }
-      end
-      @map['/'] = @map['/index']
-    end
-    alias_method :reload, :load
-
-    def prev_page(page)
-      keys = @map.keys
-      case idx = keys.index(page.permalink)
-      when 0, nil
-        nil
-      else
-        @map[keys[idx - 1]][:page]
-      end
-    end
-
-    def next_page(page)
-      keys = @map.keys
-      case idx = keys.index(page.permalink)
-      when keys.size - 1, nil
-        nil
-      else
-        @map[keys[idx + 1]][:page]
-      end
-    end
-
-    def load_file(path)
-      content = IO.read(path)
-    end
-
-    def serve(req)
-      entry = @map[req.route_relative_path]
-      raise NotFoundError unless entry
-
-      body = render_page(entry[:page])
-      req.respond(body, 'Content-Type' => 'text/html')
-    rescue NotFoundError => e
-      req.respond('Not found.', ':status' => e.http_status)
-    end
-    alias_method :call, :serve
-
-    def render_page(page)
-      layout_proc(page.layout).().render(pages: self, page: page)
-    end
-
-    def layout_proc(layout)
-      full_path = File.expand_path("../_layouts/#{layout}.rb", @base_path)
-      instance_eval("->(&block) do; #{IO.read(full_path)}; end", full_path)
-    end
-
-    def select(selector)
-      @map.inject([]) do |array, (permalink, entry)|
-        array << entry[:page] if permalink =~ selector
-        array
-      end
-    end
-  end
-
-  class Page
-    attr_reader :attributes
-
-    def initialize(path, full_path, opts = {})
-      @path = path
-      @full_path = full_path
-      @opts = opts
-      @kind = detect_page_kind(full_path)
-      read_page
-    end
-
-    EXTNAME_REGEXP = /^\.(.+)$/.freeze
-
-    def detect_page_kind(path)
-      File.extname(path).match(EXTNAME_REGEXP)[1].to_sym
-    end
-  
-    PAGE_REGEXP = /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m.freeze
-  
-    def read_page
-      data = IO.read(@full_path) || ''
-      if data =~ PAGE_REGEXP
-        front_matter = Regexp.last_match(1)
-        @content_start_line = front_matter.lines.size + 2
-        @attributes = YAML.load(front_matter)
-        @content = Regexp.last_match.post_match
-      else
-        @attributes = {}
-        @content_start_line = 1
-        @content = data
-      end
-    end
-
-    def permalink
-      @permalink = @attributes[:permalink] || path_without_extension
-    end
-
-    def path_without_extension
-      "/#{@path.delete_suffix(File.extname(@path))}"
-    end
-  
-    def title
-      @attributes['title'] || title_from_content
-    end
-
-    def prev_page
-      @opts[:pages].prev_page(self)
-    end
-
-    def next_page
-      @opts[:pages].next_page(self)
-    end
-  
-    TITLE_REGEXP = /^#\s+([^\n]+)/.freeze
-  
-    def title_from_content
-      (@content =~ TITLE_REGEXP) && Regexp.last_match(1)
-    end
-  
-    def status
-      @attributes['status'] || Qeweney::Status::OK
-    end
-
-    def layout
-      layout = @attributes['layout'] || 'default'
-    end
-  
-    def render
-      case @kind
-      when :md
-        render_markdown
-      when :rb
-        render_papercraft
-      else
-        raise "Invalid page kind #{kind.inspect}"
-      end
-    end
-
-    def render_markdown
-      Kramdown::Document.new(@content, **kramdown_options).to_html
-    end
-
-    def kramdown_options
-      {
-        entity_output: :numeric,
-        syntax_highlighter: :rouge,
-        input: 'GFM',
-        hard_wrap: false
-      }
-    end
-
-    def render_papercraft
-      proc = instance_eval("->(&block) do; #{@content}; end", @full_path, @content_start_line)
-      proc.().render(page: self, pages: @opts[:pages])
-    end
-  end
-end
-
-class Qeweney::Request
-  include Impression::Pages::RequestMethods
-end