http2 0.0.22 → 0.0.23

data/VERSION

@@ -1 +1 @@
-0.0.22
+0.0.23

data/http2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "http2"
-  s.version = "0.0.22"
+  s.version = "0.0.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = "2013-06-30"
+  s.date = "2013-11-15"
   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 = [

data/include/errors.rb

@@ -1,17 +1,11 @@
 #This class holds various classes for error-handeling.
 class Http2::Errors
-  #Raised when trying to access something you dont have access to.
-  class Noaccess < RuntimeError
+  class Http2error < RuntimeError
     attr_accessor :response
   end
   
-  #Raised when an internal error occurs on the servers side.
-  class Internalserver < RuntimeError
-    attr_accessor :response
-  end
-  
-  #Raised when a page is not found.
-  class Notfound < RuntimeError
-    attr_accessor :response
-  end
+  class Noaccess < Http2error; end
+  class Internalserver < Http2error; end
+  class Notfound < Http2error; end
+  class Badrequest < Http2error; end
 end

data/lib/http2.rb

@@ -286,8 +286,6 @@ class Http2
     
     if !@args.key?(:encoding_gzip) or @args[:encoding_gzip]
       headers["Accept-Encoding"] = "gzip"
-    else
-      #headers["Accept-Encoding"] = "none"
     end
     
     if @args[:basic_auth]
@@ -350,7 +348,7 @@ class Http2
     return praw
   end
   
-  VALID_ARGUMENTS_POST = [:post, :url, :default_headers, :headers, :json, :method, :cookies, :on_content]
+  VALID_ARGUMENTS_POST = [:post, :url, :default_headers, :headers, :json, :method, :cookies, :on_content, :content_type]
   #Posts to a certain page.
   #===Examples
   # res = http.post("login.php", {"username" => "John Doe", "password" => 123)
@@ -360,7 +358,6 @@ class Http2
     end
     
     args = self.parse_args(args)
-    content_type = "application/x-www-form-urlencoded"
     
     if args.key?(:method) && args[:method]
       method = args[:method].to_s.upcase
@@ -370,7 +367,7 @@ class Http2
     
     if args[:json]
       require "json" unless ::Kernel.const_defined?(:JSON)
-      praw = JSON.generate(args[:json])
+      praw = args[:json].to_json
       content_type = "application/json"
     elsif args[:post].is_a?(String)
       praw = args[:post]
@@ -379,15 +376,16 @@ class Http2
       autostate_set_on_post_hash(phash) if @args[:autostate]
       praw = Http2.post_convert_data(phash)
     end
+
+    content_type = args[:content_type] || content_type || "application/x-www-form-urlencoded"
     
     @mutex.synchronize do
-      puts "Doing post." if @debug
+      puts "Http2: Doing post." if @debug
       
       header_str = "#{method} /#{args[:url]} HTTP/1.1#{@nl}"
       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
       
       puts "Http2: Header str: #{header_str}" if @debug
       
@@ -509,10 +507,15 @@ class Http2
         first = false if first
         
         if cookie_data.is_a?(Hash)
-          cstr << "#{Http2::Utils.urlenc(cookie_data["name"])}=#{Http2::Utils.urlenc(cookie_data["value"])}"
+          name = cookie_data["name"]
+          value = cookie_data["value"]
         else
-          cstr << "#{Http2::Utils.urlenc(cookie_name)}=#{Http2::Utils.urlenc(cookie_data)}"
+          name = cookie_name
+          value = cookie_data
         end
+        
+        raise "Unexpected lines: #{value.lines.to_a.length}." if value.lines.to_a.length != 1
+        cstr << "#{Http2::Utils.urlenc(name)}=#{Http2::Utils.urlenc(value)}"
       end
       
       headers_hash["Cookie"] = cstr
@@ -568,7 +571,7 @@ class Http2
       
       break if line.to_s == ""
       
-      if @mode == "headers" and line == @nl
+      if @mode == "headers" and (line == "\n" || line == "\r\n")
         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
@@ -654,6 +657,10 @@ class Http2
       err = Http2::Errors::Noaccess.new(resp.body)
       err.response = resp
       raise err
+    elsif @raise_errors && resp.args[:code].to_i == 400
+      err = Http2::Errors::Badrequest.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
@@ -734,14 +741,14 @@ class Http2
         
         if len > 0
           read = @sock.read(len)
-          return "break" if read == "" or read == @nl
+          return "break" if read == "" or (read == "\n" || read == "\r\n")
           @resp.args[:body] << read
           self.on_content_call(args, read)
         end
         
         nl = @sock.gets
         if len == 0
-          if nl == @nl
+          if nl == "\n" || nl == "\r\n"
             return "break"
           else
             raise "Dont know what to do :'-("

data/spec/http2_spec.rb

@@ -97,12 +97,13 @@ describe "Http2" do
     ]
     urls = ["robots.txt"]
     
-    http = Http2.new(:host => "www.partyworm.dk", :debug => false)
-    0.upto(105) do |count|
-      url = urls[rand(urls.size)]
-      #print "Doing request #{count} of 200 (#{url}).\n"
-      #res = http.get(url)
-      #raise "Body was empty." if res.body.to_s.length <= 0
+    Http2.new(:host => "www.partyworm.dk", :debug => false) do |http|
+      0.upto(105) do |count|
+        url = urls[rand(urls.size)]
+        #print "Doing request #{count} of 200 (#{url}).\n"
+        res = http.get(url)
+        raise "Body was empty." if res.body.to_s.length <= 0
+      end
     end
   end
   
@@ -113,7 +114,38 @@ describe "Http2" do
   
   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")
+      Http2.new(:host => "www.partyworm.dk") do |http|
+        http.get("something_that_does_not_exist.php")
+      end
     }.to raise_error
   end
+  
+  it "should be able to post json" do
+    Http2.new(:host => "http2test.kaspernj.org") do |http|
+      res = http.post(
+        :url => "/jsontest.php",
+        :json => {:testkey => "testvalue"}
+      )
+      
+      data = JSON.parse(res.body)
+      data["_SERVER"]["CONTENT_TYPE"].should eql("application/json")
+      data["PHP_JSON_INPUT"]["testkey"].should eql("testvalue")
+    end
+  end
+  
+  it "should be able to post custom content types" do
+    require "json"
+    
+    Http2.new(:host => "http2test.kaspernj.org") do |http|
+      res = http.post(
+        :url => "/content_type_test.php",
+        :content_type => "plain/text",
+        :post => "test1_test2_test3"
+      )
+      
+      data = JSON.parse(res.body)
+      data["_SERVER"]["CONTENT_TYPE"].should eql("plain/text")
+      data["PHP_INPUT"].should eql("test1_test2_test3")
+    end
+  end
 end

metadata

@@ -1,75 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: http2
 version: !ruby/object:Gem::Version
-  version: 0.0.22
   prerelease: 
+  version: 0.0.23
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !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: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.8.0
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !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: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !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: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !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: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -1664380654006357926
+      hash: -1592181993674694658
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: