tom 0.2.0 → 0.2.1

data/README.md

@@ -10,8 +10,13 @@ All you have to do is define some `Adapter`s that get activated for certain rout
 As you have seen in the video above, Tom Smykowski talks extra much when
 consultants are present who might fire him. So this gem will log to
 STDOUT when you're in development mode or the BOBS environment variable
-is set. Useful for debugging, but nothing you really want in
-production/testing.
+is set. For example, you could
+
+   BOBS=present ruby yourapp.rb
+
+Useful for debugging, but nothing you really want in production/testing.
+Also, Tom is yard documented. Just run `yard --server` and direct your
+browser to `http://localhost:8808`.
 
 # TL;DR
 
@@ -111,8 +116,6 @@ Same goes for mergers.
 # Todo
 
 - handle adapter errors/states in mergers
-- register routes with concurrency on and off
-- use Goliath::Rack::Params
 - use Goliath::Rack::Heartbeat
 - think about consensus protocols
 - ...

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/adapter.rb

@@ -2,6 +2,12 @@ require 'em-synchrony/em-http'
 require_relative 'http'
 
 module Tom
+
+  # Please see the {https://github.com/moviepilot/tom#readme README} for
+  # examples on how to use this.
+  #
+  # @attribute host [String] The hostname this adapter is connecting to (the
+  #   "other" API endpoint).
   class Adapter
     class << self
       attr_accessor :host
@@ -16,13 +22,16 @@ module Tom
     #
     # @param route [String] The route this Adapter should 
     #   respond to.
+    #
     # @param methods [Array<Symbol>] Optional array of methods
     #   that this Adapter is listening to. It defaults to
-    #   all (`:head`, `:get`, `:put`, `:post`, `:delete`)
+    #   all (:head, :get, :put, :post, :delete)
+    #
+    # @return [Hash] See {Tom::Routes.register}
     def self.register_route(*args)
       route = args[0]
       methods = args[1..-1]
-      Dispatcher.register(route: /#{route}/, adapter: self, methods: methods)
+      Tom::Routes.register(route: /#{route}/, adapter: self, methods: methods)
     end
 
     def initialize
@@ -35,6 +44,9 @@ module Tom
     #
     # @param env [Array] The incoming (original request) 
     #   rack env object
+    #
+    # @return [Array] Your beloved triple of [status_code, headers,
+    #   response_body]
     def forward_request(env)
       rewrite_request(env)
       options = http_request_options(env)
@@ -54,6 +66,10 @@ module Tom
     # and POSTs this will add the request body
     #
     # @param env [Array] A rack env object
+    #
+    # @return [Hash] Has the value of @request[:body] inside its
+    #   :body key, but only when the request method in the given
+    #   env matches :put or :post
     def http_request_options(env)
       opts = {}
       if [:put, :post].include? @request[:method]
@@ -68,6 +84,10 @@ module Tom
     # this is what we feed into the EM::HttpRequest
     #
     # @param env [Array] A rack env object
+    #
+    # @return [Hash] Returns whatever the client POSTed/PUT and defaults
+    #   to an empty hash (while debugging, consider your middlewares,
+    #   they might touch this depending on the Content-Type)
     def extract_request_body(env)
       Rack::Request.new(env).POST rescue {}
     end
@@ -78,6 +98,8 @@ module Tom
     # before forwarding it.
     #
     # @param env [Array] A rack env object
+    #
+    # @return [Hash] The @request variable
     def rewrite_request(env)
       rewritten = rewrite_host(env)
       @request = rewritten.merge(@request)
@@ -88,6 +110,8 @@ module Tom
     #
     # @param env [Array] The incoming (original request) 
     #   rack env object
+    #
+    # @return [void] This mofo raises and never returns anything.
     def handle(env)
       raise "Subclass, implement #handle(env)!"
     end
@@ -99,6 +123,8 @@ module Tom
     # hostname.
     #
     # @param env [Array] A rack env object
+    #
+    # @return [Hash] With :host, :uri and :method
     def rewrite_host(env)
       { host:   self.class.host,
         uri:    env["REQUEST_URI"],

data/lib/dispatcher.rb

@@ -1,16 +1,6 @@
 require "em-synchrony/fiber_iterator"
-require 'logger'
 
 module Tom
-
-  LOG = ::Logger.new(STDOUT)
-  LOG.level = ::Logger::ERROR
-  LOG.datetime_format = "%H:%M:%S:"
-  Logger::Formatter.module_eval(
-    %q{ def call(severity, time, progname, msg)} +
-    %q{ "#{format_datetime(time)} #{msg2str(msg)}\n" end}
-  )
-
   class Dispatcher
 
     # Dispatches this request to all adapters that registered
@@ -18,9 +8,11 @@ module Tom
     # to compose a response
     #
     # @param env [Array] A rack env object
-    # @return (see #merge)
+    #
+    # @return [Array] Whatever {Tom::Dispatcher.merge} had to say
     def self.dispatch(env)
-      adapters = adapters_for_route(env)
+      route, method = route_and_method(env)
+      adapters = Tom::Routes.adapters_for_route(route, method)
       return [404, {}, '{reason: "No adapters for this route"}'] if adapters.empty?
 
       # Hit APIs. All at the same time. Oh, mygodd!
@@ -44,125 +36,30 @@ module Tom
     # The merger used depends on the route.
     #
     # @param env [Array] A rack env object
+    #
     # @return [Array] The merged result of all requests
     #   made as an array of status code, headers and body, e.g.
-    #   `[200, {}, "Hi!"]`
+    #   [200, {}, "Hi!"]
     def self.merge(env, responses)
-      merger = merger_for_route(env)
+      route, method = route_and_method(env)
+      merger = Tom::Routes.merger_for_route(route, method)
       Tom::LOG.info "Merging with:"
       Tom::LOG.info "  -> #{merger}"
       merger.new.merge env, responses
     end
 
-    # Registers a opts[:adapter] or opts[:merger] for the 
-    # given opts[:route].
-    #
-    # This method should not be called directly, use register_route
-    # in Tom::Adapter or Tom::Merger instead.
-    #
-    # @param opts [Hash] Needs to have at least `:route` and 
-    #   either `:adapter` or `:merger` set, depending on what you
-    #   are registering. But you don't need to use this method 
-    #   directly, Adapter and Merger provide convenience methods
-    #   for you.
-    def self.register(opts)
-      return register_adapter(opts) if opts[:adapter]
-      return register_merger(opts)  if opts[:merger]
-      raise "You need to supply opts[:adapter] or opts[:merger]"
-    end
-
-    private
-
-    #
-    #  Registers an adapter for a given route and request method
-    #
-    def self.register_adapter(opts)
-      validate_type(opts[:adapter], Adapter)
-      methods = get_methods(opts)
-      @adapters ||= default_methods_hash
-      methods.each do |method|
-        @adapters[method][opts[:route]] ||= []
-        @adapters[method][opts[:route]] << opts[:adapter]
-      end
-    end
 
-    #
-    #  Registers merger for a given route and request method
-    #
-    def self.register_merger(opts)
-      validate_type(opts[:merger], Merger)
-      methods = get_methods(opts)
-      @mergers ||= default_methods_hash
-      methods.each do |method|
-        @mergers[method][opts[:route]] ||= []
-        @mergers[method][opts[:route]] << opts[:merger]
-      end
-    end
 
+    # Extract the route/request uri and the method from a
+    # rack env
     #
-    #  Fetches the methods from the options hash, defaults
-    #  to all methods.
-    #
-    def self.get_methods(opts)
-      return opts[:methods] unless opts[:methods].empty?
-      [:head, :get, :put, :post, :delete]
-    end
-
-    #
-    #  Just some defaults to initialize thing
-    #
-    def self.default_methods_hash
-      { head:   {},
-        get:    {},
-        put:    {},
-        post:   {},
-        delete: {}
-      }
-    end
-
-    #
-    #  Find the right adapter for a route
-    #
-    def self.adapters_for_route(env)
-      @adapters ||= default_methods_hash
-      route, method = route_and_method(env)
-      matches = []
-      @adapters[method].map do |reg_route, adapters|
-        next unless reg_route.match(route)
-        matches += adapters
-      end
-      matches.uniq
-    end
-
-    #
-    #  Find the right merger for a route
-    #
-    def self.merger_for_route(env)
-      @mergers ||= default_methods_hash
-      route, method = route_and_method(env)
-      @mergers[method].each do |reg_route, mergers|
-        next unless reg_route.match(route)
-        return mergers.first
-      end
-      raise "Found no merger for route #{route}"
-    end
-
-    #
-    #  Extract the route/request uri and the method from a
-    #  rack env
+    # @param env [Hash] A rack env
     #
+    # @return [Array] Contains request_path, request_method as symbols
     def self.route_and_method(env)
       [env["REQUEST_PATH"],
        env["REQUEST_METHOD"].downcase.to_sym]
     end
 
-    #
-    #  Make sure one class is a subclass of another class
-    #
-    def self.validate_type(c, expected)
-      return if c < expected
-      raise "Invalid type. Expected #{expected} got #{c}"
-    end
-
   end
 end

data/lib/goliath_api.rb

@@ -0,0 +1,33 @@
+module Tom
+
+  # WE HAZ ALL TEH GOLIATH REQUESTS AND FORWARDETH
+  # THEM TO DEH DISPATCHERETH.
+  #
+  # We have to see if this is the right way to do
+  # it when it comes to parallel stuff and so on...
+  class GoliathAPI < Goliath::API
+    use Goliath::Rack::Render
+
+    # Forwards env to {Tom::Dispatcher.dispatch}, look there.
+    #
+    # @param env [Hash] Rack env
+    def response(env)
+      begin
+        Tom::Dispatcher.dispatch(env)
+      rescue => e
+        handle_exception e, env
+      end
+    end
+
+    # Hardcoded JSON stacktrace stuff for now...
+    def handle_exception(e, env)
+      trace = e.backtrace.join "\n"
+      Tom::LOG.info e
+      Tom::LOG.info trace
+      [500, {}, {error: e,
+        stacktrace: trace,
+        url:        env["REQUEST_URI"]
+      }.to_json]
+    end
+  end
+end

data/lib/init.rb

@@ -1,8 +1,18 @@
 require 'bundler'
 Bundler.require :default
 
-module Tom; end
+# Init Goliath env unless it was done already
+Goliath.env rescue Goliath.env = (ENV['RACK_ENV'] || 'development').to_sym
 
+# In dev mode, we do some logging (defaults to Logger::ERROR in other
+# envs)
+if Goliath.env == :development || ENV['BOBS']
+  Tom::LOG.level = Logger::INFO
+end
+Tom::LOG.info "Started goliath in #{Goliath.env} environment (change with ruby your_app.rb -e development or by setting $RACK_ENV)"
+
+# Fetch the codes
+require_relative 'goliath_api'
 require_relative 'dispatcher'
 require_relative 'adapter'
 require_relative 'merger'

data/lib/merger.rb

@@ -1,4 +1,7 @@
 module Tom
+
+  # Please see the {https://github.com/moviepilot/tom#readme README} for
+  # examples on how to use this.
   class Merger
 
     # Registers a route with the request dispatcher
@@ -18,7 +21,7 @@ module Tom
     def self.register_route(*args)
       route = args[0]
       methods = args[1..-1]
-      Dispatcher.register(route: /#{route}/, merger: self, methods: methods)
+      Tom::Routes.register(route: /#{route}/, merger: self, methods: methods)
     end
 
     # When the request dispatcher made all the requests,
@@ -29,7 +32,7 @@ module Tom
     #   rack env object
     # @param responses [Hash] Replies from all Adapters that
     #   got triggered by route and method, e.g.
-    #   `{MyAdapter: rack_env, MyOtherAdapter: other_env}`
+    #   `{ MyAdapter: rack_env, MyOtherAdapter: other_env }`
     # @return [Array] A rack response (for example, something
     #   like [200, {}, "body"])
     def merge(env, responses)

data/lib/tom.rb

@@ -1,59 +1,10 @@
+require_relative 'tom/log'
+require_relative 'tom/routes'
+require_relative 'tom/config'
 require_relative 'init'
 
-# Init Goliath env unless it was done already
-Goliath.env rescue Goliath.env = (ENV['RACK_ENV'] || 'development').to_sym
-
-# In dev mode, we do some logging (defaults to Logger::ERROR in other
-# envs)
-if Goliath.env == :development || ENV['BOBS']
-  Tom::LOG.level = Logger::INFO
-end
-Tom::LOG.info "Started goliath in #{Goliath.env} environment (change with ruby your_app.rb -e development or by setting $RACK_ENV)"
-
+# The only thing you should really do with the Tom class is 
+# setting or reading its configuration.
 module Tom
-
-  def self.config
-    @config || default_config
-  end
-
-  def self.config=(config)
-    @config = config
-  end
-
-  #
-  #  WE HAZ ALL TEH GOLIATH REQUESTS AND FORWARDETH
-  #  THEM TO DEH DISPATCHERETH.
-  #
-  #  We have to see if this is the right way to do
-  #  it when it comes to parallel stuff and so on...
-  #
-  class GoliathAPI < Goliath::API
-    use Goliath::Rack::Render
-
-    def response(env)
-      begin
-        Tom::Dispatcher.dispatch(env)
-      rescue => e
-        handle_exception e, env
-      end
-    end
-
-    def handle_exception(e, env)
-      trace = e.backtrace.join "\n"
-      Tom::LOG.info e
-      Tom::LOG.info trace
-      [500, {}, {error: e,
-        stacktrace: trace,
-        url:        env["REQUEST_URI"]
-      }.to_json]
-    end
-  end
-
-  private
-
-  def self.default_config
-    { timeouts:
-        { connect_timeout: 5,
-          inactivity_timeout: 10 } }
-  end
+  extend Tom::Config
 end

data/lib/tom/config.rb

@@ -0,0 +1,32 @@
+module Tom
+
+  # Don't use this module directly - access these methods
+  # through {Tom} who does a `extend Tom::Config`
+  module Config
+
+    # @return [Hash] configuration
+    def config
+      @config || default_config
+    end
+
+
+    # @param config [Hash] The configuration you want 
+    #   to set. Currently, only the `:timeout` key is 
+    #   read, and in it the `:connect_timeout` and the
+    #   `:inactivity_timeout` keys can be set to an int
+    #   value (seconds)
+    # @return [Hash] configuration
+    def config=(config)
+      @config = config
+    end
+
+
+    private
+
+    def default_config
+      { timeouts:
+        { connect_timeout: 5,
+          inactivity_timeout: 10 } }
+    end
+  end
+end

data/lib/tom/log.rb

@@ -0,0 +1,11 @@
+require 'logger'
+
+module Tom
+  LOG = ::Logger.new(STDOUT)
+  LOG.level = ::Logger::ERROR
+  LOG.datetime_format = "%H:%M:%S:"
+  Logger::Formatter.module_eval(
+    %q{ def call(severity, time, progname, msg)} +
+    %q{ "#{format_datetime(time)} #{msg2str(msg)}\n" end}
+  )
+end

data/lib/tom/routes.rb

@@ -0,0 +1,136 @@
+module Tom
+
+  # Takes care of registering adapters and mergers for routes,
+  # and then matching routes and methods to adapters and mergers.
+  module Routes
+
+    # Registers a opts[:adapter] or opts[:merger] for the
+    # given opts[:route].
+    #
+    # This method should not be called directly in your app, you
+    # would use {Tom::Adapter.register_route} or
+    # {Tom::Merger.register_route} in your subclass of {Tom::Adapter}
+    # or {Tom::Merger}
+    #
+    # @param opts [Hash] Needs to have at least :route and
+    #   either :adapter or :merger set, depending on what you
+    #   are registering. But you don't need to use this method
+    #   directly, Adapter and Merger provide convenience methods
+    #   for you.
+    #
+    # @return [Hash] See {Tom::Routes.register_adapter} or
+    #   {Tom::Routes.register_merger}
+    def self.register(opts)
+      return register_adapter(opts) if opts[:adapter]
+      return register_merger(opts)  if opts[:merger]
+      raise "You need to supply opts[:adapter] or opts[:merger]"
+    end
+
+    # Registers an {Adapter} for a given route and request method
+    #
+    # @param opts [Hash] Needs to have the :route and :adapter
+    #   keys set with a regular expression and a subclass of
+    #   {Tom::Adapter}
+    #
+    # @return [Hash] First level are the HTTP methods, second
+    #   level are the regular expressions for routes, and the
+    #   values are arrays of Adapters for the combination of
+    #   request method and route.
+    def self.register_adapter(opts)
+      validate_type(opts[:adapter], Adapter)
+      methods = get_methods(opts)
+      @adapters ||= default_methods_hash
+      methods.each do |method|
+        @adapters[method][opts[:route]] ||= []
+        @adapters[method][opts[:route]] << opts[:adapter]
+      end
+      @adapters
+    end
+
+    # Registers a {Merger} for a given route and request method
+    #
+    # @return [Hash] First level are the HTTP methods, second
+    #   level are the regular expressions for routes, and the
+    #   values are arrays of Mergers for the combination of
+    #   request method and route.
+    def self.register_merger(opts)
+      validate_type(opts[:merger], Merger)
+      methods = get_methods(opts)
+      @mergers ||= default_methods_hash
+      methods.each do |method|
+        @mergers[method][opts[:route]] ||= []
+        @mergers[method][opts[:route]] << opts[:merger]
+      end
+      @mergers
+    end
+
+    # @return [Hash] See what {Tom::Routes.register_adapter} returns
+    def self.adapters
+      @adapters
+    end
+
+    # @return [Hash] See what {Tom::Routes.register_merger} returns
+    def self.mergers
+      @mergers
+    end
+
+    private
+
+    # Fetches the methods from the options hash, defaults
+    # to all methods.
+    #
+    # @param opts [Hash] We're looking for :methods in this hash
+    #
+    # @return [Hash] Returns what's in :methods, and defaults to
+    #   [:head, :get, :put, :post, :delete]
+    def self.get_methods(opts)
+      return opts[:methods] unless opts[:methods].empty?
+      [:head, :get, :put, :post, :delete]
+    end
+
+    #
+    #  Just some defaults to initialize thing
+    #
+    def self.default_methods_hash
+      { head:   {},
+        get:    {},
+        put:    {},
+        post:   {},
+        delete: {}
+      }
+    end
+
+    #
+    #  Find the right adapter for a route
+    #
+    def self.adapters_for_route(route, method)
+      @adapters ||= default_methods_hash
+      matches = []
+      @adapters[method].map do |reg_route, adapters|
+        next unless reg_route.match(route)
+        matches += adapters
+      end
+      matches.uniq
+    end
+
+    #
+    #  Find the right merger for a route
+    #
+    def self.merger_for_route(route, method)
+      @mergers ||= default_methods_hash
+      @mergers[method].each do |reg_route, mergers|
+        next unless reg_route.match(route)
+        return mergers.first
+      end
+      raise "Found no merger for route #{route}"
+    end
+
+    #
+    #  Make sure one class is a subclass of another class
+    #
+    def self.validate_type(c, expected)
+      return if c < expected
+      raise "Invalid type. Expected #{expected} got #{c}"
+    end
+  end
+end

data/tom.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tom"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jannis Hermanns"]
-  s.date = "2011-12-06"
+  s.date = "2011-12-07"
   s.description = " Tom uses Goliath to dispatch HTTP requests to multiple other APIs (via Adapters) in parallel. In a next step, a Merger merges the result and responds to the clients request."
   s.email = "jannis@gmail.com"
   s.extra_rdoc_files = [
@@ -27,10 +27,14 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/adapter.rb",
     "lib/dispatcher.rb",
+    "lib/goliath_api.rb",
     "lib/http.rb",
     "lib/init.rb",
     "lib/merger.rb",
     "lib/tom.rb",
+    "lib/tom/config.rb",
+    "lib/tom/log.rb",
+    "lib/tom/routes.rb",
     "spec/lib/adapter_spec.rb",
     "spec/lib/dispatcher_spec.rb",
     "spec/spec_helper.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tom
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-06 00:00:00.000000000Z
+date: 2011-12-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goliath
-  requirement: &70326256348120 !ruby/object:Gem::Requirement
+  requirement: &70109120203120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326256348120
+  version_requirements: *70109120203120
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &70326256347400 !ruby/object:Gem::Requirement
+  requirement: &70109120202620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326256347400
+  version_requirements: *70109120202620
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70326256346700 !ruby/object:Gem::Requirement
+  requirement: &70109120202140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326256346700
+  version_requirements: *70109120202140
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70326256345860 !ruby/object:Gem::Requirement
+  requirement: &70109120201560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326256345860
+  version_requirements: *70109120201560
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70326256345260 !ruby/object:Gem::Requirement
+  requirement: &70109120201040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70326256345260
+  version_requirements: *70109120201040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70326256344680 !ruby/object:Gem::Requirement
+  requirement: &70109120200460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70326256344680
+  version_requirements: *70109120200460
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70326256344180 !ruby/object:Gem::Requirement
+  requirement: &70109120199960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70326256344180
+  version_requirements: *70109120199960
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70326256343660 !ruby/object:Gem::Requirement
+  requirement: &70109120199420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326256343660
+  version_requirements: *70109120199420
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70326256343040 !ruby/object:Gem::Requirement
+  requirement: &70109120198820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326256343040
+  version_requirements: *70109120198820
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70326256342520 !ruby/object:Gem::Requirement
+  requirement: &70109120198220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326256342520
+  version_requirements: *70109120198220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70326256342000 !ruby/object:Gem::Requirement
+  requirement: &70109120197620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326256342000
+  version_requirements: *70109120197620
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70326256341460 !ruby/object:Gem::Requirement
+  requirement: &70109120197020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326256341460
+  version_requirements: *70109120197020
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70326256340960 !ruby/object:Gem::Requirement
+  requirement: &70109120196420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326256340960
+  version_requirements: *70109120196420
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70326256340460 !ruby/object:Gem::Requirement
+  requirement: &70109120195780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326256340460
+  version_requirements: *70109120195780
 description: ! ' Tom uses Goliath to dispatch HTTP requests to multiple other APIs
   (via Adapters) in parallel. In a next step, a Merger merges the result and responds
   to the clients request.'
@@ -185,10 +185,14 @@ files:
 - VERSION
 - lib/adapter.rb
 - lib/dispatcher.rb
+- lib/goliath_api.rb
 - lib/http.rb
 - lib/init.rb
 - lib/merger.rb
 - lib/tom.rb
+- lib/tom/config.rb
+- lib/tom/log.rb
+- lib/tom/routes.rb
 - spec/lib/adapter_spec.rb
 - spec/lib/dispatcher_spec.rb
 - spec/spec_helper.rb
@@ -208,7 +212,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2944832155486996740
+      hash: 1267034355888235248
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: