http-request 1.1.6 → 1.1.8

data/lib/http-request.rb

@@ -1,4 +1,5 @@
 require 'net/http'
+require 'net/https'
 require 'addressable/uri'
 
 module HttpRequest
@@ -13,6 +14,28 @@ module HttpRequest
     client.open(url)
     client
   end
+
+  def config(options={})
+    # Connection defaults
+    @config ||= {
+      :user_agent     => "HttpRequest v#{HttpRequest::VERSION}",
+      :max_retries    => 3,
+      :timeout        => 30, # default seconds to timeout a request
+      :auto_redirect  => true,
+      :max_redirects  => 3,
+      :keep_alive     => true
+    }
+    @config.tap {|config| config.merge(options) }
+  end
+
+  # Short-hand methods, auto-create a client object
+  [:get, :post, :put, :delete, :head].each do |verb|
+    define_method(verb) do |*args|
+      url, headers, body = args
+      @client ||= open(url)
+      @client.send verb, *args
+    end
+  end
 end
 
 require 'http-request/version'

data/lib/http-request/client.rb

@@ -13,7 +13,7 @@ module HttpRequest
     end
 
     def initialize(options={})
-      @options = options # Connection options
+      @options = HttpRequest.config.merge(options) # Connection options
       @connections = []
     end
 
@@ -47,14 +47,38 @@ module HttpRequest
     [:get, :post, :put, :delete, :head].each do |verb|
       define_method(verb) do |*args|
         url, headers, body = args
-        url ||= open_url
         request(verb, url, headers || {}, body)
       end
     end
 
     def request(method, url, headers={}, body=nil)
+      url ||= open_url
+      # TODO: raise an exception if the url is invalid...
+      # ie. nil or something else...
       conn = open(url)
-      conn.send method, url, headers, body
+      raw_response = conn.send(method, url, headers, body)
+
+      response = Response.new(raw_response, url)
+
+      # TODO: .. max retries.. keeping track of state..
+      # is can create a bunch of connections in this process...
+      # but how do we manage that plus the idea of threads..?
+      # each thread has their own Client object.. which is a good thing..
+
+      if options[:auto_redirect] != false && raw_response.kind_of?(Net::HTTPRedirection) && !response.header['location'].nil?
+        # TODO: .. count max redirects...
+        new_location = response.header['location']
+
+        if new_location =~ /^http/i
+          request(method, new_location, headers, body)
+        else
+          absolute_url = uri(url).join(new_location).to_s
+          request(method, absolute_url, headers, body)
+        end
+      else
+        # reset redirect_count ..
+        response
+      end
     end
 
     def connection(url)
@@ -62,7 +86,11 @@ module HttpRequest
     end
 
     def server_id(url)
-      Addressable::URI.parse(url).origin
+      uri(url).normalized_site
+    end
+
+    def uri(url)
+      Addressable::URI.parse(url)
     end
 
     private

data/lib/http-request/connection.rb

@@ -1,15 +1,16 @@
 module HttpRequest
   class Connection
     attr_reader :uri, :http
-    attr_accessor :user_agent, :max_retries, :timeout, :auto_redirect, :keep_alive
+    attr_accessor :user_agent, :max_retries, :timeout, :auto_redirect, :max_redirects, :keep_alive
 
     def initialize(url, options={})
-      # Defaults
-      @user_agent     = options[:user_agent] || "HttpRequest v#{HttpRequest::VERSION}"
-      @max_retries    = options[:max_retries] || 3
-      @timeout        = options[:timeout] || 30 # 30 second timeout by default
-      @auto_redirect  = options[:auto_redirect].nil? ? true : options[:auto_redirect]
-      @keep_alive     = options[:keep_alive].nil? ? true : options[:keep_alive]
+      # Connection settings
+      @user_agent     = options[:user_agent]    || HttpRequest.config[:user_agent]
+      @max_retries    = options[:max_retries]   || HttpRequest.config[:max_retries]
+      @timeout        = options[:timeout]       || HttpRequest.config[:timeout]
+      @auto_redirect  = options[:auto_redirect] || HttpRequest.config[:auto_redirect]
+      @max_redirects  = options[:max_redirects] || HttpRequest.config[:max_redirects]
+      @keep_alive     = options[:keep_alive]    || HttpRequest.config[:keep_alive]
 
       # Let's do this
       @uri = parse_uri(url)
@@ -17,9 +18,17 @@ module HttpRequest
     end
 
     def open
+      uri.port ||= 443 if ssl?
+
       @http = Net::HTTP.new(uri.host, uri.port)
       http.open_timeout = timeout
       http.read_timeout = timeout
+
+      if ssl?
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+
       http.start
 
       if socket && socket.respond_to?(:io) && Socket.const_defined?(:TCP_NODELAY)
@@ -27,6 +36,10 @@ module HttpRequest
       end
     end
 
+    def ssl?
+      uri.normalized_scheme == "https"
+    end
+
     def close
       http.finish if http
     end
@@ -45,7 +58,7 @@ module HttpRequest
     end
 
     def server_id
-      uri.origin
+      uri.normalized_site
     end
 
     [:get, :post, :put, :delete, :head].each do |verb|
@@ -66,7 +79,7 @@ module HttpRequest
       else
         # Update the path and query
         # Note: also normalize the path in case its malformed.. dum dums
-        uri.join! parse_uri(path.gsub('//','/')).request_uri
+        uri.join! parse_uri(path.to_s.gsub('//','/')).request_uri
       end
 
       # Open the connection if its closed or hasn't been started..
@@ -85,49 +98,28 @@ module HttpRequest
       # Make the HTTP request
       retries = max_retries
       begin
-        raw_response = http.request(req)
+        response = http.request(req)
       rescue EOFError, Errno::EPIPE
         # Something happened to our connection, lets try this again
         if retries > 0
           retries -= 1
           open
           retry
-        end 
+        end
       end
 
       # Let's make sure we close the connection if we don't intend to
       # have persistent connections..
       close if !keep_alive
 
-      # Build response
-      response = Response.new(raw_response, uri)
-
-      # TODO: what about redirects that go back and forth..
-      # we should introduce a max number of auto_redirects..
-
-      # Handle URL Redirection
-      # TODO: better redirection support..  some bugs / cases here..
-      if auto_redirect && raw_response.kind_of?(Net::HTTPRedirection) && !response.header['location'].nil?
-        # binding.pry
-        new_location = response.header['location']
-        if new_location =~ /^http/i
-          close # close existing connection..
-          @uri = parse_uri(new_location)
-        else
-          uri.join! parse_uri(new_location.gsub('//','/')).request_uri
-        end
-
-        request(verb, uri.request_uri, headers, body)
-      else
-        response
-      end
+      response
     end
 
 
     private
 
-      def parse_uri(uri)
-        Addressable::URI.parse(Addressable::URI.encode(Addressable::URI.unencode(uri)))
+      def parse_uri(url)
+        Addressable::URI.parse(Addressable::URI.encode(Addressable::URI.unencode(url)))
       end
 
   end

data/lib/http-request/version.rb

@@ -1,3 +1,3 @@
 module HttpRequest
-  VERSION = '1.1.6'
+  VERSION = '1.1.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-request
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2012-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,7 +72,6 @@ files:
 - lib/http-request/response.rb
 - lib/http-request/version.rb
 - lib/http-request.rb
-- lib/old.rb
 homepage: http://nulayer.com
 licenses: []
 post_install_message: 
@@ -87,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4505057513829640071
+      hash: 4098152367455332880
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/old.rb

@@ -1,198 +0,0 @@
-# +-------------------------------------------------------------------------------+
-# | HttpRequest                                                                   |
-# +-------------------------------------------------------------------------------+
-# | Author: Nulayer Inc. / www.nulayer.com                                        |
-# +-------------------------------------------------------------------------------+
-# | BSD LICENSE                                                                   |
-# | Copyright (c) 2007-2011, Nulayer Inc.                                         |
-# | All rights reserved.                                                          |
-# |                                                                               |
-# | Redistribution and use in source and binary forms, with or without            |
-# | modification, are permitted provided that the following conditions are met:   |
-# |     * Redistributions of source code must retain the above copyright          |
-# |       notice, this list of conditions and the following disclaimer.           |
-# |     * Redistributions in binary form must reproduce the above copyright       |
-# |       notice, this list of conditions and the following disclaimer in the     |
-# |       documentation and/or other materials provided with the distribution.    |
-# |     * Neither the name of the <organization> nor the                          |
-# |       names of its contributors may be used to endorse or promote products    |
-# |       derived from this software without specific prior written permission.   |
-# |                                                                               |
-# | THIS SOFTWARE IS PROVIDED BY NuLayer Inc. "AS IS" AND ANY                     |
-# | EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED     |
-# | WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE        |
-# | DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY            |
-# | DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES    |
-# | (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;  |
-# | LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND   |
-# | ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT    |
-# | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
-# | SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                  |
-# +-------------------------------------------------------------------------------+
-
-require 'net/http'
-
-class HttpRequest
-  VERSION = '1.0.5'
-
-  class HTTPError < StandardError; end
-  class UnexpectedError < StandardError; end
-
-  class UnreachableError < HTTPError; end
-  class ConnectionResetError < HTTPError; end
-  class TimeoutError < HTTPError; end
-  class RedirectError < HTTPError; end
-
-  attr_accessor :uri
-  attr_accessor :header
-  attr_accessor :body
-  attr_accessor :status
-
-  class << self
-    attr_accessor :user_agent, :timeout, :max_retries
-  end
-
-
-  def self.head(url, options={})
-    http = HttpRequest.new(url)
-    http.head(options)
-  end
-
-  def self.get(url, options={})
-    http = HttpRequest.new(url)
-    http.get(options)
-  end
-
-  def initialize(url)
-    self.uri = url
-  end
-
-  def head(options={})
-    request(:head, options)
-  end
-
-  def get(options={})
-    request(:get, options)
-  end
-
-  def request(type, options={})
-    user_agent     = options[:user_agent] || HttpRequest.user_agent || 'HttpRequest'
-    timeout        = (options[:timeout] || HttpRequest.timeout || 10).to_i
-    redirect_limit = options[:redirect_limit] || 5
-    output_file    = options[:output_file]
-    content_max    = options[:content_max]
-    max_retries     = HttpRequest.max_retries || 3
-
-    # Check if we're in a redirecting loop
-    if redirect_limit == 0
-      raise RedirectError, "HTTP redirect too deep: #{uri.to_s}"
-    end
-
-    # Prepare the request
-    req_path = uri.path
-    req_path += "?#{uri.query}" if !uri.query.nil?
-
-    req_klass = (type == :head ? Net::HTTP::Head : Net::HTTP::Get)
-    req = req_klass.new(req_path, { 'User-Agent' => user_agent })
-
-    # Basic authentication
-    if uri.user && uri.password
-      req.basic_auth uri.user, uri.password
-    end
-
-    # HTTP request block
-    @retries = max_retries
-    begin
-      http = Net::HTTP.new(uri.host, uri.port)
-
-      http.open_timeout = timeout
-      http.read_timeout = timeout
-
-      http.start do |http|
-        http.request(req) do |response|
-          # Save the header
-          self.header = response.header
-          self.body   = nil
-
-          # Restrict downloading of content
-          download_content = true
-          if !content_max.nil? && header['content-length'].to_i > content_max
-            download_content = false
-          end
-
-          # Get the body
-          if download_content
-            if output_file
-              open(output_file, "w") do |f|
-                response.read_body { |data| f.write(data) }
-              end
-            else
-              self.body = response.read_body
-            end
-          end
-
-          # Handle URL Redirection
-          if response.kind_of?(Net::HTTPRedirection) && !header['location'].nil?
-            update_uri_location(header['location'])
-            request type, options.merge({ :redirect_limit => redirect_limit-1 })
-          end
-        end
-      end
-    rescue ::Errno::ENETUNREACH
-      raise UnreachableError, "network is unreachable: #{uri.to_s}"
-    rescue ::Errno::ECONNRESET, ::Errno::ECONNREFUSED, ::SocketError
-      raise ConnectionResetError, "connection reset by peer: #{uri.to_s}"
-    rescue ::Timeout::Error
-      raise TimeoutError, "connection timed out: #{uri.to_s}"
-    rescue ::Errno::EINTR => ex
-      # Transmission was interrupted, retry the request just once.
-      # This usually occurs because the process received a signal.
-      @retries -= 1
-      if @retries >= 0
-        retry
-      else
-        raise ex
-      end
-    rescue HTTPError => ex
-      # Catch exceptions that may be raised above -- not sure why we have to do this
-      raise ex
-    rescue => ex
-      raise UnexpectedError, "#{ex.inspect} -- #{uri.to_s}"
-    ensure
-      http.finish rescue nil
-      http = nil
-    end
-
-    return self
-  end
-
-  def header=(header)
-    return if header.nil?
-    @header     = header
-    self.status = header.code.to_i
-  end
-
-  def reset!
-    self.header = nil
-    self.body   = nil
-    self.status = nil
-  end
-
-  def uri=(url)
-    @uri = URI.parse(url)
-    @uri.path = '/' if @uri.path.empty?
-    reset!
-  end
-
-  def update_uri_location(location)
-    if header['location'].to_s[0].to_s.chr == '/'
-      url = "#{uri.scheme}://#{uri.host}"
-      url += ":#{uri.port}" if uri.port != 80 && uri.port != 443
-      url += location
-    else
-      url = location
-    end
-
-    self.uri = url
-  end
-end