mocktopus 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28b6c35e654e4773073f3a03584ad7900a76691c
-  data.tar.gz: 05f9a56facd7cf28fa56191fcfd5e37da981e4fe
+  metadata.gz: a375cef90270d421fba8b9027f691f714895ff66
+  data.tar.gz: bb9b5e7bb8e238a3a348b253c382d911bde8d0ec
 SHA512:
-  metadata.gz: ef1be1d2e1c03956a55ccf084c943e637c64507e37c57020e0330ee95aa083382ec8981443d1f188b77d676657cd556a693b28e8a8011fed769cb19cb9142f50
-  data.tar.gz: 1a5de7dbc5ca4a8973ecacdb2a9b66e9f1edd840db3a0e1972a88c7628a534c7690c428390b77d11aca6671249dff5a978224cf3c31d118c02e25d3782197562
+  metadata.gz: 25ff3a4a335a101184ae096fc884dc9f4f46bc7e28470f3db5ff7e2a5ef8d91feb1f3cc636a28e6db7254511b31e0da7b4ea88613e5d09e116bea1b11027f5b2
+  data.tar.gz: ba54b6aa842d651abc8544e19c24c3d8bce9696d08aa8d8a3a8856ff69f39d13d71a97fa11ce6bc946cc3751748aeb6b4b4e3b16db7b38a9637797251f92ddf5

data/config.ru

@@ -1,3 +1,20 @@
 require 'mocktopus'
 
+class LoggerMiddleware
+
+  def initialize(app, logger)
+    @app, @logger = app, logger
+  end
+
+  def call(env)
+    env['rack.errors'] = @logger
+    @app.call(env)
+  end
+
+end
+
+use Rack::CommonLogger, $logger
+use LoggerMiddleware, $logger
+set :show_exceptions, false
+
 run Sinatra::Application

data/lib/mocktopus.rb

@@ -1,5 +1,9 @@
 require 'logger'
-LOGGER = Logger.new('mocktopus.log', 'daily')
+
+$logger = Logger.new(STDOUT) unless $logger
+
+class ::Logger; alias_method :write, :info; end
+class ::Logger; alias_method :puts, :error; end
 
 require 'mocktopus/response'
 require 'mocktopus/input'

data/lib/mocktopus/app.rb

@@ -1,7 +1,8 @@
-require 'sinatra'
 require_relative '../../ascii.rb'
 
-LOGGER.info 'initialized mocktopus app'
+require 'sinatra'
+
+$logger.info 'initialized mocktopus app'
 $input_container = Mocktopus::InputContainer.new
 $mock_api_call_container = Mocktopus::MockApiCallContainer.new
 
@@ -24,7 +25,7 @@ error_example = {
 }
 
 post '/mocktopus/inputs/:name' do
-  LOGGER.info("received new input named #{params[:name]}")
+  $logger.info("received new input named #{params[:name]}")
   begin
     body = JSON.parse(request.body.read().to_s)
   rescue
@@ -34,22 +35,22 @@ post '/mocktopus/inputs/:name' do
     body error_hash.to_json
     return
   end
-  LOGGER.debug("body: #{body.inspect()}")
+  $logger.debug("body: #{body.inspect()}")
 
-  LOGGER.debug("creating response object from #{body['response']}")
+  $logger.debug("creating response object from #{body['response']}")
   response = Mocktopus::Response.new(body['response'])
 
-  LOGGER.debug("creating input object from #{body.inspect}, #{response.inspect}")
+  $logger.debug("creating input object from #{body.inspect}, #{response.inspect}")
   input = Mocktopus::Input.new(body, response)
 
-  LOGGER.info("added input #{params[:name]} successfully")
+  $logger.info("added input #{params[:name]} successfully")
   $input_container.add(params[:name], input)
 end
 
 get '/mocktopus/inputs' do
-  LOGGER.info("all inputs requested")
+  $logger.info("all inputs requested")
   all_inputs = $input_container.all()
-  LOGGER.debug("found #{all_inputs.size()} inputs")
+  $logger.debug("found #{all_inputs.size()} inputs")
   return_inputs = {}
   all_inputs.each do |k,v|
     return_inputs[k] = v.to_hash
@@ -59,7 +60,7 @@ get '/mocktopus/inputs' do
 end
 
 get '/mocktopus/inputs/:name' do
-  LOGGER.info("retrieving input by name #{params[:name]}")
+  $logger.info("retrieving input by name #{params[:name]}")
   input = $input_container.get_by(params[:name])
   if (input != nil)
     input.to_hash.to_json
@@ -81,12 +82,12 @@ delete '/mocktopus/mock_api_calls' do
 end
 
 delete '/mocktopus/inputs' do
-  LOGGER.info("deleting all inputs")
+  $logger.info("deleting all inputs")
   $input_container.delete_all()
 end
 
 delete '/mocktopus/inputs/:name' do
-  LOGGER.info("deleting input by name #{params[:name]}")
+  $logger.info("deleting input by name #{params[:name]}")
   $input_container.delete_by(params[:name])
 end
 
@@ -112,13 +113,13 @@ not_found do
 
   $mock_api_call_container.add(Mocktopus::MockApiCall.new(log_path, verb, request_headers, body))
 
-  LOGGER.info("not_found catch all invoked")
+  $logger.info("not_found catch all invoked")
   start_time = Time.now.to_f
-  LOGGER.debug("looking for a match with path #{request.fullpath}, verb #{verb}, headers #{request_headers}, body #{body}")
+  $logger.debug("looking for a match with path #{request.fullpath}, verb #{verb}, headers #{request_headers}, body #{body}")
   match = $input_container.match(path, verb, request_headers, body, request.env['rack.request.query_hash'])
-  LOGGER.debug("match lookup complete")
+  $logger.debug("match lookup complete")
   if (match.nil?)
-    LOGGER.info("match not found.  sending 428")
+    $logger.info("match not found.  sending 428")
     status 428
     content_type :json
     body_detail = { 
@@ -132,12 +133,12 @@ not_found do
     }
     body body_detail.to_json
   else
-    LOGGER.info("match found #{match.inspect}")
+    $logger.info("match found #{match.inspect}")
     sleep(match.response.delay/1000)
     status match.response.code
     headers match.response.headers
     body match.response.body
   end
   end_time = Time.now.to_f
-  LOGGER.info("not_found catch all completed in #{((end_time - start_time) * 1000)} milliseconds")
+  $logger.info("not_found catch all completed in #{((end_time - start_time) * 1000)} milliseconds")
 end

data/lib/mocktopus/input.rb

@@ -49,7 +49,7 @@ module Mocktopus
 
       validate_instance_variables
 
-      LOGGER.debug("initialized input object from hash #{hash.inspect()}")
+      $logger.debug("initialized input object from hash #{hash.inspect()}")
     end
 
     def to_hash

data/lib/mocktopus/response.rb

@@ -16,7 +16,7 @@ module Mocktopus
             :delay
 
     def initialize(hash)
-      LOGGER.debug("initializing response object")
+      $logger.debug("initializing response object")
       @code = hash['code']
       @headers = hash['headers']
       @body = hash['body']
@@ -30,7 +30,7 @@ module Mocktopus
 
       validate_instance_variables()
 
-      LOGGER.debug("initialized response object from hash #{hash.inspect()}")
+      $logger.debug("initialized response object from hash #{hash.inspect()}")
     end
 
   def to_hash

data/mocktopus.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'mocktopus'
-  s.version     = '0.0.6'
+  s.version     = '0.0.7'
   s.date        = '2015-03-14'
   s.required_ruby_version = '>= 1.9.3'
 
@@ -27,4 +27,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'mocha', '~> 0.14.0', '>= 0.14.0'
   s.add_development_dependency 'simplecov', '~> 0.9.2', '>= 0.9.2'
   s.add_development_dependency 'coveralls', '~> 0.7.11', '>= 0.7.11'
+  s.add_development_dependency 'pry', '~> 0.10.1', '>= 0.10.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mocktopus
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Rackspace
@@ -230,6 +230,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.11
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.1
 description: The Mocktopus is a Sinatra/thin-based Web API that lets you mock your
   app dependencies
 email: