ht2p 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/ht2p/client.rb

@@ -30,35 +30,11 @@ class HT2P::Client
   end
 
   def request_header(method, header)
-    @socket.write "%s %s%s HTTP/1.1\r\n" % [
-      method.to_s.upcase,
-      @uri.path,
-      @uri.query && "?#{@uri.query}"
-    ]
-    @socket.write "Host: #{@uri.host}\r\n"
-    @socket.write header.to_s
-    @socket.write "\r\n"
+    @socket.write header.format(method, @uri)
   end
 
   def response_header
-    code = nil
-    header = HT2P::Header.new
-
-    key = nil
-    while line = @socket.gets.chop!
-      line.empty? && break
-
-      if md = %r!HTTP[\w\./]+\s+(\d+)!.match(line)
-        code = md[1]
-      elsif md = /(.+?):\s*(.*)/.match(line)
-        key, val = md[1].downcase, md[2]
-        header[key] = val
-      elsif md = /\s+(.*)/.match(line)
-        header[key] = md[1]
-      end
-    end
-
-    [code.to_i, header]
+    HT2P::Header.load @socket
   end
 
   def write(val)

data/lib/ht2p/header.rb

@@ -1,4 +1,26 @@
 class HT2P::Header < Hash
+  def self.load(io)
+    code = nil
+    header = self.new
+
+    key = nil
+    while line = io.gets
+      line.chop!
+      line.empty? && break
+
+      if md = %r!HTTP[\w\./]+\s+(\d+)!.match(line)
+        code = md[1].to_i
+      elsif md = /(.+?):\s*(.*)/.match(line)
+        key, val = md[1].downcase, md[2]
+        header[key] = val
+      elsif md = /\s+(.*)/.match(line)
+        header.append(key, md[1])
+      end
+    end
+
+    [code, header]
+  end
+
   def []=(key, val)
     if self.key? key
       if self[key].is_a? Array
@@ -11,6 +33,14 @@ class HT2P::Header < Hash
     end
   end
 
+  def append(key, val)
+    if self[key].is_a? Array
+      self[key].last << val
+    else
+      self[key] << val
+    end
+  end
+
   def to_s
     inject('') do |ret, (key, val)|
       if val.is_a? Array
@@ -24,4 +54,12 @@ class HT2P::Header < Hash
       ret
     end
   end
+
+  def format(method, uri)
+    "%s %s%s HTTP/1.1\r\n" % [
+      method.to_s.upcase,
+      uri.path,
+      uri.query && "?#{uri.query}"
+    ] << "Host: #{uri.host}\r\n" << to_s << "\r\n"
+  end
 end

data/spec/ht2p_spec.rb

@@ -34,3 +34,98 @@ describe HT2P::Client do
     end
   end
 end
+
+HEADER=<<END
+HTTP/1.1 100 continue
+HTTP/1.1 200 ok
+a:A
+b:B
+b: B
+c:  C
+ C
+d: D
+d: D
+ D
+END
+
+require 'stringio'
+
+describe HT2P::Header do
+  before do
+    @header = HT2P::Header.new
+  end
+
+  it 'should store some keys and values like a Hash' do
+    @header['a'] = 'A'
+    @header['a'].should == 'A'
+  end
+
+  it 'should change the value to an Array if the key has been stored' do
+    @header['a'] = 'A'
+    @header['a'] = 'A'
+    @header['a'].should == ['A', 'A']
+  end
+
+  it 'should perform `append` to append the value' do
+    @header['a'] = 'A'
+    @header.append('a', 'A')
+    @header['a'].should == 'AA'
+
+    @header['b'] = 'B'
+    @header['b'] = 'B'
+    @header.append('b', 'B')
+    @header['b'].should == ['B', 'BB']
+  end
+
+  it 'should perform `load` to load HTTP header' do
+    code, header = HT2P::Header.load(StringIO.new(HEADER))
+    code.should == 200
+    header['a'].should == 'A'
+    header['b'].should == ['B', 'B']
+    header['c'].should == 'CC'
+    header['d'].should == ['D', 'DD']
+  end
+
+  it 'should perform `format` to return header string' do
+    uri = URI.parse('http://example.com/')
+    s =<<END
+GET / HTTP/1.1
+Host: example.com
+
+END
+    @header.format(:get, uri).should == s.gsub("\n", "\r\n")
+
+    @header['a'] = 'A'
+    uri = URI.parse('http://example.com/')
+    s =<<END
+GET / HTTP/1.1
+Host: example.com
+a: A
+
+END
+    @header.format(:get, uri).should == s.gsub("\n", "\r\n")
+
+    @header['b'] = 'B'
+    uri = URI.parse('http://example.com/')
+    s =<<END
+GET / HTTP/1.1
+Host: example.com
+a: A
+b: B
+
+END
+    @header.format(:get, uri).should == s.gsub("\n", "\r\n")
+
+    @header['b'] = 'BB'
+    uri = URI.parse('http://example.com/')
+    s =<<END
+GET / HTTP/1.1
+Host: example.com
+a: A
+b: B
+b: BB
+
+END
+    @header.format(:get, uri).should == s.gsub("\n", "\r\n")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ht2p
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jun Kikuchi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-11 00:00:00 +09:00
+date: 2009-11-12 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency