tynn 2.0.0.beta3 → 2.0.0.beta4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tynn
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta3
+  version: 2.0.0.beta4
 platform: ruby
 authors:
 - Francesco Rodriguez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-22 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -30,28 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.x
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.x
-- !ruby/object:Gem::Dependency
-  name: erubis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -80,22 +66,9 @@ 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
+description: Tynn is a simple and flexible library for building JSON web services
+  and web applications in Ruby
+email: frodsan@protonmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -103,7 +76,6 @@ files:
 - LICENSE
 - README.md
 - lib/tynn.rb
-- lib/tynn/base.rb
 - lib/tynn/environment.rb
 - lib/tynn/json.rb
 - lib/tynn/render.rb
@@ -116,6 +88,7 @@ files:
 - lib/tynn/test.rb
 - lib/tynn/utils.rb
 - lib/tynn/version.rb
+- lib/tynn/x/versioning.rb
 - test/default_headers_test.rb
 - test/environment_test.rb
 - test/helper.rb
@@ -132,6 +105,7 @@ files:
 - test/settings_test.rb
 - test/ssl_test.rb
 - test/static_test.rb
+- test/versioning_test.rb
 homepage: https://github.com/frodsan/tynn
 licenses:
 - MIT
@@ -173,3 +147,4 @@ test_files:
 - test/settings_test.rb
 - test/ssl_test.rb
 - test/static_test.rb
+- test/versioning_test.rb

data/lib/tynn/base.rb

@@ -1,434 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright (c) 2016      Francesco Rodriguez
-# Copyright (c) 2015-2016 Michel Martens (Portions of https://github.com/soveran/syro)
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require "rack"
-require "seg"
-require_relative "request"
-require_relative "response"
-require_relative "utils"
-
-class Tynn
-  module Base
-    module ClassMethods
-      # Sets the application handler.
-      #
-      #   class Users < Tynn
-      #   end
-      #
-      #   Users.define do
-      #     on :id do |id|
-      #       on get do
-      #         res.write("GET /users/#{ id }")
-      #       end
-      #
-      #       on post do
-      #         res.write("POST /users/#{ id }")
-      #       end
-      #     end
-      #   end
-      #
-      def define(&block)
-        @__app = build_app(proc { |env| new(block).call(env) })
-      end
-
-      def build_app(app) # :nodoc:
-        middleware.freeze.reverse.inject(app) { |a, e| e.call(a) }
-      end
-
-      # Adds given Rack <tt>middleware</tt> to the stack.
-      #
-      # [middleware] A Rack middleware.
-      # [*args]      A list of arguments passed to the middleware initialization.
-      # [&block]     A block passed to the middleware initialization.
-      #
-      #   require "rack/common_logger"
-      #   require "rack/show_exceptions"
-      #
-      #   Tynn.use(Rack::CommonLogger)
-      #   Tynn.use(Rack::ShowExceptions)
-      #
-      # If applications handler is already set, it raises an error.
-      #
-      #   Tynn.define {}
-      #
-      #   Tynn.use(Rack::CommonLogger)
-      #   # => Application middleware is frozen.
-      #
-      def use(middleware, *args, &block)
-        if self.middleware.frozen?
-          Tynn::Utils.raise_error("Application middleware is frozen", tag: :frozen_middleware)
-        else
-          self.middleware.push(proc { |app| middleware.new(app, *args, &block) })
-        end
-      end
-
-      def middleware # :nodoc:
-        @__middleware ||= []
-      end
-
-      def call(env) # :nodoc:
-        app.call(env)
-      end
-
-      def app # :nodoc:
-        (defined?(@__app) && @__app) or
-          Tynn::Utils.raise_error("Application handler is missing", tag: :missing_handler)
-      end
-
-      # Copies settings into the subclass. If a setting is not found,
-      # checks parent's settings.
-      def inherited(subclass) # :nodoc:
-        subclass.settings.replace(Tynn::Utils.deepclone_hash(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
-
-      # 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.fetch(:default_headers, {})
-      end
-    end
-
-    # Monkey-patches capture to return the path segment instead of storing it
-    # in a hash.
-    class Seg < ::Seg # :nodoc:
-      def capture
-        return nil if root?
-
-        len = (@path.index(SLASH, @pos) || @size) - @pos
-
-        segment = @path[@pos, len]
-
-        move(len)
-
-        segment
-      end
-    end
-
-    module InstanceMethods
-      def initialize(code) # :nodoc:
-        @__code = code
-      end
-
-      def call(env) # :nodoc:
-        @__env = env
-        @__req = Tynn::Request.new(env)
-        @__res = Tynn::Response.new(Hash[self.class.default_headers])
-        @__seg = Tynn::Base::Seg.new(env["PATH_INFO"])
-
-        catch(:halt) do
-          instance_eval(&@__code)
-
-          @__res.finish
-        end
-      end
-
-      # Returns the incoming request object. This object is an instance of
-      # Tynn::Request.
-      #
-      #   req.post?
-      #   # => true
-      #
-      #   req.params
-      #   # => { "username" => "bob", "password" => "secret" }
-      #
-      #   req.headers["Content-Type"]
-      #   # => "application/x-www-form-urlencoded"
-      #
-      def req
-        @__req
-      end
-
-      # Returns the current response object. This object is an instance of
-      # Tynn::Response.
-      #
-      #     res.status = 200
-      #     res.headers["Content-Type"] = "text/html"
-      #     res.write("<h1>Welcome back!</h1>")
-      #
-      def res
-        @__res
-      end
-
-      # Executes a given block if <tt>arg</tt> matches one of these conditions.
-      #
-      # If <tt>arg</tt> is a string, it matches a path segment.
-      #
-      #   Tynn.define do
-      #     # Matches if /foo
-      #     on "foo" do
-      #       # Matches if /foo/bar/baz
-      #       on "bar/baz" do
-      #         res.write("/foo/bar/baz")
-      #       end
-      #     end
-      #   end
-      #
-      # If <tt>arg</tt> is a symbol, it matches and capture a path segment.
-      #
-      #   Tynn.define do
-      #     # Matches if /users
-      #     on "users" do
-      #       # Captures id if matches /users/id
-      #       on :id do |id|
-      #         res.write("/users/#{ id }")
-      #       end
-      #     end
-      #   end
-      #
-      # Finally, if <tt>arg</tt> is <tt>true</tt>, it executes the given block
-      # inconditionally.
-      #
-      #   Tynn.define do
-      #     on current_user.nil? do
-      #       res.status = 401
-      #       res.write("Unauthorized")
-      #     end
-      #   end
-      #
-      def on(arg)
-        (v = match(arg)) && yield(v)
-      end
-
-      def match(arg)
-        case arg
-        when String then @__seg.consume(arg)
-        when Symbol then @__seg.capture
-        when true   then true
-        else false
-        end
-      end
-
-      private :match
-
-      # Immediately stops the request and returns <tt>response</tt>
-      # as per Rack's specification.
-      #
-      #     halt([200, { "Content-Type" => "text/html" }, ["hello"]])
-      #     halt(res.finish)
-      #
-      def halt(response)
-        throw(:halt, response)
-      end
-
-      # Runs a Tynn <tt>app</tt> and pass an optional hash of values to it.
-      #
-      #   Tynn.define do
-      #     on "admin" do
-      #       run(Admin, subdomain: subdomain)
-      #     end
-      #   end
-      #
-      def run(app, inbox = nil)
-        path, script = @__env["PATH_INFO"], @__env["SCRIPT_NAME"]
-
-        @__env["PATH_INFO"] = @__seg.curr
-        @__env["SCRIPT_NAME"] = @__seg.prev
-
-        @__env.delete("tynn.inbox")
-        @__env["tynn.inbox"] = inbox if inbox
-
-        halt(app.call(@__env))
-      ensure
-        @__env["PATH_INFO"], @__env["SCRIPT_NAME"] = path, script
-      end
-
-      # Returns a hash with variables passed to the application.
-      #
-      #   Tynn.define do
-      #     on "api/v1" do
-      #       run(API, version: 1)
-      #     end
-      #
-      #     on "api/v2" do
-      #       run(API, version: 2)
-      #     end
-      #   end
-      #
-      #   API.define do
-      #     version = inbox[:version]
-      #   end
-      #
-      def inbox
-        @__env.fetch("tynn.inbox", {})
-      end
-
-      # Returns <tt>true</tt> if the request method is <tt>GET</tt> and
-      # the path yet to be consumed is empty. Otherwise, returns <tt>false</tt>.
-      #
-      #   Tynn.define do
-      #     on "users" do
-      #       on get do
-      #         res.write("GET /users")
-      #       end
-      #     end
-      #   end
-      #
-      def get
-        root? && req.get?
-      end
-
-      # Returns <tt>true</tt> if the request method is <tt>POST</tt> and
-      # the path yet to be consumed is empty. Otherwise, returns <tt>false</tt>.
-      #
-      #   Tynn.define do
-      #     on "users" do
-      #       post do
-      #         res.write("POST /users")
-      #       end
-      #     end
-      #   end
-      #
-      def post
-        root? && req.post?
-      end
-
-      # Returns <tt>true</tt> if the request method is <tt>PATCH</tt> and
-      # the path yet to be consumed is empty. Otherwise, returns <tt>false</tt>.
-      #
-      #   Tynn.define do
-      #     on "users" do
-      #       on :id do |id|
-      #         on patch do
-      #           res.write("PATCH /users/#{ id }")
-      #         end
-      #       end
-      #     end
-      #   end
-      #
-      def patch
-        root? && req.patch?
-      end
-
-      # Returns <tt>true</tt> if the request method is <tt>PUT</tt> and
-      # the path yet to be consumed is empty. Otherwise, returns <tt>false</tt>.
-      #
-      #   Tynn.define do
-      #     on "users" do
-      #       on :id do |id|
-      #         on put do
-      #           res.write("PUT /users/#{ id }")
-      #         end
-      #       end
-      #     end
-      #   end
-      #
-      def put
-        root? && req.put?
-      end
-
-      # Returns <tt>true</tt> if the request method is <tt>DELETE</tt> and
-      # the path yet to be consumed is empty. Otherwise, returns <tt>false</tt>.
-      #
-      #   Tynn.define do
-      #     on "users" do
-      #       on :id do |id|
-      #         on delete do
-      #           res.write("DELETE /users/#{ id }")
-      #         end
-      #       end
-      #     end
-      #   end
-      #
-      def delete
-        root? && req.delete?
-      end
-
-      # Returns <tt>true</tt> if the path yet to be consumed is empty.
-      #
-      #   Tynn.define do
-      #     on root? do
-      #       res.write("/")
-      #     end
-      #   end
-      #
-      def root?
-        @__seg.root?
-      end
-    end
-  end
-end