http2 0.0.14 → 0.0.15

data/Gemfile.lock

@@ -8,8 +8,8 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.7)
-    rake (10.0.4)
+    json (1.8.0)
+    rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.8.0)

data/README.rdoc

@@ -1,6 +1,32 @@
 = http2
 
-Description goes here.
+Example of usage:
+ 
+ require "rubygems"
+ require "http2"
+ 
+ Http2.new(:host => "www.google.dk") do |http|
+   #Get-request.
+   res = http.get("path/to/something")
+   puts res.body
+   puts "All response-headers: #{res.headers}"
+   puts "Specific header: #{res.header("HeaderName")}"
+   
+   #Post-request.
+   res = http.post(:url => "path/to/something", :post => {
+     "some_post_val" => "some_value"
+   })
+   
+   #Post-multipart (upload).
+   res = http.post_multipart(:url => "path/to/something", :post => {
+     "test_file1" => {
+       :fpath => fpath,
+       :filename => "specfile"
+     }
+   })
+   
+   puts "Cookies until now: #{http.cookies}"
+ end
 
 == Contributing to http2
  

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15

data/http2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "http2"
-  s.version = "0.0.14"
+  s.version = "0.0.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = "2013-05-02"
+  s.date = "2013-06-21"
   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/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]
+  VALID_ARGUMENTS_INITIALIZE = [:host, :port, :ssl, :nl, :user_agent, :raise_errors, :follow_redirects, :debug, :encoding_gzip, :autostate, :basic_auth, :extra_headers]
   def initialize(args = {})
     args = {:host => args} if args.is_a?(String)
     raise "Arguments wasnt a hash." if !args.is_a?(Hash)
@@ -40,7 +40,7 @@ class Http2
     @debug = @args[:debug]
     @autostate_values = {} if @args[:autostate]
     
-    require "monitor"
+    require "monitor" unless ::Kernel.const_defined?(:Monitor)
     @mutex = Monitor.new
     
     if !@args[:port]
@@ -81,6 +81,20 @@ class Http2
     end
   end
   
+  #Closes current connection if any, changes the arguments on the object and reconnects keeping all cookies and other stuff intact.
+  def change(args)
+    self.close
+    @args.merge!(args)
+    self.reconnect
+  end
+  
+  #Closes the current connection if any.
+  def close
+    @sock.close if @sock and !@sock.closed?
+    @sock_ssl.close if @sock_ssl and !@sock_ssl.closed?
+    @sock_plain.close if @sock_plain and !@sock_plain.closed?
+  end
+  
   #Returns boolean based on the if the object is connected and the socket is working.
   #===Examples
   # puts "Socket is working." if http.socket_working?
@@ -161,7 +175,7 @@ class Http2
     
     if @args[:ssl]
       print "Http2: Initializing SSL.\n" if @debug
-      require "openssl"
+      require "openssl" unless ::Kernel.const_defined?(:OpenSSL)
       
       ssl_context = OpenSSL::SSL::SSLContext.new
       #ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
@@ -204,7 +218,13 @@ class Http2
   def get(args)
     args = self.parse_args(args)
     
-    header_str = "GET /#{args[:url]} HTTP/1.1#{@nl}"
+    if args.key?(:method) && args[:method]
+      method = args[:method].to_s.upcase
+    else
+      method = "GET"
+    end
+    
+    header_str = "#{method} /#{args[:url]} HTTP/1.1#{@nl}"
     header_str << self.header_str(self.default_headers(args), args)
     header_str << @nl
     
@@ -221,6 +241,10 @@ class Http2
     end
   end
   
+  def delete(args)
+    return self.get(args.merge(:method => :delete))
+  end
+  
   #Tries to write a string to the socket. If it fails it reconnects and tries again.
   def write(str)
     #Reset variables.
@@ -265,7 +289,16 @@ class Http2
     end
     
     if @args[:basic_auth]
-      headers["Authorization"] = "Basic #{Base64.encode64("#{@args[:basic_auth][:user]}:#{@args[:basic_auth][:passwd]}")}"
+      require "base64" unless ::Kernel.const_defined?(:Base64)
+      headers["Authorization"] = "Basic #{Base64.encode64("#{@args[:basic_auth][:user]}:#{@args[:basic_auth][:passwd]}").strip}"
+    end
+    
+    if @args[:extra_headers]
+      headers.merge!(@args[:extra_headers])
+    end
+    
+    if args[:headers]
+      headers.merge!(args[:headers])
     end
     
     return headers
@@ -315,7 +348,7 @@ class Http2
     return praw
   end
   
-  VALID_ARGUMENTS_POST = [:post, :url]
+  VALID_ARGUMENTS_POST = [:post, :url, :headers, :json]
   #Posts to a certain page.
   #===Examples
   # res = http.post("login.php", {"username" => "John Doe", "password" => 123)
@@ -325,21 +358,30 @@ class Http2
     end
     
     args = self.parse_args(args)
-    phash = args[:post] ? args[:post].clone : {}
-    autostate_set_on_post_hash(phash) if @args[:autostate]
+    content_type = "application/x-www-form-urlencoded"
+    
+    if args[:json]
+      require "json" unless ::Kernel.const_defined?(:JSON)
+      praw = JSON.generate(args[:json])
+      content_type = "application/json"
+    elsif args[:post].is_a?(String)
+      praw = args[:post]
+    else
+      phash = args[:post] ? args[:post].clone : {}
+      autostate_set_on_post_hash(phash) if @args[:autostate]
+      praw = Http2.post_convert_data(phash)
+    end
     
     @mutex.synchronize do
-      print "Doing post.\n" if @debug
-      
-      praw = Http2.post_convert_data(phash)
+      puts "Doing post." if @debug
       
       header_str = "POST /#{args[:url]} HTTP/1.1#{@nl}"
-      header_str << self.header_str(self.default_headers(args).merge("Content-Type" => "application/x-www-form-urlencoded", "Content-Length" => praw.length), args)
+      header_str << self.header_str({"Content-Length" => praw.length, "Content-Type" => content_type}.merge(self.default_headers(args)), args)
       header_str << @nl
       header_str << praw
       header_str << @nl
       
-      print "Header str: #{header_str}\n" if @debug
+      puts "Header str: #{header_str}" if @debug
       
       self.write(header_str)
       return self.read_response(args)
@@ -569,7 +611,7 @@ class Http2
     
     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])
+    if (resp.args[:code].to_s == "302" || resp.args[:code].to_s == "307") and resp.header?("location") and (!@args.key?(:follow_redirects) or @args[:follow_redirects])
       require "uri"
       uri = URI.parse(resp.header("location"))
       url = uri.path

metadata

@@ -2,14 +2,14 @@
 name: http2
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -113,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 2678064752276625690
+      hash: -3116192511012734724
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false