mock-server-thin 0.1.1 → 0.2

data/README.markdown

@@ -1,4 +1,4 @@
-# MockServer #
+# MockServerThin #
 
 A quick way of mocking an external web service you want to consume.
 

data/lib/mock_server_thin.rb

@@ -2,13 +2,48 @@ require "sinatra/base"
 require "logger"
 
 class MockServerThin
+
   class App < Sinatra::Base
     use Rack::ShowExceptions
   end
 
-  def initialize(app, port = 4000, &block)
+  class << self
+    attr_accessor :config
+  end
+
+  class Config
+    attr_accessor :timeout, :port, :host
+
+    def initialize
+      @timeout = 5
+      @port = 4000
+      @host = "0.0.0.0"
+    end
+
+    def to_hash
+      Hash[instance_variables.map { |var| [var[1..-1].to_sym, instance_variable_get(var)] }]
+    end
+  end
+
+  def self.configure
+    yield(config)
+  end
+
+  def self.config
+    @config ||= Config.new
+  end
+
+  def config
+    self.class.config
+  end
+
+  def initialize(app, opts = {}, &block)
     @app = app
-    @port = port
+    options = config.to_hash.merge!(opts)
+    puts "SERVER OPTIONS: %s" % options.inspect
+    @port = options[:port]
+    @timeout = options[:timeout]
+    @host = options[:host]
   end
 
   def start
@@ -18,16 +53,16 @@ class MockServerThin
       end
     end
 
-    wait_for_service("0.0.0.0", @port)
+    wait_for_service(@host, @port)
 
     self
   end
 
   module Methods
-    def mock_server(*args, &block)
+    def mock_server(opts = {}, &block)
       app = Class.new(Sinatra::Base)
       app.class_eval(&block)
-      @server = MockServerThin.new(app, *args, &block).start
+      @server = MockServerThin.new(app, opts, &block).start
     end
   end
 
@@ -51,12 +86,12 @@ protected
     end
   end
 
-  def wait_for_service(host, port, timeout = 5)
+  def wait_for_service(host, port)
     start_time = Time.now
 
     until listening?(host, port)
-      if timeout && (Time.now > (start_time + timeout))
-        raise SocketError.new("Socket did not open within #{timeout} seconds")
+      if @timeout && (Time.now > (start_time + @timeout))
+        raise SocketError.new("Socket did not open within #{@timeout} seconds")
       end
     end
 

data/test/mock_server_test.rb

@@ -29,18 +29,19 @@ end
 
 class MockServerRackBuilderTest < Test::Unit::TestCase
   def setup
-    @server = MockServerThin.new(HelloWorldRackBuilder, 4001)
+    @server = MockServerThin.new(HelloWorldRackBuilder, :port => 4001)
     @server.start
   end
 
   def test_server
     assert_equal "Rackup!", open("http://localhost:4001").read
-  end end
+  end
+end
 
 class MockServerMethodsTest < Test::Unit::TestCase
   extend MockServerThin::Methods
 
-  mock_server(4002) {
+  mock_server(:port => 4002) {
     get "/" do
       "Goodbye"
     end
@@ -50,3 +51,21 @@ class MockServerMethodsTest < Test::Unit::TestCase
     assert_equal "Goodbye", open("http://localhost:4002").read
   end
 end
+
+class MockServerConfigTest < Test::Unit::TestCase
+  def setup
+    MockServerThin.configure do |config|
+      config.port = 5067
+      config.timeout = 10
+      config.host = "127.0.0.1"
+    end
+    @server = MockServerThin.new(HelloWorldSinatra)
+    @server.start
+  end
+
+  def test_server_config
+    assert_equal 5067, @server.config.port
+    assert_equal 10, @server.config.timeout
+    assert_equal "127.0.0.1", @server.config.host
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock-server-thin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-18 00:00:00.000000000Z
+date: 2012-01-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2158204160 !ruby/object:Gem::Requirement
+  requirement: &2153247480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158204160
+  version_requirements: *2153247480
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &2158203160 !ruby/object:Gem::Requirement
+  requirement: &2153246160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158203160
+  version_requirements: *2153246160
 description: 
 email:
 - djanowski@dimaion.com