syntropy 0.29.0 → 0.31.0

data/test/{test_request_extensions.rb → test_request.rb}

@@ -2,31 +2,116 @@
 
 require_relative 'helper'
 
-class MethodValidationTest < Minitest::Test
-  VE = Syntropy::ValidationError
+class RequestInfoTest < Minitest::Test
+  def test_uri
+    r = Syntropy::MockAdapter.mock(':path' => '/test/path')
+    assert_equal '/test/path', r.path
+    assert_equal({}, r.query)
 
-  def test_validate_http_method
-    @req = mock_req(':method' => 'GET', ':path' => '/foo')
+    r = Syntropy::MockAdapter.mock(':path' => '/test/path?a=1&b=2&c=3%2f4')
+    assert_equal '/test/path', r.path
+    assert_equal({ a: '1', b: '2', c: '3/4' }, r.query)
+  end
 
-    assert_equal 'get', @req.validate_http_method('get', 'head')
-    assert_raises(Syntropy::Error) { @req.validate_http_method('post', 'put') }
-    assert_raises(Syntropy::Error) { @req.validate_http_method() }
+  def test_query
+    r = Syntropy::MockAdapter.mock(':path' => '/GponForm/diag_Form?images/')
+    assert_equal '/GponForm/diag_Form', r.path
+    assert_equal({:'images/' => true}, r.query)
+
+    r = Syntropy::MockAdapter.mock(':path' => '/?a=1&b=2')
+    assert_equal '/', r.path
+    assert_equal({a: '1', b: '2'}, r.query)
+
+    r = Syntropy::MockAdapter.mock(':path' => '/?l=a&t=&x=42')
+    assert_equal({l: 'a', t: '', x: '42'}, r.query)
   end
 
-  def test_respond_by_http_method
-    @req = mock_req(':method' => 'GET', ':path' => '/foo')
+  def test_host
+    r = Syntropy::MockAdapter.mock(':path' => '/')
+    assert_nil r.host
+    assert_nil r.authority
 
-    @req.respond_by_http_method(
-      'get' => ['GET foo', {}],
-      'post' => ['POST foo', {}]
+    r = Syntropy::MockAdapter.mock('host' => 'my.example.com')
+    assert_equal 'my.example.com', r.host
+    assert_equal 'my.example.com', r.authority
+
+    r = Syntropy::MockAdapter.mock(':authority' => 'my.foo.com')
+    assert_equal 'my.foo.com', r.host
+    assert_equal 'my.foo.com', r.authority
+  end
+
+  def test_full_uri
+    r = Syntropy::MockAdapter.mock(
+      ':scheme' => 'https',
+      'host' => 'foo.bar',
+      ':path' => '/hey?a=b&c=d'
     )
-    assert_equal 'GET foo', @req.response_body
 
-    assert_raises(Syntropy::Error) {
-      @req.respond_by_http_method(
-        'post' => ['POST foo', {}]
-      )
-    }
+    assert_equal 'https://foo.bar/hey?a=b&c=d', r.full_uri
+  end
+
+  def test_cookies
+    r = Syntropy::MockAdapter.mock
+
+    assert_equal({}, r.cookies)
+
+    r = Syntropy::MockAdapter.mock(
+      'cookie' => 'uaid=a%2Fb; lastLocus=settings; signin_ref=/'
+    )
+
+    assert_equal({
+      'uaid' => 'a/b',
+      'lastLocus' => 'settings',
+      'signin_ref' => '/'
+    }, r.cookies)
+  end
+
+  def test_content_type
+    r = Syntropy::MockAdapter.mock(
+      ':scheme' => 'https',
+      'host' => 'foo.bar',
+      ':path' => '/hey?a=b&c=d',
+      'content-type' => 'text/plain'
+    )
+    assert_equal 'text/plain', r.content_type
+
+    r = Syntropy::MockAdapter.mock(
+      ':scheme' => 'https',
+      'host' => 'foo.bar',
+      ':path' => '/hey?a=b&c=d',
+      'content-type' => 'text/plain; charset=utf-8'
+    )
+    assert_equal 'text/plain', r.content_type
+
+    r = Syntropy::MockAdapter.mock(
+      ':scheme' => 'https',
+      'host' => 'foo.bar',
+      ':path' => '/hey?a=b&c=d',
+      'content-type' => 'text/plain ; charset=utf-8'
+    )
+    assert_equal 'text/plain', r.content_type
+  end
+
+  def test_rewrite!
+    r = Syntropy::MockAdapter.mock(
+      ':scheme' => 'https',
+      'host' => 'foo.bar',
+      ':path' => '/hey/ho?a=b&c=d'
+    )
+
+    assert_equal '/hey/ho', r.path
+    assert_equal URI.parse('/hey/ho?a=b&c=d'), r.uri
+    assert_equal 'https://foo.bar/hey/ho?a=b&c=d', r.full_uri
+
+    r.rewrite!('/hhh', '/')
+    assert_equal '/hey/ho', r.path
+    assert_equal URI.parse('/hey/ho?a=b&c=d'), r.uri
+    assert_equal 'https://foo.bar/hey/ho?a=b&c=d', r.full_uri
+
+    r.rewrite!('/hey', '/')
+    assert_equal '/ho', r.path
+    assert_equal URI.parse('/ho?a=b&c=d'), r.uri
+    assert_equal 'https://foo.bar/ho?a=b&c=d', r.full_uri
   end
 end
 
@@ -90,6 +175,53 @@ class ValidationTest < Minitest::Test
     assert_raises(VE) { @req.validate('foo', :bool) }
     assert_raises(VE) { @req.validate(nil, :bool) }
   end
+
+  def test_validate_http_method
+    @req = mock_req(':method' => 'GET', ':path' => '/foo')
+
+    assert_equal 'get', @req.validate_http_method('get', 'head')
+    assert_raises(Syntropy::Error) { @req.validate_http_method('post', 'put') }
+    assert_raises(Syntropy::Error) { @req.validate_http_method() }
+  end
+
+  def test_respond_by_http_method
+    @req = mock_req(':method' => 'GET', ':path' => '/foo')
+
+    @req.respond_by_http_method(
+      'get' => ['GET foo', {}],
+      'post' => ['POST foo', {}]
+    )
+    assert_equal 'GET foo', @req.response_body
+
+    assert_raises(Syntropy::Error) {
+      @req.respond_by_http_method(
+        'post' => ['POST foo', {}]
+      )
+    }
+  end
+
+  def test_validate_content_type
+    @req = mock_req(':method' => 'POST', ':path' => '/foo')
+
+    assert_raises(Syntropy::InvalidRequestContentTypeError) {
+      @req.validate_content_type('application/json')
+    }
+
+    @req = mock_req(':method' => 'POST', ':path' => '/foo', 'content-type' => 'application/json')
+    assert_equal 'application/json', @req.validate_content_type(
+      'application/json', 'text/plain'
+    )
+
+    @req = mock_req(':method' => 'POST', ':path' => '/foo', 'content-type' => 'text/html; charset=utf-8')
+    assert_equal 'text/html', @req.validate_content_type(
+      'text/plain', 'text/html'
+    )
+
+    @req = mock_req(':method' => 'POST', ':path' => '/foo', 'content-type' => 'text/html ; charset=utf-8')
+    assert_equal 'text/html', @req.validate_content_type(
+      'text/plain', 'text/html'
+    )
+  end
 end
 
 class FormDataTest < Minitest::Test

data/test/test_response.rb

@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class RedirectTest < Minitest::Test
+  def test_redirect
+    r = Syntropy::MockAdapter.mock
+    r.redirect('/foo')
+
+    assert_equal [
+      [:respond, r, nil, {":status"=>302, "Location"=>"/foo"}]
+    ], r.adapter.calls
+  end
+
+  def test_redirect_wirth_status
+    r = Syntropy::MockAdapter.mock
+    r.redirect('/bar', Syntropy::HTTP::MOVED_PERMANENTLY)
+
+    assert_equal [
+      [:respond, r, nil, {":status"=>301, "Location"=>"/bar"}]
+    ], r.adapter.calls
+  end
+end
+
+class StaticFileResponeTest < Minitest::Test
+  def setup
+    @path = File.join(__dir__, 'helper.rb')
+    @stat = File.stat(@path)
+
+    @etag = Syntropy::StaticFileCaching.file_stat_to_etag(@stat)
+    @last_modified = Syntropy::StaticFileCaching.file_stat_to_last_modified(@stat)
+    @content = IO.read(@path)
+  end
+
+  def test_serve_file_non_existent
+    r = Syntropy::MockAdapter.mock
+    r.serve_file('foo.rb', base_path: __dir__)
+    assert_equal [
+      [:respond, r, nil, { ':status' => Syntropy::HTTP::NOT_FOUND }]
+    ], r.adapter.calls
+  end
+end
+
+class UpgradeTest < Minitest::Test
+  def test_upgrade
+    r = Syntropy::MockAdapter.mock
+    r.upgrade('df')
+
+    assert_equal [
+      [
+        :respond,
+        r,
+        nil,
+        {
+          ':status' => 101,
+          'Upgrade' => 'df',
+          'Connection' => 'upgrade'
+        }
+      ],
+      [
+        :with_stream
+      ]
+    ], r.adapter.calls
+
+
+    r = Syntropy::MockAdapter.mock
+    r.upgrade('df', { 'foo' => 'bar' })
+
+    assert_equal [
+      [
+        :respond,
+        r,
+        nil,
+        {
+          ':status' => 101,
+          'Upgrade' => 'df',
+          'Connection' => 'upgrade',
+          'foo' => 'bar'
+        }
+      ],
+      [
+        :with_stream
+      ]
+    ], r.adapter.calls
+  end
+
+  def test_websocket_upgrade
+    r = Syntropy::MockAdapter.mock(
+      'connection' => 'upgrade',
+      'upgrade' => 'websocket',
+      'sec-websocket-version' => '23',
+      'sec-websocket-key' => 'abcdefghij'
+    )
+
+    assert_equal 'websocket', r.upgrade_protocol
+
+    r.upgrade_to_websocket('foo' => 'baz')
+    accept = Digest::SHA1.base64digest('abcdefghij258EAFA5-E914-47DA-95CA-C5AB0DC85B11')
+
+    assert_equal [
+      [:respond, r, nil, {
+        ':status' => 101,
+        'Upgrade' => 'websocket',
+        'Connection' => 'upgrade',
+        'foo' => 'baz',
+        'Sec-WebSocket-Accept' => accept
+      }],
+      [:with_stream],
+      [:websocket_connection, r]
+    ], r.adapter.calls
+  end
+end

data/test/test_routing_tree.rb

@@ -46,6 +46,9 @@ class RoutingTreeTest < Minitest::Test
       'old': {
         'index.html': '',
         'baz.html': ''
+      },
+      '.well-known': {
+        'foo.rb': ''
       }
     }
   }
@@ -72,7 +75,9 @@ class RoutingTreeTest < Minitest::Test
     assert_nil root[:parent]
     assert_nil root[:param]
     assert_nil root[:target]
-    assert_equal ['[]', 'about', 'api', 'assets', 'old', 'posts'], root[:children].keys.sort_by(&:to_s)
+    assert_equal [
+      '.well-known', '[]', 'about', 'api', 'assets', 'old', 'posts'
+    ], root[:children].keys.sort_by(&:to_s)
 
     entry = @rt.static_map['/docs']
     assert_equal File.join(@rt.root_dir, 'index.rb'), entry[:target][:fn]
@@ -132,18 +137,25 @@ class RoutingTreeTest < Minitest::Test
     assets = root[:children]['assets']
     refute_nil assets
     assert_nil assets[:target]
+
+    well_known = root[:children]['.well-known']
+    refute_nil well_known
+    assert_nil well_known[:target]
   end
 
   def test_static_map
     map = @rt.static_map
-    assert_equal 7, map.size
+    assert_equal 8, map.size
 
     keys = map.keys.sort
     assert_equal [
-      '/docs', '/docs/about', '/docs/assets/css/style.css',
+      '/docs', '/docs/.well-known/foo', '/docs/about', '/docs/assets/css/style.css',
       '/docs/assets/img/foo.jpg', '/docs/old', '/docs/old/baz', '/docs/posts'
     ], keys
 
+    o = map['/docs/.well-known/foo']
+    assert_equal File.join(@rt.root_dir, '.well-known/foo.rb'), o[:target][:fn]
+
     o = map['/docs/assets/css/style.css']
     assert_equal File.join(@rt.root_dir, 'assets/css/style.css'), o[:target][:fn]
 

data/test/test_server.rb

@@ -26,7 +26,7 @@ class ServerTest < Minitest::Test
     @machine = UM.new
     @port = 10000 + rand(30000)
     @env = { bind: "127.0.0.1:#{@port}" }.merge(opts)
-    @server = Syntropy::Server.new(@machine, @env) { @app&.call(it) }
+    @server = Syntropy::HTTP::Server.new(@machine, @env) { @app&.call(it) }
     @f_server = @machine.spin { run_server }
 
     # let server spin and listen to incoming connections

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syntropy
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.31.0
 platform: ruby
 authors:
 - Sharon Rosner
@@ -37,48 +37,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: qeweney
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.24'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.24'
 - !ruby/object:Gem::Dependency
   name: uringmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: escape_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -153,6 +139,9 @@ files:
 - Rakefile
 - TODO.md
 - bin/syntropy
+- cmd/_banner.rb
+- cmd/help.rb
+- cmd/serve.rb
 - cmd/setup/template/site/.gitignore
 - cmd/setup/template/site/Dockerfile
 - cmd/setup/template/site/Gemfile
@@ -176,15 +165,32 @@ files:
 - cmd/setup/template/site/site/assets/css/style.css
 - cmd/setup/template/site/site/assets/img/syntropy.png
 - cmd/setup/template/site/site/index.rb
+- cmd/test.rb
 - docker-compose.yml
-- examples/bad.rb
-- examples/card.rb
-- examples/counter.js
-- examples/counter.rb
-- examples/counter_api.rb
-- examples/favicon.ico
-- examples/index.md
-- examples/templates.rb
+- examples/basic/bad.rb
+- examples/basic/card.rb
+- examples/basic/counter.js
+- examples/basic/counter.rb
+- examples/basic/counter_api.rb
+- examples/basic/favicon.ico
+- examples/basic/index.md
+- examples/basic/templates.rb
+- examples/mcp-oauth/.ruby-version
+- examples/mcp-oauth/Gemfile
+- examples/mcp-oauth/README.md
+- examples/mcp-oauth/app/.well-known/oauth-authorization-server.rb
+- examples/mcp-oauth/app/.well-known/oauth-protected-resource.rb
+- examples/mcp-oauth/app/_lib/auth_store.rb
+- examples/mcp-oauth/app/index.md
+- examples/mcp-oauth/app/mcp.rb
+- examples/mcp-oauth/app/oauth/authorize.rb
+- examples/mcp-oauth/app/oauth/consent.rb
+- examples/mcp-oauth/app/oauth/register.rb
+- examples/mcp-oauth/app/oauth/token.rb
+- examples/mcp-oauth/app/signin.rb
+- examples/mcp-oauth/test/helper.rb
+- examples/mcp-oauth/test/test_app.rb
+- examples/mcp-oauth/test/test_oauth.rb
 - lib/syntropy.rb
 - lib/syntropy/app.rb
 - lib/syntropy/applets/builtin/auto_refresh/watch.js
@@ -196,22 +202,34 @@ files:
 - lib/syntropy/applets/builtin/json_api.js
 - lib/syntropy/applets/builtin/ping.rb
 - lib/syntropy/applets/builtin/req.rb
-- lib/syntropy/connection.rb
 - lib/syntropy/connection_pool.rb
 - lib/syntropy/dev_mode.rb
 - lib/syntropy/errors.rb
+- lib/syntropy/http.rb
+- lib/syntropy/http/client.rb
+- lib/syntropy/http/client_connection.rb
+- lib/syntropy/http/io_extensions.rb
+- lib/syntropy/http/server.rb
+- lib/syntropy/http/server_connection.rb
+- lib/syntropy/http/status.rb
 - lib/syntropy/json_api.rb
 - lib/syntropy/logger.rb
 - lib/syntropy/markdown.rb
+- lib/syntropy/mime_types.rb
 - lib/syntropy/module.rb
 - lib/syntropy/papercraft_extensions.rb
-- lib/syntropy/request_extensions.rb
+- lib/syntropy/request.rb
+- lib/syntropy/request/mock_adapter.rb
+- lib/syntropy/request/request_info.rb
+- lib/syntropy/request/response.rb
+- lib/syntropy/request/validation.rb
 - lib/syntropy/routing_tree.rb
-- lib/syntropy/server.rb
 - lib/syntropy/side_run.rb
+- lib/syntropy/test.rb
 - lib/syntropy/utils.rb
 - lib/syntropy/version.rb
 - syntropy.gemspec
+- test/app/.well-known/foo.rb
 - test/app/_hook.rb
 - test/app/_layout/default.rb
 - test/app/_lib/callable.rb
@@ -248,12 +266,16 @@ files:
 - test/run.rb
 - test/test_app.rb
 - test/test_caching.rb
-- test/test_connection.rb
 - test/test_connection_pool.rb
 - test/test_errors.rb
+- test/test_http_client.rb
+- test/test_http_client_connection.rb
+- test/test_http_server_connection.rb
 - test/test_json_api.rb
+- test/test_mock_adapter.rb
 - test/test_module.rb
-- test/test_request_extensions.rb
+- test/test_request.rb
+- test/test_response.rb
 - test/test_routing_tree.rb
 - test/test_server.rb
 - test/test_side_run.rb