tynn 1.0.0.rc1 → 1.0.0.rc2

data/lib/tynn/ssl.rb

@@ -1,71 +1,73 @@
-module Tynn::SSL
-  def self.setup(app, hsts: {}) # :nodoc:
-    app.use(Tynn::SSL::Middleware, hsts: hsts)
-  end
-
-  class Middleware # :nodoc:
-    def initialize(app, hsts: {})
-      @app = app
-      @hsts_header = build_hsts_header(hsts)
+class Tynn
+  module SSL
+    def self.setup(app, hsts: {}) # :nodoc:
+      app.use(Tynn::SSL::Middleware, hsts: hsts)
     end
 
-    def call(env)
-      request = Rack::Request.new(env)
-
-      unless request.ssl?
-        return [301, redirect_headers(request), []]
+    class Middleware # :nodoc:
+      def initialize(app, hsts: {})
+        @app = app
+        @hsts_header = build_hsts_header(hsts)
       end
 
-      result = @app.call(env)
+      def call(env)
+        request = Rack::Request.new(env)
 
-      set_hsts_header(result[1])
-      set_cookies_as_secure(result[1])
-
-      return result
-    end
+        unless request.ssl?
+          return [301, redirect_headers(request), []]
+        end
 
-    private
+        result = @app.call(env)
 
-    HSTS_HEADER = "Strict-Transport-Security".freeze
-    HSTS_EXPIRE = 15_552_000 # 180 days
+        set_hsts_header(result[1])
+        set_cookies_as_secure(result[1])
 
-    def build_hsts_header(options)
-      header = sprintf("max-age=%i", options.fetch(:expires, HSTS_EXPIRE))
-      header << "; includeSubdomains" if options.fetch(:subdomains, true)
-      header << "; preload" if options[:preload]
+        return result
+      end
 
-      return header
-    end
+      private
 
-    def redirect_headers(request)
-      return {
-        "Content-Type" => "text/html",
-        "Location" => https_location(request)
-      }
-    end
+      HSTS_HEADER = "Strict-Transport-Security".freeze
+      HSTS_EXPIRE = 15_552_000 # 180 days
 
-    HTTPS_LOCATION = "https://%s%s".freeze
+      def build_hsts_header(options)
+        header = sprintf("max-age=%i", options.fetch(:expires, HSTS_EXPIRE))
+        header << "; includeSubdomains" if options.fetch(:subdomains, true)
+        header << "; preload" if options[:preload]
 
-    def https_location(request)
-      return sprintf(HTTPS_LOCATION, request.host, request.fullpath)
-    end
+        return header
+      end
 
-    def set_hsts_header(headers)
-      headers[HSTS_HEADER] = @hsts_header
-    end
+      def redirect_headers(request)
+        return {
+          "Content-Type" => "text/html",
+          "Location" => https_location(request)
+        }
+      end
 
-    COOKIE_HEADER = "Set-Cookie".freeze
-    COOKIE_SEPARATOR = "\n".freeze
-    COOKIE_REGEXP = /;\s*secure\s*(;|$)/i
+      HTTPS_LOCATION = "https://%s%s".freeze
 
-    def set_cookies_as_secure(headers)
-      return unless cookies = headers[COOKIE_HEADER]
+      def https_location(request)
+        return sprintf(HTTPS_LOCATION, request.host, request.fullpath)
+      end
 
-      cookies = cookies.split(COOKIE_SEPARATOR).map do |cookie|
-        (cookie !~ COOKIE_REGEXP) ?  "#{ cookie }; secure" : cookie
+      def set_hsts_header(headers)
+        headers[HSTS_HEADER] = @hsts_header
       end
 
-      headers[COOKIE_HEADER] = cookies.join(COOKIE_SEPARATOR)
+      COOKIE_HEADER = "Set-Cookie".freeze
+      COOKIE_SEPARATOR = "\n".freeze
+      COOKIE_REGEXP = /;\s*secure\s*(;|$)/i
+
+      def set_cookies_as_secure(headers)
+        return unless cookies = headers[COOKIE_HEADER]
+
+        cookies = cookies.split(COOKIE_SEPARATOR).map do |cookie|
+          (cookie !~ COOKIE_REGEXP) ?  "#{ cookie }; secure" : cookie
+        end
+
+        headers[COOKIE_HEADER] = cookies.join(COOKIE_SEPARATOR)
+      end
     end
   end
 end

data/lib/tynn/static.rb

@@ -1,36 +1,38 @@
-# Adds support for static files (javascript files, images, stylesheets, etc).
-#
-# ```
-# require "tynn"
-# require "tynn/static"
-#
-# Tynn.helpers(Tynn::Static, ["/js", "/css"])
-# ```
-#
-# By default, serve all requests beginning with the given paths from the folder
-# `public` in the current directory (e.g. `public/js/*`, `public/css/*`). You
-# can change the default by passing the `:root` option.
-#
-# ```
-# Tynn.helpers(Tynn::Static, ["/js", "/css"], root: "assets")
-# ```
-#
-# Under the hood, it uses the [Rack::Static][rack-static] middleware.
-# Thus, supports all the options available for this middleware.
-#
-# ```
-# Tynn.helpers(Tynn::Static, ["/js", "/css"], index: "index.html")
-# ```
-#
-# [rack-static]: http://www.rubydoc.info/gems/rack/Rack/Static
-#
-module Tynn::Static
-  def self.setup(app, urls, options = {}) # :nodoc:
-    options = options.dup
+class Tynn
+  # Adds support for static files (javascript files, images, stylesheets, etc).
+  #
+  # ```
+  # require "tynn"
+  # require "tynn/static"
+  #
+  # Tynn.helpers(Tynn::Static, ["/js", "/css"])
+  # ```
+  #
+  # By default, serve all requests beginning with the given paths from the folder
+  # `public` in the current directory (e.g. `public/js/*`, `public/css/*`). You
+  # can change the default by passing the `:root` option.
+  #
+  # ```
+  # Tynn.helpers(Tynn::Static, ["/js", "/css"], root: "assets")
+  # ```
+  #
+  # Under the hood, it uses the [Rack::Static][rack-static] middleware.
+  # Thus, supports all the options available for this middleware.
+  #
+  # ```
+  # Tynn.helpers(Tynn::Static, ["/js", "/css"], index: "index.html")
+  # ```
+  #
+  # [rack-static]: http://www.rubydoc.info/gems/rack/Rack/Static
+  #
+  module Static
+    def self.setup(app, urls, options = {}) # :nodoc:
+      options = options.dup
 
-    options[:urls] ||= urls
-    options[:root] ||= File.expand_path("public", Dir.pwd)
+      options[:urls] ||= urls
+      options[:root] ||= File.expand_path("public", Dir.pwd)
 
-    app.use(Rack::Static, options)
+      app.use(Rack::Static, options)
+    end
   end
 end

data/lib/tynn/test.rb

@@ -1,51 +1,53 @@
 require "rack/test"
 
-# A simple helper class that uses [rack-test][rack-test] to simulate requests
-# to your application.
-#
-# ```
-# require "tynn"
-# require "tynn/test"
-#
-# Tynn.define do
-#   root do
-#     res.write("hei")
-#   end
-# end
-#
-# app = Tynn::Test.new
-# app.get("/")
-#
-# 200   == app.res.status # => true
-# "hei" == app.res.body   # => true
-# ```
-#
-# **NOTE:** Tynn doesn't ship with [rack-test][rack-test]. In order to
-# use this plugin, you need to install it first.
-#
-# [rack-test]: http://rubygems.org/gems/rack-test
-#
-class Tynn::Test
-  include Rack::Test::Methods
-
-  # Instantiates a new Tynn::Test object with the given `application` to test.
+class Tynn
+  # A simple helper class that uses [rack-test][rack-test] to simulate requests
+  # to your application.
   #
   # ```
-  # class API < Tynn
+  # require "tynn"
+  # require "tynn/test"
+  #
+  # Tynn.define do
+  #   root do
+  #     res.write("hei")
+  #   end
   # end
   #
-  # app = Tynn::Test.new(API)
-  # app.get("/json")
+  # app = Tynn::Test.new
+  # app.get("/")
+  #
+  # 200   == app.res.status # => true
+  # "hei" == app.res.body   # => true
   # ```
   #
-  def initialize(application = Tynn)
-    @app = application
-  end
+  # **NOTE:** Tynn doesn't ship with [rack-test][rack-test]. In order to
+  # use this plugin, you need to install it first.
+  #
+  # [rack-test]: http://rubygems.org/gems/rack-test
+  #
+  class Test
+    include Rack::Test::Methods
 
-  def app # :nodoc:
-    return @app
-  end
+    # Instantiates a new Tynn::Test object with the given `application` to test.
+    #
+    # ```
+    # class API < Tynn
+    # end
+    #
+    # app = Tynn::Test.new(API)
+    # app.get("/json")
+    # ```
+    #
+    def initialize(application = Tynn)
+      @app = application
+    end
 
-  alias_method :res, :last_response
-  alias_method :req, :last_request
+    def app # :nodoc:
+      return @app
+    end
+
+    alias_method :res, :last_response
+    alias_method :req, :last_request
+  end
 end

data/lib/tynn/version.rb

@@ -1,8 +1,8 @@
-class Tynn # :nodoc:
+class Tynn # :nodoc: all
   VERSION = [
     MAJOR_VERSION = 1,
     MINOR_VERSION = 0,
     PATCH_VERSION = 0,
-    PRE_VERSION   = "rc1"
+    PRE_VERSION   = "rc2"
   ].compact.join(".")
 end

data/test/core_test.rb

@@ -63,11 +63,3 @@ test "composition" do
   assert_equal 200, app.res.status
   assert_equal "42", app.res.body
 end
-
-test "raise unless application handler is set" do
-  app = Tynn::Test.new
-
-  assert_raise(RuntimeError) do
-    app.get("/")
-  end
-end

data/test/middleware_test.rb

@@ -54,16 +54,16 @@ test "middleware with composition" do
 end
 
 test "middleware only in child application" do
+  class API < Tynn
+    use(Shrimp)
+  end
+
   Tynn.define do
     on "api" do
       run(API)
     end
   end
 
-  class API < Tynn
-    use(Shrimp)
-  end
-
   API.define do
     get do
       res.write("1")

data/test/render_test.rb

@@ -63,7 +63,7 @@ end
 
 test "custom layout" do
   class App < Tynn
-    layout("custom_layout")
+    set :layout, "custom_layout"
   end
 
   App.define do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tynn
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Francesco Rodríguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -122,7 +122,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: Simple library to create Rack applications
+description: Thin library to create web applications
 email:
 - frodsan@protonmail.ch
 executables: []
@@ -135,9 +135,7 @@ files:
 - lib/tynn/all_methods.rb
 - lib/tynn/environment.rb
 - lib/tynn/erubis.rb
-- lib/tynn/hmote.rb
 - lib/tynn/json.rb
-- lib/tynn/json_parser.rb
 - lib/tynn/matchers.rb
 - lib/tynn/not_found.rb
 - lib/tynn/protection.rb
@@ -155,8 +153,6 @@ files:
 - 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
@@ -167,7 +163,7 @@ files:
 - test/session_test.rb
 - test/ssl_test.rb
 - test/static_test.rb
-homepage: https://github.com/harmoni/tynn
+homepage: https://github.com/frodsan/tynn
 licenses:
 - MIT
 metadata: {}
@@ -190,15 +186,13 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Simple library to create Rack applications
+summary: Thin library to create web applications
 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

data/lib/tynn/hmote.rb

@@ -1,40 +0,0 @@
-require "hmote"
-
-module Tynn::HMote
-  include ::HMote::Helpers
-
-  def self.setup(app, options = {}) # :nodoc:
-    options = options.dup
-
-    options[:layout] ||= "layout"
-    options[:views]  ||= File.expand_path("views", Dir.pwd)
-
-    app.settings[:hmote] ||= options
-  end
-
-  module ClassMethods
-    def layout(layout)
-      settings[:hmote][:layout] = layout
-    end
-  end
-
-  def render(template, locals = {}, layout = settings[:hmote][:layout])
-    res.headers[Rack::CONTENT_TYPE] ||= Syro::Response::DEFAULT
-
-    res.write(view(template, locals, layout))
-  end
-
-  def view(template, locals = {}, layout = settings[:hmote][:layout])
-    return partial(layout, locals.merge(content: partial(template, locals)))
-  end
-
-  def partial(template, locals = {})
-    return hmote(template_path(template), locals.merge(app: self), TOPLEVEL_BINDING)
-  end
-
-  private
-
-  def template_path(template)
-    return File.join(settings[:hmote][:views], "#{ template }.mote")
-  end
-end