tynn 0.0.4 → 1.0.0.rc1

data/test/core_test.rb

@@ -71,89 +71,3 @@ test "raise unless application handler is set" do
     app.get("/")
   end
 end
-
-scope "middleware" do
-  class Shrimp
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      s, h, resp = @app.call(env)
-
-      return [s, h, resp.reverse]
-    end
-  end
-
-  setup do
-    Tynn.reset!
-  end
-
-  test "middleware in main application" do
-    Tynn.use(Shrimp)
-
-    Tynn.define do
-      get do
-        res.write("1")
-        res.write("2")
-      end
-    end
-
-    app = Tynn::Test.new
-    app.get("/")
-
-    assert_equal 200, app.res.status
-    assert_equal "21", app.res.body
-  end
-
-  test "middleware with composition" do
-    Tynn.use(Shrimp)
-
-    Tynn.define do
-      on "api" do
-        run(API)
-      end
-    end
-
-    class API < Tynn
-    end
-
-    API.define do
-      get do
-        res.write("1")
-        res.write("2")
-      end
-    end
-
-    app = Tynn::Test.new
-    app.get("/api")
-
-    assert_equal 200, app.res.status
-    assert_equal "21", app.res.body
-  end
-
-  test "middleware only in child application" do
-    Tynn.define do
-      on "api" do
-        run(API)
-      end
-    end
-
-    class API < Tynn
-      use(Shrimp)
-    end
-
-    API.define do
-      get do
-        res.write("1")
-        res.write("2")
-      end
-    end
-
-    app = Tynn::Test.new
-    app.get("/api")
-
-    assert_equal 200, app.res.status
-    assert_equal "21", app.res.body
-  end
-end

data/test/matchers_test.rb

@@ -19,19 +19,22 @@ test "default" do |app|
   assert_equal "foo", app.res.body
 end
 
-test "param?" do |app|
+test "param" do |app|
   Tynn.define do
-    on param?(:key) do
-      res.write(req[:key])
+    param(:foo) do |foo|
+      res.write(foo)
+    end
+
+    param("bar") do |bar|
+      res.write(bar)
     end
   end
 
-  app.get("/")
+  app.get("/", foo: "foo")
 
-  assert_equal 404, app.res.status
+  assert_equal "foo", app.res.body
 
-  app.get("/", key: "foo")
+  app.get("/", foo: "bar")
 
-  assert_equal 200, app.res.status
-  assert_equal "foo", app.res.body
+  assert_equal "bar", app.res.body
 end

data/test/middleware_test.rb

@@ -0,0 +1,79 @@
+class Shrimp
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    status, headers, body = @app.call(env)
+
+    return [status, headers, body.reverse]
+  end
+end
+
+test "middleware in main application" do
+  Tynn.use(Shrimp)
+
+  Tynn.define do
+    get do
+      res.write("1")
+      res.write("2")
+    end
+  end
+
+  app = Tynn::Test.new
+  app.get("/")
+
+  assert_equal 200, app.res.status
+  assert_equal "21", app.res.body
+end
+
+test "middleware with composition" do
+  Tynn.use(Shrimp)
+
+  Tynn.define do
+    on "api" do
+      run(API)
+    end
+  end
+
+  class API < Tynn
+  end
+
+  API.define do
+    get do
+      res.write("1")
+      res.write("2")
+    end
+  end
+
+  app = Tynn::Test.new
+  app.get("/api")
+
+  assert_equal 200, app.res.status
+  assert_equal "21", app.res.body
+end
+
+test "middleware only in child application" do
+  Tynn.define do
+    on "api" do
+      run(API)
+    end
+  end
+
+  class API < Tynn
+    use(Shrimp)
+  end
+
+  API.define do
+    get do
+      res.write("1")
+      res.write("2")
+    end
+  end
+
+  app = Tynn::Test.new
+  app.get("/api")
+
+  assert_equal 200, app.res.status
+  assert_equal "21", app.res.body
+end

data/test/protection_test.rb

@@ -1,4 +1,5 @@
 require_relative "../lib/tynn/protection"
+require_relative "../lib/tynn/session"
 
 test "includes secure headers" do
   Tynn.helpers(Tynn::Protection)
@@ -27,3 +28,39 @@ test "supports hsts options" do
 
   assert_equal "max-age=100; preload", hsts
 end
+
+test "adds secure flag to session cookie" do
+  Tynn.helpers(Tynn::Protection, ssl: true)
+  Tynn.helpers(Tynn::Session, secret: "_this_must_be_random_")
+
+  Tynn.define do
+    root do
+      session[:foo] = "foo"
+    end
+  end
+
+  app = Tynn::Test.new
+  app.get("/", {}, "HTTPS" => "on")
+
+  session, _ = app.res.headers["Set-Cookie"].split("\n")
+
+  assert(/;\s*secure\s*(;|$)/i === session)
+end
+
+test "if session uses secure flag" do
+  Tynn.helpers(Tynn::Protection, ssl: true)
+  Tynn.helpers(Tynn::Session, secret: "_this_must_be_random_", secure: true)
+
+  Tynn.define do
+    root do
+      session[:foo] = "foo"
+    end
+  end
+
+  app = Tynn::Test.new
+  app.get("/", {}, "HTTPS" => "on")
+
+  session, _ = app.res.headers["Set-Cookie"].split("\n")
+
+  assert(/;\s*secure\s*(;|$)/i === session)
+end

data/test/session_test.rb

@@ -15,11 +15,6 @@ test "session" do
   app = Tynn::Test.new
   app.get("/")
 
-  env = app.req.env
-  session = env["rack.session"]
-  session_options = env["rack.session.options"]
-
   assert_equal "foo", app.res.body
-  assert_equal "foo", session["foo"]
-  assert_equal true, session_options[:http_only]
+  assert_equal "foo", app.req.env["rack.session"]["foo"]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tynn
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Francesco Rodríguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -28,44 +28,44 @@ dependencies:
   name: seteable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: syro
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: cutest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -84,30 +84,30 @@ dependencies:
   name: hmote
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -129,25 +129,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gems"
 - LICENSE
 - README.md
-- docs/bin/build
-- docs/guides/security.md
-- docs/index.md
-- docs/layout.html
-- docs/public/.gitignore
-- docs/public/css/styles.css
-- docs/public/guides/.gitignore
-- docs/syro/syro.rb
-- examples/composition.ru
-- examples/hello.ru
-- examples/protection.ru
-- examples/render.ru
-- examples/views/home.erb
-- examples/views/layout.erb
 - lib/tynn.rb
-- lib/tynn/csrf.rb
+- lib/tynn/all_methods.rb
 - lib/tynn/environment.rb
 - lib/tynn/erubis.rb
 - lib/tynn/hmote.rb
@@ -155,18 +140,18 @@ files:
 - lib/tynn/json_parser.rb
 - lib/tynn/matchers.rb
 - lib/tynn/not_found.rb
-- lib/tynn/options.rb
 - lib/tynn/protection.rb
 - lib/tynn/render.rb
+- lib/tynn/request.rb
+- lib/tynn/response.rb
 - lib/tynn/secure_headers.rb
 - lib/tynn/session.rb
 - lib/tynn/ssl.rb
 - lib/tynn/static.rb
 - lib/tynn/test.rb
 - lib/tynn/version.rb
-- makefile
+- test/all_methods_test.rb
 - test/core_test.rb
-- test/csrf_test.rb
 - test/environment_test.rb
 - test/erubis_test.rb
 - test/helper.rb
@@ -174,23 +159,14 @@ files:
 - test/json_parser_test.rb
 - test/json_test.rb
 - test/matchers_test.rb
+- test/middleware_test.rb
 - test/not_found_test.rb
-- test/options_test.rb
 - test/protection_test.rb
 - test/render_test.rb
 - test/secure_headers_test.rb
 - test/session_test.rb
 - test/ssl_test.rb
 - test/static_test.rb
-- test/views/custom_layout.erb
-- test/views/custom_layout.mote
-- test/views/layout.erb
-- test/views/layout.mote
-- test/views/partial.erb
-- test/views/partial.mote
-- test/views/view.erb
-- test/views/view.mote
-- tynn.gemspec
 homepage: https://github.com/harmoni/tynn
 licenses:
 - MIT
@@ -206,13 +182,30 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Simple library to create Rack applications
-test_files: []
+test_files:
+- test/all_methods_test.rb
+- test/core_test.rb
+- test/environment_test.rb
+- test/erubis_test.rb
+- test/helper.rb
+- test/hmote_test.rb
+- test/json_parser_test.rb
+- test/json_test.rb
+- test/matchers_test.rb
+- test/middleware_test.rb
+- test/not_found_test.rb
+- test/protection_test.rb
+- test/render_test.rb
+- test/secure_headers_test.rb
+- test/session_test.rb
+- test/ssl_test.rb
+- test/static_test.rb

data/.gems

@@ -1,10 +0,0 @@
-cutest:1.2.2
-erubis:2.7.0
-hmote:1.4.0
-rack:1.6.4
-rack-test:0.6.3
-redcarpet:3.3.3
-seg:0.0.1
-seteable:1.1.0
-syro:1.0.0
-tilt:2.0.1

data/docs/bin/build

@@ -1,38 +0,0 @@
-#!/usr/bin/env ruby
-
-require "redcarpet"
-
-LAYOUT = File.read("./docs/layout.html")
-
-def markdown(text)
-  options = {
-    autolink: true,
-    fenced_code_blocks: true,
-    tables: true
-  }
-
-  renderer = Redcarpet::Render::HTML.new
-  markdown = Redcarpet::Markdown.new(renderer, options)
-
-  return markdown.render(text)
-end
-
-def title(content)
-  return content.match(/<h1>(.*)<\/h1>/)[1]
-end
-
-def render(content)
-  markdown = markdown(content)
-  title = title(markdown)
-
-  return sprintf(LAYOUT, content: markdown, title: title)
-end
-
-Dir["./docs/**/*.md"].each do |file|
-  _, name = file.split("./docs")
-
-  name = name.sub(".md", ".html")
-  output = File.join("./docs/public", name)
-
-  File.write(output, render(File.read(file)))
-end

data/docs/guides/security.md

@@ -1 +0,0 @@
-# Security

data/docs/index.md

@@ -1,89 +0,0 @@
-# Getting Started
-
-## Subtitle
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-Donec magna sapien, dignissim at tellus lobortis, finibus
-pulvinar nulla. Nulla non ante ut mauris accumsan
-vulputate at sed tortor. Integer dignissim massa at elit
-pretium dapibus. Duis pretium erat dolor, vel luctus quam
-pretium eget. Fusce imperdiet est in quam semper, ac
-hendrerit risus hendrerit. Praesent convallis, risus
-tempor lacinia posuere, quam diam porttitor magna, eget
-pharetra turpis dui id est. Suspendisse pharetra mauris
-nulla, eget sagittis risus cursus eget. Donec efficitur
-odio non risus luctus, nec posuere nulla fermentum.
-
-## Subtitle
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-Donec magna sapien, dignissim at tellus lobortis, finibus
-pulvinar nulla. Nulla non ante ut mauris accumsan
-vulputate at sed tortor. Integer dignissim massa at elit
-pretium dapibus. Duis pretium erat dolor, vel luctus quam
-pretium eget. Fusce imperdiet est in quam semper, ac
-hendrerit risus hendrerit. Praesent convallis, risus
-tempor lacinia posuere, quam diam porttitor magna, eget
-pharetra turpis dui id est. Suspendisse pharetra mauris
-nulla, eget sagittis risus cursus eget. Donec efficitur
-odio non risus luctus, nec posuere nulla fermentum.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-Donec magna sapien, dignissim at tellus lobortis, finibus
-pulvinar nulla. Nulla non ante ut mauris accumsan
-vulputate at sed tortor. Integer dignissim massa at elit
-pretium dapibus. Duis pretium erat dolor, vel luctus quam
-pretium eget. Fusce imperdiet est in quam semper, ac
-hendrerit risus hendrerit. Praesent convallis, risus
-tempor lacinia posuere, quam diam porttitor magna, eget
-pharetra turpis dui id est. Suspendisse pharetra mauris
-nulla, eget sagittis risus cursus eget. Donec efficitur
-odio non risus luctus, nec posuere nulla fermentum.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-Donec magna sapien, dignissim at tellus lobortis, finibus
-pulvinar nulla. Nulla non ante ut mauris accumsan
-vulputate at sed tortor. Integer dignissim massa at elit
-pretium dapibus. Duis pretium erat dolor, vel luctus quam
-pretium eget. Fusce imperdiet est in quam semper, ac
-hendrerit risus hendrerit. Praesent convallis, risus
-tempor lacinia posuere, quam diam porttitor magna, eget
-pharetra turpis dui id est. Suspendisse pharetra mauris
-nulla, eget sagittis risus cursus eget. Donec efficitur
-odio non risus luctus, nec posuere nulla fermentum.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-Donec magna sapien, dignissim at tellus lobortis, finibus
-pulvinar nulla. Nulla non ante ut mauris accumsan
-vulputate at sed tortor. Integer dignissim massa at elit
-pretium dapibus. Duis pretium erat dolor, vel luctus quam
-pretium eget. Fusce imperdiet est in quam semper, ac
-hendrerit risus hendrerit. Praesent convallis, risus
-tempor lacinia posuere, quam diam porttitor magna, eget
-pharetra turpis dui id est. Suspendisse pharetra mauris
-nulla, eget sagittis risus cursus eget. Donec efficitur
-odio non risus luctus, nec posuere nulla fermentum.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-Donec magna sapien, dignissim at tellus lobortis, finibus
-pulvinar nulla. Nulla non ante ut mauris accumsan
-vulputate at sed tortor. Integer dignissim massa at elit
-pretium dapibus. Duis pretium erat dolor, vel luctus quam
-pretium eget. Fusce imperdiet est in quam semper, ac
-hendrerit risus hendrerit. Praesent convallis, risus
-tempor lacinia posuere, quam diam porttitor magna, eget
-pharetra turpis dui id est. Suspendisse pharetra mauris
-nulla, eget sagittis risus cursus eget. Donec efficitur
-odio non risus luctus, nec posuere nulla fermentum.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-Donec magna sapien, dignissim at tellus lobortis, finibus
-pulvinar nulla. Nulla non ante ut mauris accumsan
-vulputate at sed tortor. Integer dignissim massa at elit
-pretium dapibus. Duis pretium erat dolor, vel luctus quam
-pretium eget. Fusce imperdiet est in quam semper, ac
-hendrerit risus hendrerit. Praesent convallis, risus
-tempor lacinia posuere, quam diam porttitor magna, eget
-pharetra turpis dui id est. Suspendisse pharetra mauris
-nulla, eget sagittis risus cursus eget. Donec efficitur
-odio non risus luctus, nec posuere nulla fermentum.

data/docs/layout.html

@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <title>tynn | %{title}</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="/css/styles.css" rel="stylesheet" media="screen">
-    <link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
-    <link href="//fonts.googleapis.com/css?family=Roboto:400,500" rel="stylesheet">
-  </head>
-  <body>
-    <div class="container">
-      <header>
-        <div class="wrap">
-          <a class="nav-home" href="/">TYNN</a>
-          <a class="nav-github" href="https://github.com/frodsan/tynn">
-            <i class="fa fa-github"></i>
-          </a>
-        </div>
-      </header>
-
-      <section class="content wrap">
-        <div class="nav-docs">
-          <div class="nav-docs-section">
-            <h3>QUICK START</h3>
-            <ul>
-              <li><a href="#">Getting Started</a></li>
-              <li><a href="#">Tutorial</a></li>
-            </ul>
-          </div>
-          <div class="nav-docs-section">
-            <h3>Guides</h3>
-            <ul>
-              <li><a href="#">Link To Something</a></li>
-              <li><a href="#">Link to Something</a>
-                <ul>
-                  <li><a href="#">Sublink</a></li>
-                  <li><a href="#">Sublink</a></li>
-                </ul>
-              </li>
-              <li><a href="#">Link to Something</a></li>
-              <li><a href="#">Link to Something</a></li>
-            </ul>
-          </div>
-          <div class="nav-docs-section">
-            <h3>Community</h3>
-            <ul>
-              <li><a href="#">Slack</a></li>
-              <li><a href="#">Link to Something</a></li>
-              <li><a href="#">Link to Something</a></li>
-            </ul>
-          </div>
-        </div>
-
-        <div class="inner-content">
-          %{content}
-        </div>
-      </section>
-    </div>
-  </body>
-</html>

data/docs/public/.gitignore

@@ -1 +0,0 @@
-*.html