syntropy 0.15.1 → 0.16

data/test/test_app.rb

@@ -28,10 +28,6 @@ class AppTest < Minitest::Test
   end
 
   def test_app_rendering
-    # puts "*" * 40
-    # pp @app.routing_tree.root
-    # puts
-
     req = make_request(':method' => 'GET', ':path' => '/')
     assert_equal Status::NOT_FOUND, req.response_status
     assert_equal 'Not found', req.response_body
@@ -118,6 +114,10 @@ class AppTest < Minitest::Test
 
     req = make_request(':method' => 'GET', ':path' => '/test/params/abc')
     assert_equal '/test/params/[foo]-abc', req.response_body.chomp
+
+    req = make_request(':method' => 'GET', ':path' => '/test/rss')
+    assert_equal '<link>foo</link>', req.response_body
+
   end
 
   def test_app_file_watching

data/test/test_json_api.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class JSONAPITest < Minitest::Test
+  class TestAPI < Syntropy::JSONAPI
+    def foo(req)
+      @value
+    end
+
+    def bar!(req)
+      @value = req.query[:v]
+      true
+    end
+  end
+
+  def setup
+    @app = TestAPI.new({})
+  end
+
+  def test_json_api
+    req = mock_req(':method' => 'GET', ':path' => '/')
+    @app.call(req)
+    assert_equal Qeweney::Status::BAD_REQUEST, req.response_status
+
+    req = mock_req(':method' => 'GET', ':path' => '/?q=foo')
+    @app.call(req)
+    assert_equal Qeweney::Status::OK, req.response_status
+    assert_equal({ status: 'OK', response: nil }, req.response_json)
+
+    req = mock_req(':method' => 'POST', ':path' => '/?q=foo')
+    @app.call(req)
+    assert_equal Qeweney::Status::METHOD_NOT_ALLOWED, req.response_status
+
+
+    req = mock_req(':method' => 'POST', ':path' => '/?q=bar&v=foo')
+    @app.call(req)
+    assert_equal Qeweney::Status::OK, req.response_status
+    assert_equal({ status: 'OK', response: true }, req.response_json)
+
+    req = mock_req(':method' => 'GET', ':path' => '/?q=bar&v=foo')
+    @app.call(req)
+    assert_equal Qeweney::Status::METHOD_NOT_ALLOWED, req.response_status
+
+    req = mock_req(':method' => 'GET', ':path' => '/?q=foo')
+    @app.call(req)
+    assert_equal Qeweney::Status::OK, req.response_status
+    assert_equal({ status: 'OK', response: 'foo' }, req.response_json)
+
+    req = mock_req(':method' => 'GET', ':path' => '/?q=foo')
+    @app.call(req)
+    assert_equal Qeweney::Status::OK, req.response_status
+    assert_equal({ status: 'OK', response: 'foo' }, req.response_json)
+
+    req = mock_req(':method' => 'GET', ':path' => '/?q=xxx')
+    @app.call(req)
+    assert_equal Qeweney::Status::NOT_FOUND, req.response_status
+  end
+end

data/test/test_routing_tree.rb

@@ -292,9 +292,6 @@ class RoutingTreeTest < Minitest::Test
     rt = Syntropy::RoutingTree.new(root_dir: File.join(@root_dir, 'site'), mount_path: '/')
     router = rt.router_proc
 
-    # pp rt.root
-    # puts
-
     route = router.('/docs/df/p2/issues/14', {})
     assert_nil route
 
@@ -372,4 +369,42 @@ class RoutingTreeTest < Minitest::Test
     assert_equal File.join(@rt.root_dir, 'posts/[id].rb'), route[:target][:fn]
     assert_equal 'foo', params['id']
   end
+
+  def test_mount_applet
+    rt = Syntropy::RoutingTree.new(root_dir: File.join(@root_dir, 'site'), mount_path: '/')
+    applet = ->(req) { :foo }
+    rt.mount_applet('/foo/bar', applet)
+    router = rt.router_proc
+
+    refute_nil rt.dynamic_map['/foo/bar']
+    assert_equal applet, rt.dynamic_map['/foo/bar'][:proc]
+
+    route = router.('/foo/bar', {})
+    assert_equal applet, route[:proc]
+  end
+
+  def test_mount_applet_nested_mount_path
+    rt = Syntropy::RoutingTree.new(root_dir: File.join(@root_dir, 'site'), mount_path: '/my/site')
+    applet = ->(req) { :foo }
+    rt.mount_applet('/my/site/foo/bar', applet)
+    router = rt.router_proc
+
+    refute_nil rt.dynamic_map['/my/site/foo/bar']
+    assert_equal applet, rt.dynamic_map['/my/site/foo/bar'][:proc]
+
+    route = router.('/my/site/foo/bar', {})
+    assert_equal applet, route[:proc]
+  end
+
+  def test_mount_applet_clash
+    rt = Syntropy::RoutingTree.new(root_dir: File.join(@root_dir, 'site'), mount_path: '/')
+    applet = ->(req) { :foo }
+    assert_raises(Syntropy::Error) {
+      rt.mount_applet('/about', applet)
+    }
+
+    assert_raises(Syntropy::Error) {
+      rt.mount_applet('/old/baz', applet)
+    }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syntropy
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: '0.16'
 platform: ruby
 authors:
 - Sharon Rosner
@@ -43,28 +43,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '2.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '2.8'
-- !ruby/object:Gem::Dependency
-  name: papercraft
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: qeweney
   requirement: !ruby/object:Gem::Requirement
@@ -85,14 +71,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: uringmachine
   requirement: !ruby/object:Gem::Requirement
@@ -204,16 +190,31 @@ files:
 - cmd/setup/template/site/site/assets/img/syntropy.png
 - cmd/setup/template/site/site/index.rb
 - docker-compose.yml
+- examples/card.rb
+- examples/counter.js
+- examples/counter.rb
+- examples/counter_api.rb
+- examples/favicon.ico
+- examples/index.md
+- examples/templates.rb
 - lib/syntropy.rb
 - lib/syntropy/app.rb
+- lib/syntropy/applets/builtin/auto_refresh/watch.js
+- lib/syntropy/applets/builtin/auto_refresh/watch.sse.rb
+- lib/syntropy/applets/builtin/debug/debug.css
+- lib/syntropy/applets/builtin/debug/debug.js
+- lib/syntropy/applets/builtin/json_api.js
+- lib/syntropy/applets/builtin/ping.rb
 - lib/syntropy/connection_pool.rb
+- lib/syntropy/dev_mode.rb
 - lib/syntropy/errors.rb
 - lib/syntropy/file_watch.rb
+- lib/syntropy/json_api.rb
 - lib/syntropy/markdown.rb
 - lib/syntropy/module.rb
+- lib/syntropy/p2_extensions.rb
 - lib/syntropy/request_extensions.rb
 - lib/syntropy/routing_tree.rb
-- lib/syntropy/rpc_api.rb
 - lib/syntropy/side_run.rb
 - lib/syntropy/utils.rb
 - lib/syntropy/version.rb
@@ -236,21 +237,23 @@ files:
 - test/app/baz.rb
 - test/app/index.html
 - test/app/params/[foo].rb
+- test/app/rss.rb
 - test/app/tmp.rb
 - test/app_custom/_site.rb
 - test/app_multi_site/_site.rb
 - test/app_multi_site/bar.baz/index.html
 - test/app_multi_site/foo.bar/index.html
+- test/bm_router_proc.rb
 - test/helper.rb
 - test/run.rb
 - test/test_app.rb
 - test/test_connection_pool.rb
 - test/test_errors.rb
 - test/test_file_watch.rb
+- test/test_json_api.rb
 - test/test_module.rb
 - test/test_request_extensions.rb
 - test/test_routing_tree.rb
-- test/test_rpc_api.rb
 - test/test_side_run.rb
 homepage: https://github.com/noteflakes/syntropy
 licenses:
@@ -277,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.0.dev
 specification_version: 4
 summary: Syntropic Web Framework
 test_files: []

data/test/test_rpc_api.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class RPCAPITest < Minitest::Test
-  class TestAPI < Syntropy::RPCAPI
-    def get(req)
-      @value
-    end
-
-    def set!(req)
-      @value = req.query[:v]
-      true
-    end
-  end
-
-  def setup
-    @app = TestAPI.new({})
-  end
-
-  def test_rpc_api
-    req = mock_req(':method' => 'GET', ':path' => '/')
-    @app.call(req)
-    assert_equal Qeweney::Status::BAD_REQUEST, req.response_status
-
-    req = mock_req(':method' => 'GET', ':path' => '/?q=get')
-    @app.call(req)
-    assert_equal Qeweney::Status::OK, req.response_status
-    assert_equal({ status: 'OK', response: nil }, req.response_json)
-
-    req = mock_req(':method' => 'POST', ':path' => '/?q=set&v=foo')
-    @app.call(req)
-    assert_equal Qeweney::Status::OK, req.response_status
-    assert_equal({ status: 'OK', response: true }, req.response_json)
-
-    req = mock_req(':method' => 'GET', ':path' => '/?q=get')
-    @app.call(req)
-    assert_equal Qeweney::Status::OK, req.response_status
-    assert_equal({ status: 'OK', response: 'foo' }, req.response_json)
-  end
-end