simplify by consolidating server run logic on to server

geemus · Jul 8, 2010 · fffaee4 · fffaee4
1 parent 0cf4452
commit fffaee4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/lib/radome/server.rb b/lib/radome/server.rb
@@ -4,7 +4,17 @@
 module Radome
   class Server < Sinatra::Base
 
-    def initialize(*args)
+    def self.run
+      server = Radome::Server.new
+      Rack::Handler::WEBrick.run(
+        server,
+        :Port => 9292,
+        :AccessLog => [],
+        :Logger => WEBrick::Log.new(nil, WEBrick::Log::ERROR)
+      )
+    end
+
+    def initialize
       @data_store = DataStore.new
       super
     end

diff --git a/tests/helpers.rb b/tests/helpers.rb
@@ -3,12 +3,7 @@
 
 def with_server(&block)
   pid = Process.fork do
-    Rack::Handler::WEBrick.run(
-      Radome::Server.new,
-      :Port => 9292,
-      :AccessLog => [],
-      :Logger => WEBrick::Log.new(nil, WEBrick::Log::ERROR)
-    )
+    Radome::Server.run
   end
   sleep(1)
   yield