http-testing 0.1.4 → 0.1.5

data/lib/http_testing.rb

@@ -2,6 +2,30 @@ module HttpTesting
   class HttpTestingError < StandardError
   end
   
+  class DefaultLogFactory
+    def self.create_logger(name)
+      require 'logger' unless defined? Logger
+      log = Logger.new(STDOUT)
+      log.formatter = proc do |severity, datetime, progname, msg|
+        "#{datetime.strftime('%Y-%m-%d %H:%M:%S,%L')} [#{severity}] (#{name}) - #{msg}\n"
+      end
+      log
+    end
+  end
+  
+  class EmptyLoggerFactory
+    def self.fatal(*args); end
+    def self.error(*args); end
+    def self.warn(*args); end
+    def self.info(*args); end
+    def self.debug(*args); end
+    
+    def self.create_logger(*args)
+      self
+    end
+  end
+  
+  
   autoload :Context, 'http_testing/context'
   autoload :VERSION, 'http_testing/version'
 end

data/lib/http_testing/context.rb

@@ -3,21 +3,26 @@ require 'monitor'
 
 class HttpTesting::Context
   include WEBrick
-  # extend MonitorMixin
   
   def initialize(port, options = {})
     @options = {
-      :wait_timeout => 3 #seconds
+      wait_timeout: 3, #seconds
+      verbose: false,
+      requests_dumps_path: nil, #Path to the folder to dump requests
+      log_factory: HttpTesting::DefaultLogFactory
     }.merge options
     @port = port
     
-    @monitor      = Monitor.new
+    @monitor = Monitor.new
     @completed_cond = @monitor.new_cond
-    @started_cond   = @monitor.new_cond
+    @started_cond = @monitor.new_cond
     
-    @started   = false
+    @started = false
     @completed = false
-    @error     = nil
+    @error = nil
+    
+    logger_factory = @options[:verbose] ? @options[:log_factory] : HttpTesting::EmptyLoggerFactory
+    @log = logger_factory.create_logger('http-testing::context')
   end
   
   def self.start(port, options = {}, &block)
@@ -30,12 +35,37 @@ class HttpTesting::Context
     @error     = nil
     
     #Starting separate thread for the server
+    @log.info 'Starting main worker thread...'
     @main = Thread.start do
-      @server = HTTPServer.new(Port: @port, Logger: Log.new(nil, BasicLog::ERROR), AccessLog: [])
+      @log.info "Starting http server on port: #{@port}."
+      
+      access_log = []
+      access_log << [$stdout, WEBrick::AccessLog::COMMON_LOG_FORMAT] if @options[:verbose]
+      @server = HTTPServer.new(
+        Port: @port, 
+        Logger: Log.new(nil, BasicLog::ERROR), 
+        AccessLog: access_log,
+        RequestCallback: proc do |request, response|
+          if @options[:requests_dumps_path]
+            FileUtils.mkdirs(@options[:requests_dumps_path]) unless File.exists?(@options[:requests_dumps_path])
+            timestamp = Time.now.strftime('%Y%m%d%H%M%S%L')
+            request_dump_file = File.join(@options[:requests_dumps_path], "#{timestamp}-#{request.request_method}.txt")
+            File.open(request_dump_file, 'w') do |f|
+              f.write(request.request_line)
+              f.write(request.raw_header.join(''))
+              f.write("\r\n")
+              f.write(request.body)
+            end
+          end
+        end)
+      
       @server.mount_proc("/", nil) do |request, response|
+        @log.info "Connection started. Path: #{request.path}."
         begin
+          @log.info 'Yielding request and response...'
           yield(request, response)
         rescue
+          @log.error "Block raised error #{$!}"
           @error = $!
         end
         
@@ -43,6 +73,7 @@ class HttpTesting::Context
         @monitor.synchronize do
           @completed_cond.signal
         end
+        @log.info 'Connection completed.'
       end
       @started = true
       @monitor.synchronize do
@@ -55,13 +86,18 @@ class HttpTesting::Context
     @monitor.synchronize do
       @started_cond.wait_until { @started }
     end
+    @log.info 'Server started.'
     self
   end
   
   def wait
     @monitor.synchronize do
-      @completed_cond.wait(@options[:wait_timeout]) unless @completed
+      unless @completed
+        @log.info 'Waiting for connection to complete...'
+        @completed_cond.wait(@options[:wait_timeout]) 
+      end
     end
+    @log.info "Stopping http server on port: #{@port}."
     @server.shutdown
     raise HttpTesting::HttpTestingError.new "HTTP Connection was not completed within #{@options[:wait_timeout]} seconds" unless @completed
     raise @error if @error

data/lib/http_testing/version.rb

@@ -1,3 +1,3 @@
 module HttpTesting
-  VERSION = "0.1.4".freeze
+  VERSION = "0.1.5".freeze
 end

metadata

@@ -1,27 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: http-testing
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
+  prerelease: 
 platform: ruby
 authors:
 - Evgeny Myasishchev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
 description: HttpTesting allows testing HTTP requests.
@@ -48,26 +51,27 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/evgeny-myasishchev/http-testing
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: http-testing
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Library for testing HTTP requests in Ruby.
 test_files:
 - spec/context_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e2edb59d922e578fda365269e88432b5c1a48fe3
-  data.tar.gz: 49f751a723a923f02f2f62c55a417633d3c6b3eb
-SHA512:
-  metadata.gz: 97e811491183d35a657c78277d6b2c60f672bc107d702a96a6076edbab7ca50f86d14450ad1801677ae25ee1b48327eb6cd09fb858ee4a8a6ab48cdec1e161f4
-  data.tar.gz: 471d8838ebb32daf4f029b5dfea318794d69d3a23ced5d2959570bc24f732896f9f691463ca5aa86d73ad11ef1dd7600ffaea3379c837ab24d374c581cb63bd6