summaryrefslogtreecommitdiff
path: root/spec/tiny_server.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/tiny_server.rb')
-rw-r--r--spec/tiny_server.rb33
1 files changed, 13 insertions, 20 deletions
diff --git a/spec/tiny_server.rb b/spec/tiny_server.rb
index 7a58328224..2e47f1ae2d 100644
--- a/spec/tiny_server.rb
+++ b/spec/tiny_server.rb
@@ -26,12 +26,10 @@ require "open-uri"
require "chef/config"
module TinyServer
-
class Server < Rack::Server
-
attr_writer :app
- def self.setup(options=nil, &block)
+ def self.setup(options = nil, &block)
tiny_app = new(options)
app_code = Rack::Builder.new(&block).to_app
tiny_app.app = app_code
@@ -44,7 +42,6 @@ module TinyServer
end
class Manager
-
# 5 == debug, 3 == warning
LOGGER = WEBrick::Log.new(STDOUT, 3)
DEFAULT_OPTIONS = {
@@ -56,7 +53,7 @@ module TinyServer
:AccessLog => [] # Remove this option to enable the access log when debugging.
}
- def initialize(options=nil)
+ def initialize(options = nil)
@options = options ? DEFAULT_OPTIONS.merge(options) : DEFAULT_OPTIONS
@creator = caller.first
end
@@ -110,7 +107,6 @@ module TinyServer
@server_thread.join
@server_thread = nil
end
-
end
class API
@@ -128,22 +124,22 @@ module TinyServer
end
def clear
- @routes = {GET => [], PUT => [], POST => [], DELETE => []}
+ @routes = { GET => [], PUT => [], POST => [], DELETE => [] }
end
- def get(path, response_code, data=nil, headers=nil, &block)
+ def get(path, response_code, data = nil, headers = nil, &block)
@routes[GET] << Route.new(path, Response.new(response_code, data, headers, &block))
end
- def put(path, response_code, data=nil, headers=nil, &block)
+ def put(path, response_code, data = nil, headers = nil, &block)
@routes[PUT] << Route.new(path, Response.new(response_code, data, headers, &block))
end
- def post(path, response_code, data=nil, headers=nil, &block)
+ def post(path, response_code, data = nil, headers = nil, &block)
@routes[POST] << Route.new(path, Response.new(response_code, data, headers, &block))
end
- def delete(path, response_code, data=nil, headers=nil, &block)
+ def delete(path, response_code, data = nil, headers = nil, &block)
@routes[DELETE] << Route.new(path, Response.new(response_code, data, headers, &block))
end
@@ -151,11 +147,11 @@ module TinyServer
if response = response_for_request(env)
response.call
else
- debug_info = {:message => "no data matches the request for #{env['REQUEST_URI']}",
- :available_routes => @routes, :request => env}
+ debug_info = { :message => "no data matches the request for #{env['REQUEST_URI']}",
+ :available_routes => @routes, :request => env }
# Uncomment me for glorious debugging
# pp :not_found => debug_info
- [404, {"Content-Type" => "application/json"}, [ Chef::JSONCompat.to_json(debug_info) ]]
+ [404, { "Content-Type" => "application/json" }, [ Chef::JSONCompat.to_json(debug_info) ]]
end
end
@@ -181,13 +177,12 @@ module TinyServer
def to_s
"#{@path_spec} => (#{@response})"
end
-
end
class Response
- HEADERS = {"Content-Type" => "application/json"}
+ HEADERS = { "Content-Type" => "application/json" }
- def initialize(response_code=200, data=nil, headers=nil, &block)
+ def initialize(response_code = 200, data = nil, headers = nil, &block)
@response_code, @data = response_code, data
@response_headers = headers ? HEADERS.merge(headers) : HEADERS
@block = block_given? ? block : nil
@@ -199,9 +194,7 @@ module TinyServer
end
def to_s
- "#{@response_code} => #{(@data|| @block)}"
+ "#{@response_code} => #{(@data || @block)}"
end
-
end
-
end