impression 0.10 → 0.13

data/lib/impression.rb

@@ -3,12 +3,10 @@
 require 'polyphony'
 
 require_relative './impression/request_extensions'
-# require_relative './impression/file_watcher'
-
 require_relative './impression/resource'
 require_relative './impression/file_tree'
-require_relative './impression/jamstack'
 require_relative './impression/app'
+require_relative './impression/rack_app'
 
 # The Impression module contains convenience methods for creating resources.
 module Impression
@@ -26,17 +24,31 @@ module Impression
 
   # Creates a new `Impression::FileTree` instance with the given parameters.
   #
-  # @param **props [Hash] properties
+  # @param path [String] resource path (defaults to `"/"`)
+  # @param **props [Hash] other resource properties
+  # @param &block [Proc] optional block for overriding default request handler
   # @return [Impression::FileTree] new resource
-  def self.file_tree(path: '/', **props)
-    FileTree.new(path: path, **props)
+  def self.file_tree(path: '/', **props, &block)
+    FileTree.new(path: path, **props, &block)
+  end
+
+  # Creates a new `Impression::App` instance with the given parameters.
+  #
+  # @param path [String] resource path (defaults to `"/"`)
+  # @param **props [Hash] other resource properties
+  # @param &block [Proc] optional block for overriding default request handler
+  # @return [Impression::App] new resource
+  def self.app(path: '/', **props, &block)
+    App.new(path: path, **props, &block)
   end
 
-  # Creates a new `Impression::Jamstack` instance with the given parameters.
+  # Creates a new `Impression::RackApp` instance with the given parameters.
   #
-  # @param **props [Hash] properties
-  # @return [Impression::Jamstack] new resource
-  def self.jamstack(path: '/', **props)
-    Jamstack.new(path: path, **props)
+  # @param path [String] resource path (defaults to `"/"`)
+  # @param **props [Hash] other resource properties
+  # @param &block [Proc] Rack app proc (can also be passed using the `app:` parameter)
+  # @return [Impression::RackApp] new resource
+  def self.rack_app(path: '/', **props, &block)
+    RackApp.new(path: path, **props, &block)
   end
 end

data/test/{jamstack → app}/resources/recurse.rb

@@ -3,7 +3,7 @@
 export :resource
 
 def resource
-  Impression.jamstack(
+  Impression.app(
     directory: File.expand_path('..', __dir__)
   )
 end

data/test/test_app.rb

@@ -1,9 +1,356 @@
 # frozen_string_literal: true
 
 require_relative 'helper'
+require 'qeweney/test_adapter'
 
 class AppTest < MiniTest::Test
-  def test_empty_app
+  APP_PATH = File.join(__dir__, 'app')
+
+  def setup
+    @app = Impression::App.new(path: '/', directory: APP_PATH)
+  end
+
+  def test_app_routing
+    req = mock_req(':method' => 'GET', ':path' => '/')
+    assert_equal @app, @app.route(req)
+
+    req = mock_req(':method' => 'GET', ':path' => '/nonexistent')
+    assert_equal @app, @app.route(req)
+
+    req = mock_req(':method' => 'GET', ':path' => '/index.html')
+    assert_equal @app, @app.route(req)
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo')
+    assert_equal @app, @app.route(req)
+  end
+
+  def static(path)
+    IO.read(File.join(APP_PATH, path))
+  end
+
+  def test_app_response
+    req = mock_req(':method' => 'GET', ':path' => '/roo')
+    @app.route_and_call(req)
+    assert_equal Qeweney::Status::NOT_FOUND, req.response_status
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo2')
+    @app.route_and_call(req)
+    assert_equal Qeweney::Status::NOT_FOUND, req.response_status
+
+    req = mock_req(':method' => 'GET', ':path' => '/bar2')
+    @app.route_and_call(req)
+    assert_equal Qeweney::Status::NOT_FOUND, req.response_status
+
+    req = mock_req(':method' => 'GET', ':path' => '/assets/js/a.js')
+    @app.route_and_call(req)
+    assert_response static('assets/js/a.js'), :js, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo')
+    @app.route_and_call(req)
+
+    foo = Papercraft.html {
+      html5 {
+        head {
+          title 'Foo title'
+        }
+        body {
+          h1 'foo'
+        }
+      }
+    }
+    assert_response foo.render, :html, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/index')
+    @app.route_and_call(req)
+
+    index = Papercraft.html {
+      html5 {
+        head {
+          title 'Hello'
+        }
+        body {
+          h1 'Index'
+        }
+      }
+    }
+    assert_response index.render, :html, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/')
+    @app.route_and_call(req)
+    assert_response index.render, :html, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/bar')
+    @app.route_and_call(req)
+    assert_response static('bar.html'), :html, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/baz')
+    @app.route_and_call(req)
+
+    baz_index = Papercraft.html {
+      html5 {
+        head {
+          title 'BarBar'
+        }
+        body {
+          h1 'BarIndex'
+        }
+      }
+    }
+    assert_response baz_index.render, :html, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/articles/a')
+    @app.route_and_call(req)
+
+    a = Papercraft.html {
+      html5 {
+        head {
+          title 'AAA'
+        }
+        body {
+          article {
+            h2 'ZZZ', id: 'zzz'
+          }
+        }
+      }
+    }
+    assert_response a.render, :html, req
+  end
+
+  def test_non_root_app_response
+    @app = Impression::App.new(path: '/app', directory: APP_PATH)
+
+    req = mock_req(':method' => 'GET', ':path' => '/app/roo')
+    @app.route_and_call(req)
+    assert_equal Qeweney::Status::NOT_FOUND, req.response_status
+
+    req = mock_req(':method' => 'GET', ':path' => '/app/foo2')
+    @app.route_and_call(req)
+    assert_equal Qeweney::Status::NOT_FOUND, req.response_status
+
+    req = mock_req(':method' => 'GET', ':path' => '/app/bar2')
+    @app.route_and_call(req)
+    assert_equal Qeweney::Status::NOT_FOUND, req.response_status
+
+    req = mock_req(':method' => 'GET', ':path' => '/app/assets/js/a.js')
+    @app.route_and_call(req)
+    assert_response static('assets/js/a.js'), :js, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/app/foo')
+    @app.route_and_call(req)
+
+    foo = Papercraft.html {
+      html5 {
+        head {
+          title 'Foo title'
+        }
+        body {
+          h1 'foo'
+        }
+      }
+    }
+    assert_response foo.render, :html, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/app/index')
+    @app.route_and_call(req)
+
+    index = Papercraft.html {
+      html5 {
+        head {
+          title 'Hello'
+        }
+        body {
+          h1 'Index'
+        }
+      }
+    }
+    assert_response index.render, :html, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/app/')
+    @app.route_and_call(req)
+    assert_response index.render, :html, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/app/bar')
+    @app.route_and_call(req)
+    assert_response static('bar.html'), :html, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/app/baz')
+    @app.route_and_call(req)
+
+    baz_index = Papercraft.html {
+      html5 {
+        head {
+          title 'BarBar'
+        }
+        body {
+          h1 'BarIndex'
+        }
+      }
+    }
+    assert_response baz_index.render, :html, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/app/articles/a')
+    @app.route_and_call(req)
+
+    a = Papercraft.html {
+      html5 {
+        head {
+          title 'AAA'
+        }
+        body {
+          article {
+            h2 'ZZZ', id: 'zzz'
+          }
+        }
+      }
+    }
+    assert_response a.render, :html, req
+  end
+
+  def test_page_list
+    @app = Impression::App.new(path: '/app', directory: APP_PATH)
+
+    list = @app.page_list('/')
+    assert_equal [
+      { kind: :file, path: File.join(APP_PATH, 'bar.html'), ext: '.html', url: '/app/bar' },
+      { kind: :markdown, path: File.join(APP_PATH, 'index.md'), ext: '.md', url: '/app', 
+        title: 'Hello', foo: 'BarBar', html_content: "<h1>Index</h1>\n" },
+    ], list
+
+
+    list = @app.page_list('/articles')
+
+    assert_equal [
+      {
+        kind: :markdown,
+        path: File.join(APP_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: :markdown,
+        path: File.join(APP_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: :markdown,
+        path: File.join(APP_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')
+    @app.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)
+    @app.send(:get_path_info, path)
+  end
+
+  def test_path_info
+    assert_equal({
+      kind: :markdown,
+      path: File.join(APP_PATH, 'index.md'),
+      ext: '.md',
+      url:  '/',
+      title: 'Hello',
+      foo: 'BarBar',
+      html_content: "<h1>Index</h1>\n"
+    },  path_info('/index'))
+
+    assert_equal({
+      kind: :markdown,
+      path: File.join(APP_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(APP_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
+
+  def test_resource_loading
+    req = mock_req(':method' => 'GET', ':path' => '/resources/greeter?name=world')
+    route = @app.route(req)
+    assert_equal @app, route
+
+    req = mock_req(':method' => 'GET', ':path' => '/resources/greeter?name=world')
+    @app.route_and_call(req)
+    assert_response 'Hello, world!', :text, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/resources/recurse/resources/greeter?name=foo')
+    @app.route_and_call(req)
+    assert_response 'Hello, foo!', :text, req
+  end
+
+  def test_recursive_resource_loading_on_non_root_app
+    app = Impression::App.new(path: '/foo/bar', directory: APP_PATH)
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo/bar/resources/greeter?name=world')
+    route = app.route(req)
+    assert_equal app, route
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo/bar/resources/greeter?name=world')
+    app.route_and_call(req)
+    assert_response 'Hello, world!', :text, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo/bar/resources/recurse/resources/greeter?name=foo')
+    app.route_and_call(req)
+    assert_response 'Hello, foo!', :text, req
+
+    # req = mock_req(':method' => 'GET', ':path' => '/foo/bar/resources/recurse/bar')
+    # @app.route_and_call(req)
+    # assert_response static('bar.html'), :html, req
+  end
+end
+
+class AbstractAppTest < MiniTest::Test
+  def test_abstract_app_default_response
     app = Impression::App.new(path: '/')
     req = mock_req(':method' => 'GET', ':path' => '/')
 
@@ -11,7 +358,7 @@ class AppTest < MiniTest::Test
     assert_equal Qeweney::Status::NOT_FOUND, req.adapter.status
   end
 
-  def test_app_each
+  def test_abstract_app_each
     app = Impression::App.new(path: '/')
     
     buffer = []
@@ -33,10 +380,6 @@ class AppTest < MiniTest::Test
     foo = PathRenderingResource.new(parent: app, path: 'foo')
     bar = PathRenderingResource.new(parent: app, path: 'bar')
 
-    # req = mock_req(':method' => 'GET', ':path' => '/')
-    # app_proc.(req)
-    # assert_equal Qeweney::Status::NOT_FOUND, req.adapter.status
-
     req = mock_req(':method' => 'GET', ':path' => '/foo')
     app_proc.(req)
     assert_equal '/foo', req.adapter.body

data/test/test_file_tree.rb

@@ -151,4 +151,22 @@ class FileTreeTest < MiniTest::Test
       kind: :not_found,
     },  path_info('/js/b.js'))
   end
+
+  def test_file_tree_with_default_handler_block
+    @file_tree = Impression::FileTree.new(path: '/', directory: STATIC_PATH)
+
+    req = mock_req(':method' => 'GET', ':path' => '/foobar')
+    @file_tree.route_and_call(req)
+    assert_equal Qeweney::Status::NOT_FOUND, req.response_status
+
+    @file_tree = Impression::FileTree.new(path: '/', directory: STATIC_PATH) { |req|
+      req.respond('foobar', 'Foo' => 'bar')
+    }
+
+    req = mock_req(':method' => 'GET', ':path' => '/foobar')
+    @file_tree.route_and_call(req)
+    assert_equal Qeweney::Status::OK, req.response_status
+    assert_equal 'foobar', req.response_body
+    assert_equal 'bar', req.response_headers['Foo']
+  end
 end

data/test/test_impression.rb

@@ -22,10 +22,10 @@ class ImpressionModuleTest < MiniTest::Test
     assert_equal '/bar', r1.directory
   end
 
-  def test_jamstack_method
-    r1 = Impression.jamstack(path: '/foo', directory: '/bar')
+  def test_app_method
+    r1 = Impression.app(path: '/foo', directory: '/bar')
 
-    assert_kind_of Impression::Jamstack, r1
+    assert_kind_of Impression::App, r1
     assert_equal '/foo', r1.path
     assert_equal '/bar', r1.directory
   end

data/test/test_rack_app.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class RackAppTest < MiniTest::Test
+  def test_basic_rack_app
+    app = Impression.rack_app(path: '/etc/rack') { |env|
+      [
+        200,
+        {'Content-Type' => 'text/plain'},
+        ['Hello, world!']
+      ]
+    }
+
+    req = mock_req(':method' => 'GET', ':path' => '/foobar')
+    assert_nil app.route(req)
+
+    req = mock_req(':method' => 'GET', ':path' => '/etc/rack')
+    app.route_and_call(req)
+    assert_equal '200', req.response_status
+    assert_equal 'text/plain', req.response_headers['Content-Type']
+    assert_equal 'Hello, world!', req.response_body
+  end
+
+  def test_path_rewriting
+    app = Impression.rack_app(path: '/') { |env|
+      [200, {}, ["path: #{env['PATH_INFO']}"]]
+    }
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo/bar')
+    app.route_and_call(req)
+    assert_equal 'path: /foo/bar', req.response_body
+
+    ###
+
+    app = Impression.rack_app(path: '/etc/rack') { |env|
+      [200, {}, ["path: #{env['PATH_INFO']}"]]
+    }
+
+    req = mock_req(':method' => 'GET', ':path' => '/etc/rack')
+    app.route_and_call(req)
+    assert_equal 'path: /', req.response_body
+
+    req = mock_req(':method' => 'GET', ':path' => '/etc/rack/foo/bar')
+    app.route_and_call(req)
+    assert_equal 'path: /foo/bar', req.response_body
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: impression
 version: !ruby/object:Gem::Version
-  version: '0.10'
+  version: '0.13'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.77'
+        version: '0.93'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.77'
+        version: '0.93'
 - !ruby/object:Gem::Dependency
   name: tipi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.52'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.52'
 - !ruby/object:Gem::Dependency
   name: qeweney
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: papercraft
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.23'
 - !ruby/object:Gem::Dependency
   name: modulation
   requirement: !ruby/object:Gem::Requirement
@@ -150,26 +150,26 @@ files:
 - lib/impression/errors.rb
 - lib/impression/file_tree.rb
 - lib/impression/file_watcher.rb
-- lib/impression/jamstack.rb
+- lib/impression/rack_app.rb
 - lib/impression/request_extensions.rb
 - lib/impression/request_extensions/responses.rb
 - lib/impression/request_extensions/routing.rb
 - lib/impression/resource.rb
 - lib/impression/version.rb
+- test/app/_layouts/article.rb
+- test/app/_layouts/default.rb
+- test/app/articles/2008-06-14-manu.md
+- test/app/articles/2009-06-12-noatche.md
+- test/app/articles/a.md
+- test/app/assets/js/a.js
+- test/app/bar.html
+- test/app/baz/index.md
+- test/app/foo.rb
+- test/app/foobar.rb
+- test/app/index.md
+- test/app/resources/greeter.rb
+- test/app/resources/recurse.rb
 - 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/jamstack/resources/greeter.rb
-- test/jamstack/resources/recurse.rb
 - test/run.rb
 - test/static/bar/index.html
 - test/static/foo.html
@@ -179,7 +179,7 @@ files:
 - test/test_file_tree.rb
 - test/test_file_watcher.rb
 - test/test_impression.rb
-- test/test_jamstack.rb
+- test/test_rack_app.rb
 - test/test_resource.rb
 homepage: http://github.com/digital-fabric/impression
 licenses: