derfred-httpstub 0.1.2 → 0.2.0

data/lib/httpstub.rb

@@ -1,12 +1,13 @@
 require 'webrick'
+require 'webrick/https'
 require File.expand_path(File.dirname(__FILE__) + "/webrick_monkey_patch")
 require File.expand_path(File.dirname(__FILE__) + "/httpstubservlet")
 require File.expand_path(File.dirname(__FILE__) + "/httpstubserver")
 
 class HTTPStub
 
-  @@root_server = nil
-  @@thread = nil
+  @@server_list = {}
+  @@thread_group = nil
   @@disable_logging = true
 
   def self.disable_logging=(value)
@@ -18,30 +19,38 @@ class HTTPStub
   end
 
 
-  def self.listen_on(ports)
+  def self.listen_on(urls)
     stop_server
 
-    unless @@root_server
-      @@root_server = WEBrick::HTTPServer.new :Port => 10000, :DoNotListen => true
-      [ports].flatten.each do |port|
-        @@root_server.virtual_host HTTPStubServer.new(port)
-        @@root_server.listen "0.0.0.0", port
+    unless @@thread_group
+      @@thread_group = ThreadGroup.new
+      [urls].flatten.each do |url|
+        @@thread_group.add build_server(url)
       end
-      @@thread = Thread.new(@@root_server) { |server| server.start }
     end
   end
 
-  def self.initialize_server(port)
-    @@root_server.server_for_port(port)
+  def self.build_server(url)
+    uri = URI.parse(url)
+    server = HTTPStubServer.new(uri.port, uri.scheme == "https")
+    @@server_list[uri.port] = server
+
+    Thread.start do
+      #server.listen "0.0.0.0", uri.port
+      server.start
+    end
   end
 
   def self.stop_server
-    if @@thread
-      @@root_server.virtual_hosts.each { |h| h.servlet.clear_responses }
-      @@root_server.shutdown
-      @@thread.join
-      @@thread = nil
-      @@root_server = nil
+    if @@thread_group
+      @@server_list.values.each do |server|
+        server.servlet.clear_responses
+        server.shutdown
+      end
+
+      @@thread_group.list.each { |th| th.join }
+      @@thread_group = nil
+      @@server_list.clear
     end
   end
 
@@ -65,7 +74,7 @@ class HTTPStub
 
   def self.stub(method, url, metadata, body)
     parsed_url = URI.parse(url)
-    server = initialize_server parsed_url.port
+    server = @@server_list[parsed_url.port]
     path = if parsed_url.query.nil? or parsed_url.query == ""
              parsed_url.path
            else

data/lib/httpstubserver.rb

@@ -4,19 +4,25 @@ class HTTPStubServer < WEBrick::HTTPServer
 
   attr_reader :servlet
 
-  def initialize(port)
-    options = { :Port => port, :DoNotListen => true, :BindAddress => nil, :ServerName => nil, :ServerAlias => nil }
-    options.merge!(:AccessLog => []) if HTTPStub.disable_logging?
+  def initialize(port, use_ssl)
+    options = { :Port => port, :BindAddress => nil, :ServerName => nil, :ServerAlias => nil }
+    options.merge!(:AccessLog => [], :Logger => WEBrick::BasicLog.new([])) if HTTPStub.disable_logging?
+    options.merge!(ssl_options) if use_ssl
     super options
     @servlet = HTTPStubServlet.get_instance self, port
   end
 
-  def hier
-    puts "hier"
-  end
-
   def service(req, res)
     @servlet.service(req, res)
   end
 
+  private
+    def ssl_options
+      {
+        :SSLEnable       => true,
+        :SSLVerifyClient => OpenSSL::SSL::VERIFY_NONE,
+        :SSLCertName     => [ [ "CN", "localhost" ] ]
+      }
+    end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: derfred-httpstub
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Frederik Fix