reel 0.2.0.pre → 0.2.0

data/CHANGES.md

@@ -2,6 +2,7 @@ HEAD
 ----
 * Initial WebSockets support via Reel::WebSocket
 * Experimental Rack adapter by Alberto Fernández-Capel
+* Octarine (Sinatra-like DSL) support by Grant Rodgers
 
 0.1.0
 -----

data/README.md

@@ -64,6 +64,7 @@ require 'reel'
 
 Reel::Server.supervise("0.0.0.0", 3000) do |connection|
   while request = connection.request
+    case request
     when Reel::Request
       puts "Client requested: #{request.method} #{request.url}"
       connection.respond :ok, "hello, world"

data/lib/reel/app.rb

@@ -0,0 +1,33 @@
+require 'reel'
+require 'octarine'
+
+module Reel
+  # Define Reel endpoints using a sinatra-like dsl (provided by octarine)
+  module App
+    def self.included(base)
+      base.class_eval do
+        include Octarine::App
+
+        attr_accessor :server
+      end
+    end
+
+    def initialize(host, port)
+      super()
+      @server = Reel::Server.supervise(host, port) do |connection|
+        while request = connection.request
+          status, headers, body = call Rack::MockRequest.env_for(request.url, :method => request.method, :input => request.body)
+          connection.respond status_symbol(status), headers, body.to_s
+        end
+      end
+    end
+
+    def status_symbol(status)
+      status.is_a?(Fixnum) ? Http::Response::STATUS_CODES[status].downcase.gsub(/\s|-/, '_').to_sym : status.to_sym
+    end
+
+    def terminate
+      @server.terminate
+    end
+  end
+end

data/lib/reel/connection.rb

@@ -31,6 +31,18 @@ module Reel
       self
     end
 
+    # Obtain the IP address of the remote connection
+    def remote_ip
+      @socket.peeraddr(false)[3]
+    end
+    alias_method :remote_addr, :remote_ip
+
+    # Obtain the hostname of the remote connection
+    def remote_host
+      # NOTE: Celluloid::IO does not yet support non-blocking reverse DNS
+      @socket.peeraddr(true)[2]
+    end
+
     # Reset the current request state
     def reset_request(state = :header)
       @request_state = state
@@ -38,14 +50,6 @@ module Reel
       @parser.reset
     end
 
-    def peer_address
-      @socket.peeraddr(false)
-    end
-
-    def local_address
-      @socket.addr(false)
-    end
-
     # Read a request object from the connection
     def request
       return if @request_state == :websocket
@@ -139,6 +143,7 @@ module Reel
       chunk_header = chunk.bytesize.to_s(16) + Response::CRLF
       @socket << chunk_header
       @socket << chunk
+      @socket << Response::CRLF
     end
     alias_method :<<, :write
 

data/lib/reel/rack_worker.rb

@@ -47,10 +47,8 @@ module Reel
       env["SERVER_NAME"] = @handler[:host]
       env["SERVER_PORT"] = @handler[:port]
 
-      peer_address = connection.peer_address
-
-      env["REMOTE_ADDR"] = peer_address[3]
-      env["REMOTE_HOST"] = peer_address[2]
+      env["REMOTE_ADDR"] = connection.remote_ip
+      env["REMOTE_HOST"] = connection.remote_host
 
       env["PATH_INFO"]   = request.path
       env["REQUEST_METHOD"] = request.method.to_s.upcase

data/lib/reel/version.rb

@@ -1,3 +1,3 @@
 module Reel
-  VERSION = "0.2.0.pre"
+  VERSION = "0.2.0"
 end

data/reel.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'octarine'
 end

data/spec/reel/app_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+require 'reel/app'
+
+describe Reel::App do
+  let(:app) {
+    Class.new do
+      include Reel::App
+
+      get example_path do
+        [200, {}, "hello foo"]
+      end
+
+    end
+  }
+
+  before(:each) do
+    @app = app.new(example_addr, example_port)
+  end
+
+  after(:each) do
+    @app.server.terminate if @app.server.alive?
+  end
+
+  it 'responds to get requests' do
+    res = Http.with_response(:object).get example_url
+    res.status.should == 200
+    res.headers.should == {"Connection" => "Keep-Alive", "Content-Length" => res.body.length.to_s}
+    res.body.should == "hello foo"
+  end
+
+  it 'terminates the server' do
+    @app.terminate
+    @app.server.should_not be_alive
+  end
+end

data/spec/reel/connection_spec.rb

@@ -77,7 +77,7 @@ describe Reel::Connection do
       end
 
       crlf = "\r\n"
-      fixture = "5#{crlf}Hello5#{crlf}World0#{crlf*2}"
+      fixture = "5#{crlf}Hello#{crlf}5#{crlf}World#{crlf}0#{crlf*2}"
       response[(response.length - fixture.length)..-1].should eq fixture
     end
   end

data/spec/reel/rack_worker_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Reel::RackWorker do
 
-  let(:endpoint) { URI("http://#{example_addr}:#{example_port}#{example_url}") }
+  let(:endpoint) { URI(example_url) }
 
   let(:worker) do
     app = Proc.new do |env|
@@ -29,7 +29,6 @@ describe Reel::RackWorker do
       env["SERVER_NAME"].should == '0.0.0.0'
       env["SERVER_PORT"].should == 3000
       env["REMOTE_ADDR"].should == "127.0.0.1"
-      env["REMOTE_HOST"].should == "127.0.0.1"
       env["PATH_INFO"].should == "/test"
       env["REQUEST_METHOD"].should == "GET"
       env["REQUEST_PATH"].should == "/test"
@@ -39,6 +38,8 @@ describe Reel::RackWorker do
       env["HTTP_ACCEPT_LANGUAGE"].should == "en-US,en;q=0.8"
       env["REQUEST_URI"].should == 'http://www.example.com/test'
 
+      %w(localhost 127.0.0.1).should include env["REMOTE_HOST"]
+
       env["rack.input"].should be_kind_of(StringIO)
       env["rack.input"].string.should == ''
     end

data/spec/reel/server_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'net/http'
 
 describe Reel::Server do
-  let(:endpoint) { URI("http://#{example_addr}:#{example_port}#{example_url}") }
+  let(:endpoint) { URI(example_url) }
   let(:response_body) { "ohai thar" }
 
   it "receives HTTP requests and sends responses" do
@@ -13,7 +13,7 @@ describe Reel::Server do
         request = connection.request
         request.method.should eq :get
         request.version.should eq "1.1"
-        request.url.should eq example_url
+        request.url.should eq example_path
 
         connection.respond :ok, response_body
       rescue => ex

data/spec/spec_helper.rb

@@ -6,7 +6,8 @@ Celluloid.logger = Logger.new(logfile)
 
 def example_addr; '127.0.0.1'; end
 def example_port; 1234; end
-def example_url;  "/example"; 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)

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: reel
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre
-  prerelease: 6
+  version: 0.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
-  requirement: &70212936553620 !ruby/object:Gem::Requirement
+  requirement: &70335285356900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70212936553620
+  version_requirements: *70335285356900
 - !ruby/object:Gem::Dependency
   name: http
-  requirement: &70212936553120 !ruby/object:Gem::Requirement
+  requirement: &70335285356400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70212936553120
+  version_requirements: *70335285356400
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
-  requirement: &70212936552660 !ruby/object:Gem::Requirement
+  requirement: &70335285355940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *70212936552660
+  version_requirements: *70335285355940
 - !ruby/object:Gem::Dependency
   name: websocket_parser
-  requirement: &70212936552200 !ruby/object:Gem::Requirement
+  requirement: &70335285355480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70212936552200
+  version_requirements: *70335285355480
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70212936551740 !ruby/object:Gem::Requirement
+  requirement: &70335285355020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70212936551740
+  version_requirements: *70335285355020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70212936551360 !ruby/object:Gem::Requirement
+  requirement: &70335285354640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212936551360
+  version_requirements: *70335285354640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70212936550900 !ruby/object:Gem::Requirement
+  requirement: &70335285370560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70212936550900
+  version_requirements: *70335285370560
+- !ruby/object:Gem::Dependency
+  name: octarine
+  requirement: &70335285370080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70335285370080
 description: A Celluloid::IO-powered HTTP server
 email:
 - tony.arcieri@gmail.com
@@ -113,6 +124,7 @@ files:
 - examples/websockets.rb
 - lib/rack/handler/reel.rb
 - lib/reel.rb
+- lib/reel/app.rb
 - lib/reel/connection.rb
 - lib/reel/logger.rb
 - lib/reel/rack_worker.rb
@@ -126,6 +138,7 @@ files:
 - logo.png
 - reel.gemspec
 - spec/fixtures/example.txt
+- spec/reel/app_spec.rb
 - spec/reel/connection_spec.rb
 - spec/reel/rack_worker_spec.rb
 - spec/reel/response_spec.rb
@@ -148,21 +161,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A reel good HTTP server
 test_files:
 - spec/fixtures/example.txt
+- spec/reel/app_spec.rb
 - spec/reel/connection_spec.rb
 - spec/reel/rack_worker_spec.rb
 - spec/reel/response_spec.rb
 - spec/reel/server_spec.rb
 - spec/reel/websocket_spec.rb
 - spec/spec_helper.rb
-has_rdoc: