spec_helper.rb in reel-0.5.0.pre

- old
+ new

@@ -3,10 +3,12 @@
 
 require 'bundler/setup'
 require 'reel'
 require 'pry'
 
+require 'support/example_request'
+
 logfile = File.open(File.expand_path("../../log/test.log", __FILE__), 'a')
 Celluloid.logger = Logger.new(logfile)
 
 def fixture_dir
   Pathname.new File.expand_path("../fixtures", __FILE__)
@@ -16,11 +18,11 @@
 def example_port; 1234; end
 def example_path; "/example"; end
 def example_url;  "http://#{example_addr}:#{example_port}#{example_path}"; end
 
 def with_reel(handler)
-  server = Reel::Server.new(example_addr, example_port, &handler)
+  server = Reel::Server::HTTP.new(example_addr, example_port, &handler)
   yield server
 ensure
   server.terminate if server && server.alive?
 end
 
@@ -36,42 +38,9 @@
     yield client, peer
   ensure
     server.close rescue nil
     client.close rescue nil
     peer.close   rescue nil
-  end
-end
-
-class ExampleRequest
-  extend Forwardable
-  def_delegators :@headers, :[], :[]=
-  attr_accessor  :method, :path, :version, :body
-
-  def initialize(method = :get, path = "/", version = "1.1", headers = {}, body = nil)
-    @method = method.to_s.upcase
-    @path = path
-    @version = "1.1"
-    @headers = {
-      'Host'       => 'www.example.com',
-      'Connection' => 'keep-alive',
-      'User-Agent' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.78 S',
-      'Accept'     => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-      'Accept-Encoding' => 'gzip,deflate,sdch',
-      'Accept-Language' => 'en-US,en;q=0.8',
-      'Accept-Charset'  => 'ISO-8859-1,utf-8;q=0.7,*;q=0.3'
-    }.merge(headers)
-
-    @body = nil
-  end
-
-  def to_s
-    if @body && !@headers['Content-Length']
-      @headers['Content-Length'] = @body.length
-    end
-
-    "#{@method} #{@path} HTTP/#{@version}\r\n" <<
-    @headers.map { |k, v| "#{k}: #{v}" }.join("\r\n") << "\r\n\r\n" <<
-    (@body ? @body : '')
   end
 end
 
 module WebSocketHelpers
   def self.included(spec)