http2 0.0.17 → 0.0.18

data/VERSION

@@ -1 +1 @@
-0.0.17
+0.0.18

data/http2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "http2"
-  s.version = "0.0.17"
+  s.version = "0.0.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = "2013-06-26"
+  s.date = "2013-06-28"
   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.11"
+  s.rubygems_version = "1.8.23"
   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/include/errors.rb

@@ -9,4 +9,9 @@ class Http2::Errors
   class Internalserver < RuntimeError
     attr_accessor :response
   end
+  
+  #Raised when a page is not found.
+  class Notfound < RuntimeError
+    attr_accessor :response
+  end
 end

data/include/response.rb

@@ -8,6 +8,7 @@ class Http2::Response
     @args = args
     @args[:headers] = {} if !@args.key?(:headers)
     @args[:body] = "" if !@args.key?(:body)
+    @debug = @args[:debug]
   end
   
   #Returns headers given from the host for the result.
@@ -73,4 +74,28 @@ class Http2::Response
     raise "URL could not be detected." if !@args[:request_args][:url]
     return @args[:request_args][:url]
   end
+  
+  # Checks the data that has been sat on the object and raises various exceptions, if it does not validate somehow.
+  def validate!
+    puts "Http2: Validating response length." if @debug
+    validate_body_versus_content_length!
+  end
+  
+  private
+  
+  # Checks that the length of the body is the same as the given content-length if given.
+  def validate_body_versus_content_length!
+    unless self.header?("content-length")
+      puts "Http2: No content length given - skipping length validation." if @debug
+      return nil
+    end
+    
+    content_length = self.header("content-length").to_i
+    body_length = @args[:body].to_s.bytesize
+    
+    puts "Http2: Body length: #{body_length}" if @debug
+    puts "Http2: Content length: #{content_length}" if @debug
+    
+    raise "Body does not match the given content-length: '#{body_length}', '#{content_length}'." if body_length != content_length
+  end
 end

data/lib/http2.rb

@@ -388,7 +388,7 @@ class Http2
       header_str << praw
       header_str << @nl
       
-      puts "Header str: #{header_str}" if @debug
+      puts "Http2: Header str: #{header_str}" if @debug
       
       self.write(header_str)
       return self.read_response(args)
@@ -469,7 +469,7 @@ class Http2
       
       
       #Debug.
-      print "Headerstr: #{header_str}\n" if @debug
+      print "Http2: Headerstr: #{header_str}\n" if @debug
       
       
       #Write and return.
@@ -534,14 +534,15 @@ class Http2
   # res = http.read_response
   def read_response(args = {})
     @mode = "headers"
-    @resp = Http2::Response.new(:request_args => args)
-    
+    @transfer_encoding = nil
+    @resp = Http2::Response.new(:request_args => args, :debug => @debug)
     rec_count = 0
     
     loop do
       begin
         if @length and @length > 0 and @mode == "body"
           line = @sock.read(@length)
+          raise "Expected to get #{@length} of bytes but got #{line.bytesize}" if @length != line.bytesize
         else
           line = @sock.gets
         end
@@ -553,7 +554,7 @@ class Http2
           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
+        puts "<#{@mode}>: '#{line}'" if @debug
       rescue Errno::ECONNRESET => e
         if rec_count > 0
           print "Http2: The connection was reset while reading - breaking gently...\n" if @debug
@@ -567,7 +568,8 @@ class Http2
       break if line.to_s == ""
       
       if @mode == "headers" and line == @nl
-        print "Http2: Changing mode to body!\n" if @debug
+        puts "Http2: Changing mode to body!" if @debug
+        raise "No headers was given at all? Possibly corrupt state after last request?" if @resp.headers.empty?
         break if @length == 0
         @mode = "body"
         self.on_content_call(args, @nl)
@@ -584,6 +586,12 @@ class Http2
     end
     
     
+    #Release variables.
+    resp = @resp
+    @resp = nil
+    @mode = nil
+    
+    
     #Check if we should reconnect based on keep-alive-max.
     if @keepalive_max == 1 or @connection == "close"
       @sock.close if !@sock.closed?
@@ -591,30 +599,31 @@ class Http2
     end
     
     
+    
+    # Validate that the response is as it should be.
+    puts "Http2: Validating response." if @debug
+    resp.validate!
+    
+    
     #Check if the content is gzip-encoded - if so: decode it!
     if @encoding == "gzip"
       require "zlib"
-      require "iconv"
       require "stringio"
-      io = StringIO.new(@resp.args[:body])
+      io = StringIO.new(resp.args[:body])
       gz = Zlib::GzipReader.new(io)
       untrusted_str = gz.read
       
       begin
-        valid_string = ic.encode("utf-8")
+        valid_string = ic.encode("UTF-8")
       rescue
-        ic = Iconv.new("UTF-8//IGNORE", "UTF-8")
-        valid_string = ic.iconv(untrusted_str + " ")[0..-2]
+        valid_string = untrusted_str.force_encoding("UTF-8").encode("UTF-8", :invalid => :replace, :replace => "").encode("UTF-8")
       end
       
-      @resp.args[:body] = valid_string
+      resp.args[:body] = valid_string
     end
     
     
-    #Release variables.
-    resp = @resp
-    @resp = nil
-    @mode = nil
+    
     
     raise "No status-code was received from the server. Headers: '#{resp.headers}' Body: '#{resp.args[:body]}'." if !resp.args[:code]
     
@@ -628,7 +637,7 @@ class Http2
       args[:ssl] = true if uri.scheme == "https"
       args[:port] = uri.port if uri.port
       
-      print "Redirecting from location-header to '#{url}'.\n" if @debug
+      puts "Http2: Redirecting from location-header to '#{url}'." if @debug
       
       if !args[:host] or args[:host] == @args[:host]
         return self.get(url)
@@ -644,6 +653,10 @@ class Http2
       err = Http2::Errors::Noaccess.new(resp.body)
       err.response = resp
       raise err
+    elsif @raise_errors && resp.args[:code].to_i == 404
+      err = Http2::Errors::Notfound.new(resp.body)
+      err.response = resp
+      raise err
     else
       autostate_register(resp) if @args[:autostate]
       
@@ -688,13 +701,16 @@ class Http2
         
         @ctype = ctype
         @resp.args[:contenttype] = @ctype
+      elsif key == "transfer-encoding"
+        @transfer_encoding = match[2].to_s.downcase.strip
       end
       
       if key != "transfer-encoding" and key != "content-length" and key != "connection" and key != "keep-alive"
         self.on_content_call(args, line)
       end
       
-      @resp.headers[key] = [] if !@resp.headers.key?(key)
+      puts "Http2: Parsed header: #{match[1]}: #{match[2]}" if @debug
+      @resp.headers[key] = [] unless @resp.headers.key?(key)
       @resp.headers[key] << match[2]
     elsif match = line.match(/^HTTP\/([\d\.]+)\s+(\d+)\s+(.+)$/)
       @resp.args[:code] = match[2]
@@ -710,7 +726,7 @@ class Http2
     if @resp.args[:http_version] = "1.1"
       return "break" if @length == 0
       
-      if @resp.header("transfer-encoding").to_s.downcase == "chunked"
+      if @transfer_encoding == "chunked"
         len = line.strip.hex
         
         if len > 0
@@ -731,9 +747,10 @@ class Http2
         
         raise "Should have read newline but didnt: '#{nl}'." if nl != @nl
       else
+        puts "Http2: Adding #{line.to_s.bytesize} to the body." if @debug
         @resp.args[:body] << line.to_s
         self.on_content_call(args, line)
-        return "break" if @resp.header?("content-length") and @resp.args[:body].length >= @resp.header("content-length").to_i
+        return "break" if @resp.header?("content-length") && @resp.args[:body].length >= @resp.header("content-length").to_i
       end
     else
       raise "Dont know how to read HTTP version: '#{@resp.args[:http_version]}'."

data/spec/http2_spec.rb

@@ -26,7 +26,7 @@ describe "Http2" do
     require "json"
     
     #Test posting keep-alive and advanced post-data.
-    Http2.new(:host => "www.partyworm.dk") do |http|
+    Http2.new(:host => "www.partyworm.dk", :debug => false) do |http|
       0.upto(5) do
         resp = http.get("multipart_test.php")
         
@@ -110,4 +110,10 @@ describe "Http2" do
     isgd = Http2.isgdlink("https://github.com/kaspernj/http2")
     raise "Expected isgd-var to be valid but it wasnt: '#{isgd}'." if !isgd.match(/^http:\/\/is\.gd\/([A-z\d]+)$/)
   end
+  
+  it "should raise exception when something is not found" do
+    expect{
+      res = Http2.new(:host => "www.partyworm.dk").get("something_that_does_not_exist.php")
+    }.to raise_error
+  end
 end

metadata

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