httparty 0.4.3 → 0.5.0

data/lib/httparty/cookie_hash.rb

@@ -1,9 +1,22 @@
 class HTTParty::CookieHash < Hash #:nodoc:
-  def add_cookies(hash)
-    merge!(hash)
+  
+  CLIENT_COOKIES = %w{path expires domain path secure HTTPOnly}
+  
+  def add_cookies(value)
+    case value
+    when Hash
+      merge!(value)
+    when String
+      value.split('; ').each do |cookie|
+        array = cookie.split('=')
+        self[array[0].to_sym] = array[1]
+      end
+    else
+      raise "add_cookies only takes a Hash or a String"
+    end
   end
 
   def to_cookie_string
-    collect { |k, v| "#{k}=#{v}" }.join("; ")
+    delete_if { |k, v| CLIENT_COOKIES.include?(k.to_s) }.collect { |k, v| "#{k}=#{v}" }.join("; ")
   end
 end

data/lib/httparty/core_extensions.rb

@@ -1,7 +1,13 @@
-class BlankSlate #:nodoc:
-  instance_methods.each { |m| undef_method m unless m =~ /^__/ }
+module HTTParty
+  if defined?(::BasicObject)
+    BasicObject = ::BasicObject #:nodoc:
+  else
+    class BasicObject #:nodoc:
+      instance_methods.each { |m| undef_method m unless m =~ /^__|instance_eval/ }
+    end
+  end
 end
- 
+
 # 1.8.6 has mistyping of transitive in if statement
 require "rexml/document"
 module REXML #:nodoc:

data/lib/httparty/exceptions.rb

@@ -1,7 +1,10 @@
 module HTTParty
   # Exception raised when you attempt to set a non-existant format
   class UnsupportedFormat < StandardError; end
-  
+
+  # Exception raised when using a URI scheme other than HTTP or HTTPS
+  class UnsupportedURIScheme < StandardError; end
+
   # Exception that is raised when request has redirected too many times
   class RedirectionTooDeep < StandardError; end
-end
+end

data/lib/httparty/module_inheritable_attributes.rb

@@ -16,10 +16,10 @@ module HTTParty
 
       def inherited(subclass)
         @mattr_inheritable_attrs.each do |inheritable_attribute|
-          instance_var = "@#{inheritable_attribute}" 
-          subclass.instance_variable_set(instance_var, instance_variable_get(instance_var))
+          instance_var = "@#{inheritable_attribute}"
+          subclass.instance_variable_set(instance_var, instance_variable_get(instance_var).clone)
         end
       end
     end
   end
-end
+end

data/lib/httparty/parser.rb

@@ -0,0 +1,140 @@
+module HTTParty
+  # The default parser used by HTTParty, supports xml, json, html, yaml, and
+  # plain text.
+  #
+  # == Custom Parsers
+  #
+  # If you'd like to do your own custom parsing, subclassing HTTParty::Parser
+  # will make that process much easier. There are a few different ways you can
+  # utilize HTTParty::Parser as a superclass.
+  #
+  # @example Intercept the parsing for all formats
+  #   class SimpleParser < HTTParty::Parser
+  #     def parse
+  #       perform_parsing
+  #     end
+  #   end
+  #
+  # @example Add the atom format and parsing method to the default parser
+  #   class AtomParsingIncluded < HTTParty::Parser
+  #     SupportedFormats.merge!(
+  #       {"application/atom+xml" => :atom}
+  #     )
+  #
+  #     def atom
+  #       perform_atom_parsing
+  #     end
+  #   end
+  #
+  # @example Only support the atom format
+  #   class ParseOnlyAtom < HTTParty::Parser
+  #     SupportedFormats = {"application/atom+xml" => :atom}
+  #
+  #     def atom
+  #       perform_atom_parsing
+  #     end
+  #   end
+  #
+  # @abstract Read the Custom Parsers section for more information.
+  class Parser
+    SupportedFormats = {
+      'text/xml'               => :xml,
+      'application/xml'        => :xml,
+      'application/json'       => :json,
+      'text/json'              => :json,
+      'application/javascript' => :json,
+      'text/javascript'        => :json,
+      'text/html'              => :html,
+      'application/x-yaml'     => :yaml,
+      'text/yaml'              => :yaml,
+      'text/plain'             => :plain
+    }
+
+    # The response body of the request
+    # @return [String]
+    attr_reader :body
+
+    # The intended parsing format for the request
+    # @return [Symbol] e.g. :json
+    attr_reader :format
+
+    # @param [String] body the response body
+    # @param [Symbol] format the response format
+    # @return parsed response
+    def self.call(body, format)
+      new(body, format).parse
+    end
+
+    # @return [Hash] the SupportedFormats hash
+    def self.formats
+      const_get(:SupportedFormats)
+    end
+
+    # @param [String] mimetype response MIME type
+    # @return [Symbol]
+    # @return [nil] mime type not supported
+    def self.format_from_mimetype(mimetype)
+      formats[formats.keys.detect {|k| mimetype.include?(k)}]
+    end
+
+    # @return [Array<Symbol>] list of supported formats
+    def self.supported_formats
+      formats.values.uniq
+    end
+
+    # @param [Symbol] format e.g. :json, :xml
+    # @return [Boolean]
+    def self.supports_format?(format)
+      supported_formats.include?(format)
+    end
+
+    def initialize(body, format)
+      @body = body
+      @format = format
+    end
+    private_class_method :new
+
+    # @return [Object] the parsed body
+    # @return [nil] when the response body is nil or an empty string
+    def parse
+      return nil if body.nil? || body.empty?
+      if supports_format?
+        parse_supported_format
+      else
+        body
+      end
+    end
+
+    protected
+
+    def xml
+      Crack::XML.parse(body)
+    end
+
+    def json
+      Crack::JSON.parse(body)
+    end
+
+    def yaml
+      YAML.load(body)
+    end
+
+    def html
+      body
+    end
+
+    def plain
+      body
+    end
+
+    def supports_format?
+      self.class.supports_format?(format)
+    end
+
+    def parse_supported_format
+      send(format)
+      rescue NoMethodError
+        raise NotImplementedError, "#{self.class.name} has not implemented a parsing method for the #{format.inspect} format."
+    end
+  end
+end

data/lib/httparty/request.rb

@@ -2,38 +2,57 @@ require 'uri'
 
 module HTTParty
   class Request #:nodoc:
-    SupportedHTTPMethods = [Net::HTTP::Get, Net::HTTP::Post, Net::HTTP::Put, Net::HTTP::Delete]
-    
+    SupportedHTTPMethods = [
+      Net::HTTP::Get,
+      Net::HTTP::Post,
+      Net::HTTP::Put,
+      Net::HTTP::Delete,
+      Net::HTTP::Head,
+      Net::HTTP::Options
+    ]
+
+    SupportedURISchemes  = [URI::HTTP, URI::HTTPS]
+
     attr_accessor :http_method, :path, :options
-    
+
     def initialize(http_method, path, o={})
       self.http_method = http_method
       self.path = path
       self.options = {
-        :limit => o.delete(:no_follow) ? 0 : 5, 
+        :limit => o.delete(:no_follow) ? 0 : 5,
         :default_params => {},
+        :parser => Parser
       }.merge(o)
     end
 
     def path=(uri)
       @path = URI.parse(uri)
     end
-    
+
     def uri
       new_uri = path.relative? ? URI.parse("#{options[:base_uri]}#{path}") : path
-      
+
       # avoid double query string on redirects [#12]
       unless @redirect
         new_uri.query = query_string(new_uri)
       end
-      
+
+      unless SupportedURISchemes.include? new_uri.class
+        raise UnsupportedURIScheme, "'#{new_uri}' Must be HTTP or HTTPS"
+      end
+
       new_uri
     end
-    
+
     def format
       options[:format]
     end
-    
+
+    def parser
+      options[:parser]
+    end
+
+
     def perform
       validate
       setup_raw_request
@@ -41,28 +60,48 @@ module HTTParty
     end
 
     private
+
       def http
         http = Net::HTTP.new(uri.host, uri.port, options[:http_proxyaddr], options[:http_proxyport])
-        http.use_ssl = (uri.port == 443)
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        http.use_ssl = ssl_implied?
+
+        if options[:timeout] && options[:timeout].is_a?(Integer)
+          http.open_timeout = options[:timeout]
+          http.read_timeout = options[:timeout]
+        end
+
+        if options[:pem] && http.use_ssl?
+          http.cert = OpenSSL::X509::Certificate.new(options[:pem])
+          http.key = OpenSSL::PKey::RSA.new(options[:pem])
+          http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        else
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
+
         http
       end
 
-      def configure_basic_auth
-        @raw_request.basic_auth(options[:basic_auth][:username], options[:basic_auth][:password])
+      def ssl_implied?
+        uri.port == 443 || uri.instance_of?(URI::HTTPS)
+      end
+
+      def body
+        options[:body].is_a?(Hash) ? options[:body].to_params : options[:body]
+      end
+
+      def username
+        options[:basic_auth][:username]
+      end
+
+      def password
+        options[:basic_auth][:password]
       end
 
       def setup_raw_request
         @raw_request = http_method.new(uri.request_uri)
-        
-        if post? && options[:query]
-          @raw_request.set_form_data(options[:query])
-        end
-        
-        @raw_request.body = options[:body].is_a?(Hash) ? options[:body].to_params : options[:body] unless options[:body].blank?
-        @raw_request.initialize_http_header options[:headers]
-        
-        configure_basic_auth if options[:basic_auth]
+        @raw_request.body = body if body
+        @raw_request.initialize_http_header(options[:headers])
+        @raw_request.basic_auth(username, password) if options[:basic_auth]
       end
 
       def perform_actual_request
@@ -74,21 +113,21 @@ module HTTParty
         options[:format] ||= format_from_mimetype(response['content-type'])
         response
       end
-      
+
       def query_string(uri)
         query_string_parts = []
-        query_string_parts << uri.query unless uri.query.blank?
+        query_string_parts << uri.query unless uri.query.nil?
 
         if options[:query].is_a?(Hash)
           query_string_parts << options[:default_params].merge(options[:query]).to_params
         else
-          query_string_parts << options[:default_params].to_params unless options[:default_params].blank?
-          query_string_parts << options[:query] unless options[:query].blank?
+          query_string_parts << options[:default_params].to_params unless options[:default_params].nil?
+          query_string_parts << options[:query] unless options[:query].nil?
         end
-        
+
         query_string_parts.size > 0 ? query_string_parts.join('&') : nil
       end
-      
+
       # Raises exception Net::XXX (http error code) if an http error occured
       def handle_response(response)
         case response
@@ -96,44 +135,47 @@ module HTTParty
             options[:limit] -= 1
             self.path = response['location']
             @redirect = true
+            self.http_method = Net::HTTP::Get
+            capture_cookies(response)
             perform
           else
-            parsed_response = parse_response(response.body)
-            Response.new(parsed_response, response.body, response.code, response.message, response.to_hash)
+            Response.new(parse_response(response.body), response.body, response.code, response.message, response.to_hash)
           end
       end
-      
+
       def parse_response(body)
-        return nil if body.nil? or body.empty?
-        case format
-          when :xml
-            Crack::XML.parse(body)
-          when :json
-            Crack::JSON.parse(body)
-          when :yaml
-            YAML::load(body)
-          else
-            body
-          end
+        parser.call(body, format)
+      end
+
+      def capture_cookies(response)
+        return unless response['Set-Cookie']
+        cookies_hash = HTTParty::CookieHash.new()
+        cookies_hash.add_cookies(options[:headers]['Cookie']) if options[:headers] && options[:headers]['Cookie']
+        cookies_hash.add_cookies(response['Set-Cookie'])
+        options[:headers] ||= {}
+        options[:headers]['Cookie'] = cookies_hash.to_cookie_string
       end
-  
-      # Uses the HTTP Content-Type header to determine the format of the response
-      # It compares the MIME type returned to the types stored in the AllowedFormats hash
+
+      # Uses the HTTP Content-Type header to determine the format of the
+      # response It compares the MIME type returned to the types stored in the
+      # SupportedFormats hash
       def format_from_mimetype(mimetype)
-        return nil if mimetype.nil?
-        AllowedFormats.each { |k, v| return v if mimetype.include?(k) }
+        if mimetype && parser.respond_to?(:format_from_mimetype)
+          parser.format_from_mimetype(mimetype)
+        end
       end
-      
+
       def validate
         raise HTTParty::RedirectionTooDeep, 'HTTP redirects too deep' if options[:limit].to_i <= 0
-        raise ArgumentError, 'only get, post, put and delete methods are supported' unless SupportedHTTPMethods.include?(http_method)
+        raise ArgumentError, 'only get, post, put, delete, head, and options methods are supported' unless SupportedHTTPMethods.include?(http_method)
         raise ArgumentError, ':headers must be a hash' if options[:headers] && !options[:headers].is_a?(Hash)
         raise ArgumentError, ':basic_auth must be a hash' if options[:basic_auth] && !options[:basic_auth].is_a?(Hash)
         raise ArgumentError, ':query must be hash if using HTTP Post' if post? && !options[:query].nil? && !options[:query].is_a?(Hash)
       end
-      
+
       def post?
         Net::HTTP::Post == http_method
       end
   end
 end
+

data/lib/httparty/response.rb

@@ -1,5 +1,5 @@
 module HTTParty
-  class Response < BlankSlate #:nodoc:
+  class Response < HTTParty::BasicObject #:nodoc:
     attr_accessor :body, :code, :message, :headers
     attr_reader :delegate
 

data/lib/httparty/version.rb

@@ -1,3 +1,3 @@
 module HTTParty #:nodoc:
-  Version = '0.4.3'
+  Version = '0.5.0'
 end