http2 0.0.10 → 0.0.11

data/Gemfile.lock

@@ -8,7 +8,7 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.4)
+    json (1.7.5)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/http2.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{http2}
-  s.version = "0.0.10"
+  s.name = "http2"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-08-16}
-  s.description = %q{A lightweight framework for doing http-connections in Ruby. Supports cookies, keep-alive, compressing and much more.}
-  s.email = %q{k@spernj.org}
+  s.date = "2012-09-30"
+  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 = [
     "LICENSE.txt",
     "README.rdoc"
@@ -33,11 +33,11 @@ Gem::Specification.new do |s|
     "spec/http2_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/kaspernj/http2}
+  s.homepage = "http://github.com/kaspernj/http2"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{A lightweight framework for doing http-connections in Ruby. Supports cookies, keep-alive, compressing and much more.}
+  s.rubygems_version = "1.8.24"
+  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
     s.specification_version = 3

data/lib/http2.rb

@@ -71,14 +71,14 @@ class Http2
   
   #Returns boolean based on the if the object is connected and the socket is working.
   #===Examples
-  # print "Socket is working." if http.socket_working?
+  # puts "Socket is working." if http.socket_working?
   def socket_working?
     return false if !@sock or @sock.closed?
     
     if @keepalive_timeout and @request_last
       between = Time.now.to_i - @request_last.to_i
       if between >= @keepalive_timeout
-        print "Http2: We are over the keepalive-wait - returning false for socket_working?.\n" if @debug
+        puts "Http2: We are over the keepalive-wait - returning false for socket_working?." if @debug
         return false
       end
     end
@@ -111,7 +111,7 @@ class Http2
   #Reconnects to the host.
   def reconnect
     require "socket"
-    print "Http2: Reconnect.\n" if @debug
+    puts "Http2: Reconnect." if @debug
     
     #Reset variables.
     @keepalive_max = nil
@@ -176,8 +176,8 @@ class Http2
       raise "Invalid arguments: '#{args.class.name}'."
     end
     
-    if args[:url].to_s.strip.empty?
-      raise "Empty URL given: '#{args[:url]}'."
+    if !args.key?(:url) or !args[:url]
+      raise "No URL given: '#{args[:url]}'."
     elsif args[:url].to_s.split("\n").length > 1
       raise "Multiple lines given in URL: '#{args[:url]}'."
     end
@@ -218,10 +218,10 @@ class Http2
     
     begin
       raise Errno::EPIPE, "The socket is closed." if !@sock or @sock.closed?
-      @sock.puts(str)
+      self.sock_puts(str)
     rescue Errno::EPIPE #this can also be thrown by puts.
       self.reconnect
-      @sock.puts(str)
+      self.sock_puts(str)
     end
     
     @request_last = Time.now
@@ -235,11 +235,17 @@ class Http2
     return args[:default_headers] if args[:default_headers]
     
     headers = {
-      "Host" => @args[:host],
       "Connection" => "Keep-Alive",
       "User-Agent" => @uagent
     }
     
+    #Possible to give custom host-argument.
+    if args[:host]
+      headers["Host"] = args[:host]
+    else
+      headers["Host"] = @args[:host]
+    end
+    
     if !@args.key?(:encoding_gzip) or @args[:encoding_gzip]
       headers["Accept-Encoding"] = "gzip"
     else
@@ -401,7 +407,7 @@ class Http2
       File.open(praw.path, "r") do |fp|
         begin
           while data = fp.sysread(4096)
-            @sock.write(data)
+            self.sock_write(data)
           end
         rescue EOFError
           #ignore.
@@ -412,6 +418,17 @@ class Http2
     end
   end
   
+  def sock_write(str)
+    str = str.to_s
+    return nil if str.empty?
+    count = @sock.write(str)
+    raise "Couldnt write to socket: '#{count}', '#{str}'." if count <= 0
+  end
+  
+  def sock_puts(str)
+    self.sock_write("#{str}#{@nl}")
+  end
+  
   #Returns a header-string which normally would be used for a request in the given state.
   def header_str(headers_hash, args = {})
     if @cookies.length > 0 and (!args.key?(:cookies) or args[:cookies])
@@ -451,6 +468,8 @@ class Http2
     @mode = "headers"
     @resp = Http2::Response.new(:request_args => args)
     
+    rec_count = 0
+    
     loop do
       begin
         if @length and @length > 0 and @mode == "body"
@@ -459,11 +478,22 @@ class Http2
           line = @sock.gets
         end
         
+        if line
+          rec_count += line.length
+        elsif !line and rec_count <= 0
+          @sock = nil
+          raise Errno::ECONNABORTED, "Server closed the connection before being able to read anything (KeepAliveMax: '#{@keepalive_max}', Connection: '#{@connection}', PID: '#{Process.pid}')."
+        end
+        
         print "<#{@mode}>: '#{line}'\n" if @debug
-      rescue Errno::ECONNRESET
-        print "Http2: The connection was reset while reading - breaking gently...\n" if @debug
-        @sock = nil
-        break
+      rescue Errno::ECONNRESET => e
+        if rec_count > 0
+          print "Http2: The connection was reset while reading - breaking gently...\n" if @debug
+          @sock = nil
+          break
+        else
+          raise Errno::ECONNABORTED, "Server closed the connection before being able to read anything (KeepAliveMax: '#{@keepalive_max}', Connection: '#{@connection}', PID: '#{Process.pid}')."
+        end
       end
       
       break if line.to_s == ""
@@ -512,7 +542,7 @@ class Http2
     @resp = nil
     @mode = nil
     
-    raise "No status-code was received from the server.\n\nHeaders:\n#{resp.headers}\n\nBody:\n#{resp.args[:body]}" if !resp.args[:code]
+    raise "No status-code was received from the server. Headers: '#{resp.headers}' Body: '#{resp.args[:body]}'." if !resp.args[:code]
     
     if resp.args[:code].to_s == "302" and resp.header?("location") and (!@args.key?(:follow_redirects) or @args[:follow_redirects])
       require "uri"

metadata

@@ -2,7 +2,7 @@
 name: http2
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-16 00:00:00 +02:00
-default_executable: 
+date: 2012-09-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -82,7 +81,6 @@ files:
 - lib/http2.rb
 - spec/http2_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/kaspernj/http2
 licenses: 
 - MIT
@@ -96,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4399535538021775808
+      hash: -3252344485534143672
       segments: 
       - 0
       version: "0"
@@ -109,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A lightweight framework for doing http-connections in Ruby. Supports cookies, keep-alive, compressing and much more.