http2 0.0.13 → 0.0.14

data/Gemfile.lock

@@ -8,9 +8,9 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.5)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    json (1.7.7)
+    rake (10.0.4)
+    rdoc (3.12.2)
       json (~> 1.4)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/http2.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{http2}
-  s.version = "0.0.13"
+  s.name = "http2"
+  s.version = "0.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-10-05}
-  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 = "2013-05-02"
+  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.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
     s.specification_version = 3

data/lib/http2.rb

@@ -26,13 +26,19 @@ class Http2
   
   attr_reader :cookies, :args
   
+  VALID_ARGUMENTS_INITIALIZE = [:host, :port, :ssl, :nl, :user_agent, :raise_errors, :follow_redirects, :debug, :encoding_gzip, :autostate]
   def initialize(args = {})
     args = {:host => args} if args.is_a?(String)
     raise "Arguments wasnt a hash." if !args.is_a?(Hash)
     
+    args.each do |key, val|
+      raise "Invalid key: '#{key}'." if !VALID_ARGUMENTS_INITIALIZE.include?(key)
+    end
+    
     @args = args
     @cookies = {}
     @debug = @args[:debug]
+    @autostate_values = {} if @args[:autostate]
     
     require "monitor"
     @mutex = Monitor.new
@@ -57,6 +63,12 @@ class Http2
       @uagent = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)"
     end
     
+    if !@args.key?(:raise_errors) or @args[:raise_errors]
+      @raise_errors = true
+    else
+      @raise_errors = false
+    end
+    
     raise "No host was given." if !@args[:host]
     self.reconnect
     
@@ -303,16 +315,23 @@ class Http2
     return praw
   end
   
+  VALID_ARGUMENTS_POST = [:post, :url]
   #Posts to a certain page.
   #===Examples
   # res = http.post("login.php", {"username" => "John Doe", "password" => 123)
   def post(args)
+    args.each do |key, val|
+      raise "Invalid key: '#{key}'." if !VALID_ARGUMENTS_POST.include?(key)
+    end
+    
     args = self.parse_args(args)
+    phash = args[:post] ? args[:post].clone : {}
+    autostate_set_on_post_hash(phash) if @args[:autostate]
     
     @mutex.synchronize do
       print "Doing post.\n" if @debug
       
-      praw = Http2.post_convert_data(args[:post])
+      praw = Http2.post_convert_data(phash)
       
       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)
@@ -333,6 +352,9 @@ class Http2
   def post_multipart(*args)
     args = self.parse_args(*args)
     
+    phash = args[:post].clone
+    autostate_set_on_post_hash(phash) if @args[:autostate]
+    
     #Generate random string.
     boundary = rand(36**50).to_s(36)
     
@@ -340,7 +362,7 @@ class Http2
     require "tempfile"
     
     Tempfile.open("http2_post_multipart_tmp_#{boundary}") do |praw|
-      args[:post].each do |key, val|
+      phash.each do |key, val|
         praw << "--#{boundary}#{@nl}"
         
         if val.class.name.to_s == "Tempfile" and val.respond_to?(:original_filename)
@@ -565,15 +587,17 @@ class Http2
         http = Http2.new(args)
         return http.get(url)
       end
-    elsif resp.args[:code].to_s == "500"
+    elsif @raise_errors and resp.args[:code].to_i == 500
       err = Http2::Errors::Internalserver.new(resp.body)
       err.response = resp
       raise err
-    elsif resp.args[:code].to_s == "403"
+    elsif @raise_errors and resp.args[:code].to_i == 403
       err = Http2::Errors::Noaccess.new(resp.body)
       err.response = resp
       raise err
     else
+      autostate_register(resp) if @args[:autostate]
+      
       return resp
     end
   end
@@ -666,4 +690,28 @@ class Http2
       raise "Dont know how to read HTTP version: '#{@resp.args[:http_version]}'."
     end
   end
+  
+  private
+  
+  #Registers the states from a result.
+  def autostate_register(res)
+    puts "Http2: Running autostate-register on result." if @debug
+    @autostate_values.clear
+    
+    res.body.to_s.scan(/<input type="hidden" name="__(EVENTTARGET|EVENTARGUMENT|VIEWSTATE|LASTFOCUS)" id="(.*?)" value="(.*?)" \/>/) do |match|
+      name = "__#{match[0]}"
+      id = match[1]
+      value = match[2]
+      
+      puts "Http2: Registered autostate-value with name '#{name}' and value '#{value}'." if @debug
+      @autostate_values[name] = Http2::Utils.urldec(value)
+    end
+    
+    raise "No states could be found." if @autostate_values.empty?
+  end
+  
+  #Sets the states on the given post-hash.
+  def autostate_set_on_post_hash(phash)
+    phash.merge!(@autostate_values)
+  end
 end

data/spec/http2_spec.rb

@@ -108,6 +108,6 @@ describe "Http2" do
   
   it "should be able to convert URL's to 'is.gd'-short-urls" do
     isgd = Http2.isgdlink("https://github.com/kaspernj/http2")
-    raise "Expected isgd-var to be 'http://is.gd/Z7kHSl' but it wasnt: '#{isgd}'." if isgd != "http://is.gd/Z7kHSl"
+    raise "Expected isgd-var to be valid but it wasnt: '#{isgd}'." if !isgd.match(/^http:\/\/is\.gd\/([A-z\d]+)$/)
   end
 end

metadata

@@ -1,61 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: http2
 version: !ruby/object:Gem::Version
-  version: 0.0.13
   prerelease: 
+  version: 0.0.14
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 +02:00
-default_executable: 
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &21138800 !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: *21138800
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &21138280 !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: *21138280
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &21135240 !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: *21135240
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &21134660 !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: *21134660
+  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
@@ -80,7 +99,6 @@ files:
 - lib/http2.rb
 - spec/http2_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/kaspernj/http2
 licenses:
 - MIT
@@ -93,10 +111,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -1035862485575419894
+      hash: 2678064752276625690
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -105,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A lightweight framework for doing http-connections in Ruby. Supports cookies,