ht2p 0.0.6 → 0.0.7

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Jun Kikuchi
+Copyright (c) 2009, 2010 Jun Kikuchi
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -40,4 +40,4 @@ HT2P is a Ruby library for HTTP and HTTPS.
 
 == Copyright
 
-Copyright (c) 2009 Jun Kikuchi. See LICENSE for details.
+Copyright (c) 2009, 2010 Jun Kikuchi. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/ht2p.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ht2p}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jun Kikuchi"]
-  s.date = %q{2009-11-21}
+  s.date = %q{2010-01-16}
   s.description = %q{ht2p}
   s.email = %q{kikuchi@bonnou.com}
   s.extra_rdoc_files = [

data/lib/ht2p/client.rb

@@ -1,8 +1,12 @@
 require 'uri'
 require 'socket'
 require 'openssl'
+require 'forwardable'
 
 class HT2P::Client
+  extend Forwardable
+  def_delegators :@socket, :write, :read, :gets, :flush
+
   attr_reader :uri, :request
 
   def initialize(uri, params={}, &block)
@@ -13,8 +17,16 @@ class HT2P::Client
 
     TCPSocket.open(ip, @uri.port) do |socket|
       if @uri.scheme == 'https'
+        context = OpenSSL::SSL::SSLContext.new
+        context.ca_file = params[:ca_file]
+        context.ca_path = params[:ca_path] || OpenSSL::X509::DEFAULT_CERT_DIR
+        context.timeout = params[:timeout]
+        context.verify_depth = params[:verify_depth]
+        context.verify_mode  = OpenSSL::SSL.const_get\
+          "VERIFY_#{(params[:verify_mode] || 'PEER').to_s.upcase}"
+
         begin
-          @socket = OpenSSL::SSL::SSLSocket.new(socket)
+          @socket = OpenSSL::SSL::SSLSocket.new(socket, context)
           @socket.connect
           @request = HT2P::Client::Request.new(self, params)
           block.call @request
@@ -29,30 +41,6 @@ class HT2P::Client
     end
   end
 
-  def request_header(method, header)
-    @socket.write header.format(method, @uri)
-  end
-
-  def response_header
-    HT2P::Header.load @socket
-  end
-
-  def write(val)
-    @socket.write val.to_s
-  end
-
-  def read(length=nil)
-    @socket.read length
-  end
-
-  def gets
-    @socket.gets
-  end
-
-  def flush
-    @socket.flush
-  end
-
   autoload :Request, 'ht2p/client/request'
   autoload :Response, 'ht2p/client/response'
 end

data/lib/ht2p/client/request.rb

@@ -1,7 +1,11 @@
 class HT2P::Client::Request
-  METHODS = %w'get head post put delete options trace connect'
+  extend Forwardable
+  def_delegators :@client, :uri, :write
+  def_delegators :@header, :[], :[]=
+
+  attr_accessor :method, :header
 
-  attr_accessor :uri, :method, :header
+  alias :headers :header
 
   def initialize(client, params)
     @client = client
@@ -11,18 +15,15 @@ class HT2P::Client::Request
 
   def send(body=nil, &block)
     @header['content-length'] = body.to_s.size if body
-    @client.request_header(@method, @header)
-    @client.write(body) if body
-    block.call(self) if block_given?
+    @client.write @header.format(@method, @client.uri)
+    @client.write body if body
+    block.call self if block_given?
     @client.flush
-    HT2P::Client::Response.new(@client)
+    HT2P::Client::Response.new @client
   end
 
+  METHODS = %w'get head post put delete options trace connect'
   METHODS.each do |val|
-    define_method(val, instance_method(:send))
-  end
-
-  def write(val)
-    @client.write(val)
+    define_method val, instance_method(:send)
   end
 end

data/lib/ht2p/client/response.rb

@@ -1,16 +1,21 @@
 class HT2P::Client::Response
+  extend Forwardable
+  def_delegators :@header, :[], :[]=
+
   attr_reader :code, :header
 
+  alias :headers :header
+
   HAS_BODY = [:get, :post, :put, :delete, :trace]
 
   def initialize(client)
-    @client, @code, @header = client, *client.response_header
+    @client, @code, @header = client, *HT2P::Header.load(client)
 
     @body = if HAS_BODY.include? @client.request.method.to_s.downcase.to_sym
       if @header['transfer-encoding'].to_s.downcase == 'chunked'
-        Chunked.new(@client)
+        Chunked.new @client
       else
-        Transfer.new(@client, @header['content-length'].to_i)
+        Transfer.new @client, @header['content-length'].to_i
       end
     else
       Empty.new
@@ -19,14 +24,14 @@ class HT2P::Client::Response
 
   def receive(&block)
     if block_given?
-      block.call(self)
+      block.call self
     else
       read
     end
   end
 
   def read(length=nil)
-    @body.read(length)
+    @body.read length
   end
 
   class Transfer
@@ -36,13 +41,13 @@ class HT2P::Client::Response
 
     def read(length=nil)
       if @size.nil?
-        @client.read(length)
+        @client.read length
       elsif @size > 0
         length ||= @size
         length = @size if @size < length
         @size -= length
 
-        @client.read(length)
+        @client.read length
       else
         nil
       end
@@ -51,18 +56,19 @@ class HT2P::Client::Response
 
   class Chunked < Transfer
     def initialize(client)
-      super(client, nil)
+      super client, nil
       parse_size
     end
 
     def read(length=nil)
-      parse_size unless @size > 0
-      super(length)
+      parse_size if @size <= 0
+      super length
     end
 
     def parse_size
       @size = @client.gets.chop!.hex
     end
+    private :parse_size
   end
 
   class Empty

data/lib/ht2p/header.rb

@@ -12,24 +12,28 @@ class HT2P::Header < Hash
         code = md[1].to_i
       elsif md = /(.+?):\s*(.*)/.match(line)
         key, val = md[1].downcase, md[2]
-        header[key] = val
+        if header.key? key
+          header.add key, val
+        else
+          header[key] = val
+        end
       elsif md = /\s+(.*)/.match(line)
-        header.append(key, md[1])
+        header.append key, md[1]
       end
     end
 
     [code, header]
   end
 
-  def []=(key, val)
-    if self.key? key
+  def add(key, val)
+    if key? key
       if self[key].is_a? Array
         self[key] << val
       else
-        super(key, [self[key], val])
+        self[key] = [self[key], val]
       end
     else
-      super(key, val)
+      self[key] = [val]
     end
   end
 

data/spec/ht2p_spec.rb

@@ -42,29 +42,16 @@ describe HT2P::Header do
     @header = HT2P::Header.new
   end
 
-  it 'should store some keys and values like a Hash' do
+  it '見た目は 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'] = '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']
+    @header['a'].should == 'A'
   end
 
-  it 'should perform `load` to load HTTP header' do
+  it 'class メソッドの load は HTTP ヘッダーを読み込む' do
     s =<<END
 HTTP/1.1 100 continue
 HTTP/1.1 200 ok
@@ -85,7 +72,7 @@ END
     header['d'].should == ['D', 'DD']
   end
 
-  it 'should perform `format` to return header string' do
+  it 'format メソッドは HTTP ヘッダー文字列を返す' do
     uri = URI.parse('http://example.com/')
     s =<<END
 GET / HTTP/1.1
@@ -101,6 +88,17 @@ 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")
 
@@ -115,14 +113,25 @@ b: B
 END
     @header.format(:get, uri).should == s.gsub("\n", "\r\n")
 
-    @header['b'] = 'BB'
+    @header.add('b', 'B')
     uri = URI.parse('http://example.com/')
     s =<<END
 GET / HTTP/1.1
 Host: example.com
 a: A
 b: B
-b: BB
+b: B
+
+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")

metadata

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