impression 0.16 → 0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bffd1fd2193a7ece32fa7cfa6b90a709a3fd54ed3f92d9ff93314fd565ba9c2
-  data.tar.gz: 198b729951f6a0202eb53e6c7703ec7459e22f6bd011de67d408c7258efe6740
+  metadata.gz: 21cbdbcabed8fc3f6fb8c84c40845fab6e8b8dfbe3c4d72b99aa22183b1e054e
+  data.tar.gz: d1ea4c3d1c57a87e3a77a1ead41c7b9e7e62e36de10554b844e42595e1266966
 SHA512:
-  metadata.gz: 9102da1086ce2158a9cd423f6d32bca80f9f2e85f5a64a271c54f373dfba207ad96eec4fa62f5e7dc2ecb5e9d3e16758f2c90885ae02d030219206340e2fddfd
-  data.tar.gz: 95b007b04f7937763ab5f5f4c827cf48b4670afc2e91ae1caf3bdbba09288ce90251fb4f501f46d201412df4972452eebf7b58f9893c591c97b7fa8ba60317f7
+  metadata.gz: 1452a646d9707f65ae1d3ae23dfb41718de01b5483f141db83f515a260a34409a4fec8e5f36ddc8ee8e14eb5761142fc61e02d3cee995f76922c8652b1a37831
+  data.tar.gz: 952cbbe582f0f6426a81404fbcab10629eaa4f48be477ddce5af5f0e1470ee148f47b84f2ed95a5f428568d292923c6e57abd1bbe672a786ef47e98e70ddfb8b

data/.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        ruby: ['2.7', '3.0', '3.1', 'head']
+        ruby: ['3.2', '3.3', '3.4']
 
     name: >-
       ${{matrix.os}}, ${{matrix.ruby}}

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.18 2025-06-15
+
+- Fix behaviour of App resource for not found paths
+
+## 0.17 2025-01-09
+
+- Update deps, cleanup tests
+
 ## 0.14 2024-12-11
 
 - Remove Polyphony, Tipi deps

data/Gemfile.lock

@@ -1,40 +1,40 @@
 PATH
   remote: .
   specs:
-    impression (0.16)
-      papercraft (~> 1.3)
-      qeweney (~> 0.20)
+    impression (0.17)
+      papercraft (~> 1.4)
+      qeweney (~> 0.21)
 
 GEM
   remote: https://rubygems.org/
   specs:
     docile (1.4.1)
     escape_utils (1.3.0)
-    json (2.9.0)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    minitest (5.11.3)
+    minitest (5.25.5)
     modulation (1.2)
-    papercraft (1.3)
+    papercraft (1.4)
       escape_utils (~> 1.3.0)
       kramdown (~> 2.5.1)
       kramdown-parser-gfm (~> 1.1.0)
       rouge (~> 4.5.1)
-      sirop (~> 0.4)
+      sirop (~> 0.5)
     prism (0.27.0)
-    qeweney (0.20)
-      escape_utils (~> 1.3.0)
-    rake (12.3.3)
-    rexml (3.4.0)
-    rouge (4.5.1)
-    simplecov (0.17.1)
+    qeweney (0.21)
+      escape_utils (= 1.3.0)
+    rake (13.2.1)
+    rexml (3.4.1)
+    rouge (4.5.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    sirop (0.4)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.13.1)
+    simplecov_json_formatter (0.1.4)
+    sirop (0.5)
       prism (~> 0.27.0)
 
 PLATFORMS
@@ -43,10 +43,10 @@ PLATFORMS
 
 DEPENDENCIES
   impression!
-  minitest (~> 5.11.3)
-  modulation (~> 1.1)
-  rake (~> 12.3.3)
-  simplecov (~> 0.17.1)
+  minitest (~> 5.25.4)
+  modulation (~> 1.2)
+  rake (~> 13.2.1)
+  simplecov (~> 0.22.0)
 
 BUNDLED WITH
    2.5.22

data/impression.gemspec

@@ -18,15 +18,13 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--title", "impression", "--main", "README.md"]
   s.extra_rdoc_files = ["README.md"]
   s.require_paths = ["lib"]
-  s.required_ruby_version = '>= 2.6'
+  s.required_ruby_version = '>= 3.3'
 
-  # s.add_runtime_dependency      'polyphony',            '~>0.93'
-  # s.add_runtime_dependency      'tipi',                 '~>0.52'
-  s.add_runtime_dependency      'qeweney',              '~>0.20'
-  s.add_runtime_dependency      'papercraft',           '~>1.3'
-  
-  s.add_development_dependency  'modulation',           '~>1.1'
-  s.add_development_dependency  'rake',                 '~>12.3.3'
-  s.add_development_dependency  'minitest',             '~>5.11.3'
-  s.add_development_dependency  'simplecov',            '~>0.17.1'
+  s.add_runtime_dependency      'qeweney',    '~>0.21'
+  s.add_runtime_dependency      'papercraft', '~>1.4'
+
+  s.add_development_dependency  'modulation', '~>1.2'
+  s.add_development_dependency  'rake',       '~>13.2.1'
+  s.add_development_dependency  'minitest',   '~>5.25.4'
+  s.add_development_dependency  'simplecov',  '~>0.22.0'
 end

data/lib/impression/app.rb

@@ -145,12 +145,7 @@ module Impression
     def render_from_path_info(req, path_info)
       case (kind = path_info[:kind])
       when :not_found
-        mod_path_info = up_tree_resource_module_path_info(req, path_info)
-        if mod_path_info
-          render_module(req, mod_path_info)
-        else
-          req.respond(nil, ':status' => Qeweney::Status::NOT_FOUND)
-        end
+        req.respond(nil, ':status' => Qeweney::Status::NOT_FOUND)
       when :module
         render_module(req, path_info)
       when :markdown

data/lib/impression/rack_app.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'fileutils'
-# require 'tipi'
 require_relative './resource'
 
 module Impression
@@ -14,7 +13,7 @@ module Impression
       # We pass nil as the block, otherwise the block will pass to
       # Resource#initialize, which will cause #call to be overidden.
       super(**props, &nil) 
-      @handler = Tipi::RackAdapter.run(app || block)
+      @handler = RackAdapter.run(app || block)
     end
 
     def call(req)
@@ -24,4 +23,35 @@ module Impression
       @handler.(req)
     end
   end
+
+  module RackAdapter
+    class << self
+      def run(app)
+        ->(req) { respond(req, app.(env(req))) }
+      end
+
+      def load(path)
+        src = IO.read(path)
+        instance_eval(src, path, 1)
+      end
+
+      def env(request)
+        Qeweney.rack_env_from_request(request)
+      end
+
+      def respond(request, (status_code, headers, body))
+        headers[':status'] = status_code.to_s
+
+        content =
+          if body.respond_to?(:to_path)
+            File.open(body.to_path, 'rb') { |f| f.read }
+          else
+            body.first
+          end
+
+        request.respond(content, headers)
+      end
+    end
+  end
+  
 end

data/lib/impression/version.rb

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

data/test/helper.rb

@@ -4,12 +4,12 @@ require 'bundler/setup'
 require_relative './coverage' if ENV['COVERAGE']
 require 'minitest/autorun'
 require 'impression'
-require 'qeweney/test_adapter'
+require 'qeweney/mock_adapter'
 require 'modulation'
 
 module Kernel
   def mock_req(**args)
-    Qeweney::TestAdapter.mock(**args)
+    Qeweney::MockAdapter.mock(**args)
   end
 
   def capture_exception
@@ -46,7 +46,7 @@ module Minitest::Assertions
     msg = message(msg) { "Expected HTTP status 200 OK, but instead got #{status}" }
     assert_equal 200, status, msg
 
-    actual = req.response_body
+    actual = req.adapter.body
     assert_equal exp_body.gsub("\n", ''), actual&.gsub("\n", '')
 
     return unless exp_content_type
@@ -83,10 +83,6 @@ class Qeweney::Request
     adapter.headers
   end
 
-  def response_body
-    adapter.body
-  end
-
   def response_status
     adapter.status
   end

data/test/test_app.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 require_relative 'helper'
-require 'qeweney/test_adapter'
 
-class AppTest < MiniTest::Test
+class AppTest < Minitest::Test
   APP_PATH = File.join(__dir__, 'app')
 
   def setup
@@ -323,9 +322,9 @@ class AppTest < MiniTest::Test
     @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
+    # 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
@@ -339,9 +338,9 @@ class AppTest < MiniTest::Test
     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/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)
@@ -349,7 +348,7 @@ class AppTest < MiniTest::Test
   end
 end
 
-class AbstractAppTest < MiniTest::Test
+class AbstractAppTest < Minitest::Test
   def test_abstract_app_default_response
     app = Impression::App.new(path: '/')
     req = mock_req(':method' => 'GET', ':path' => '/')

data/test/test_file_tree.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 require_relative 'helper'
-require 'qeweney/test_adapter'
 
-class FileTreeTest < MiniTest::Test
+class FileTreeTest < Minitest::Test
   STATIC_PATH = File.join(__dir__, 'static')
 
   def setup
@@ -166,7 +165,7 @@ class FileTreeTest < MiniTest::Test
     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 'foobar', req.adapter.body
     assert_equal 'bar', req.response_headers['Foo']
   end
 end

data/test/test_file_watcher.rb

@@ -3,7 +3,7 @@
 require_relative 'helper'
 require 'fileutils'
 
-# class FileWatcherTest < MiniTest::Test
+# class FileWatcherTest < Minitest::Test
 #   def setup
 #     @tmp_path = File.expand_path('../tmp', __dir__)
 #     FileUtils.mkdir(@tmp_path)

data/test/test_impression.rb

@@ -2,7 +2,7 @@
 
 require_relative 'helper'
 
-class ImpressionModuleTest < MiniTest::Test
+class ImpressionModuleTest < Minitest::Test
   def test_resource_method
     r1 = Impression.resource do |req|
       req.respond('foobar', ':status' => Qeweney::Status::TEAPOT)
@@ -10,7 +10,7 @@ class ImpressionModuleTest < MiniTest::Test
 
     req = mock_req(':method' => 'GET', ':path' => '/')
     r1.route_and_call(req)
-    assert_equal 'foobar', req.response_body
+    assert_equal 'foobar', req.adapter.body
     assert_equal Qeweney::Status::TEAPOT, req.response_status
   end
 

data/test/test_rack_app.rb

@@ -2,7 +2,7 @@
 
 require_relative 'helper'
 
-class RackAppTest < MiniTest::Test
+class RackAppTest < Minitest::Test
   def test_basic_rack_app
     app = Impression.rack_app(path: '/etc/rack') { |env|
       [
@@ -19,7 +19,7 @@ class RackAppTest < MiniTest::Test
     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
+    assert_equal 'Hello, world!', req.adapter.body
   end
 
   def test_path_rewriting
@@ -29,7 +29,7 @@ class RackAppTest < MiniTest::Test
 
     req = mock_req(':method' => 'GET', ':path' => '/foo/bar')
     app.route_and_call(req)
-    assert_equal 'path: /foo/bar', req.response_body
+    assert_equal 'path: /foo/bar', req.adapter.body
 
     ###
 
@@ -39,10 +39,10 @@ class RackAppTest < MiniTest::Test
 
     req = mock_req(':method' => 'GET', ':path' => '/etc/rack')
     app.route_and_call(req)
-    assert_equal 'path: /', req.response_body
+    assert_equal 'path: /', req.adapter.body
 
     req = mock_req(':method' => 'GET', ':path' => '/etc/rack/foo/bar')
     app.route_and_call(req)
-    assert_equal 'path: /foo/bar', req.response_body
+    assert_equal 'path: /foo/bar', req.adapter.body
   end
 end

data/test/test_resource.rb

@@ -2,7 +2,7 @@
 
 require_relative 'helper'
 
-class ResourceTest < MiniTest::Test
+class ResourceTest < Minitest::Test
   def test_absolute_path
     r1 = Impression::Resource.new(path: 'foo')
     assert_equal '/foo', r1.absolute_path
@@ -84,11 +84,11 @@ class ResourceTest < MiniTest::Test
 
     req = mock_req(':method' => 'GET', ':path' => '/foo/bar')
     r1.route_and_call(req)
-    assert_equal '/foo/bar', req.response_body
+    assert_equal '/foo/bar', req.adapter.body
 
     req = mock_req(':method' => 'GET', ':path' => '/foo/baz')
     r1.route_and_call(req)
-    assert_equal '/foo/baz', req.response_body
+    assert_equal '/foo/baz', req.adapter.body
 
     req = mock_req(':method' => 'GET', ':path' => '/foo/bbb')
     assert_equal r1, r1.route(req)
@@ -104,27 +104,27 @@ class ResourceTest < MiniTest::Test
 
     req = mock_req(':method' => 'GET', ':path' => '/foo')
     r1.route_and_call(req)
-    assert_equal '/foo /', req.response_body
+    assert_equal '/foo /', req.adapter.body
 
     req = mock_req(':method' => 'GET', ':path' => '/foo/zzz')
     r1.route_and_call(req)
-    assert_equal '/foo /zzz', req.response_body
+    assert_equal '/foo /zzz', req.adapter.body
 
     req = mock_req(':method' => 'GET', ':path' => '/foo/bar')
     r1.route_and_call(req)
-    assert_equal '/foo/bar /', req.response_body
+    assert_equal '/foo/bar /', req.adapter.body
 
     req = mock_req(':method' => 'GET', ':path' => '/foo/bar/zzz')
     r1.route_and_call(req)
-    assert_equal '/foo/bar /zzz', req.response_body
+    assert_equal '/foo/bar /zzz', req.adapter.body
 
     req = mock_req(':method' => 'GET', ':path' => '/foo/baz')
     r1.route_and_call(req)
-    assert_equal '/foo/baz /', req.response_body
+    assert_equal '/foo/baz /', req.adapter.body
 
     req = mock_req(':method' => 'GET', ':path' => '/foo/baz/xxx/yyy')
     r1.route_and_call(req)
-    assert_equal '/foo/baz /xxx/yyy', req.response_body
+    assert_equal '/foo/baz /xxx/yyy', req.adapter.body
   end
 
   class CallableResource < Impression::Resource
@@ -144,7 +144,7 @@ class ResourceTest < MiniTest::Test
 
     req = mock_req(':method' => 'GET', ':path' => '/foo/bar')
     r1.route_and_call(req)
-    assert_equal 'hi', req.response_body
+    assert_equal 'hi', req.adapter.body
   end
 
   class CallableRouteResource < Impression::Resource
@@ -164,7 +164,7 @@ class ResourceTest < MiniTest::Test
 
     req = mock_req(':method' => 'GET', ':path' => '/foo/bar')
     r1.route_and_call(req)
-    assert_equal 'bye', req.response_body
+    assert_equal 'bye', req.adapter.body
   end
 
   def test_text_response
@@ -185,17 +185,17 @@ class ResourceTest < MiniTest::Test
 
     req = mock_req(':method' => 'GET', ':path' => '/text')
     r.route_and_call(req)
-    assert_equal 'foo', req.response_body
+    assert_equal 'foo', req.adapter.body
     assert_equal 'text/plain', req.response_content_type
 
     req = mock_req(':method' => 'GET', ':path' => '/html')
     r.route_and_call(req)
-    assert_equal 'bar', req.response_body
+    assert_equal 'bar', req.adapter.body
     assert_equal 'text/html', req.response_content_type
 
     req = mock_req(':method' => 'GET', ':path' => '/json')
     r.route_and_call(req)
-    assert_equal '{"baz":123}', req.response_body
+    assert_equal '{"baz":123}', req.adapter.body
     assert_equal 'application/json', req.response_content_type
   end
 
@@ -206,7 +206,7 @@ class ResourceTest < MiniTest::Test
 
     req = mock_req(':method' => 'GET', ':path' => '/')
     r1.route_and_call(req)
-    assert_equal 'foobar', req.response_body
+    assert_equal 'foobar', req.adapter.body
     assert_equal Qeweney::Status::TEAPOT, req.response_status
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: impression
 version: !ruby/object:Gem::Version
-  version: '0.16'
+  version: '0.18'
 platform: ruby
 authors:
 - Sharon Rosner
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: qeweney
@@ -16,85 +15,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: papercraft
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: modulation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.2.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.11.3
+        version: 5.25.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.11.3
+        version: 5.25.4
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
-description:
+        version: 0.22.0
 email: sharon@noteflakes.com
 executables: []
 extensions: []
@@ -161,7 +159,6 @@ metadata:
   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"
 - impression
@@ -173,15 +170,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.8
 specification_version: 4
 summary: Impression - a modern web framework for Ruby
 test_files: []