impression 0.1 → 0.2

data/test/test_file_tree.rb

@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+require 'qeweney/test_adapter'
+
+class FileTreeTest < MiniTest::Test
+  STATIC_PATH = File.join(__dir__, 'static')
+
+  def setup
+    @file_tree = Impression::FileTree.new(path: '/', directory: STATIC_PATH)
+  end
+
+  def test_file_tree_routing
+    req = mock_req(':method' => 'GET', ':path' => '/')
+    assert_equal @file_tree, @file_tree.route(req)
+
+    req = mock_req(':method' => 'GET', ':path' => '/nonexistent')
+    assert_equal @file_tree, @file_tree.route(req)
+
+    req = mock_req(':method' => 'GET', ':path' => '/index.html')
+    assert_equal @file_tree, @file_tree.route(req)
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo')
+    assert_equal @file_tree, @file_tree.route(req)
+  end
+
+  def static(path)
+    IO.read(File.join(STATIC_PATH, path))
+  end
+
+  def test_file_tree_response
+    req = mock_req(':method' => 'GET', ':path' => '/roo')
+    @file_tree.route_and_respond(req)
+    assert_equal Qeweney::Status::NOT_FOUND, req.response_status
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo2')
+    @file_tree.route_and_respond(req)
+    assert_equal Qeweney::Status::NOT_FOUND, req.response_status
+
+    req = mock_req(':method' => 'GET', ':path' => '/bar2')
+    @file_tree.route_and_respond(req)
+    assert_equal Qeweney::Status::NOT_FOUND, req.response_status
+
+    req = mock_req(':method' => 'GET', ':path' => '/js/a.js')
+    @file_tree.route_and_respond(req)
+    assert_response static('js/a.js'), :js, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo.html')
+    @file_tree.route_and_respond(req)
+    assert_response static('foo.html'), :html, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo')
+    @file_tree.route_and_respond(req)
+    assert_response static('foo.html'), :html, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/index.html')
+    @file_tree.route_and_respond(req)
+    assert_response static('index.html'), :html, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/')
+    @file_tree.route_and_respond(req)
+    assert_response static('index.html'), :html, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/bar/index.html')
+    @file_tree.route_and_respond(req)
+    assert_response static('bar/index.html'), :html, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/bar')
+    @file_tree.route_and_respond(req)
+    assert_response static('bar/index.html'), :html, req
+  end
+
+  def test_non_root_file_tree_response
+    @file_tree = Impression::FileTree.new(path: '/app', directory: STATIC_PATH)
+
+    req = mock_req(':method' => 'GET', ':path' => '/app/roo')
+    @file_tree.route_and_respond(req)
+    assert_equal Qeweney::Status::NOT_FOUND, req.response_status
+
+    req = mock_req(':method' => 'GET', ':path' => '/app/foo2')
+    @file_tree.route_and_respond(req)
+    assert_equal Qeweney::Status::NOT_FOUND, req.response_status
+
+    req = mock_req(':method' => 'GET', ':path' => '/app/bar2')
+    @file_tree.route_and_respond(req)
+    assert_equal Qeweney::Status::NOT_FOUND, req.response_status
+
+    req = mock_req(':method' => 'GET', ':path' => '/app/js/a.js')
+    @file_tree.route_and_respond(req)
+    assert_response static('js/a.js'), :js, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/app/foo.html')
+    @file_tree.route_and_respond(req)
+    assert_response static('foo.html'), :html, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/app/foo')
+    @file_tree.route_and_respond(req)
+    assert_response static('foo.html'), :html, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/app/index.html')
+    @file_tree.route_and_respond(req)
+    assert_response static('index.html'), :html, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/app/')
+    @file_tree.route_and_respond(req)
+    assert_response static('index.html'), :html, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/app/bar/index.html')
+    @file_tree.route_and_respond(req)
+    assert_response static('bar/index.html'), :html, req
+
+    req = mock_req(':method' => 'GET', ':path' => '/app/bar')
+    @file_tree.route_and_respond(req)
+    assert_response static('bar/index.html'), :html, req
+  end
+end

data/test/test_file_watcher.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+require 'fileutils'
+
+# class FileWatcherTest < MiniTest::Test
+#   def setup
+#     @tmp_path = File.expand_path('../tmp', __dir__)
+#     FileUtils.mkdir(@tmp_path)
+#   end
+
+#   def teardown
+#     FileUtils.rm_rf(@tmp_path)
+#   end
+
+#   def test_directory_watcher
+#     watcher = Impression::FileWatcher.new(@tmp_path)
+#     file_path = File.join(@tmp_path, 'foo')
+
+#     buffer = []
+#     spin do
+#       watcher.each { |kind, path| buffer << [kind, path] }
+#     end
+
+#     assert_equal [], buffer
+
+#     # create
+#     buffer.clear
+#     IO.write(file_path, 'bar')
+#     sleep 0.01
+#     assert_equal [[:create, file_path]], buffer
+
+#     # modify
+#     buffer.clear
+#     IO.write(file_path, 'baz')
+#     sleep 0.01
+#     assert_equal [[:modify, file_path]], buffer
+
+#     # move
+#     tmp_file_path = File.join("/tmp/#{rand(1024)}")
+#     file2_path = File.join(@tmp_path, 'foo2')
+#     buffer.clear
+#     IO.write(tmp_file_path, '---')
+#     FileUtils.mv(tmp_file_path, file2_path)
+#     sleep 0.01
+#     assert_equal [[:moved_to, file2_path]], buffer
+
+#     # delete
+#     buffer.clear
+#     FileUtils.rm(file_path)
+#     sleep 0.01
+#     assert_equal [[:delete, file_path]], buffer
+#   end
+
+#   def test_recursive_directory_watcher
+#   end
+# end

data/test/test_resource.rb

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class ResourceTest < MiniTest::Test
+  def test_absolute_path
+    r1 = Impression::Resource.new(path: 'foo')
+    assert_equal '/foo', r1.absolute_path
+
+    r2 = Impression::Resource.new(parent: r1, path: 'bar')
+    assert_equal '/foo/bar', r2.absolute_path
+  end
+
+  def test_each
+    r1 = Impression::Resource.new(path: 'foo')
+    r2 = Impression::Resource.new(parent: r1, path: 'bar')
+    r3 = Impression::Resource.new(parent: r1, path: 'baz')
+
+    assert_equal [r2, r3], r1.children.values
+
+    buffer = []
+    r1.each { |r| buffer << r }
+    assert_equal [r1, r2, r3], buffer
+  end
+
+  def test_route
+    r1 = Impression::Resource.new(path: 'foo')
+    r2 = Impression::Resource.new(parent: r1, path: 'bar')
+    r3 = Impression::Resource.new(parent: r1, path: 'baz')
+    r4 = Impression::Resource.new(parent: r2, path: 'littlebar')
+
+    assert_equal [r2, r3], r1.children.values
+    assert_equal [r4], r2.children.values
+
+    req = mock_req(':method' => 'GET', ':path' => '/')
+    assert_nil r1.route(req)
+    assert_equal '/', req.resource_relative_path
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo2')
+    assert_nil r1.route(req)
+    assert_equal '/foo2', req.resource_relative_path
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo')
+    assert_equal r1, r1.route(req)
+    assert_equal '/', req.resource_relative_path
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo/bar')
+    assert_equal r2, r1.route(req)
+    assert_equal '/', req.resource_relative_path
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo/baz')
+    assert_equal r3, r1.route(req)
+    assert_equal '/', req.resource_relative_path
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo/bar/littlebar')
+    assert_equal r4, r1.route(req)
+    assert_equal '/', req.resource_relative_path
+  
+    req = mock_req(':method' => 'GET', ':path' => '/foo/bar/littlebar/littlebaz')
+    assert_equal r4, r1.route(req)
+    assert_equal '/littlebaz', req.resource_relative_path
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo/hi')
+    assert_equal r1, r1.route(req)
+    assert_equal '/hi', req.resource_relative_path
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo/hi/bye')
+    assert_equal r1, r1.route(req)
+    assert_equal '/hi/bye', req.resource_relative_path
+  end
+
+  def test_nested_resource_rendering
+    r1 = Impression::Resource.new(path: 'foo')
+    r2 = PathRenderingResource.new(parent: r1, path: 'bar')
+    r3 = PathRenderingResource.new(parent: r1, path: 'baz')
+
+    req = mock_req(':method' => 'GET', ':path' => '/')
+    assert_nil r1.route(req)
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo')
+    r1.route(req).respond(req)
+    # default reply
+    assert_equal Qeweney::Status::NOT_FOUND, req.response_status
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo/bar')
+    r1.route(req).respond(req)
+    assert_equal '/foo/bar', req.response_body
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo/baz')
+    r1.route(req).respond(req)
+    assert_equal '/foo/baz', req.response_body
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo/bbb')
+    assert_equal r1, r1.route(req)
+  end
+
+  def test_relative_path
+    r1 = CompletePathInfoRenderingResource.new(path: 'foo')
+    r2 = CompletePathInfoRenderingResource.new(parent: r1, path: 'bar')
+    r3 = CompletePathInfoRenderingResource.new(parent: r1, path: 'baz')
+
+    req = mock_req(':method' => 'GET', ':path' => '/')
+    assert_nil r1.route(req)
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo')
+    r1.route(req).respond(req)
+    assert_equal '/foo /', req.response_body
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo/zzz')
+    r1.route(req).respond(req)
+    assert_equal '/foo /zzz', req.response_body
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo/bar')
+    r1.route(req).respond(req)
+    assert_equal '/foo/bar /', req.response_body
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo/bar/zzz')
+    r1.route(req).respond(req)
+    assert_equal '/foo/bar /zzz', req.response_body
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo/baz')
+    r1.route(req).respond(req)
+    assert_equal '/foo/baz /', req.response_body
+
+    req = mock_req(':method' => 'GET', ':path' => '/foo/baz/xxx/yyy')
+    r1.route(req).respond(req)
+    assert_equal '/foo/baz /xxx/yyy', req.response_body
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: impression
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Sharon Rosner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.73.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.73.1
 - !ruby/object:Gem::Dependency
   name: tipi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: '0.45'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.37'
+        version: '0.45'
+- !ruby/object:Gem::Dependency
+  name: qeweney
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  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
@@ -81,47 +95,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: papercraft
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
-  type: :development
+        version: '0.12'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '0.12'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.11.3
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.11.3
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 5.11.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 5.11.3
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -136,34 +150,54 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.17.1
-description: 
+description:
 email: sharon@noteflakes.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- ".github/FUNDING.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
+- Rakefile
 - TODO.md
+- examples/markdown/_assets/style.css
 - examples/markdown/app.rb
 - examples/markdown/docs/index.md
+- examples/markdown/docs/tutorial.md
 - impression.gemspec
 - lib/impression.rb
+- lib/impression/app.rb
 - lib/impression/errors.rb
+- lib/impression/file_tree.rb
+- lib/impression/file_watcher.rb
 - lib/impression/pages.rb
 - lib/impression/request_extensions.rb
+- lib/impression/request_routing.rb
+- lib/impression/resource.rb
 - lib/impression/version.rb
+- test/helper.rb
+- test/run.rb
+- test/static/bar/index.html
+- test/static/foo.html
+- test/static/index.html
+- test/static/js/a.js
+- test/test_app.rb
+- test/test_file_tree.rb
+- test/test_file_watcher.rb
+- test/test_resource.rb
 homepage: http://github.com/digital-fabric/impression
 licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/digital-fabric/impression
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - impression
@@ -182,8 +216,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Impression - a modern web framework for Ruby
 test_files: []