net-http-server 0.2.1 → 0.2.2

data/ChangeLog.md

@@ -1,3 +1,12 @@
+### 0.2.2 / 2012-09-08
+
+* Added an example `rackup` command.
+
+#### Parser
+
+* Fixed the rule for escaped unicode characters (`%uXXXX`).
+* Added a rule for escaped characters (`%XX`).
+
 ### 0.2.1 / 2011-10-14
 
 * Adjusted {Net::HTTP::Server::Parser} to include the leading `/` in the

data/README.md

@@ -35,6 +35,10 @@ Use it with Rack:
     
     Rack::Handler::HTTP.run app
 
+Using it with `rackup`:
+
+    $ rackup -s HTTP
+
 ## Requirements
 
 * [parslet](http://rubygems.org/gems/parslet) ~> 1.0

data/Rakefile

@@ -2,13 +2,13 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'ore-tasks', '~> 0.4'
-  require 'ore/tasks'
+  gem 'rubygems-tasks', '~> 0.1'
+  require 'rubygems/tasks'
 
-  Ore::Tasks.new
+  Gem::Tasks.new
 rescue LoadError => e
   warn e.message
-  warn "Run `gem install ore-tasks` to install 'ore/tasks'."
+  warn "Run `gem install rubygems-tasks` to install 'rubygems/tasks'."
 end
 
 begin
@@ -25,7 +25,7 @@ task :test => :spec
 task :default => :spec
 
 begin
-  gem 'yard', '~> 0.6.0'
+  gem 'yard', '~> 0.8'
   require 'yard'
 
   YARD::Rake::YardocTask.new  

data/gemspec.yml

@@ -11,6 +11,6 @@ dependencies:
   parslet: ~> 1.0
 
 development_dependencies:
-  ore-tasks: ~> 0.4
+  rubygems-tasks: ~> 0.1
   rspec: ~> 2.4
-  yard: ~> 0.6.0
+  yard: ~> 0.8

data/lib/net/http/server/parser.rb

@@ -43,8 +43,9 @@ module Net
         }
 
         rule(:unreserved) { alpha | digit | safe | extra | national }
-        rule(:escape) { str("%u").maybe >> xdigit >> xdigit }
-        rule(:uchar) { unreserved | escape | sorta_safe }
+        rule(:uescape) { str("%u") >> xdigit >> xdigit >> xdigit >> xdigit }
+        rule(:escape) { str("%") >> xdigit >> xdigit }
+        rule(:uchar) { unreserved | uescape | escape | sorta_safe }
         rule(:pchar) { uchar | charset(':', '@', '&', '=', '+') }
         rule(:separators) {
           lws | charset(

data/lib/net/http/server/requests.rb

@@ -7,7 +7,7 @@ module Net
         # Default ports for common URI schemes
         DEFAULT_PORTS = {
           'https' => 443,
-          'http' => 80
+          'http'  => 80
         }
 
         protected
@@ -91,7 +91,7 @@ module Net
 
           unless headers.empty?
             headers.each do |header|
-              name = header[:name].to_s
+              name  = header[:name].to_s
               value = header[:value].to_s
 
               if normalized_headers.has_key?(name)

data/lib/net/http/server/responses.rb

@@ -87,7 +87,7 @@ module Net
         # @param [IO] stream
         #   The stream to write the headers back to.
         #
-        # @param [Hash{String => [String, Time, Array<String>}] headers
+        # @param [Hash{String => String,Time,Array<String>}] headers
         #   The headers of the HTTP Response.
         #
         def write_headers(stream,headers)
@@ -155,7 +155,7 @@ module Net
         # @param [Integer] status
         #   The status of the HTTP Response.
         #
-        # @param [Hash{String => [String, Time, Array<String>}] headers
+        # @param [Hash{String => String,Time,Array<String>}] headers
         #   The headers of the HTTP Response.
         #
         # @param [#each] body

data/lib/net/http/server/version.rb

@@ -4,7 +4,7 @@ module Net
   class HTTP < Protocol
     module Server
       # net-http-server version.
-      VERSION = '0.2.1'
+      VERSION = '0.2.2'
     end
   end
 end

data/lib/rack/handler/http.rb

@@ -47,10 +47,9 @@ module Rack
       #   The port to listen on.
       #
       def initialize(app,options={})
-        @app = app
+        @app     = app
         @options = options
-
-        @server = nil
+        @server  = nil
       end
 
       #
@@ -67,8 +66,8 @@ module Rack
       #
       def run
         @server = Net::HTTP::Server::Daemon.new(
-          :host => @options[:Host],
-          :port => @options[:Port],
+          :host    => @options[:Host],
+          :port    => @options[:Port],
           :handler => self
         )
 
@@ -89,9 +88,9 @@ module Rack
       #   The response status, headers and body.
       #
       def call(request,stream)
-        request_uri = request[:uri]
+        request_uri    = request[:uri]
         remote_address = stream.socket.remote_address
-        local_address = stream.socket.local_address
+        local_address  = stream.socket.local_address
 
         env = {}
 
@@ -105,16 +104,16 @@ module Rack
           env['rack.url_scheme'] = request_uri[:scheme].to_s
         end
 
-        env['SERVER_NAME'] = local_address.getnameinfo[0]
-        env['SERVER_PORT'] = local_address.ip_port.to_s
+        env['SERVER_NAME']     = local_address.getnameinfo[0]
+        env['SERVER_PORT']     = local_address.ip_port.to_s
         env['SERVER_PROTOCOL'] = "HTTP/#{request[:http_version]}"
 
         env['REMOTE_ADDR'] = remote_address.ip_address
         env['REMOTE_PORT'] = remote_address.ip_port.to_s
 
         env['REQUEST_METHOD'] = request[:method].to_s
-        env['PATH_INFO'] = request_uri.fetch(:path,'*').to_s
-        env['QUERY_STRING'] = request_uri[:query_string].to_s
+        env['PATH_INFO']      = request_uri.fetch(:path,'*').to_s
+        env['QUERY_STRING']   = request_uri[:query_string].to_s
 
         # add the headers
         request[:headers].each do |name,value|

data/spec/net/http/server/daemon_spec.rb

@@ -2,24 +2,22 @@ require 'spec_helper'
 require 'net/http/server/daemon'
 
 describe Net::HTTP::Server::Daemon do
-  subject { Net::HTTP::Server::Daemon }
+  subject { described_class }
 
-  describe "new" do
-    it "should have a default host" do
-      daemon = subject.new { |request,socket| }
+  describe "#initialize" do
+    subject { described_class.new { |request,response| } }
 
-      daemon.host.should_not be_nil
+    it "should have a default host" do
+      subject.host.should_not be_nil
     end
 
     it "should have a default port" do
-      daemon = subject.new { |request,socket| }
-
-      daemon.port.should_not be_nil
+      subject.port.should_not be_nil
     end
 
     it "should require a HTTP Request handler" do
       lambda {
-        subject.new
+        described_class.new
       }.should raise_error
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-http-server
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-15 00:00:00.000000000Z
+date: 2012-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
-  requirement: &16637300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,31 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *16637300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: ore-tasks
-  requirement: &16636440 !ruby/object:Gem::Requirement
+  name: rubygems-tasks
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.1'
   type: :development
   prerelease: false
-  version_requirements: *16636440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16635800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,18 +53,28 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *16635800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &16635320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *16635320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
 description: A Rack compatible pure Ruby HTTP Server.
 email: postmodern.mod3@gmail.com
 executables: []
@@ -116,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A pure Ruby HTTP Server