diff --git a/.yardoc/checksums b/.yardoc/checksums index 59aa550..4cc44b3 100644 --- a/.yardoc/checksums +++ b/.yardoc/checksums @@ -2,27 +2,29 @@ lib/hyde.rb 632d043ed6e7484bca963c37e1629e1d88c89b69 lib/hyde/node.rb 93d92492390abb2b55649c6d027fa3a2cb8f2014 lib/hyde/path.rb 42c04e42ea879ad73f639f2086b3ab5ca40489dc lib/hyde/probe.rb 673b55e9aa8c8286a770bd23ae00bff1ac2047fe -lib/hyde/server.rb 6f15f6c8e67783086bfe70ad03c7ca9b8269c69d +lib/hyde/server.rb b68b932a689a2f8dbebebc2dc7eef5972c13d974 lib/hyde/request.rb 792427908273455eb694e13d3517cdae43af3454 -lib/hyde/response.rb 0f0c107c7db883b308b81cbf5c0c4b7d5c90e7ba -lib/hyde/template.rb f3ac5033c5cdb9218b1865b5c9662ba50b813a70 -lib/hyde/util/html.rb bb83ec3ad162b8702ae054428f33c7d8a041d816 +lib/hyde/response.rb a82971ec8f86201de804e61b4dd277b48d28e8b2 +lib/hyde/template.rb 69e46f8095e5e06dd69129ed975a5ce1e6d3de1f +lib/hyde/util/html.rb a29b85ecfdcbd294efff67a12c509262ac9c49be lib/hyde/util/query.rb 212e9bd776eac429c2b2a821586ccce97f996df9 -lib/hyde/util/header.rb ce82b5351a857860b105f25d68ca66c0193359ce +lib/hyde/util/cookie.rb d36b33ae00c2ae8eb7c007bdf40a232c46bda24f +lib/hyde/util/header.rb 3af726c08bdf54a348238e76279e82d75bbaacc1 lib/hyde/util/lookup.rb 5b8e28a8471bb786f4e0a0d616885d238c806661 -lib/hyde/template/erb.rb 4d1c85dd55b55030bba1ba4f9c27ea39fd0c1e47 +lib/hyde/template/erb.rb d8c808a1fafaa65b400780204063bae6046e2f54 lib/hyde/util/sorting.rb af30f01ce32880f7e3e2b0ad6c2324c2fded9431 lib/hyde/probe/handler.rb 9b3eb4ce702c40920c04ed0cb3b93984683de447 +lib/hyde/template/erubi.rb 74793cda58f79d6be3ce4ca25dc231296485bd4c lib/hyde/util/multipart.rb 37abad9fbe044855d02d36185be645f07cb417c0 -lib/hyde/dsl/methods_path.rb 0369e370c594f0bd5c987c67791175eeaa8f9c21 +lib/hyde/dsl/methods_path.rb 57411e500d5ac565164a1f7250a7141f0f206e60 lib/hyde/pattern_matching.rb fe86f6529a2d22c128d9d3a74217862e9fa59c15 lib/hyde/dsl/methods_probe.rb c18bb7f712f14e4d08416f77969eb0af07a4f3a7 lib/hyde/probe/http_method.rb 26ba5c9dabff5508dbd6efcba1711d6417cf957b lib/hyde/dsl/methods_common.rb ea06161f4324127fbbacd51918eadc4e059e4fcf lib/hyde/probe/serve_handler.rb 6c1d2a7b949700468342ced4c23c7fe60df4d3f0 -lib/hyde/dsl/methods_template.rb c77827f2a4133142b7f9f9dfe0bb49efb3b23d44 +lib/hyde/dsl/methods_template.rb 5ea0be9ad7411ed0d5bd50435edf2b7be9bd0b6f lib/hyde/dsl/constructors_path.rb d9fafcfae4d6aab9bd85a7de955eb74f8d4d5937 lib/hyde/pattern_matching/glob.rb 16595083bc8d6f7b98f4adda502a05bd411bc1ca lib/hyde/pattern_matching/util.rb 188dc7d5d9a9a6538a01943a83eb132c385dc092 -lib/hyde/dsl/constructors_probe.rb 6295d25bfa4e896b122590e79e57a03111ed2f09 +lib/hyde/dsl/constructors_probe.rb c447b87b77ddb476584a3d77c5bf58f8122492ee lib/hyde/pattern_matching/rematch.rb 54a4f94791e68d85c38034d954e4c3174e01511b diff --git a/.yardoc/object_types b/.yardoc/object_types index 43429da..2e75a58 100644 Binary files a/.yardoc/object_types and b/.yardoc/object_types differ diff --git a/.yardoc/objects/root.dat b/.yardoc/objects/root.dat index 0fdf97b..9ea0128 100644 Binary files a/.yardoc/objects/root.dat and b/.yardoc/objects/root.dat differ diff --git a/README.md b/README.md index c37c169..165fad1 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ app = Hyde::Server.new do end get "answer" do header "content-type", "application/json" - '\\{"answer":42, "desc":"something important!"\\}' + '{"answer":42, "desc":"something important!"}' end end end diff --git a/doc/Hyde.html b/doc/Hyde.html index 80854e5..120d380 100644 --- a/doc/Hyde.html +++ b/doc/Hyde.html @@ -79,7 +79,7 @@
Defined in:
lib/hyde.rb,
- lib/hyde/node.rb,
lib/hyde/path.rb,
lib/hyde/probe.rb,
lib/hyde/server.rb,
lib/hyde/request.rb,
lib/hyde/response.rb,
lib/hyde/template.rb,
lib/hyde/util/html.rb,
lib/hyde/util/query.rb,
lib/hyde/util/header.rb,
lib/hyde/util/lookup.rb,
lib/hyde/template/erb.rb,
lib/hyde/util/sorting.rb,
lib/hyde/probe/handler.rb,
lib/hyde/util/multipart.rb,
lib/hyde/dsl/methods_path.rb,
lib/hyde/pattern_matching.rb,
lib/hyde/dsl/methods_probe.rb,
lib/hyde/probe/http_method.rb,
lib/hyde/dsl/methods_common.rb,
lib/hyde/probe/serve_handler.rb,
lib/hyde/dsl/methods_template.rb,
lib/hyde/dsl/constructors_path.rb,
lib/hyde/pattern_matching/glob.rb,
lib/hyde/pattern_matching/util.rb,
lib/hyde/dsl/constructors_probe.rb,
lib/hyde/pattern_matching/rematch.rb + lib/hyde/node.rb,
lib/hyde/path.rb,
lib/hyde/probe.rb,
lib/hyde/server.rb,
lib/hyde/request.rb,
lib/hyde/response.rb,
lib/hyde/template.rb,
lib/hyde/util/html.rb,
lib/hyde/util/query.rb,
lib/hyde/util/cookie.rb,
lib/hyde/util/header.rb,
lib/hyde/util/lookup.rb,
lib/hyde/template/erb.rb,
lib/hyde/util/sorting.rb,
lib/hyde/probe/handler.rb,
lib/hyde/template/erubi.rb,
lib/hyde/util/multipart.rb,
lib/hyde/dsl/methods_path.rb,
lib/hyde/pattern_matching.rb,
lib/hyde/dsl/methods_probe.rb,
lib/hyde/probe/http_method.rb,
lib/hyde/dsl/methods_common.rb,
lib/hyde/probe/serve_handler.rb,
lib/hyde/dsl/methods_template.rb,
lib/hyde/dsl/constructors_path.rb,
lib/hyde/pattern_matching/glob.rb,
lib/hyde/pattern_matching/util.rb,
lib/hyde/dsl/constructors_probe.rb,
lib/hyde/pattern_matching/rematch.rb
@@ -103,7 +103,7 @@ - Classes: Node, Path, PathContext, Pattern, Probe, ProbeContext, ProcessorContext, Request, Response, Server, ServerContext, Template, TemplateContext + Classes: Cookie, Node, Path, PathContext, Pattern, Probe, ProbeContext, ProcessorContext, Request, Response, Server, ServerContext, Template, TemplateContext

@@ -175,7 +175,7 @@ diff --git a/doc/Hyde/Cookie.html b/doc/Hyde/Cookie.html new file mode 100644 index 0000000..26c28c7 --- /dev/null +++ b/doc/Hyde/Cookie.html @@ -0,0 +1,808 @@ + + + + + + + Class: Hyde::Cookie + + — Documentation by YARD 0.9.34 + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + +

Class: Hyde::Cookie + + + +

+
+ +
+
Inherits:
+
+ Object + +
    +
  • Object
    • + + + +
+ show all + +
+
+ + + + + + + + + + + +
+
Defined in:
+
lib/hyde/util/cookie.rb
+
+ +
+ +

Overview

+
+

Utility class for handling cookies

+ + +
+
+
+ + +
+ + + +

Instance Attribute Summary collapse

+ + + + + + +

+ Class Method Summary + collapse +

+ + + +

+ Instance Method Summary + collapse +

+ + + + +
+

Constructor Details

+ +
+

+ + #initialize(key, value, params = {}) ⇒ Cookie + + + + + +

+
+

Returns a new instance of Cookie.

+ + +
+
+
+

Parameters:

+
    + +
  • + + data + + + (String) + + + + — +

    raw cookie data

    +
    + +
    • + +
+ + +
+ + + + +
+ 
+
+
+9
+10
+11
+12
+13
+ 		+ 
# File 'lib/hyde/util/cookie.rb', line 9
+
+def initialize(key, value, params = {})
+  @key = key
+  @value = value
+  @params = params
+end
+
+
+ +
+ +
+

Instance Attribute Details

+ + + +
+

+ + #key ⇒ Object + + + + + +

+
+

Returns the value of attribute key.

+ + +
+
+
+ + +
+ + + + +
+ 
+
+
+26
+27
+28
+ 		+ 
# File 'lib/hyde/util/cookie.rb', line 26
+
+def key
+  @key
+end
+
+
+ + + +
+

+ + #params ⇒ Object (readonly) + + + + + +

+
+

Returns the value of attribute params.

+ + +
+
+
+ + +
+ + + + +
+ 
+
+
+27
+28
+29
+ 		+ 
# File 'lib/hyde/util/cookie.rb', line 27
+
+def params
+  @params
+end
+
+
+ + + +
+

+ + #value ⇒ Object + + + + + +

+
+

Returns the value of attribute value.

+ + +
+
+
+ + +
+ + + + +
+ 
+
+
+26
+27
+28
+ 		+ 
# File 'lib/hyde/util/cookie.rb', line 26
+
+def value
+  @value
+end
+
+
+ +
+ + +
+

Class Method Details

+ + +
+
+
+

Create cookie(s) from a "Cookie: " format

+ + +
+
+
+

Parameters:

+
    + +
  • + + data + + + (String) + + + + — +

    value part of "Cookie: " header

    +
    + +
    • + +
+ +

Returns:

+
    + +
  • + + + (Array(Cookie)) + + + +
    • + +
+ +
+ + + + +
+ 
+
+
+41
+42
+43
+44
+45
+ 		+ 
# File 'lib/hyde/util/cookie.rb', line 41
+
+def self.from_cookie_string(data)
+  data.split(";").map do |cookiestr|
+    Cookie.new(*cookiestr.split("=").map(&:strip))
+  end
+end
+
+
+ +
+

+ + .from_setcookie_string(data) ⇒ Cookie + + + + + +

+
+

Create cookie from a "Set-Cookie: " format

+ + +
+
+
+

Parameters:

+
    + +
  • + + data + + + (String) + + + + — +

    value part of "Set-Cookie: " header

    +
    + +
    • + +
+ +

Returns:

+
    + +
  • + + + (Cookie) + + + +
    • + +
+ +
+ + + + +
+ 
+
+
+32
+33
+34
+35
+36
+ 		+ 
# File 'lib/hyde/util/cookie.rb', line 32
+
+def self.from_setcookie_string(data)
+  kvpair, params = Hyde::Util.parse_value(data)
+  key, value = kvpair.split("=").map(&:strip)
+  Cookie.new(key, value, params)
+end
+
+
+ +
+ +
+

Instance Method Details

+ + +
+

+ + #to_s ⇒ String + + + + + +

+
+

Convert cookie to "Set-Cookie: " string representation.

+ + +
+
+
+ +

Returns:

+
    + +
  • + + + (String) + + + +
    • + +
+ +
+ + + + +
+ 
+
+
+17
+18
+19
+ 		+ 
# File 'lib/hyde/util/cookie.rb', line 17
+
+def to_s
+  Hyde::Util.make_value(to_short, @params)
+end
+
+
+ +
+

+ + #to_short ⇒ Object + + + + + +

+
+

Convert cookie to "Cookie: " string representation (no params)

+ + +
+
+
+ + +
+ + + + +
+ 
+
+
+22
+23
+24
+ 		+ 
# File 'lib/hyde/util/cookie.rb', line 22
+
+def to_short
+  "#{key.to_s.strip}=#{value.to_s.strip}"
+end
+
+
+ +
+ +
+ + + +
+ + \ No newline at end of file diff --git a/doc/Hyde/DSL.html b/doc/Hyde/DSL.html index c54c1a2..84165ad 100644 --- a/doc/Hyde/DSL.html +++ b/doc/Hyde/DSL.html @@ -117,7 +117,7 @@ diff --git a/doc/Hyde/DSL/CommonMethods.html b/doc/Hyde/DSL/CommonMethods.html index cce4dc4..1435c78 100644 --- a/doc/Hyde/DSL/CommonMethods.html +++ b/doc/Hyde/DSL/CommonMethods.html @@ -327,7 +327,7 @@ diff --git a/doc/Hyde/DSL/PathConstructors.html b/doc/Hyde/DSL/PathConstructors.html index 8d8d9a0..dda3a22 100644 --- a/doc/Hyde/DSL/PathConstructors.html +++ b/doc/Hyde/DSL/PathConstructors.html @@ -954,7 +954,7 @@ diff --git a/doc/Hyde/DSL/PathMethods.html b/doc/Hyde/DSL/PathMethods.html index f644575..8899da7 100644 --- a/doc/Hyde/DSL/PathMethods.html +++ b/doc/Hyde/DSL/PathMethods.html @@ -156,6 +156,29 @@

Set path index.

 + + + +
  • + + + #plugin(filename) ⇒ Object + + + + + + + + + + + + + +

    Include an application as a child of path.

    +
     +
    • @@ -400,6 +423,77 @@ Blocks path access if a filter returns false.

    + + +
    +

    + + #plugin(filename) ⇒ Object + + + + + +

    +
    +

    Include an application as a child of path.

    + + +
    +
    +
    +

    Parameters:

    + + + +
    + + + + +
    + 
    +
+
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
    +     		+ 
    # File 'lib/hyde/dsl/methods_path.rb', line 62
+
+def plugin(filename)
+  self.define_singleton_method(:run) do |object|
+    unless object.is_a? Hyde::Node
+      raise StandardError, "not a node instance or subclass instance"
+    end
+
+    object
+  end
+  @origin.children.append(self.instance_eval(File.read(filename)))
+  self.singleton_class.undef_method :run
+end
    +
    @@ -681,7 +775,7 @@ Does not modify path execution.

    diff --git a/doc/Hyde/DSL/ProbeConstructors.html b/doc/Hyde/DSL/ProbeConstructors.html index 62bd930..bf51d60 100644 --- a/doc/Hyde/DSL/ProbeConstructors.html +++ b/doc/Hyde/DSL/ProbeConstructors.html @@ -116,7 +116,7 @@
  • - #erb(input, toplevel: nil, locals: nil) ⇒ Object + #erb(input, vars = {}) ⇒ Object @@ -133,6 +133,29 @@

    Create a new erb template.

     +
    • + + +
  • + + + #erubi(input, vars = {}, freeze: true, capture: false) ⇒ Object + + + + + + + + + + + + + +

    Create a new erb template using Erubi engine.

    +
     +
    • @@ -148,7 +171,7 @@

    - #erb(input, toplevel: nil, locals: nil) ⇒ Object + #erb(input, vars = {}) ⇒ Object @@ -167,7 +190,7 @@

    See Also:

    @@ -179,13 +202,110 @@ 9 10 -11 +11 +12 +13 
    # File 'lib/hyde/dsl/constructors_probe.rb', line 9
 
-def erb(input, toplevel: nil, locals: nil)
-  Hyde::Templates::ERB.new(input, toplevel: toplevel, locals: locals)
+def erb(input, vars = {})
+  Hyde::Templates::ERB.new(input,
+                           vars,
+                           parent: @origin)
+end
    + + + +

    + +
    +

    + + #erubi(input, vars = {}, freeze: true, capture: false) ⇒ Object + + + + + +

    +
    +

    Create a new erb template using Erubi engine

    + + +
    +
    +
    +

    Parameters:

    + + + +

    See Also:

    + + +
    + + + @@ -197,7 +317,7 @@ diff --git a/doc/Hyde/DSL/ProbeMethods.html b/doc/Hyde/DSL/ProbeMethods.html index 319f1c7..db97c8d 100644 --- a/doc/Hyde/DSL/ProbeMethods.html +++ b/doc/Hyde/DSL/ProbeMethods.html @@ -778,7 +778,7 @@ If no value is provided, deletes all key entries

    diff --git a/doc/Hyde/DSL/TemplateMethods.html b/doc/Hyde/DSL/TemplateMethods.html index fef857f..3b42a87 100644 --- a/doc/Hyde/DSL/TemplateMethods.html +++ b/doc/Hyde/DSL/TemplateMethods.html @@ -74,6 +74,11 @@ +
    +
    Included in:
    +
    TemplateContext
    +
    +
    @@ -83,19 +88,109 @@ +

    Overview

    +
    +

    Common methods for template contexts

    + + +
    +
    +
    + + +
    + +

    + Instance Method Summary + collapse +

    + + + +
    +

    Instance Method Details

    + + +
    +

    + + #import(filepath) ⇒ Object + + + + + +

    +
    +

    Import a template part

    + + +
    +
    +
    + + +
    + 
    +
+
+19
+20
+21
+22
+23
+24
+25
    +     		+ 
    # File 'lib/hyde/dsl/constructors_probe.rb', line 19
+
+def erubi(input, vars = {}, freeze: true, capture: false)
+  Hyde::Templates::Erubi.new(input,
+                             vars,
+                             parent: @origin,
+                             freeze: freeze,
+                             capture: capture)
 end
    + + + + +
    + 
    +
+
+11
+12
+13
    +     		+ 
    # File 'lib/hyde/dsl/methods_template.rb', line 11
+
+def import(filepath)
+  @parent_template.import(file(filepath)).run
+end
    +
    +
    + + + diff --git a/doc/Hyde/Handlers.html b/doc/Hyde/Handlers.html index f89abca..454c598 100644 --- a/doc/Hyde/Handlers.html +++ b/doc/Hyde/Handlers.html @@ -117,7 +117,7 @@ diff --git a/doc/Hyde/Handlers/CONNECT.html b/doc/Hyde/Handlers/CONNECT.html index c18fe90..39b54b3 100644 --- a/doc/Hyde/Handlers/CONNECT.html +++ b/doc/Hyde/Handlers/CONNECT.html @@ -210,7 +210,7 @@ diff --git a/doc/Hyde/Handlers/DELETE.html b/doc/Hyde/Handlers/DELETE.html index 244f96b..4c76647 100644 --- a/doc/Hyde/Handlers/DELETE.html +++ b/doc/Hyde/Handlers/DELETE.html @@ -210,7 +210,7 @@ diff --git a/doc/Hyde/Handlers/GET.html b/doc/Hyde/Handlers/GET.html index 2ee0d1e..a727d53 100644 --- a/doc/Hyde/Handlers/GET.html +++ b/doc/Hyde/Handlers/GET.html @@ -350,7 +350,7 @@ Request's #splat and #param are passed to block.

    diff --git a/doc/Hyde/Handlers/HEAD.html b/doc/Hyde/Handlers/HEAD.html index 4f5bd68..9f50cb1 100644 --- a/doc/Hyde/Handlers/HEAD.html +++ b/doc/Hyde/Handlers/HEAD.html @@ -210,7 +210,7 @@ diff --git a/doc/Hyde/Handlers/Handler.html b/doc/Hyde/Handlers/Handler.html index 2273f8b..53722e7 100644 --- a/doc/Hyde/Handlers/Handler.html +++ b/doc/Hyde/Handlers/Handler.html @@ -587,7 +587,7 @@ Request's #splat and #param are passed to block.

    diff --git a/doc/Hyde/Handlers/OPTIONS.html b/doc/Hyde/Handlers/OPTIONS.html index 1557b39..a560b8a 100644 --- a/doc/Hyde/Handlers/OPTIONS.html +++ b/doc/Hyde/Handlers/OPTIONS.html @@ -210,7 +210,7 @@ diff --git a/doc/Hyde/Handlers/PATCH.html b/doc/Hyde/Handlers/PATCH.html index 12c153f..7f848f4 100644 --- a/doc/Hyde/Handlers/PATCH.html +++ b/doc/Hyde/Handlers/PATCH.html @@ -210,7 +210,7 @@ diff --git a/doc/Hyde/Handlers/POST.html b/doc/Hyde/Handlers/POST.html index 8c23108..8793c37 100644 --- a/doc/Hyde/Handlers/POST.html +++ b/doc/Hyde/Handlers/POST.html @@ -210,7 +210,7 @@ diff --git a/doc/Hyde/Handlers/PUT.html b/doc/Hyde/Handlers/PUT.html index ef40433..8d25ec2 100644 --- a/doc/Hyde/Handlers/PUT.html +++ b/doc/Hyde/Handlers/PUT.html @@ -210,7 +210,7 @@ diff --git a/doc/Hyde/Handlers/Serve.html b/doc/Hyde/Handlers/Serve.html index 799e46e..3442688 100644 --- a/doc/Hyde/Handlers/Serve.html +++ b/doc/Hyde/Handlers/Serve.html @@ -459,7 +459,7 @@ Tries to serve files matched by handler

    diff --git a/doc/Hyde/Handlers/TRACE.html b/doc/Hyde/Handlers/TRACE.html index c8ac125..5d1c505 100644 --- a/doc/Hyde/Handlers/TRACE.html +++ b/doc/Hyde/Handlers/TRACE.html @@ -210,7 +210,7 @@ diff --git a/doc/Hyde/Node.html b/doc/Hyde/Node.html index 72f1392..1dc0019 100644 --- a/doc/Hyde/Node.html +++ b/doc/Hyde/Node.html @@ -692,7 +692,7 @@ Does nothing by default, behaviour should be overriden through

    diff --git a/doc/Hyde/Path.html b/doc/Hyde/Path.html index 0557357..7252e27 100644 --- a/doc/Hyde/Path.html +++ b/doc/Hyde/Path.html @@ -887,7 +887,7 @@ Finds the next appropriate path to go to.

    diff --git a/doc/Hyde/PathContext.html b/doc/Hyde/PathContext.html index f10c891..c0cb6ba 100644 --- a/doc/Hyde/PathContext.html +++ b/doc/Hyde/PathContext.html @@ -171,7 +171,7 @@

    Methods included from DSL::PathMethods

    -

    #filter, #index, #postprocess, #preprocess, #remap, #root

    +

    #filter, #index, #plugin, #postprocess, #preprocess, #remap, #root

    @@ -232,7 +232,7 @@ diff --git a/doc/Hyde/Pattern.html b/doc/Hyde/Pattern.html index fe2827b..0d7df14 100644 --- a/doc/Hyde/Pattern.html +++ b/doc/Hyde/Pattern.html @@ -542,7 +542,7 @@ Lighter version of match that doesn't assign any variables.

    diff --git a/doc/Hyde/PatternMatching.html b/doc/Hyde/PatternMatching.html index 2c2623c..72352ce 100644 --- a/doc/Hyde/PatternMatching.html +++ b/doc/Hyde/PatternMatching.html @@ -231,7 +231,7 @@ Used primarily to create patterns for path definitions.

    diff --git a/doc/Hyde/PatternMatching/Glob.html b/doc/Hyde/PatternMatching/Glob.html index 246bc63..97b33fa 100644 --- a/doc/Hyde/PatternMatching/Glob.html +++ b/doc/Hyde/PatternMatching/Glob.html @@ -638,7 +638,7 @@ Lighter version of match that doesn't assign any variables.

    diff --git a/doc/Hyde/PatternMatching/ReMatch.html b/doc/Hyde/PatternMatching/ReMatch.html index 8a055e7..2a12d0d 100644 --- a/doc/Hyde/PatternMatching/ReMatch.html +++ b/doc/Hyde/PatternMatching/ReMatch.html @@ -547,7 +547,7 @@ Lighter version of match that doesn't assign any variables.

    diff --git a/doc/Hyde/Probe.html b/doc/Hyde/Probe.html index 7a43863..8a0c092 100644 --- a/doc/Hyde/Probe.html +++ b/doc/Hyde/Probe.html @@ -455,7 +455,7 @@ This behaviour should only be used internally.

    diff --git a/doc/Hyde/ProbeContext.html b/doc/Hyde/ProbeContext.html index 7447eb1..1a56156 100644 --- a/doc/Hyde/ProbeContext.html +++ b/doc/Hyde/ProbeContext.html @@ -189,7 +189,7 @@

    Methods included from DSL::ProbeConstructors

    -

    #erb

    +

    #erb, #erubi

    Constructor Details

    @@ -239,7 +239,7 @@
    diff --git a/doc/Hyde/ProcessorContext.html b/doc/Hyde/ProcessorContext.html index b902533..c4bc452 100644 --- a/doc/Hyde/ProcessorContext.html +++ b/doc/Hyde/ProcessorContext.html @@ -217,7 +217,7 @@ diff --git a/doc/Hyde/Request.html b/doc/Hyde/Request.html index 1ad005f..853a74a 100644 --- a/doc/Hyde/Request.html +++ b/doc/Hyde/Request.html @@ -1538,7 +1538,7 @@ diff --git a/doc/Hyde/Response.html b/doc/Hyde/Response.html index 7900382..eb300b3 100644 --- a/doc/Hyde/Response.html +++ b/doc/Hyde/Response.html @@ -1140,7 +1140,7 @@ If no value is provided, deletes all key entries

    diff --git a/doc/Hyde/Server.html b/doc/Hyde/Server.html index 99c4cac..2a00424 100644 --- a/doc/Hyde/Server.html +++ b/doc/Hyde/Server.html @@ -327,7 +327,7 @@ "handle.default" => proc do |code, backtrace: nil| page = Hyde::Util.default_error_page(code, backtrace) headers = { - "content-length": page.length, + "content-length": page.bytesize, "content-type": "text/html" } [headers, page] @@ -432,7 +432,7 @@ although server nesting for the purpose of creating virtual hosts is allowed.

    diff --git a/doc/Hyde/ServerContext.html b/doc/Hyde/ServerContext.html index 76d4d19..4b1aff6 100644 --- a/doc/Hyde/ServerContext.html +++ b/doc/Hyde/ServerContext.html @@ -129,7 +129,7 @@

    Methods included from DSL::PathMethods

    -

    #filter, #index, #postprocess, #preprocess, #remap, #root

    +

    #filter, #index, #plugin, #postprocess, #preprocess, #remap, #root

    @@ -152,7 +152,7 @@ diff --git a/doc/Hyde/Template.html b/doc/Hyde/Template.html index 3e7cfea..254ce83 100644 --- a/doc/Hyde/Template.html +++ b/doc/Hyde/Template.html @@ -116,43 +116,12 @@ -

    Instance Attribute Summary collapse

    -
      - -
    • - - - #binding ⇒ Object - - - - - - - - - - - - - - - - -

      Returns the value of attribute binding.

      -
       - -
      • - - -
    - @@ -167,7 +136,30 @@
  • - #initialize(input, toplevel: nil, locals: nil) ⇒ Template + #import(filepath) ⇒ Object + + + + + + + + + + + + + +

    Import a template from within current template.

    +
     + +
    • + + +
  • + + + #initialize(input, vars = {}, parent:) ⇒ Template @@ -313,7 +305,7 @@

    - #initialize(input, toplevel: nil, locals: nil) ⇒ Template + #initialize(input, vars = {}, parent:) ⇒ Template @@ -339,30 +331,42 @@ -

    • - -
  • - - context - - - (Binding, nil) - - + — +

    template text

    +
  • - locals + vars - (Hash, nil) + (Hash) - (defaults to: nil) + (defaults to: {}) + — +

    local variables for tempalte

    +
    + +
    • + +
  • + + parent + + + (Hyde::Node) + + + + — +

    parent node

    +
    +
    • @@ -374,27 +378,29 @@ 
     
 
-30
-31
-32
-33
-34
-35
-36
-37
-38
    +39 +40 +41 +42 +43 +44 +45 +46 +47 +48 - 
    # File 'lib/hyde/template.rb', line 30
+      
    # File 'lib/hyde/template.rb', line 39
 
-def initialize(input, toplevel: nil, locals: nil)
+def initialize(input, vars = {}, parent:)
   @template = input.is_a?(File) ? input.read : input
+  @context = TemplateContext.new(parent, self)
+  @parent = parent
   input.close if input.is_a? File
-  @binding = toplevel or binding
-  locals&.each do |k, v|
-    @binding.local_variable_set(k,v)
+  @binding = @context.binding
+  vars.each do |k, v|
+    @binding.local_variable_set(k, v)
   end
-  @context = TemplateContext.new(self)
 end
    
     
   
@@ -403,15 +409,15 @@
   
 
 
-  
    
-    
    Instance Attribute Details
    
+
+  
    
+    
    Instance Method Details
    
+
     
-      
-      
       
    
-  
    
+  
    
   
-    #binding  ⇒ Object 
+    #import(filepath)  ⇒ Object 
   
 
   
@@ -419,7 +425,7 @@
   
 
    
   
    
-    
    Returns the value of attribute binding.
    
+    
    Import a template from within current template
    
 
 
   
    
@@ -433,30 +439,27 @@
       
     
 
-74
-75
-76
    
+85
+86
+87
+88
+89
    - 
    # File 'lib/hyde/template.rb', line 74
+      
    # File 'lib/hyde/template.rb', line 85
 
-def binding
-  @binding
+def import(filepath)
+  newtemp = self.class.new(filepath, {}, parent: @parent)
+  newtemp.binding = @binding
+  newtemp
 end
    
     
   
 
 
     
-  
-
-
-  
    
-    
    Instance Method Details
    
-
-    
-      
    
-  
    
+      
    
+  
    
   
     #local_variable_get(key)  ⇒ Object 
   
@@ -508,12 +511,12 @@
       
     
 
-50
-51
-52
    
+60
+61
+62
    - 
    # File 'lib/hyde/template.rb', line 50
+      
    # File 'lib/hyde/template.rb', line 60
 
 def local_variable_get(key)
   @binding.local_variable_get(key)
@@ -574,12 +577,12 @@
       
     
 
-43
-44
-45
    
+53
+54
+55
    
     
     
-      
    # File 'lib/hyde/template.rb', line 43
+      
    # File 'lib/hyde/template.rb', line 53
 
 def local_variable_set(key, value)
   @binding.local_variable_set(key, value)
@@ -627,12 +630,12 @@
       
     
 
-56
-57
-58
    
+66
+67
+68
    
     
     
-      
    # File 'lib/hyde/template.rb', line 56
+      
    # File 'lib/hyde/template.rb', line 66
 
 def local_variables
   @binding.local_variables
@@ -682,14 +685,14 @@
       
     
 
-62
-63
-64
-65
-66
    
+72
+73
+74
+75
+76
    
     
     
-      
    # File 'lib/hyde/template.rb', line 62
+      
    # File 'lib/hyde/template.rb', line 72
 
 def override_locals(vars)
   vars.each do |k, v|
@@ -733,12 +736,12 @@
       
     
 
-70
-71
-72
    
+80
+81
+82
    
     
     
-      
    # File 'lib/hyde/template.rb', line 70
+      
    # File 'lib/hyde/template.rb', line 80
 
 def run
   # ... (stub)
@@ -753,7 +756,7 @@
 
 
       
diff --git a/doc/Hyde/TemplateContext.html b/doc/Hyde/TemplateContext.html
index 76d099d..4e16373 100644
--- a/doc/Hyde/TemplateContext.html
+++ b/doc/Hyde/TemplateContext.html
@@ -89,7 +89,7 @@
   
   
    
       
    Includes:
    
-      
    DSL::CommonMethods, DSL::ProbeConstructors, DSL::ProbeMethods
    
+      
    DSL::CommonMethods, DSL::ProbeConstructors, DSL::ProbeMethods, DSL::TemplateMethods
    
   
    
   
   
@@ -132,7 +132,29 @@
         
  • 
   
     
-      #initialize(parent)  ⇒ TemplateContext 
+      #binding  ⇒ Binding 
+    
+
+    
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+    
    
+  
+
    • 
+
+      
+        
  • 
+  
+    
+      #initialize(parent, parent_template)  ⇒ TemplateContext 
     
 
     
@@ -166,8 +188,19 @@
   
   
   
-  
    Methods included from DSL::ProbeConstructors
    
-  
    #erb
    
+  
    Methods included from DSL::TemplateMethods
    
+  
    #import
    
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
    Methods included from DSL::CommonMethods
    
+  
    #bounce, #die
    
 
   
   
@@ -188,15 +221,15 @@
   
   
   
-  
    Methods included from DSL::CommonMethods
    
-  
    #bounce, #die
    
+  
    Methods included from DSL::ProbeConstructors
    
+  
    #erb, #erubi
    
 
    
   
    Constructor Details
    
   
     
    
   
    
   
-    #initialize(parent)  ⇒ TemplateContext 
+    #initialize(parent, parent_template)  ⇒ TemplateContext 
   
 
   
@@ -218,15 +251,17 @@
       
     
 
-19
-20
-21
    
+27
+28
+29
+30
    • 
     
     
-      
    # File 'lib/hyde/template.rb', line 19
+      
    # File 'lib/hyde/template.rb', line 27
 
-def initialize(parent)
+def initialize(parent, parent_template)
   @origin = parent
+  @parent_template = parent_template
 end
    
     
   
@@ -236,10 +271,68 @@
 
 
 
+  
    
+    
    Instance Method Details
    
+
+    
+      
    
+  
    
+  
+    #binding  ⇒ Binding 
+  
+
+  
+
+  
+
    
+  
    
+    
+
+  
    
+
    
+
    
+  
+
    Returns:
    
+
      
+  
+    
    • 
+      
+      
+        (Binding)
+      
+      
+      
+    
      • 
+  
+
    
+
+
    
+  
+    
+    
+  
+
    
+      
    +
+
+23
+24
+25
    
+        		
+      
    # File 'lib/hyde/template.rb', line 23
+
+def binding
+  Kernel.binding
+end
    
+    
    
+
    
+    
+  
    
+
 
 
       
diff --git a/doc/Hyde/Templates.html b/doc/Hyde/Templates.html
index 5a658e6..a528448 100644
--- a/doc/Hyde/Templates.html
+++ b/doc/Hyde/Templates.html
@@ -79,7 +79,7 @@
   
    
     
    Defined in:
    
     
    lib/hyde/template.rb,
    
-  lib/hyde/template/erb.rb    
+  lib/hyde/template/erb.rb,
     lib/hyde/template/erubi.rb
 
    
   
    
   
@@ -101,7 +101,7 @@
     
   
     
-      Classes: ERB
+      Classes: ERB, Erubi
     
   
 
    
@@ -117,7 +117,7 @@
 
 
       
diff --git a/doc/Hyde/Templates/ERB.html b/doc/Hyde/Templates/ERB.html
index 4faaf33..72bc568 100644
--- a/doc/Hyde/Templates/ERB.html
+++ b/doc/Hyde/Templates/ERB.html
@@ -117,11 +117,6 @@
 
 
 
-  
    Instance Attribute Summary
    
-  
-  
    Attributes inherited from Hyde::Template
    
-  
    #binding
    
-
 
   
     
    
@@ -134,7 +129,7 @@
         
  • 
   
     
-      #initialize(input, toplevel: nil, locals: nil)  ⇒ ERB 
+      #initialize(input, vars = nil, parent:)  ⇒ ERB 
     
 
     
@@ -192,14 +187,14 @@
   
   
   
    Methods inherited from Hyde::Template
    
-  
    #local_variable_get, #local_variable_set, #local_variables, #override_locals
    
+  
    #import, #local_variable_get, #local_variable_set, #local_variables, #override_locals
    
 
    
   
    Constructor Details
    
   
     
    
   
    
   
-    #initialize(input, toplevel: nil, locals: nil)  ⇒ ERB 
+    #initialize(input, vars = nil, parent:)  ⇒ ERB 
   
 
   
@@ -218,7 +213,7 @@
   
    See Also:
    
   
      
     
-      
    • Hyde::Template#new
      • 
+      
    • Hyde::Templates::ERB.{Hyde{Hyde::Template{Hyde::Template#new}
      • 
     
   
    
 
@@ -231,14 +226,24 @@
 11
 12
 13
-14
    • 
+14
+15
+16
+17
+18
+19
    
     
     
       
    # File 'lib/hyde/template/erb.rb', line 11
 
-def initialize(input, toplevel: nil, locals: nil)
+def initialize(input, vars = nil, parent:)
   super
-  @template = ::ERB.new(@template)
+  varname = "_part_#{SecureRandom.hex(10)}".to_sym
+  while @binding.local_variable_defined? varname
+    varname = "_part_#{SecureRandom.hex(10)}".to_sym
+  end
+  @template = ::ERB.new(@template, eoutvar: varname)
+  @template.filename = input.is_a?(File) ? input.path : "(Inline)"
 end
    
     
   
@@ -277,19 +282,15 @@
       
     
 
-17
-18
-19
-20
-21
    
+22
+23
+24
    
     
     
-      
    # File 'lib/hyde/template/erb.rb', line 17
+      
    # File 'lib/hyde/template/erb.rb', line 22
 
 def run
-  @context.instance_exec(@template) do |template|
-    template.result @binding
-  end
+  @template.result @binding
 end
    
     
   
@@ -301,7 +302,7 @@
 
 
       
diff --git a/doc/Hyde/Templates/Erubi.html b/doc/Hyde/Templates/Erubi.html
new file mode 100644
index 0000000..b507718
--- /dev/null
+++ b/doc/Hyde/Templates/Erubi.html
@@ -0,0 +1,330 @@
+
+
+  
+    
+
+
+  Class: Hyde::Templates::Erubi
+  
+    — Documentation by YARD 0.9.34
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
    
+      
+      
    
+    
    
+
+    
    
+      
+
+      
    Class: Hyde::Templates::Erubi
+  
+  
+  
+
    
+
    
+  
+  
    
+    
    Inherits:
    
+    
    
+      Hyde::Template
+      
+        
+        show all
+      
+    
    
+  
    
+  
+
+  
+  
+  
+  
+  
+
+  
+
+  
+  
    
+    
    Defined in:
    
+    
    lib/hyde/template/erubi.rb
    
+  
    
+  
+
    
+
+
    Overview
    
+  
    
+    
    Erubi (ERB) template language adapter
    
+
+
+  
    
+
    
+
    
+  
+
+
    
+
+
+
+
+
+
+  
+    
    
+      Instance Method Summary
+      collapse
+    
    
+
+    
+  
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
    Methods inherited from Hyde::Template
    
+  
    #import, #local_variable_get, #local_variable_set, #local_variables, #override_locals
    
+
    
+  
    Constructor Details
    
+  
+    
    
+  
    
+  
+    #initialize(input, vars = nil, parent:, freeze: true, capture: false)  ⇒ Erubi 
+  
+
+  
+
+  
+
    
+  
    
+    
    Returns a new instance of Erubi.
    
+
+
+  
    
+
    
+
    
+  
+
+  
    See Also:
    
+  
      
+    
+      
    • Hyde::Templates::Erubi.{Hyde{Hyde::Template{Hyde::Template#new}
      • 
+    
+  
    
+
+
    
+  
+    
+    
+  
+
    
+      
    +
+
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
    
+        		
+      
    # File 'lib/hyde/template/erubi.rb', line 11
+
+def initialize(input,
+               vars = nil,
+               parent:,
+               freeze: true,
+               capture: false)
+  super(input, vars, parent: parent)
+  varname = "_part_#{SecureRandom.hex(10)}"
+  while @binding.local_variable_defined? varname.to_sym
+    varname = "_part_#{SecureRandom.hex(10)}"
+  end
+  properties = {
+    filename: input.is_a?(File) ? input.path : "(Inline)",
+    bufvar: varname,
+    freeze: freeze
+  }
+  engine = capture ? ::Erubi::CaptureEndEngine : ::Erubi::Engine
+  @template = engine.new(@template, properties)
+end
    
+    
    
+
    
+  
+
    
+
+
+  
    
+    
    Instance Method Details
    
+
+    
+      
    
+  
    
+  
+    #run  ⇒ Object 
+  
+
+  
+
+  
+
    
+  
    
+    
    Run the template.
    
+
+
+  
    
+
    
+
    
+  
+
+
    
+  
+    
+    
+  
+
    
+      
    +
+
+31
+32
+33
    
+        		
+      
    # File 'lib/hyde/template/erubi.rb', line 31
+
+def run
+  @binding.eval(@template.src)
+end
    
+    
    
+
    
+    
+  
    
+
+
    
+
+      
+
+    
    
+  
+
\ No newline at end of file
diff --git a/doc/Hyde/Util.html b/doc/Hyde/Util.html
index 887da0a..49287e0 100644
--- a/doc/Hyde/Util.html
+++ b/doc/Hyde/Util.html
@@ -424,7 +424,8 @@ Taken from WEBrick # File 'lib/hyde/util/html.rb', line 87
@@ -438,6 +439,7 @@ Taken from WEBrick Util.escape_html(errortext)}</title>
             <style> .header {padding: 0.5rem; overflow: auto;} .title { font-weight: bolder; font-size: 48px; margin: 10px 10px; text-shadow: 1px 1px 1px #202222, 2px 2px 2px #404444; float: left } body { margin: 0; } .text { font-size 1rem; } .small { color: #7D7D7D; font-size: 12px;} .code { font-family: monospace; font-size: 0.7rem; } </style>
+            <meta charset="utf-8">
         </head>
         <body>
             <div class="header">
@@ -602,11 +604,6 @@ This function is not adequate to prevent string interpolation.
    
       
     
 
-25
-26
-27
-28
-29
 30
 31
 32
@@ -616,14 +613,19 @@ This function is not adequate to prevent string interpolation.
    
 36
 37
 38
-39
    
+39
+40
+41
+42
+43
+44
    
     
     
-      
    # File 'lib/hyde/util/header.rb', line 25
+      
    # File 'lib/hyde/util/header.rb', line 30
 
 def self.make_value(input, opts, sep = ";")
   unless input.match?(/^[\w!#$%&'*+-.^_`|~]*=?[^[:cntrl:]\\",;]+$/)
-    raise StandardError, "input contains invalid characters"
+    raise StandardError, "input format is invalid"
   end
 
   output = input
@@ -715,7 +717,12 @@ This function is not adequate to prevent string interpolation.
    
 16
 17
 18
-19
    
+19
+20
+21
+22
+23
+24
    
     
     
       
    # File 'lib/hyde/util/header.rb', line 11
@@ -724,7 +731,12 @@ This function is not adequate to prevent string interpolation.
    
   parts = input.split(sep).map { |x| URI.decode_uri_component(x).strip }
   base = parts.shift
   opts = parts.map do |raw|
-    key, value = raw.match(/^([^=]*)(?:=(.*)|)\Z/).to_a[1..]
+    key, value = raw.match(/
+        \A                    # beginning of string
+        ([!-~&&[^=;,]]+)      # key
+        (?:=([\s!-~&&[^;,]]*)|) # optional value
+        \Z                    # end of sting
+    /x).to_a[1..]
     [key, ((value&.match?(/^".*"$/) ? value[1..-2] : value) or true)]
   end.to_h
   [base, opts]
@@ -807,7 +819,7 @@ This function is not adequate to prevent string interpolation.
    
 
 
       
diff --git a/doc/Hyde/Util/FormPart.html b/doc/Hyde/Util/FormPart.html
index c70987c..fe45777 100644
--- a/doc/Hyde/Util/FormPart.html
+++ b/doc/Hyde/Util/FormPart.html
@@ -847,7 +847,7 @@
 
 
       
diff --git a/doc/Hyde/Util/Lookup.html b/doc/Hyde/Util/Lookup.html
index a1fb651..777d470 100644
--- a/doc/Hyde/Util/Lookup.html
+++ b/doc/Hyde/Util/Lookup.html
@@ -589,7 +589,7 @@
 
 
       
diff --git a/doc/Hyde/Util/MultipartParser.html b/doc/Hyde/Util/MultipartParser.html
index 86ef9d3..92a54bb 100644
--- a/doc/Hyde/Util/MultipartParser.html
+++ b/doc/Hyde/Util/MultipartParser.html
@@ -477,7 +477,7 @@
 
 
       
diff --git a/doc/Hyde/Util/ParserCommon.html b/doc/Hyde/Util/ParserCommon.html
index aecc37c..2e255e0 100644
--- a/doc/Hyde/Util/ParserCommon.html
+++ b/doc/Hyde/Util/ParserCommon.html
@@ -110,7 +110,7 @@
 
 
       
diff --git a/doc/Hyde/Util/Query.html b/doc/Hyde/Util/Query.html
index e43d504..f376b4a 100644
--- a/doc/Hyde/Util/Query.html
+++ b/doc/Hyde/Util/Query.html
@@ -489,7 +489,7 @@ Key semantics:
    
 
 
       
diff --git a/doc/_index.html b/doc/_index.html
index 0d849c2..ba43b1b 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -94,6 +94,13 @@
                 
               
             
+              
  • 
+                Cookie
+                
+                  (Hyde)
+                
+              
    • 
+            
           
         
       
@@ -131,6 +138,13 @@
                 
               
             
+              
  • 
+                Erubi
+                
+                  (Hyde::Templates)
+                
+              
    • 
+            
           
         
       
@@ -524,7 +538,7 @@
 
 
       
diff --git a/doc/class_list.html b/doc/class_list.html
index 142398b..cd336bd 100644
--- a/doc/class_list.html
+++ b/doc/class_list.html
@@ -43,7 +43,7 @@
 
       
     
diff --git a/doc/file.README.html b/doc/file.README.html
index 9acf03c..fa6cac2 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -59,13 +59,13 @@
 
       
    The strange case of Dr. Rack and Mr. Hyde
    
 
-
    Hyde is a library that provides a DSL for creating HTTP servers. As of now it is using Rack as the webserver adapter, but ideally it shouldn't take much work to make it run on top of any webserver.
    
+
    Hyde is a library that provides a DSL for creating web applications. As of now it is using Rack as the webserver adapter, but ideally it shouldn't take much work to make it run on top of any webserver.
    
 
 
    Hyde was made mostly for fun. Ideally it will become something more, but as of yet it's just an experiment revolving around Ruby Metaprogramming and its DSL capabilities.
    
 
 
    Examples
    
 
-
    A simple "Hello, World!" HTTP API using Hyde
    
+
    A simple "Hello, World!" app using Hyde
    
 
 
    require 'hyde'
 
@@ -79,7 +79,7 @@
 run app
 
    
 
-
    A push/pull stack as an HTTP API
    
+
    A push/pull stack as an app
    
 
 
    require 'hyde'
 
@@ -155,7 +155,7 @@
     end
     get "answer" do
       header "content-type", "application/json"
-      '\\{"answer":42, "desc":"something important!"\\}'
+      '{"answer":42, "desc":"something important!"}'
     end
   end
 end
@@ -190,7 +190,7 @@
 
    
 
       
diff --git a/doc/index.html b/doc/index.html
index 00183c3..d908c0a 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -59,13 +59,13 @@
 
       
    The strange case of Dr. Rack and Mr. Hyde
    
 
-
    Hyde is a library that provides a DSL for creating HTTP servers. As of now it is using Rack as the webserver adapter, but ideally it shouldn't take much work to make it run on top of any webserver.
    
+
    Hyde is a library that provides a DSL for creating web applications. As of now it is using Rack as the webserver adapter, but ideally it shouldn't take much work to make it run on top of any webserver.
    
 
 
    Hyde was made mostly for fun. Ideally it will become something more, but as of yet it's just an experiment revolving around Ruby Metaprogramming and its DSL capabilities.
    
 
 
    Examples
    
 
-
    A simple "Hello, World!" HTTP API using Hyde
    
+
    A simple "Hello, World!" app using Hyde
    
 
 
    require 'hyde'
 
@@ -79,7 +79,7 @@
 run app
 
    
 
-
    A push/pull stack as an HTTP API
    
+
    A push/pull stack as an app
    
 
 
    require 'hyde'
 
@@ -155,7 +155,7 @@
     end
     get "answer" do
       header "content-type", "application/json"
-      '\\{"answer":42, "desc":"something important!"\\}'
+      '{"answer":42, "desc":"something important!"}'
     end
   end
 end
@@ -190,7 +190,7 @@
 
    
 
       
diff --git a/doc/method_list.html b/doc/method_list.html
index 477c905..3f95571 100644
--- a/doc/method_list.html
+++ b/doc/method_list.html
@@ -86,8 +86,8 @@
 
   
  • 
     
    
-      #binding
-      Hyde::Template
+      #binding
+      Hyde::TemplateContext
     
    
   
    • 
   
@@ -237,6 +237,14 @@
   
 
   
  • 
+    
    
+      #erubi
+      Hyde::DSL::ProbeConstructors
+    
    
+  
    • 
+  
+
+  
  • 
     
    
       escape_html
       Hyde::Util
@@ -244,7 +252,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #file
       Hyde::DSL::ProbeMethods
@@ -252,7 +260,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #file?
       Hyde::Util::FormPart
@@ -260,7 +268,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #filename
       Hyde::Util::FormPart
@@ -268,7 +276,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #filepath
       Hyde::Request
@@ -276,7 +284,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #filetype
       Hyde::Util::FormPart
@@ -284,7 +292,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #filter
       Hyde::Path
@@ -292,7 +300,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #filter
       Hyde::DSL::PathMethods
@@ -300,7 +308,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #finalize
       Hyde::Response
@@ -308,7 +316,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #form
       Hyde::DSL::ProbeMethods
@@ -316,7 +324,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #form?
       Hyde::DSL::ProbeMethods
@@ -324,7 +332,23 @@
   
    • 
   
 
+  
  • 
+    
    
+      from_cookie_string
+      Hyde::Cookie
+    
    
+  
    • 
+  
+
   
  • 
+    
    
+      from_setcookie_string
+      Hyde::Cookie
+    
    
+  
    • 
+  
+
+  
  • 
     
    
       #get
       Hyde::DSL::PathConstructors
@@ -332,7 +356,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #go
       Hyde::Node
@@ -340,7 +364,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #head
       Hyde::DSL::PathConstructors
@@ -348,7 +372,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #header
       Hyde::DSL::ProbeMethods
@@ -356,7 +380,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #headers
       Hyde::Request
@@ -364,7 +388,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #headers
       Hyde::Response
@@ -372,7 +396,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #headers=
       Hyde::Util::FormPart
@@ -380,103 +404,119 @@
   
    • 
   
 
-  
  • 
-    
    
-      #index
-      Hyde::DSL::PathMethods
-    
    
-  
    • 
-  
-
   
  • 
     
    
-      #initialize
-      Hyde::Node
-    
    
-  
    • 
-  
-
-  
  • 
-    
    
-      #initialize
-      Hyde::ProcessorContext
-    
    
-  
    • 
-  
-
-  
  • 
-    
    
-      #initialize
-      Hyde::PathContext
-    
    
-  
    • 
-  
-
-  
  • 
-    
    
-      #initialize
-      Hyde::Path
-    
    
-  
    • 
-  
-
-  
  • 
-    
    
-      #initialize
-      Hyde::ProbeContext
-    
    
-  
    • 
-  
-
-  
  • 
-    
    
-      #initialize
-      Hyde::Probe
-    
    
-  
    • 
-  
-
-  
  • 
-    
    
-      #initialize
-      Hyde::Server
-    
    
-  
    • 
-  
-
-  
  • 
-    
    
-      #initialize
-      Hyde::Request
-    
    
-  
    • 
-  
-
-  
  • 
-    
    
-      #initialize
-      Hyde::Response
-    
    
-  
    • 
-  
-
-  
  • 
-    
    
-      #initialize
-      Hyde::TemplateContext
-    
    
-  
    • 
-  
-
-  
  • 
-    
    
-      #initialize
+      #import
       Hyde::Template
     
    
   
    • 
   
 
   
  • 
+    
    
+      #import
+      Hyde::DSL::TemplateMethods
+    
    
+  
    • 
+  
+
+  
  • 
+    
    
+      #index
+      Hyde::DSL::PathMethods
+    
    
+  
    • 
+  
+
+  
  • 
+    
    
+      #initialize
+      Hyde::Node
+    
    
+  
    • 
+  
+
+  
  • 
+    
    
+      #initialize
+      Hyde::ProcessorContext
+    
    
+  
    • 
+  
+
+  
  • 
+    
    
+      #initialize
+      Hyde::PathContext
+    
    
+  
    • 
+  
+
+  
  • 
+    
    
+      #initialize
+      Hyde::Path
+    
    
+  
    • 
+  
+
+  
  • 
+    
    
+      #initialize
+      Hyde::ProbeContext
+    
    
+  
    • 
+  
+
+  
  • 
+    
    
+      #initialize
+      Hyde::Probe
+    
    
+  
    • 
+  
+
+  
  • 
+    
    
+      #initialize
+      Hyde::Server
+    
    
+  
    • 
+  
+
+  
  • 
+    
    
+      #initialize
+      Hyde::Request
+    
    
+  
    • 
+  
+
+  
  • 
+    
    
+      #initialize
+      Hyde::Response
+    
    
+  
    • 
+  
+
+  
  • 
+    
    
+      #initialize
+      Hyde::TemplateContext
+    
    
+  
    • 
+  
+
+  
  • 
+    
    
+      #initialize
+      Hyde::Template
+    
    
+  
    • 
+  
+
+  
  • 
     
    
       #initialize
       Hyde::Util::Query
@@ -484,6 +524,14 @@
   
    • 
   
 
+  
  • 
+    
    
+      #initialize
+      Hyde::Cookie
+    
    
+  
    • 
+  
+
   
  • 
     
    
       #initialize
@@ -509,6 +557,14 @@
   
 
   
  • 
+    
    
+      #initialize
+      Hyde::Templates::Erubi
+    
    
+  
    • 
+  
+
+  
  • 
     
    
       #initialize
       Hyde::Util::MultipartParser
@@ -516,7 +572,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #initialize
       Hyde::Pattern
@@ -524,7 +580,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #initialize
       Hyde::Handlers::Serve
@@ -532,7 +588,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #initialize
       Hyde::PatternMatching::Glob
@@ -540,7 +596,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #initialize
       Hyde::PatternMatching::ReMatch
@@ -548,7 +604,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #input
       Hyde::Request
@@ -556,6 +612,14 @@
   
    • 
   
 
+  
  • 
+    
    
+      #key
+      Hyde::Cookie
+    
    
+  
    • 
+  
+
   
  • 
     
    
       #local_variable_get
@@ -669,6 +733,14 @@
   
 
   
  • 
+    
    
+      #params
+      Hyde::Cookie
+    
    
+  
    • 
+  
+
+  
  • 
     
    
       #parent
       Hyde::Util::Lookup
@@ -676,7 +748,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #parse
       Hyde::Util::Query
@@ -684,7 +756,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #parse
       Hyde::Util::MultipartParser
@@ -692,7 +764,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #parse_shallow
       Hyde::Util::Query
@@ -700,7 +772,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       parse_value
       Hyde::Util
@@ -708,7 +780,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #patch
       Hyde::DSL::PathConstructors
@@ -716,7 +788,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #path
       Hyde::Request
@@ -724,7 +796,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #path
       Hyde::DSL::PathConstructors
@@ -732,7 +804,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #path_info
       Hyde::Request
@@ -740,6 +812,14 @@
   
    • 
   
 
+  
  • 
+    
    
+      #plugin
+      Hyde::DSL::PathMethods
+    
    
+  
    • 
+  
+
   
  • 
     
    
       #pop_state
@@ -1005,6 +1085,14 @@
   
 
   
  • 
+    
    
+      #run
+      Hyde::Templates::Erubi
+    
    
+  
    • 
+  
+
+  
  • 
     
    
       #run_postprocessors
       Hyde::Request
@@ -1012,7 +1100,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #script_name
       Hyde::Request
@@ -1020,7 +1108,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #serve
       Hyde::DSL::PathConstructors
@@ -1028,7 +1116,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #server_name
       Hyde::Request
@@ -1036,7 +1124,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #server_port
       Hyde::Request
@@ -1044,7 +1132,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #server_protocol
       Hyde::Request
@@ -1052,7 +1140,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #simplify
       Hyde::Util::FormPart
@@ -1060,7 +1148,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #splat
       Hyde::Request
@@ -1068,7 +1156,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #static?
       Hyde::Pattern
@@ -1076,7 +1164,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #status
       Hyde::Response
@@ -1084,7 +1172,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #status
       Hyde::DSL::ProbeMethods
@@ -1092,7 +1180,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #tempfile=
       Hyde::Util::FormPart
@@ -1100,7 +1188,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #to_h
       Hyde::Util::MultipartParser
@@ -1108,7 +1196,23 @@
   
    • 
   
 
+  
  • 
+    
    
+      #to_s
+      Hyde::Cookie
+    
    
+  
    • 
+  
+
   
  • 
+    
    
+      #to_short
+      Hyde::Cookie
+    
    
+  
    • 
+  
+
+  
  • 
     
    
       #trace
       Hyde::DSL::PathConstructors
@@ -1116,7 +1220,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       unescape_html
       Hyde::Util
@@ -1124,7 +1228,7 @@
   
    • 
   
 
-  
  • 
+  
  • 
     
    
       #validate
       Hyde::Response
@@ -1132,6 +1236,14 @@
   
    • 
   
 
+  
  • 
+    
    
+      #value
+      Hyde::Cookie
+    
    
+  
    • 
+  
+
 
       
     
diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index bae6e7d..2c8f5b6 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -100,7 +100,7 @@