syntropy 0.2 → 0.4

data/lib/syntropy.rb

@@ -8,64 +8,29 @@ require 'syntropy/errors'
 require 'syntropy/connection_pool'
 require 'syntropy/module'
 require 'syntropy/rpc_api'
+require 'syntropy/side_run'
 require 'syntropy/app'
+require 'syntropy/request_extensions'
 
-class Qeweney::Request
-  def ctx
-    @ctx ||= {}
-  end
-
-  def validate_param(name, *clauses)
-    value = query[name]
-    clauses.each do |c|
-      valid = param_is_valid?(value, c)
-      raise(Syntropy::ValidationError, 'Validation error') if !valid
-      value = param_convert(value, c)
-    end
-    value
-  end
-
-  private
-
-  BOOL_REGEXP = /^(t|f|true|false|on|off|1|0|yes|no)$/
-  BOOL_TRUE_REGEXP = /^(t|true|on|1|yes)$/
-  INTEGER_REGEXP = /^[\+\-]?[0-9]+$/
-  FLOAT_REGEXP = /^[\+\-]?[0-9]+(\.[0-9]+)?$/
+module Syntropy
+    Status = Qeweney::Status
 
-  def param_is_valid?(value, cond)
-    if cond == :bool
-      return (value && value =~ BOOL_REGEXP)
-    elsif cond == Integer
-      return (value && value =~ INTEGER_REGEXP)
-    elsif cond == Float
-      return (value && value =~ FLOAT_REGEXP)
-    elsif cond.is_a?(Array)
-      return cond.any? { |c| param_is_valid?(value, c) }
-    end
+  class << self
+    attr_accessor :machine
 
-    cond === value
-  end
+    def side_run(&block)
+      raise 'Syntropy.machine not set' if !@machine
 
-  def param_convert(value, klass)
-    if klass == :bool
-      value = value =~ BOOL_TRUE_REGEXP ? true : false
-    elsif klass == Integer
-      value = value.to_i
-    elsif klass == Float
-      value = value.to_f
-    else
-      value
+      SideRun.call(@machine, &block)
     end
   end
-end
 
-module Syntropy
   def colorize(color_code)
     "\e[#{color_code}m#{self}\e[0m"
   end
 
   GREEN = "\e[32m"
-  WHITE = "\e[0m"
+  CLEAR = "\e[0m"
   YELLOW = "\e[33m"
 
   BANNER = (
@@ -73,10 +38,10 @@ module Syntropy
     "  #{GREEN}\n"\
     "  #{GREEN} ooo\n"\
     "  #{GREEN}ooooo\n"\
-    "  #{GREEN} ooo vvv       #{WHITE}Syntropy - a web framework for Ruby\n"\
-    "  #{GREEN}  o vvvvv     #{WHITE}--------------------------------------\n"\
-    "  #{GREEN}  #{YELLOW}|#{GREEN}  vvv o    #{WHITE}https://github.com/noteflakes/syntropy\n"\
+    "  #{GREEN} ooo vvv       #{CLEAR}Syntropy - a web framework for Ruby\n"\
+    "  #{GREEN}  o vvvvv     #{CLEAR}--------------------------------------\n"\
+    "  #{GREEN}  #{YELLOW}|#{GREEN}  vvv o    #{CLEAR}https://github.com/noteflakes/syntropy\n"\
     "  #{GREEN} :#{YELLOW}|#{GREEN}:::#{YELLOW}|#{GREEN}::#{YELLOW}|#{GREEN}:\n"\
-    "  #{YELLOW}++++++++++++\e[0m\n\n"
+    "#{YELLOW}+++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\n\n"
   )
 end

data/syntropy.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'json',          '2.12.2'
   s.add_dependency 'papercraft',    '1.4'
   s.add_dependency 'qeweney',       '0.21'
-  s.add_dependency 'tp2',           '0.12.2'
+  s.add_dependency 'tp2',           '0.13.2'
   s.add_dependency 'uringmachine',  '0.15'
 
   s.add_dependency 'listen',        '3.9.0'

data/test/app/baz.rb

@@ -0,0 +1,3 @@
+export ->(req) {
+  req.respond_on_get('foobar')
+}

data/test/test_app.rb

@@ -3,13 +3,15 @@
 require_relative 'helper'
 
 class AppRoutingTest < Minitest::Test
+  Status = Qeweney::Status
+
   APP_ROOT = File.join(__dir__, 'app')
 
   def setup
     @machine = UM.new
 
     @tmp_path = '/test/tmp'
-    @tmp_fn = File.join(APP_ROOT, "tmp.rb")
+    @tmp_fn = File.join(APP_ROOT, 'tmp.rb')
 
     @app = Syntropy::App.new(@machine, APP_ROOT, '/test', watch_files: 0.05)
   end
@@ -63,39 +65,87 @@ class AppRoutingTest < Minitest::Test
 
   def test_app_rendering
     req = make_request(':method' => 'GET', ':path' => '/')
-    assert_equal Qeweney::Status::NOT_FOUND, req.response_status
+    assert_equal 'Not found', req.response_body
+    assert_equal Status::NOT_FOUND, req.response_status
+
+    req = make_request(':method' => 'HEAD', ':path' => '/')
+    assert_nil req.response_body
+    assert_equal Status::NOT_FOUND, req.response_status
+
+    req = make_request(':method' => 'POST', ':path' => '/')
+    assert_equal 'Not found', req.response_body
+    assert_equal Status::NOT_FOUND, req.response_status
 
     req = make_request(':method' => 'GET', ':path' => '/test')
-    assert_equal Qeweney::Status::OK, req.response_status
+    assert_equal Status::OK, req.response_status
     assert_equal '<h1>Hello, world!</h1>', req.response_body
 
+    req = make_request(':method' => 'HEAD', ':path' => '/test')
+    assert_equal Status::OK, req.response_status
+    assert_nil req.response_body
+
+    req = make_request(':method' => 'POST', ':path' => '/test')
+    assert_equal Status::METHOD_NOT_ALLOWED, req.response_status
+    assert_nil req.response_body
+
     req = make_request(':method' => 'GET', ':path' => '/test/index')
     assert_equal '<h1>Hello, world!</h1>', req.response_body
 
     req = make_request(':method' => 'GET', ':path' => '/test/index.html')
     assert_equal '<h1>Hello, world!</h1>', req.response_body
+    assert_equal 'text/html', req.response_headers['Content-Type']
+
+    req = make_request(':method' => 'HEAD', ':path' => '/test/index.html')
+    assert_nil req.response_body
+    assert_equal 'text/html', req.response_headers['Content-Type']
+
+    req = make_request(':method' => 'POST', ':path' => '/test/index.html')
+    assert_nil req.response_body
+    assert_equal Status::METHOD_NOT_ALLOWED, req.response_status
 
     req = make_request(':method' => 'GET', ':path' => '/test/assets/style.css')
     assert_equal '* { color: beige }', req.response_body
+    assert_equal 'text/css', req.response_headers['Content-Type']
 
     req = make_request(':method' => 'GET', ':path' => '/assets/style.css')
-    assert_equal Qeweney::Status::NOT_FOUND, req.response_status
+    assert_equal Status::NOT_FOUND, req.response_status
 
     req = make_request(':method' => 'GET', ':path' => '/test/api?q=get')
     assert_equal({ status: 'OK', response: 0 }, req.response_json)
 
+    req = make_request(':method' => 'POST', ':path' => '/test/api?q=get')
+    assert_equal Status::METHOD_NOT_ALLOWED, req.response_status
+    assert_equal({ status: 'Error', message: '' }, req.response_json)
+
     req = make_request(':method' => 'GET', ':path' => '/test/api/foo?q=get')
     assert_equal({ status: 'OK', response: 0 }, req.response_json)
 
     req = make_request(':method' => 'POST', ':path' => '/test/api?q=incr')
     assert_equal({ status: 'OK', response: 1 }, req.response_json)
 
+    req = make_request(':method' => 'GET', ':path' => '/test/api?q=incr')
+    assert_equal Status::METHOD_NOT_ALLOWED, req.response_status
+    assert_equal({ status: 'Error', message: '' }, req.response_json)
+
     req = make_request(':method' => 'POST', ':path' => '/test/api/foo?q=incr')
-    assert_equal({ status: 'Syntropy::Error', message: 'Teapot' }, req.response_json)
-    assert_equal Qeweney::Status::TEAPOT, req.response_status
+    assert_equal({ status: 'Error', message: 'Teapot' }, req.response_json)
+    assert_equal Status::TEAPOT, req.response_status
 
     req = make_request(':method' => 'GET', ':path' => '/test/bar')
     assert_equal 'foobar', req.response_body
+    assert_equal Status::OK, req.response_status
+
+    req = make_request(':method' => 'POST', ':path' => '/test/bar')
+    assert_equal 'foobar', req.response_body
+    assert_equal Status::OK, req.response_status
+
+    req = make_request(':method' => 'GET', ':path' => '/test/baz')
+    assert_equal 'foobar', req.response_body
+    assert_equal Status::OK, req.response_status
+
+    req = make_request(':method' => 'POST', ':path' => '/test/baz')
+    assert_nil req.response_body
+    assert_equal Status::METHOD_NOT_ALLOWED, req.response_status
 
     req = make_request(':method' => 'GET', ':path' => '/test/about')
     assert_equal 'About', req.response_body.chomp
@@ -104,7 +154,7 @@ class AppRoutingTest < Minitest::Test
     assert_equal '<p>Hello from Markdown</p>', req.response_body.chomp
 
     req = make_request(':method' => 'GET', ':path' => '/test/about/foo/bar')
-    assert_equal Qeweney::Status::NOT_FOUND, req.response_status
+    assert_equal Status::NOT_FOUND, req.response_status
   end
 
   def test_app_file_watching

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.2'
+  version: '0.4'
 platform: ruby
 authors:
 - Sharon Rosner
@@ -71,14 +71,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.13.2
 - !ruby/object:Gem::Dependency
   name: uringmachine
   requirement: !ruby/object:Gem::Requirement
@@ -166,13 +166,39 @@ 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/rpc_api.rb
+- lib/syntropy/side_run.rb
 - lib/syntropy/version.rb
 - syntropy.gemspec
 - test/app/_layout/default.rb
@@ -184,6 +210,7 @@ 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/helper.rb
@@ -193,6 +220,7 @@ files:
 - test/test_file_watch.rb
 - test/test_module.rb
 - test/test_rpc_api.rb
+- test/test_side_run.rb
 - test/test_validation.rb
 homepage: https://github.com/noteflakes/syntropy
 licenses: