impression 0.17 → 0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bc8c935df76dce2703fe415857bb3f700d527c32ee59cc0e59a508f5470aef8
-  data.tar.gz: 1fed2d81850f8dc28e9aafa8d012f2236dc2b7450db793916245f84949d49199
+  metadata.gz: 21cbdbcabed8fc3f6fb8c84c40845fab6e8b8dfbe3c4d72b99aa22183b1e054e
+  data.tar.gz: d1ea4c3d1c57a87e3a77a1ead41c7b9e7e62e36de10554b844e42595e1266966
 SHA512:
-  metadata.gz: '095b5f6cd4651b1dabfd26bea49a2993738720b6b7346bd4b6cae01de7aaf610e196935c15fca504e7d37fa8dbf134924d1ea7d7f793ad8b35822680ddc0401a'
-  data.tar.gz: fa9417ce89cf28562aad917f129dc7cafd1791a443e2dec81b7123faf9968649aed347043efdc0a594925559e9b076168e4727cb74119314e26976b2f95e3240
+  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,7 @@
+## 0.18 2025-06-15
+
+- Fix behaviour of App resource for not found paths
+
 ## 0.17 2025-01-09
 
 - Update deps, cleanup tests

data/Gemfile.lock

@@ -14,7 +14,7 @@ GEM
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    minitest (5.25.4)
+    minitest (5.25.5)
     modulation (1.2)
     papercraft (1.4)
       escape_utils (~> 1.3.0)
@@ -26,8 +26,8 @@ GEM
     qeweney (0.21)
       escape_utils (= 1.3.0)
     rake (13.2.1)
-    rexml (3.4.0)
-    rouge (4.5.1)
+    rexml (3.4.1)
+    rouge (4.5.2)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)

data/impression.gemspec

@@ -18,7 +18,7 @@ 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      'qeweney',    '~>0.21'
   s.add_runtime_dependency      'papercraft', '~>1.4'

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/version.rb

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

data/test/helper.rb

@@ -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

@@ -322,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
@@ -338,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)

data/test/test_file_tree.rb

@@ -165,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_impression.rb

@@ -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

@@ -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

@@ -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,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: impression
 version: !ruby/object:Gem::Version
-  version: '0.17'
+  version: '0.18'
 platform: ruby
 authors:
 - Sharon Rosner
 bindir: bin
 cert_chain: []
-date: 2025-01-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: qeweney
@@ -170,14 +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.6.2
+rubygems_version: 3.6.8
 specification_version: 4
 summary: Impression - a modern web framework for Ruby
 test_files: []