saorin 0.3.0 → 0.3.1

data/lib/saorin/server.rb

@@ -6,12 +6,15 @@ module Saorin
     self.load_path = 'saorin/server'
 
     class << self
-      def new(handler, options = {}, &block)
+      def new(handler, options = {})
         adapter = options.delete(:adapter) || :rack
         adapter_class = guess adapter
-        adapter_class.new handler, options, &block
+        adapter_class.new handler, options
+      end
+
+      def start(handler, options = {}, &block)
+        new(handler, options).start(&block)
       end
-      alias_method :start, :new
     end
   end
 end

data/lib/saorin/server/base.rb

@@ -7,11 +7,13 @@ module Saorin
   module Server
     module Base
       attr_reader :handler, :allowed_methods
+      attr_reader :options
 
       def initialize(handler, options = {})
         @handler = handler
         @allowed_methods = options[:allowed_methods] || handler.public_methods(false)
         @allowed_methods.map! { |m| m.to_s }
+        @options = options
       end
 
       def process_request(content)

data/lib/saorin/server/rack.rb

@@ -10,14 +10,25 @@ module Saorin
         'Content-Type' => 'application/json'
       }.freeze
 
-      def initialize(handler, options = {}, &block)
-        super handler, options
+      attr_reader :server
 
-        ::Rack::Server.start({
+      def initialize(handler, options = {})
+        super
+        @server = ::Rack::Server.new({
           :app => self,
           :Host => options[:host],
           :Port => options[:port],
-        }.merge(options))
+        }.merge(@options))
+      end
+
+      def start(&block)
+        @server.start &block
+      end
+
+      def shutdown
+        if @server.server.respond_to?(:shutdown)
+          @server.server.shutdonw
+        end
       end
 
       def call(env)

data/lib/saorin/test.rb

@@ -49,19 +49,20 @@ module Saorin
 
     def create_test_server(options = {})
       @pid = Process.fork do
-        @server = Saorin::Server.start(Handler.new, {
+        @server = Saorin::Server.new(Handler.new, {
           :host => HOST,
           :port => PORT,
           :Logger => Logger.new('/dev/null'),
           :AccessLog => [],
         }.merge(options))
+        @server.start
       end
-      sleep 3
+      sleep 2
     end
 
     def shutdown_test_server
       Process.kill :INT, @pid
-      sleep 3
+      sleep 2
     end
 
     def create_test_client(options = {})

data/lib/saorin/version.rb

@@ -1,3 +1,3 @@
 module Saorin
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saorin
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -140,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 926844584898114179
+      hash: 1175865570057102178
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 926844584898114179
+      hash: 1175865570057102178
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24