syntropy 0.15.1 → 0.17

data/test/bm_router_proc.rb

@@ -0,0 +1,201 @@
+# frozen_string_literal: true
+
+require 'bundler/inline'
+
+gemfile do
+  gem 'syntropy', path: '.'
+  gem 'roda'
+  gem 'benchmark-ips'
+end
+
+require 'syntropy'
+require 'roda'
+require 'benchmark/ips'
+require 'securerandom'
+require 'rack/mock_request'
+require 'qeweney/mock_adapter'
+
+class BM
+  def self.name(name)
+    define_method(:name) { name }
+  end
+
+  def self.run(&block)
+    new(&block).run
+  end
+
+  def initialize(&block)
+    @entry_classes = []
+    instance_exec(&block)
+  end
+
+  def entry(name, &block)
+    k = Class.new(Entry)
+    k.define_method(:name) { name }
+    k.class_exec(&block)
+    @entry_classes << k
+  end
+
+  def run
+    entries = @entry_classes.map { it.new.tap(&:setup) }
+
+    Benchmark.ips do |x|
+      entries.each do |e|
+        x.report(e.name) { e.call }
+      end
+      x.compare!(order: :baseline)
+    end
+  end
+
+  class Entry
+    def setup
+    end
+
+    def call
+      raise NotImplementedError
+    end
+  end
+end
+
+################################################################################
+
+class RodaRouter < Roda
+  route do |r|
+    # GET / request
+    r.root do
+
+      r.redirect "/hello"
+    end
+
+    # /hello branch
+    r.on "hello" do
+      # Set variable for all routes in /hello branch
+      @greeting = 'Hello'
+
+      # GET /hello/world request
+      r.get "world" do
+        "#{@greeting} world!"
+      end
+
+      # /hello request
+      r.is do
+        # GET /hello request
+        r.get do
+          "#{@greeting}!"
+        end
+
+        # POST /hello request
+        r.post do
+          puts "Someone said #{@greeting}!"
+          r.redirect
+        end
+      end
+    end
+  end
+end
+
+req = Rack::MockRequest.env_for("http://example.com:8080/hello/world")
+roda_app = RodaRouter.app
+p roda_app.(req)
+
+################################################################################
+
+class Qeweney::Request
+  def response_headers
+    adapter.headers
+  end
+
+  def response_status
+    adapter.status
+  end
+
+  def response_body
+    adapter.body
+  end
+
+  def response_json
+    raise if response_content_type != 'application/json'
+    JSON.parse(response_body, symbolize_names: true)
+  end
+
+  def response_content_type
+    response_headers['Content-Type']
+  end
+end
+
+def make_tmp_file_tree(dir, spec)
+  FileUtils.mkdir(dir) rescue nil
+  spec.each do |k, v|
+    fn = File.join(dir, k.to_s)
+    case v
+    when String
+      IO.write(fn, v)
+    when Hash
+      FileUtils.mkdir(fn) rescue nil
+      make_tmp_file_tree(fn, v)
+    end
+  end
+  dir
+end
+
+ROOT_DIR = "/tmp/#{__FILE__.gsub('/', '-')}-#{SecureRandom.hex}"
+make_tmp_file_tree(ROOT_DIR, {
+  'index.rb': "export ->(req) { req.redirect('/hello') }",
+  'hello': {
+    'index.rb': "export ->(req) { req.respond('Hello!', 'Content-Type' => 'text/html') }",
+    'world.rb': "export ->(req) { req.respond('Hello world!', 'Content-Type' => 'text/html') }",
+  }
+})
+
+machine = UM.new
+syntropy_app = Syntropy::App.new(
+  root_dir: ROOT_DIR,
+  mount_path: '/',
+  machine: machine
+)
+proc = ->(req) { syntropy_app.(req) }
+
+module ::Kernel
+  def mock_req(headers, body = nil)
+    Qeweney::MockAdapter.mock(headers, body).tap { it.setup_mock_request }
+  end
+end
+
+puts '*' * 40
+
+req = mock_req(':method' => 'GET', ':path' => '/hello/world')
+proc.(req)
+p [req.response_status, req.response_headers, req.response_body]
+
+################################################################################
+
+BM.run do
+  entry(:roda) {
+    def setup
+      @app = RodaRouter.app
+    end
+
+    def call
+      req = Rack::MockRequest.env_for("http://example.com:8080/hello/world")
+      @app.(req)
+    end
+  }
+
+  entry(:syntropy) {
+    def setup
+      machine = UM.new
+      syntropy_app = Syntropy::App.new(
+        root_dir: ROOT_DIR,
+        mount_path: '/',
+        # watch_files: 0.05,
+        machine: machine
+      )
+      @app = ->(req) { syntropy_app.(req) }
+    end
+
+    def call
+      req = mock_req(':method' => 'GET', ':path' => '/hello/world')
+      @app.(req)
+    end
+  }
+end

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
@@ -108,7 +104,7 @@ class AppTest < Minitest::Test
     assert_equal 'About', req.response_body.chomp
 
     req = make_request(':method' => 'GET', ':path' => '/test/about/foo')
-    assert_equal '<p>Hello from Markdown</p>', req.response_body.chomp
+    assert_equal '<!DOCTYPE html><html><head><title></title></head><body><p>Hello from Markdown</p></body></html>', req.response_body.gsub(/\n/, '')
 
     req = make_request(':method' => 'HEAD', ':path' => '/test/about/foo')
     assert_nil 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.17'
 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,29 +237,31 @@ 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
+homepage: https://github.com/digital-fabric/syntropy
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/noteflakes/syntropy
+  homepage_uri: https://github.com/digital-fabric/syntropy
   documentation_uri: https://www.rubydoc.info/gems/syntropy
-  changelog_uri: https://github.com/noteflakes/syntropy/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/digital-fabric/syntropy/blob/master/CHANGELOG.md
 rdoc_options:
 - "--title"
 - Extralite
@@ -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