Merge branch 'hotfix-0.9.1'

Author: chriskite

CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 0.9.1 / 2012-09-18
+
+* Bug fixes
+
+  * Allow opts to be passed to Server.with_routes
+
 == 0.9.0 / 2012-08-22
 
 * Minor enhancements

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jimson (0.8.0)
+    jimson (0.9.0)
       blankslate (>= 2.1.2.3)
       multi_json (~> 1.1.0)
       rack (>= 1.3)

VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

jimson.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = "jimson"
-  s.version = "0.9.0"
+  s.version = "0.9.1"
   s.author = "Chris Kite"
   s.homepage = "http://www.github.com/chriskite/jimson"
   s.platform = Gem::Platform::RUBY

lib/jimson/server.rb

@@ -27,15 +27,15 @@ def isAlive
 
     JSON_RPC_VERSION = '2.0'
 
-    attr_accessor :router, :host, :port, :opts
+    attr_accessor :router, :host, :port, :show_errors, :opts
 
     #
     # Create a Server with routes defined
     #
-    def self.with_routes(&block)
+    def self.with_routes(opts = {}, &block)
       router = Router.new
       router.send(:draw, &block)
-      self.new(router)
+      self.new(router, opts)
     end
 
     #
@@ -45,6 +45,7 @@ def self.with_routes(&block)
     # * :host - the hostname or ip to bind to
     # * :port - the port to listen on
     # * :server - the rack handler to use, e.g. 'webrick' or 'thin'
+    # * :show_errors - true or false, send backtraces in error responses?
     #
     # Remaining options are forwarded to the underlying Rack server.
     #

spec/server_spec.rb

@@ -450,6 +450,17 @@ def post_json(hash)
                            'id'      => 1
                          }
         end
+
+        context "when opts are given" do
+          it "passes the opts to the new server" do
+            app = Server.with_routes(:show_errors => true) do
+              root TestHandler.new
+              namespace 'foo', OtherHandler.new
+            end
+
+            app.show_errors.should be_true
+          end
+        end
       end
   end
 end