net-http-server 0.2.0 → 0.2.1

data/ChangeLog.md

@@ -1,3 +1,10 @@
+### 0.2.1 / 2011-10-14
+
+* Adjusted {Net::HTTP::Server::Parser} to include the leading `/` in the
+  `:path`.
+* Use `String#replace` to clear the buffer passed to
+  {Net::HTTP::Server::ChunkedStream#read}.
+
 ### 0.2.0 / 2011-08-23
 
 * Added support for handling Streams and Chunked Transfer-Encoding:

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

@@ -62,7 +62,7 @@ module Net
           end
 
           # clear the buffer before appending
-          buffer.clear
+          buffer.replace('')
 
           unless @buffer.empty?
             # empty a slice of the buffer

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

@@ -86,23 +86,22 @@ module Net
         rule(:params) { param >> (str(';') >> param).repeat }
         rule(:frag) { (uchar | reserved).repeat }
 
-        rule(:relative_path) {
-          path.maybe.as(:path) >>
+        rule(:uri_path) {
+          (str('/').maybe >> path.maybe).as(:path) >>
           (str(';') >> params.as(:params)).maybe >>
           (str('?') >> query_string.as(:query)).maybe >>
           (str('#') >> frag.as(:fragment)).maybe
         }
-        rule(:absolute_path) { str('/').repeat(1) >> relative_path }
 
-        rule(:absolute_uri) {
+        rule(:uri) {
           scheme.as(:scheme) >> str(':') >> str('//').maybe >>
           (user_info.as(:user_info) >> str('@')).maybe >>
           host_name.as(:host) >>
           (str(':') >> digits.as(:port)).maybe >>
-          absolute_path
+          uri_path
         }
 
-        rule(:request_uri) { str('*') | absolute_uri | absolute_path }
+        rule(:request_uri) { str('*') | uri | uri_path }
 
         #
         # HTTP Elements
@@ -112,9 +111,9 @@ module Net
         rule(:version_number) { digits >> str('.') >> digits }
         rule(:http_version) { str('HTTP/') >> version_number.as(:version) }
         rule(:request_line) {
-          request_method.as(:method) >>
-          str(' ') >> request_uri.as(:uri) >>
-          str(' ') >> http_version
+          request_method.as(:method) >> str(' ') >>
+          request_uri.as(:uri) >> str(' ') >>
+          http_version
         }
 
         rule(:header_name) { (str(':').absnt? >> token).repeat(1) }

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

@@ -65,7 +65,8 @@ module Net
         def normalize_uri(request)
           uri = request[:uri]
 
-          if uri.kind_of?(Hash)
+          case uri
+          when Hash
             if uri[:scheme]
               uri[:port] = unless uri[:port]
                              DEFAULT_PORTS[uri[:scheme]]
@@ -73,13 +74,7 @@ module Net
                              uri[:port].to_i
                            end
             end
-
-            unless uri[:path]
-              uri[:path] = '/'
-            else
-              uri[:path].insert(0,'/')
-            end
-          elsif uri == '*'
+          when '*'
             request[:uri] = {}
           end
         end

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.0'
+      VERSION = '0.2.1'
     end
   end
 end

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

@@ -26,26 +26,26 @@ describe Net::HTTP::Server::Parser do
     it "should not confuse the '/*' path with '*'" do
       request = subject.parse("OPTIONS /* HTTP/1.1\r\n\r\n")
 
-      request[:uri][:path].should == '*'
+      request[:uri][:path].should == '/*'
     end
 
     it "should parse absolute paths" do
       request = subject.parse("GET /absolute/path HTTP/1.1\r\n\r\n")
 
-      request[:uri][:path].should == 'absolute/path'
+      request[:uri][:path].should == '/absolute/path'
     end
 
     it "should parse the params in the path" do
       request = subject.parse("GET /path;q=1;p=2 HTTP/1.1\r\n\r\n")
 
-      request[:uri][:path].should == 'path'
+      request[:uri][:path].should == '/path'
       request[:uri][:params].should == 'q=1;p=2'
     end
 
     it "should parse the query-string in the path" do
       request = subject.parse("GET /path?q=1&p=2 HTTP/1.1\r\n\r\n")
 
-      request[:uri][:path].should == 'path'
+      request[:uri][:path].should == '/path'
       request[:uri][:query].should == 'q=1&p=2'
     end
 
@@ -55,7 +55,7 @@ describe Net::HTTP::Server::Parser do
       request[:uri][:scheme].should == 'http'
       request[:uri][:host].should == 'www.example.com'
       request[:uri][:port].should == '8080'
-      request[:uri][:path].should == 'path'
+      request[:uri][:path].should == '/path'
     end
 
     it "should parse non-http URIs" do
@@ -64,7 +64,7 @@ describe Net::HTTP::Server::Parser do
       request[:uri][:scheme].should == 'xmpp'
       request[:uri][:user_info].should == 'alice:secret'
       request[:uri][:host].should == 'example.com'
-      request[:uri][:path].should == 'path'
+      request[:uri][:path].should == '/path'
     end
 
     it "should parse the HTTP version" do
@@ -83,7 +83,7 @@ describe Net::HTTP::Server::Parser do
       request = subject.parse("GET / HTTP/1.1\r\n\r\n")
 
       request[:method].should == 'GET'
-      request[:uri][:path].should be_nil
+      request[:uri][:path].should == '/'
       request[:version].should == '1.1'
     end
   end

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

@@ -52,20 +52,6 @@ describe Net::HTTP::Server::Requests do
       request[:uri][:port].should == 80
     end
 
-    it "should default :path to '/'" do
-      request = {:uri => {:path => nil}}
-      normalize_uri(request)
-
-      request[:uri][:path].should == '/'
-    end
-
-    it "should ensure that the path begins with a '/'" do
-      request = {:uri => {:path => 'foo'}}
-      normalize_uri(request)
-
-      request[:uri][:path].should == '/foo'
-    end
-
     it "should replace a '*' URI with an empty Hash" do
       request = {:uri => '*'}
       normalize_uri(request)

metadata

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