tynn 2.0.0.beta2 → 2.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5bd012f5ff0f594ab60d1fa1a3f657e433558b4
-  data.tar.gz: 8d82f66b729cc4ed0ab9298e90c5dedce400b5dc
+  metadata.gz: 1f568dca09bcd12ce698740d952349f3fd5b8384
+  data.tar.gz: bf36f7702d0a0eb6c0684a67429cac3c98b8595c
 SHA512:
-  metadata.gz: a8798001b4bc3f4d4a3503e159e45a9516d8ce2310dbedfbd219f5d3cdfd1f5b24be7927b055c32d7db2d3feb2f37365ca94a888385248a34dccac60c0e71162
-  data.tar.gz: 7406e6aa902dab2bab7d46ce7b9cc5ca8378d4f8e40b8dfd309744cb84368f357d57b2113706b44bf34d6a50b6c25d30f8d28cef1b332ff82a73901bd00f568c
+  metadata.gz: 5791a202646ee5e484d2606da3aa0fec2f9f9c547092fbe3df39e748997b966f3348ad4055654924988967c1af4c5e35f8f4ce07caa57c322595a694e0240b26
+  data.tar.gz: 4c983c263c8c4c0f87317cf3ceda25fbfe63a3cd3dbcb4250d9986d9dad3f52984e971d3ded76d5ef4b0b76fa148c2a6c1bb8020d0476c045ad4374afa3cb478

data/README.md

@@ -26,7 +26,6 @@ A thin library for web development in Ruby.
   * [Setting HTTP Headers](#setting-http-headers)
   * [Redirecting a Request](#redirecting-a-request)
   * [Halting a Request](#halting-a-request)
-  * [Cookies](#cookies)
 * [Extending Tynn](#extending-tynn)
   * [Middleware](#middleware)
   * [Plugins](#plugins)
@@ -301,10 +300,6 @@ end
 # This won't be reached if current_user is nil
 ```
 
-### Cookies
-
-TODO.
-
 ## Extending Tynn
 
 TODO.

data/lib/tynn/render.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
-require "hmote"
+require "tilt"
 
 class Tynn
   module Render
     def self.setup(app, options = {}) # :nodoc:
       app.set(:render, {
         content_type: "text/html",
+        engine: "erb",
+        engine_opts: { escape_html: true },
         layout: "layout",
         root: Dir.pwd,
         views: "views"
@@ -14,8 +16,6 @@ class Tynn
     end
 
     module InstanceMethods
-      include ::HMote::Helpers
-
       # Renders <tt>template</tt> within the default layout. An optional hash of
       # local variables can be passed to make available inside the template. It
       # automatically sets the <tt>Content-Type</tt> header to <tt>"text/html"</tt>.
@@ -43,19 +43,27 @@ class Tynn
       #   res.write(partial("about", name: "John Doe"))
       #
       def partial(template, locals = {})
-        hmote(template_path(template), locals.merge(app: self), TOPLEVEL_BINDING)
+        tilt(template_path(template), locals.merge(app: self), render_opts[:engine_opts])
       end
 
       private
 
       def template_path(template)
-        File.join(views_path, "#{ template }.mote")
+        File.join(views_path, "#{ template }.#{ render_opts[:engine] }")
       end
 
       def views_path
         File.expand_path(render_opts[:views], render_opts[:root])
       end
 
+      def tilt(file, locals = {}, opts = {})
+        tilt_cache.fetch(file) { Tilt.new(file, 1, opts) }.render(self, locals)
+      end
+
+      def tilt_cache
+        Thread.current[:tilt_cache] ||= Tilt::Cache.new
+      end
+
       def render_opts
         self.class.settings[:render]
       end

data/lib/tynn/response.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "rack/utils"
-
 class Tynn
   # It provides convenience methods to construct a Rack response.
   #
@@ -185,77 +183,5 @@ class Tynn
       self.status = status
       self.location = path
     end
-
-    # Sets a cookie into the response. The following options are supported:
-    #
-    # [domain and path]
-    #   Define the scope of the cookie. They tell the browser what website
-    #   the cookie belongs to. If a cookie's domain and path are not specified,
-    #   they default to the domain and path of the resource that was requested.
-    #
-    # [expires]
-    #   Defines a specific date and time for when the browser should delete
-    #   the cookie.
-    #
-    # [max_age]
-    #   Sets the cookie’s expiration as an interval of seconds in the future,
-    #   relative to the time the browser received the cookie.
-    #
-    # [httponly]
-    #   If <tt>true</tt>, sets the <tt>HttpOnly</tt> flag. This mitigates the
-    #   risk of client side scripting accessing the cookie.
-    #
-    # [secure]
-    #   If <tt>true</tt>, sets the <tt>Secure</tt> flag. This tells the browser
-    #   to only transmit the cookie over HTTPS.
-    #
-    # [same_site]
-    #   Disables third-party usage for cookies. There are two possible values
-    #   <tt>:Lax</tt> and <tt>:Strict</tt>. In <tt>Strict</tt> mode, the cookie
-    #   is restrain to any cross-site usage; in <tt>Lax</tt> mode, some cross-site
-    #   usage is allowed.
-    #
-    # <tt></tt>
-    #
-    #   res.set_cookie("foo", "bar")
-    #   res.headers["Set-Cookie"] # => "foo=bar"
-    #
-    #   res.set_cookie("foo2", "bar2")
-    #   res.headers["Set-Cookie"] # => "foo=bar\nfoo2=bar2"
-    #
-    #   res.set_cookie("bar", "bar", {
-    #     domain: ".example.com",
-    #     path: "/",
-    #     # max_age: 0,
-    #     # expires: Time.now + 10_000,
-    #     secure: true,
-    #     httponly: true,
-    #     same_site: :Lax
-    #   })
-    #
-    #   res.headers["Set-Cookie"].split("\n").last
-    #   # => "bar=bar; domain=.example.com; path=/; secure; HttpOnly; SameSite=Lax"
-    #
-    # *NOTE.* This method doesn't sign and/or encrypt the value of the cookie.
-    #
-    def set_cookie(key, value, options = {})
-      Rack::Utils.set_cookie_header!(headers, key, options.merge(value: value))
-    end
-
-    # Deletes cookie by <tt>key</tt>.
-    #
-    #   res.set_cookie("foo", "bar")
-    #   res.headers["Set-Cookie"]
-    #   # => "foo=bar"
-    #
-    #   res.delete_cookie("foo")
-    #   res.headers["Set-Cookie"]
-    #   # => "foo=; max-age=0; expires=Thu, 01 Jan 1970 00:00:00 -0000"
-    #
-    # Check #set_cookie for supported options.
-    #
-    def delete_cookie(key, options = {})
-      Rack::Utils.delete_cookie_header!(headers, key, options)
-    end
   end
 end

data/lib/tynn/session.rb

@@ -55,7 +55,7 @@ class Tynn
   #   is restrain to any cross-site usage; in <tt>Lax</tt> mode, some cross-site
   #   usage is allowed. Defaults to <tt>:Lax</tt>. If <tt>nil</tt> is passed,
   #   the flag is not included. Check this article[http://www.sjoerdlangkemper.nl/2016/04/14/preventing-csrf-with-samesite-cookie-attribute/]
-  #   for more information.
+  #   for more information. Supported by Chrome 51+.
   #
   # [expire_after]
   #   The lifespan of the cookie. If <tt>nil</tt>, the session cookie is temporary

data/lib/tynn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Tynn
-  VERSION = "2.0.0.beta2" # :nodoc:
+  VERSION = "2.0.0.beta3" # :nodoc:
 end

data/test/render_test.rb

@@ -2,6 +2,7 @@
 
 require_relative "helper"
 require_relative "../lib/tynn/render"
+require "tilt/erubis"
 
 class RenderTest < Minitest::Test
   def setup
@@ -72,7 +73,7 @@ class RenderTest < Minitest::Test
     ts = Tynn::Test.new(@app)
     ts.get("/escape")
 
-    assert_equal "&lt;a&gt;&lt;&#x2F;a&gt;", ts.res.body.join.strip
+    assert_equal "&lt;a&gt;&lt;/a&gt;", ts.res.body.join.strip
   end
 
   def test_custom_layout

data/test/response_test.rb

@@ -120,98 +120,4 @@ class ResponseTest < Minitest::Test
 
     assert_equal 303, res.status
   end
-
-  def test_set_cookie
-    res = Tynn::Response.new
-
-    res.set_cookie("foo", "bar")
-
-    assert_equal "foo=bar", res.headers["Set-Cookie"]
-  end
-
-  def test_set_multiple_cookies
-    res = Tynn::Response.new
-
-    res.set_cookie("foo1", "bar1")
-    res.set_cookie("foo2", "bar2")
-
-    assert_equal "foo1=bar1\nfoo2=bar2", res.headers["Set-Cookie"]
-  end
-
-  def test_set_cookie_with_options
-    res = Tynn::Response.new
-
-    time = Time.new(2016)
-
-    res.set_cookie("foo", "bar", {
-      domain: "example.org",
-      path: "/path",
-      max_age: 100, # seconds
-      expires: time,
-      httponly: true,
-      secure: true,
-      same_site: :Lax
-    })
-
-    expected = %W(
-      foo=bar
-      domain=example.org
-      path=/path
-      max-age=100
-      expires=#{ time.gmtime.rfc2822 }
-      secure
-      HttpOnly
-      SameSite=Lax
-    ).join("; ")
-
-    assert_equal expected, res.headers["Set-Cookie"]
-  end
-
-  def test_delete_cookie
-    res = Tynn::Response.new
-
-    res.set_cookie("foo1", "bar1")
-    res.set_cookie("foo2", "bar2")
-
-    res.delete_cookie("foo1")
-
-    expected = [
-      "foo2=bar2",
-      "foo1=; max-age=0; expires=Thu, 01 Jan 1970 00:00:00 -0000"
-    ].join("\n")
-
-    assert_equal expected, res.headers["Set-Cookie"]
-  end
-
-  def test_delete_cookie_with_multiple_domains
-    res = Tynn::Response.new
-
-    res.set_cookie("foo1", "bar1", domain: "foo1.example.org")
-    res.set_cookie("foo2", "bar2", domain: "foo2.example.org")
-
-    res.delete_cookie("foo1", domain: "foo1.example.org")
-
-    expected = [
-      "foo2=bar2; domain=foo2.example.org",
-      "foo1=; domain=foo1.example.org; max-age=0; expires=Thu, 01 Jan 1970 00:00:00 -0000"
-    ].join("\n")
-
-    assert_equal expected, res.headers["Set-Cookie"]
-  end
-
-  def test_delete_cookie_with_same_domain_and_multiple_paths
-    res = Tynn::Response.new
-
-    res.set_cookie("foo1", "bar1", domain: "example.org", path: "/foo1")
-    res.set_cookie("foo2", "bar2", domain: "example.org", path: "/foo2")
-
-    res.delete_cookie("foo1", domain: "example.org", path: "/foo1")
-
-    expected = [
-      "foo2=bar2; domain=example.org; path=/foo2",
-      "foo1=; domain=example.org; path=/foo1; max-age=0; expires=Thu, 01 Jan 1970 00:00:00 -0000"
-    ].join("\n")
-
-    assert_equal expected, res.headers["Set-Cookie"]
-  end
 end

data/test/ssl_test.rb

@@ -112,11 +112,17 @@ class SSLTest < Minitest::Test
   def test_set_secure_flag
     @app.plugin(Tynn::SSL, hsts: false)
 
+    @app.class_eval do
+      def set_cookie(key, value, opts)
+        Rack::Utils.set_cookie_header!(res.headers, key, opts.merge(value: value))
+      end
+    end
+
     @app.define do
       on get do
-        res.set_cookie("first", "cookie", secure: false)
-        res.set_cookie("other", "cookie", http_only: true)
-        res.set_cookie("secure", "cookie", secure: true)
+        set_cookie("first", "cookie", secure: false)
+        set_cookie("other", "cookie", http_only: true)
+        set_cookie("secure", "cookie", secure: true)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tynn
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.beta3
 platform: ruby
 authors:
 - Francesco Rodriguez
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.x
 - !ruby/object:Gem::Dependency
-  name: hmote
+  name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '11.0'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: A thin library for web development in Ruby
 email: hello@frodsan.com
 executables: []