tynn 2.0.0.alpha → 2.0.0.beta1

data/test/secure_headers_test.rb

@@ -7,7 +7,7 @@ class SecureHeadersTest < Minitest::Test
   HEADERS = Tynn::SecureHeaders::HEADERS
 
   def setup
-    @app = Class.new(Tynn)
+    @app = new_app
   end
 
   def test_dont_override_default_headers

data/test/session_test.rb

@@ -5,22 +5,22 @@ require_relative "../lib/tynn/session"
 
 class SessionTest < Minitest::Test
   def setup
-    @app = Class.new(Tynn)
+    @app = new_app
   end
 
   def test_raise_error_if_secret_is_empty
-    assert_raises { @app.plugin(Tynn::Session) }
+    assert_raises(Tynn::Error) { @app.plugin(Tynn::Session) }
   end
 
   def test_raise_error_if_secret_is_short
-    assert_raises { @app.plugin(Tynn::Session, secret: "__not_secure__") }
+    assert_raises(Tynn::Error) { @app.plugin(Tynn::Session, secret: "__not_secure__") }
   end
 
   def test_set_and_get_session
     @app.plugin(Tynn::Session, secret: SecureRandom.hex(64))
 
     @app.define do
-      get do
+      on get do
         session[:foo] = "foo"
 
         res.write(session[:foo])
@@ -30,7 +30,7 @@ class SessionTest < Minitest::Test
     ts = Tynn::Test.new(@app)
     ts.get("/")
 
-    assert_equal "foo", ts.res.body
+    assert_equal "foo", ts.res.body.join
     assert_equal "foo", ts.req.session["foo"]
   end
 
@@ -38,7 +38,7 @@ class SessionTest < Minitest::Test
     @app.plugin(Tynn::Session, secret: SecureRandom.hex(64))
 
     @app.define do
-      get do
+      on get do
         session[:foo] = "foo"
       end
     end

data/test/settings_test.rb

@@ -4,7 +4,7 @@ require_relative "helper"
 
 class SettingsTest < Minitest::Test
   def setup
-    @app = Class.new(Tynn)
+    @app = new_app
   end
 
   def test_set_and_get
@@ -39,8 +39,8 @@ class SettingsTest < Minitest::Test
   def test_inheritance
     @app.set(:foo, "foo")
 
-    @child1 = Class.new(@app)
-    @child2 = Class.new(@child1)
+    @child1 = new_app(parent: @app)
+    @child2 = new_app(parent: @child1)
 
     assert_equal "foo", @child1.settings[:foo]
     assert_equal "foo", @child2.settings[:foo]

data/test/ssl_test.rb

@@ -5,7 +5,7 @@ require_relative "../lib/tynn/ssl"
 
 class SSLTest < Minitest::Test
   def setup
-    @app = Class.new(Tynn)
+    @app = new_app
   end
 
   def test_redirect_to_https
@@ -65,7 +65,7 @@ class SSLTest < Minitest::Test
     ts.get("/", {}, "HTTPS" => "on")
 
     assert_equal 200, ts.res.status
-    assert_equal "secure", ts.res.body
+    assert_equal "secure", ts.res.body.join
   end
 
   def test_set_hsts_header_with_defaults
@@ -113,7 +113,7 @@ class SSLTest < Minitest::Test
     @app.plugin(Tynn::SSL, hsts: false)
 
     @app.define do
-      get 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)

data/test/static_test.rb

@@ -5,7 +5,7 @@ require_relative "../lib/tynn/static"
 
 class StaticTest < Minitest::Test
   def setup
-    @app = Class.new(Tynn)
+    @app = new_app
   end
 
   def test_serve_static_files_ok

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tynn
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Francesco Rodriguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.x
 - !ruby/object:Gem::Dependency
-  name: syro
+  name: seg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: hmote
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ 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: []
@@ -104,18 +90,18 @@ files:
 - README.md
 - lib/tynn.rb
 - lib/tynn/base.rb
-- lib/tynn/default_headers.rb
 - lib/tynn/environment.rb
+- lib/tynn/errors.rb
 - lib/tynn/json.rb
 - lib/tynn/render.rb
 - lib/tynn/request.rb
 - lib/tynn/response.rb
 - lib/tynn/secure_headers.rb
 - lib/tynn/session.rb
-- lib/tynn/settings.rb
 - lib/tynn/ssl.rb
 - lib/tynn/static.rb
 - lib/tynn/test.rb
+- lib/tynn/utils.rb
 - lib/tynn/version.rb
 - test/default_headers_test.rb
 - test/environment_test.rb
@@ -125,6 +111,8 @@ files:
 - test/plugin_test.rb
 - test/render_test.rb
 - test/request_headers_test.rb
+- test/request_test.rb
+- test/response_test.rb
 - test/routing_test.rb
 - test/secure_headers_test.rb
 - test/session_test.rb
@@ -164,6 +152,8 @@ test_files:
 - test/plugin_test.rb
 - test/render_test.rb
 - test/request_headers_test.rb
+- test/request_test.rb
+- test/response_test.rb
 - test/routing_test.rb
 - test/secure_headers_test.rb
 - test/session_test.rb

data/lib/tynn/default_headers.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-class Tynn
-  # Adds support to set default headers for responses.
-  #
-  #   require "tynn"
-  #   require "tynn/test"
-  #
-  #   Tynn.set(:default_headers, {
-  #     "Content-Type" => "application/json"
-  #   })
-  #
-  #   Tynn.define { }
-  #
-  #   app = Tynn::Test.new
-  #   app.get("/")
-  #
-  #   app.res.headers
-  #   # => { "Content-Type" => "application/json" }
-  #
-  # This plugin is included by default.
-  #
-  module DefaultHeaders
-    def self.setup(app) # :nodoc:
-      app.set(:default_headers, {})
-    end
-
-    module ClassMethods
-      # Returns a Hash with the default headers.
-      #
-      #   Tynn.set(:default_headers, {
-      #     "Content-Type" => "application/json"
-      #   })
-      #
-      #   Tynn.default_headers["Content-Type"]
-      #   # => "application/json"
-      #
-      def default_headers
-        settings[:default_headers]
-      end
-    end
-
-    module InstanceMethods # :nodoc:
-      # Overrides Syro's default implementation of default headers.
-      def default_headers
-        Hash[self.class.default_headers]
-      end
-    end
-  end
-end

data/lib/tynn/settings.rb

@@ -1,107 +0,0 @@
-# frozen_string_literal: true
-
-class Tynn
-  # It provides a settings API for applications and plugins.
-  #
-  #   require "tynn"
-  #
-  #   module AppName
-  #     def self.setup(app, app_name)
-  #       app.settings[:app_name] = app_name
-  #     end
-  #
-  #     module ClassMethods
-  #       def app_name
-  #         settings[:app_name]
-  #       end
-  #     end
-  #   end
-  #
-  #   Tynn.plugin(AppName, "MyApp")
-  #
-  #   Tynn.app_name
-  #   # => "MyApp"
-  #
-  #   Tynn.set(:app_name, "MyAwesomeApp")
-  #
-  #   Tynn.app_name
-  #   # => "MyAwesomeApp"
-  #
-  # # This plugin is included by default.
-  #
-  module Settings
-    def self.deepclone(hash) # :nodoc:
-      default_proc, hash.default_proc = hash.default_proc, nil
-
-      Marshal.load(Marshal.dump(hash))
-    ensure
-      hash.default_proc = default_proc
-    end
-
-    module ClassMethods
-      # Copies settings into the subclass. If a setting is not found,
-      # checks parent's settings.
-      def inherited(subclass) # :nodoc:
-        subclass.settings.replace(Tynn::Settings.deepclone(settings))
-        subclass.settings.default_proc = proc { |h, k| h[k] = settings[k] }
-      end
-
-      # Returns a Hash with the application settings.
-      #
-      #   Tynn.set(:environment, :development)
-      #
-      #   Tynn.settings
-      #   # => { :environment => :development }
-      #
-      def settings
-        @settings ||= {}
-      end
-
-      # Sets an <tt>option</tt> to the given </tt>value</tt>. If a setting
-      # with the <tt>option</tt> key exists and is a hash value, it merges
-      # the stored hash with <tt>value</tt>.
-      #
-      #   Tynn.set(:environment, :staging)
-      #
-      #   Tynn.settings[:environment]
-      #   # => :staging
-      #
-      #   Tynn.default_headers
-      #   # => { "Content-Type" => "text/html" }
-      #
-      #   Tynn.set(:default_headers, "X-Frame-Options" => "DENY")
-      #
-      #   Tynn.default_headers
-      #   # => { "Content-Type" => "text/html", "X-Frame-Options" => "DENY" }
-      #
-      def set(option, value)
-        v = settings[option]
-
-        if Hash === v
-          set!(option, v.merge(value))
-        else
-          set!(option, value)
-        end
-      end
-
-      # Sets an <tt>option</tt> to the given </tt>value</tt>.
-      #
-      #   Tynn.set!(:environment, :staging)
-      #
-      #   Tynn.settings[:environment]
-      #   # => :staging
-      #
-      #   Tynn.default_headers
-      #   # => { "Content-Type" => "text/html" }
-      #
-      #   Tynn.set!(:default_headers, "X-Frame-Options" => "DENY")
-      #
-      #   Tynn.default_headers
-      #   # => { "X-Frame-Options" => "DENY" }
-      #
-      def set!(option, value)
-        settings[option] = value
-      end
-    end
-  end
-end