http2 0.0.16 → 0.0.17

data/VERSION

@@ -1 +1 @@
-0.0.16
+0.0.17

data/http2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "http2"
-  s.version = "0.0.16"
+  s.version = "0.0.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = "2013-06-21"
+  s.date = "2013-06-26"
   s.description = "A lightweight framework for doing http-connections in Ruby. Supports cookies, keep-alive, compressing and much more."
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/kaspernj/http2"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "1.8.11"
   s.summary = "A lightweight framework for doing http-connections in Ruby. Supports cookies, keep-alive, compressing and much more."
 
   if s.respond_to? :specification_version then

data/lib/http2.rb

@@ -26,7 +26,7 @@ class Http2
   
   attr_reader :cookies, :args
   
-  VALID_ARGUMENTS_INITIALIZE = [:host, :port, :ssl, :nl, :user_agent, :raise_errors, :follow_redirects, :debug, :encoding_gzip, :autostate, :basic_auth, :extra_headers]
+  VALID_ARGUMENTS_INITIALIZE = [:host, :port, :ssl, :nl, :user_agent, :raise_errors, :follow_redirects, :debug, :encoding_gzip, :autostate, :basic_auth, :extra_headers, :proxy]
   def initialize(args = {})
     args = {:host => args} if args.is_a?(String)
     raise "Arguments wasnt a hash." if !args.is_a?(Hash)
@@ -147,27 +147,26 @@ class Http2
     @charset = nil
     
     #Open connection.
-    if @args[:proxy]
+    if @args[:proxy] && @args[:ssl]
       print "Http2: Initializing proxy stuff.\n" if @debug
       @sock_plain = TCPSocket.new(@args[:proxy][:host], @args[:proxy][:port])
-      @sock = @sock_plain
       
-      @sock.write("CONNECT #{@args[:host]}:#{@args[:port]} HTTP/1.0#{@nl}")
-      @sock.write("User-Agent: #{@uagent}#{@nl}")
+      @sock_plain.write("CONNECT #{@args[:host]}:#{@args[:port]} HTTP/1.0#{@nl}")
+      @sock_plain.write("User-Agent: #{@uagent}#{@nl}")
       
       if @args[:proxy][:user] and @args[:proxy][:passwd]
         credential = ["#{@args[:proxy][:user]}:#{@args[:proxy][:passwd]}"].pack("m")
         credential.delete!("\r\n")
-        @sock.write("Proxy-Authorization: Basic #{credential}#{@nl}")
+        @sock_plain.write("Proxy-Authorization: Basic #{credential}#{@nl}")
       end
       
-      @sock.write(@nl)
+      @sock_plain.write(@nl)
       
-      res = @sock.gets
+      res = @sock_plain.gets
       raise res if res.to_s.downcase != "http/1.0 200 connection established#{@nl}"
-      
-      res_empty = @sock.gets
-      raise "Empty res wasnt empty." if res_empty != @nl
+    elsif @args[:proxy]
+      print "Http2: Opening socket connection to '#{@args[:host]}:#{@args[:port]}' through proxy '#{@args[:proxy][:host]}:#{@args[:proxy][:port]}'.\n" if @debug
+      @sock_plain = TCPSocket.new(@args[:proxy][:host], @args[:proxy][:port].to_i)
     else
       print "Http2: Opening socket connection to '#{@args[:host]}:#{@args[:port]}'.\n" if @debug
       @sock_plain = TCPSocket.new(@args[:host], @args[:port].to_i)
@@ -280,11 +279,9 @@ class Http2
     }
     
     #Possible to give custom host-argument.
-    if args[:host]
-      headers["Host"] = args[:host]
-    else
-      headers["Host"] = @args[:host]
-    end
+    _args = args[:host] ? args : @args
+    headers["Host"] = _args[:host]
+    headers["Host"] += ":#{_args[:port]}" unless _args[:port] && [80,443].include?(_args[:port].to_i)
     
     if !@args.key?(:encoding_gzip) or @args[:encoding_gzip]
       headers["Accept-Encoding"] = "gzip"
@@ -386,7 +383,7 @@ class Http2
       puts "Doing post." if @debug
       
       header_str = "#{method} /#{args[:url]} HTTP/1.1#{@nl}"
-      header_str << self.header_str({"Content-Length" => praw.length, "Content-Type" => content_type}.merge(self.default_headers(args)), args)
+      header_str << self.header_str({"Content-Length" => praw.bytesize, "Content-Type" => content_type}.merge(self.default_headers(args)), args)
       header_str << @nl
       header_str << praw
       header_str << @nl

metadata

@@ -1,80 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: http2
 version: !ruby/object:Gem::Version
+  version: 0.0.17
   prerelease: 
-  version: 0.0.16
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &9884720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.8.0
-  name: rspec
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.8.0
+  version_requirements: *9884720
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: &9883900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
-  name: rdoc
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.12'
+  version_requirements: *9883900
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: bundler
+  requirement: &9882980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-  name: bundler
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+  version_requirements: *9882980
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: jeweler
+  requirement: &9881920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.4
-  name: jeweler
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.4
+  version_requirements: *9881920
 description: A lightweight framework for doing http-connections in Ruby. Supports
   cookies, keep-alive, compressing and much more.
 email: k@spernj.org
@@ -111,10 +91,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      hash: 1149026515699745004
-      version: '0'
+      hash: 1747882727937754556
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -123,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A lightweight framework for doing http-connections in Ruby. Supports cookies,