syntropy 0.3 → 0.5

data/test/test_router.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class RouterTest < Minitest::Test
+  APP_ROOT = File.join(__dir__, 'app')
+
+  def setup
+    @machine = UM.new
+
+    @tmp_path = '/test/tmp'
+    @tmp_fn = File.join(APP_ROOT, 'tmp.rb')
+
+    @router = Syntropy::Router.new(
+      machine: @machine,
+      location: APP_ROOT,
+      mount_path: '/test',
+      watch_files: 0.05
+    )
+    @router.start_file_watcher
+  end
+
+  def full_path(fn)
+    File.join(APP_ROOT, fn)
+  end
+
+  def test_find_route
+    # entry = @router['/']
+    # assert_equal :not_found, entry[:kind]
+
+    entry = @router['/test']
+    assert_equal :static, entry[:kind]
+    assert_equal full_path('index.html'), entry[:fn]
+
+    entry = @router['/test/about']
+    assert_equal :module, entry[:kind]
+    assert_equal full_path('about/index.rb'), entry[:fn]
+
+    entry = @router['/test/../test_app.rb']
+    assert_equal :not_found, entry[:kind]
+
+    entry = @router['/test/_layout/default']
+    assert_equal :not_found, entry[:kind]
+
+    entry = @router['/test/api']
+    assert_equal :module, entry[:kind]
+    assert_equal full_path('api+.rb'), entry[:fn]
+
+    entry = @router['/test/api/foo/bar']
+    assert_equal :module, entry[:kind]
+    assert_equal full_path('api+.rb'), entry[:fn]
+
+    entry = @router['/test/api/foo/../bar']
+    assert_equal :not_found, entry[:kind]
+
+    entry = @router['/test/api_1']
+    assert_equal :not_found, entry[:kind]
+
+    entry = @router['/test/about/foo']
+    assert_equal :markdown, entry[:kind]
+    assert_equal full_path('about/foo.md'), entry[:fn]
+  end
+
+  def test_router_file_watching
+    @machine.sleep 0.2
+
+    entry = @router[@tmp_path]
+    assert_equal :module, entry[:kind]
+
+    # remove file
+    orig_body = IO.read(@tmp_fn)
+    FileUtils.rm(@tmp_fn)
+    @machine.sleep(0.3)
+
+    entry = @router[@tmp_path]
+    assert_equal :not_found, entry[:kind]
+
+    IO.write(@tmp_fn, 'foobar')
+    @machine.sleep(0.3)
+    entry = @router[@tmp_path]
+    assert_equal :module, entry[:kind]
+
+    entry[:proc] = ->(x) { x }
+    IO.write(@tmp_fn, 'barbaz')
+    @machine.sleep(0.3)
+    assert_nil entry[:proc]
+  ensure
+    IO.write(@tmp_fn, orig_body) if orig_body
+  end
+end

data/test/test_side_run.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+
+class SideRunTest < Minitest::Test
+  def setup
+    @machine = UM.new
+  end
+
+  def test_side_run
+    x = Syntropy::SideRun.call(@machine) { 42 }
+    assert_equal 42, x
+
+    hits = []
+    f = @machine.spin {
+      @machine.periodically(0.01) { hits << it }
+    }
+
+    y = Syntropy::SideRun.call(@machine) { sleep 0.10; 43 }
+    @machine.schedule(f, UM::Terminate.new)
+    assert_in_range 9..11, hits.size
+  end
+
+  class Bad < Exception
+  end
+
+  def test_side_run_exception
+    assert_raises(Bad) { Syntropy::SideRun.call(@machine) { raise Bad } }
+  end
+
+  def test_side_run_convenience_method
+    Syntropy.machine = nil
+    assert_raises { Syntropy.side_run { 42 } }
+
+    Syntropy.machine = @machine
+    x = Syntropy.side_run { 42 }
+    assert_equal 42, x
+
+    assert_raises(Bad) { Syntropy.side_run { raise Bad } }
+  ensure
+  Syntropy.machine = nil
+  end
+end

data/test/test_validation.rb

@@ -27,7 +27,7 @@ class ValidationTest < Minitest::Test
     assert_raises(VE) { @req.validate_param(:q, Integer) }
     assert_raises(VE) { @req.validate_param(:q, Float) }
     assert_raises(VE) { @req.validate_param(:q, nil) }
-    
+
     assert_raises(VE) { @req.validate_param(:y, Integer, 1..100) }
 
     assert_raises(VE) { @req.validate_param(:y, :bool) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syntropy
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.5'
 platform: ruby
 authors:
 - Sharon Rosner
@@ -71,14 +71,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.3.1
+        version: 0.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.3.1
+        version: 0.13.2
 - !ruby/object:Gem::Dependency
   name: uringmachine
   requirement: !ruby/object:Gem::Requirement
@@ -166,13 +166,40 @@ files:
 - Rakefile
 - TODO.md
 - bin/syntropy
+- cmd/setup/template/site/.gitignore
+- cmd/setup/template/site/Dockerfile
+- cmd/setup/template/site/Gemfile
+- cmd/setup/template/site/README.md
+- cmd/setup/template/site/bin/console
+- cmd/setup/template/site/bin/restart
+- cmd/setup/template/site/bin/server
+- cmd/setup/template/site/bin/start
+- cmd/setup/template/site/bin/stop
+- cmd/setup/template/site/docker-compose.yml
+- cmd/setup/template/site/proxy/Dockerfile
+- cmd/setup/template/site/proxy/etc/Caddyfile
+- cmd/setup/template/site/proxy/etc/tls_auto
+- cmd/setup/template/site/proxy/etc/tls_cloudflare
+- cmd/setup/template/site/proxy/etc/tls_custom
+- cmd/setup/template/site/proxy/etc/tls_selfsigned
+- cmd/setup/template/site/site/_layout/default.rb
+- cmd/setup/template/site/site/about.md
+- cmd/setup/template/site/site/articles/cage.rb
+- cmd/setup/template/site/site/articles/index.rb
+- 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
+- docker-compose.yml
 - lib/syntropy.rb
 - lib/syntropy/app.rb
 - lib/syntropy/connection_pool.rb
 - lib/syntropy/errors.rb
 - lib/syntropy/file_watch.rb
 - lib/syntropy/module.rb
+- lib/syntropy/request_extensions.rb
+- lib/syntropy/router.rb
 - lib/syntropy/rpc_api.rb
+- lib/syntropy/side_run.rb
 - lib/syntropy/version.rb
 - syntropy.gemspec
 - test/app/_layout/default.rb
@@ -184,15 +211,19 @@ files:
 - test/app/api+.rb
 - test/app/assets/style.css
 - test/app/bar.rb
+- test/app/baz.rb
 - test/app/index.html
 - test/app/tmp.rb
+- test/app_custom/_site.rb
 - test/helper.rb
 - test/run.rb
 - test/test_app.rb
 - test/test_connection_pool.rb
 - test/test_file_watch.rb
 - test/test_module.rb
+- test/test_router.rb
 - test/test_rpc_api.rb
+- test/test_side_run.rb
 - test/test_validation.rb
 homepage: https://github.com/noteflakes/syntropy
 licenses: