tom 0.2.2 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/lib/dispatcher.rb

@@ -13,14 +13,14 @@ module Tom
     def self.dispatch(env)
 
       # 1. hit APIs. All at the same time. Oh, mygodd!
-      Tom::LOG.info "#{env['REQUEST_METHOD'].upcase} #{env['REQUEST_URI']}"
+      Tom::Log.logger.info "#{env['REQUEST_METHOD'].upcase} #{env['REQUEST_URI']}"
       responses = parallel_adapter_dispatch(env)
 
       # 2. merge
       merged = merge(env, responses)
 
       # 3. ???
-      Tom::LOG.info "-------------------------------------------------------n"
+      Tom::Log.logger.info "-------------------------------------------------------"
 
       # 4. profit
       merged
@@ -40,8 +40,8 @@ module Tom
     def self.merge(env, responses)
       route, method = route_and_method(env)
       if merger = Tom::Routes.merger_for_route(route, method)
-        Tom::LOG.info "Merging with:"
-        Tom::LOG.info "  -> #{merger}"
+        Tom::Log.logger.info "Merging with:"
+        Tom::Log.logger.info "  -> #{merger}"
         merged = merger.new.merge(env, responses)
       else
         merged = [404, {}, ""]
@@ -78,9 +78,9 @@ module Tom
       adapters = Tom::Routes.adapters_for_route(route, method)
       return responses if adapters.empty?
 
-      Tom::LOG.info "Dispatching to:"
+      Tom::Log.logger.info "Dispatching to:"
       EM::Synchrony::FiberIterator.new(adapters, adapters.count).map do |clazz|
-        Tom::LOG.info "  -> #{clazz}"
+        Tom::Log.logger.info "  -> #{clazz}"
         (responses[clazz] ||= []) <<  clazz.new.handle(env)
       end
       responses

data/lib/goliath_api.rb

@@ -22,8 +22,8 @@ module Tom
     # Hardcoded JSON stacktrace stuff for now...
     def handle_exception(e, env)
       trace = e.backtrace.join "\n"
-      Tom::LOG.info e
-      Tom::LOG.info trace
+      Tom::Log.logger.info e
+      Tom::Log.logger.info trace
       [500, {}, {error: e,
         stacktrace: trace,
         url:        env["REQUEST_URI"]

data/lib/http.rb

@@ -12,11 +12,13 @@ module Tom
     # @param options [Hash] Options to pass to EM::HttpRequest's 
     #   get/put/post/delete method
     def self.make_request(method, url, options = {})
-      Tom::LOG.info "     curl -X#{method.upcase} -d '#{options[:body]}' #{url}"
+      Tom::Log.logger.info "     curl -X#{method.upcase} -d '#{options[:body]}' #{url}"
 
       conn = EM::HttpRequest.new(url, connection_options)
       result  = conn.send(method, options)
-      handle_errors(method, url, result)
+
+      # Disabling this for a while
+      # handle_errors(method, url, result)
 
       result
     end

data/lib/init.rb

@@ -7,9 +7,9 @@ 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
+  Tom::Log.logger.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)"
+Tom::Log.logger.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'

data/lib/tom/log.rb

@@ -1,11 +1,28 @@
 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}
-  )
+  module Log
+
+
+  def self.logger=(logger)
+    @logger = logger
+  end
+
+  def self.logger
+    unless @logger
+      @logger = ::Logger.new(STDOUT)
+      init_logger_defaults
+    end
+    @logger
+  end
+
+  def self.init_logger_defaults
+    @logger.level = ::Logger::ERROR
+    @logger.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
+  end
 end

data/tom.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tom"
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jannis Hermanns"]
-  s.date = "2011-12-09"
+  s.date = "2011-12-13"
   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 = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tom
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-09 00:00:00.000000000Z
+date: 2011-12-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: goliath
-  requirement: &70294091681900 !ruby/object:Gem::Requirement
+  requirement: &70192164200580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70294091681900
+  version_requirements: *70192164200580
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &70294091681320 !ruby/object:Gem::Requirement
+  requirement: &70192164200000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70294091681320
+  version_requirements: *70192164200000
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70294091680840 !ruby/object:Gem::Requirement
+  requirement: &70192164199480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70294091680840
+  version_requirements: *70192164199480
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70294091680220 !ruby/object:Gem::Requirement
+  requirement: &70192164198920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70294091680220
+  version_requirements: *70192164198920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70294091679620 !ruby/object:Gem::Requirement
+  requirement: &70192164198340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70294091679620
+  version_requirements: *70192164198340
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70294091679080 !ruby/object:Gem::Requirement
+  requirement: &70192164197820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70294091679080
+  version_requirements: *70192164197820
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70294091678600 !ruby/object:Gem::Requirement
+  requirement: &70192164197320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70294091678600
+  version_requirements: *70192164197320
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70294091677960 !ruby/object:Gem::Requirement
+  requirement: &70192164196780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294091677960
+  version_requirements: *70192164196780
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70294091677440 !ruby/object:Gem::Requirement
+  requirement: &70192164196280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294091677440
+  version_requirements: *70192164196280
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70294091676940 !ruby/object:Gem::Requirement
+  requirement: &70192164195780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294091676940
+  version_requirements: *70192164195780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70294091667620 !ruby/object:Gem::Requirement
+  requirement: &70192164195280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294091667620
+  version_requirements: *70192164195280
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70294091667000 !ruby/object:Gem::Requirement
+  requirement: &70192164194780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294091667000
+  version_requirements: *70192164194780
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70294091666380 !ruby/object:Gem::Requirement
+  requirement: &70192164194220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294091666380
+  version_requirements: *70192164194220
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70294091665740 !ruby/object:Gem::Requirement
+  requirement: &70192164193660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70294091665740
+  version_requirements: *70192164193660
 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.'
@@ -212,7 +212,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4134106071848066876
+      hash: 1893692767236117233
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: