Implement module loading

Author: noteflakes

lib/syntropy/app.rb

@@ -3,6 +3,7 @@
 require 'qeweney'
 require 'syntropy/errors'
 require 'json'
+require 'papercraft'
 
 module Syntropy
   class App
@@ -118,7 +119,7 @@ def render_entry(req, entry)
         entry[:mime_type] ||= Qeweney::MimeTypes[File.extname(entry[:fn])]
         req.respond(IO.read(entry[:fn]), 'Content-Type' => entry[:mime_type])
       when :markdown
-        body = render_markdown(markdown)
+        body = render_markdown(IO.read(entry[:fn]))
         req.respond(body, 'Content-Type' => 'text/html')
       when :module
         ctx = Syntropy::Context.new(req)
@@ -127,5 +128,42 @@ def render_entry(req, entry)
         raise "Invalid entry kind"
       end
     end
+
+    def call_module(entry, ctx)
+      entry[:code] ||= load_module(entry)
+      if entry[:code] == :invalid
+        req.respond(nil, ':status' => Qeweney::Status::INTERNAL_SERVER_ERROR)
+        return
+      end
+
+      entry[:code].call(ctx)
+    rescue StandardError => e
+      p e
+      p e.backtrace
+      req.respond(nil, ':status' => Qeweney::S*tatus::INTERNAL_SERVER_ERROR)
+    end
+
+    def load_module(entry)
+      body = IO.read(entry[:fn])
+      klass = Class.new
+      o = klass.instance_eval(body, entry[:fn], 1)
+
+      if o.is_a?(Papercraft::HTML)
+        return wrap_template(o)
+      else
+        return o
+      end
+    end
+
+    def wrap_template(templ)
+      ->(ctx) {
+        body = templ.render
+        req.respond(body, 'Content-Type' => 'text/html')
+      }
+    end
+
+    def render_markdown(str)
+      Papercraft.markdown(str)
+    end
   end
 end

test/app/_layout/default.rb

@@ -3,6 +3,6 @@
     h1 'Foo'
   }
   content {
-    emit_yield **props
+    emit_yield(**props)
   }
 }

test/app/about/foo.md

@@ -0,0 +1 @@
+Hello from Markdown

test/app/about/index.rb

@@ -0,0 +1,3 @@
+->(ctx) {
+  ctx.request.respond('About')
+}

test/app/api+.rb

@@ -0,0 +1,19 @@
+class API < Syntropy::RPCAPI
+  def initialize
+    @count = 0
+  end
+
+  def get(ctx)
+    @count
+  end
+
+  def incr!(ctx)
+    if ctx.request.path != '/test/api'
+        raise Syntropy::Error.new(Qeweney::Status::TEAPOT, 'Teapot') 
+    end
+
+    @count += 1
+  end
+end
+
+API.new

test/app/bar.rb

@@ -0,0 +1,3 @@
+->(ctx) {
+  ctx.request.respond('foobar')
+}

test/test_app.rb

@@ -45,6 +45,10 @@ def test_find_route
     entry = @app.find_route('/test/api_1')
     assert_equal :not_found, entry[:kind]
 
+    entry = @app.find_route('/test/about/foo')
+    assert_equal :markdown, entry[:kind]
+    assert_equal full_path('about/foo.md'), entry[:fn]
+
     pp @app.route_cache
   end
 
@@ -73,5 +77,32 @@ def test_app_rendering
 
     req = make_request(':method' => 'GET', ':path' => '/assets/style.css')
     assert_equal Qeweney::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' => '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' => '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
+
+    req = make_request(':method' => 'GET', ':path' => '/test/bar')
+    assert_equal 'foobar', req.response_body
+
+    req = make_request(':method' => 'GET', ':path' => '/test/about')
+    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
+
+    req = make_request(':method' => 'GET', ':path' => '/test/about/foo/bar')
+    assert_equal Qeweney::Status::NOT_FOUND, req.response_status
+
+
   end
 end