httparty 0.8.0 → 0.8.3

data/.gitignore

@@ -7,3 +7,4 @@ log/
 pkg/
 *.swp
 /.bundle
+.rvmrc

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - ree
+  - 1.9.2
+  - 1.9.3
+notifications:
+  email: false
+bundler_args: --without development

data/Gemfile

@@ -1,8 +1,15 @@
 source :rubygems
 gemspec
 
-gem 'rake',     '~> 0.8.7'
+gem 'rake'
 gem 'cucumber', '~> 0.7'
 gem 'fakeweb',  '~> 1.2'
 gem 'rspec',    '~> 1.3'
 gem 'mongrel',  '1.2.0.pre2'
+gem 'multi_json', '~> 1.3'
+
+group :development do
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-bundler'
+end

data/Guardfile

@@ -0,0 +1,16 @@
+rspec_options = {
+  :version        => 1,
+  :all_after_pass => false,
+  :all_on_start   => false,
+}
+
+guard 'rspec', rspec_options do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+
+guard 'bundler' do
+  watch('Gemfile')
+  watch(/^.+\.gemspec/)
+end

data/History

@@ -1,3 +1,27 @@
+== 0.8.3 2012-04-21
+* new
+  * [lazy parsing of responses](https://github.com/jnunemaker/httparty/commit/9fd5259c8dab00e426082b66af44ede2c9068f45)
+  * [add support for PATCH requests](https://github.com/jnunemaker/httparty/commit/7ab6641e37a9e31517e46f6124f38c615395d38a)
+* bug fixes
+  * [subclasses no longer override superclass options](https://github.com/jnunemaker/httparty/commit/682af8fbf672e7b3009e650da776c85cdfe78d39)
+
+== 0.8.2 2012-04-12
+* new
+  * add -r to make CLI return failure code if status >= 400
+  * allow blank username from CLI
+* bug fixes
+  * return nil for null body
+  * automatically deflate responses with a Content-Encoding: x-gzip header
+  * Do not HEAD on POST request with digest authentication
+  * add support for proxy authentication
+  * fix posting data with CLI
+  * require rexml/document if xml format from CLI
+  * support for fragmented responses
+
+== 0.8.1 2011-10-05
+* bug fixes
+  * content-encoding header should be removed when automatically inflating the body
+
 == 0.8.0 2011-09-13
 * new
   * switch to multi json/xml for parsing by default

data/README.rdoc

@@ -2,22 +2,6 @@
 
 Makes http fun again!
 
-== Note on Releases
-
-Releases are tagged on github and also released as gems on github and rubyforge. Master is pushed to whenever I add a patch or a new feature. To build from master, you can clone the code, generate the updated gemspec, build the gem and install.
-
-* rake gemspec
-* gem build httparty.gemspec
-* gem install the gem that was built
-
-== Note on Patches/Pull Requests
-
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a future version unintentionally.
-* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself in another branch so I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
 == Features:
 
 * Easy get, post requests
@@ -29,6 +13,14 @@ Releases are tagged on github and also released as gems on github and rubyforge.
 
 See http://github.com/jnunemaker/httparty/tree/master/examples
 
+== Note on Patches/Pull Requests
+
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a future version unintentionally.
+* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself in another branch so I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
 == Command Line Interface
 
 httparty also includes the executable <tt>httparty</tt> which can be
@@ -49,6 +41,7 @@ options. Below is an example of how easy it is.
 
 * sudo gem install httparty
 
-== Docs
+== Help and Docs
 
-http://rdoc.info/projects/jnunemaker/httparty
+* https://groups.google.com/forum/#!forum/httparty-gem
+* http://rdoc.info/projects/jnunemaker/httparty

data/bin/httparty

@@ -32,9 +32,9 @@ OptionParser.new do |o|
        "--data [BODY]",
        "Data to put in request body (prefix with '@' for file)") do |d|
     if d =~ /^@/
-      opts[:data] = open(d[1..-1]).read
+      opts[:body] = open(d[1..-1]).read
     else
-      opts[:data] = d
+      opts[:body] = d
     end
   end
 
@@ -49,11 +49,15 @@ OptionParser.new do |o|
   end
 
   o.on("-u", "--user [CREDS]", "Use basic authentication. Value should be user:password") do |u|
-    abort "Invalid credentials format. Must be user:password" unless u =~ /.+:.+/
+    abort "Invalid credentials format. Must be user:password" unless u =~ /.*:.+/
     user, password = u.split(':')
     opts[:basic_auth] = { :username => user, :password => password }
   end
 
+  o.on("-r", "--response-code", "Command fails if response code >= 400") do
+    opts[:response_code] = true
+  end
+
   o.on("-h", "--help", "Show help documentation") do |h|
     puts o
     exit
@@ -100,9 +104,11 @@ else
         puts YAML.dump(response.delegate)
       end
     when :xml
+      require 'rexml/document'
       REXML::Document.new(response.body).write(STDOUT, 2)
       puts
     else
       puts response
   end
 end
+exit false if opts[:response_code] && response.code >= 400

data/cucumber.yml

@@ -1 +1 @@
-default: features
+default: features --format progress

data/examples/crack.rb

@@ -0,0 +1,19 @@
+require 'rubygems'
+require 'crack'
+
+dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+require File.join(dir, 'httparty')
+require 'pp'
+
+class Rep
+  include HTTParty
+
+  parser(
+    Proc.new do |body, format|
+      Crack::XML.parse(body)
+    end
+  )
+end
+
+pp Rep.get('http://whoismyrepresentative.com/whoismyrep.php?zip=46544')
+pp Rep.get('http://whoismyrepresentative.com/whoismyrep.php', :query => {:zip => 46544})

data/examples/headers_and_user_agents.rb

@@ -0,0 +1,6 @@
+# To send custom user agents to identify your application to a web service (or mask as a specific browser for testing), send "User-Agent" as a hash to headers as shown below.
+
+require 'httparty'
+
+APPLICATION_NAME = "Httparty" 
+response = HTTParty.get('http://example.com', :headers => {"User-Agent" => APPLICATION_NAME})

data/examples/nokogiri_html_parser.rb

@@ -0,0 +1,22 @@
+require 'rubygems'
+require 'nokogiri'
+
+
+dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+require File.join(dir, 'httparty')
+require 'pp'
+
+class HtmlParserIncluded < HTTParty::Parser
+  SupportedFormats.merge!('text/html' => :html)
+
+  def html
+    Nokogiri::HTML(body)
+  end
+end
+
+class Page
+  include HTTParty
+  parser HtmlParserIncluded
+end
+
+pp Page.get('http://www.google.com')

data/features/steps/remote_service_steps.rb

@@ -14,7 +14,7 @@ end
 
 Given /^that service takes (\d+) seconds to generate a response$/ do |time|
   @server_response_time = time.to_i
-  @handler.preprocessor = lambda { sleep time.to_i }
+  @handler.preprocessor = Proc.new { sleep time.to_i }
 end
 
 Given /^a remote deflate service$/ do

data/httparty.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = %q{Makes http fun! Also, makes consuming restful web services dead easy.}
   s.description = %q{Makes http fun! Also, makes consuming restful web services dead easy.}
 
-  s.add_dependency 'multi_json'
+  s.add_dependency 'multi_json', "~> 1.0"
   s.add_dependency 'multi_xml'
 
   s.post_install_message = "When you HTTParty, you must party hard!"

data/lib/httparty.rb

@@ -36,11 +36,13 @@ module HTTParty
   end
 
   # == Common Request Options
-  # Request methods (get, post, put, delete, head, options) all take a common set of options. These are:
+  # Request methods (get, post, patch, put, delete, head, options) all take a common set of options. These are:
   #
   # [:+body+:] Body of the request. If passed a Hash, will try to normalize it first, by default passing it to ActiveSupport::to_params. Any other kind of object will get used as-is.
   # [:+http_proxyaddr+:] Address of proxy server to use.
   # [:+http_proxyport+:]  Port of proxy server to use.
+  # [:+http_proxyuser+:] User for proxy server authentication.
+  # [:+http_proxypass+:] Password for proxy server authentication.
   # [:+limit+:] Maximum number of redirects to follow. Takes precedences over :+no_follow+.
   # [:+query+:] Query string, or a Hash representing it. Normalized according to the same rules as :+body+. If you specify this on a POST, you must use a Hash. See also HTTParty::ClassMethods.default_params.
   # [:+timeout+:] Timeout for opening connection and reading data.
@@ -67,11 +69,13 @@ module HTTParty
     #
     #   class Foo
     #     include HTTParty
-    #     http_proxy 'http://foo.com', 80
+    #     http_proxy 'http://foo.com', 80, 'user', 'pass'
     #   end
-    def http_proxy(addr=nil, port = nil)
+    def http_proxy(addr=nil, port=nil, user=nil, pass=nil)
       default_options[:http_proxyaddr] = addr
       default_options[:http_proxyport] = port
+      default_options[:http_proxyuser] = user
+      default_options[:http_proxypass] = pass
     end
 
     # Allows setting a base uri to be used for each request.
@@ -339,8 +343,8 @@ module HTTParty
     #   # Simple get with full url and query parameters
     #   # ie: http://foo.com/resource.json?limit=10
     #   Foo.get('http://foo.com/resource.json', :query => {:limit => 10})
-    def get(path, options={})
-      perform_request Net::HTTP::Get, path, options
+    def get(path, options={}, &block)
+      perform_request Net::HTTP::Get, path, options, &block
     end
 
     # Allows making a post request to a url.
@@ -355,28 +359,33 @@ module HTTParty
     #   # Simple post with full url using :query option,
     #   # which gets set as form data on the request.
     #   Foo.post('http://foo.com/resources', :query => {:bar => 'baz'})
-    def post(path, options={})
-      perform_request Net::HTTP::Post, path, options
+    def post(path, options={}, &block)
+      perform_request Net::HTTP::Post, path, options, &block
+    end
+
+    # Perform a PATCH request to a path
+    def patch(path, options={}, &block)
+      perform_request Net::HTTP::Patch, path, options, &block
     end
 
     # Perform a PUT request to a path
-    def put(path, options={})
-      perform_request Net::HTTP::Put, path, options
+    def put(path, options={}, &block)
+      perform_request Net::HTTP::Put, path, options, &block
     end
 
     # Perform a DELETE request to a path
-    def delete(path, options={})
-      perform_request Net::HTTP::Delete, path, options
+    def delete(path, options={}, &block)
+      perform_request Net::HTTP::Delete, path, options, &block
     end
 
     # Perform a HEAD request to a path
-    def head(path, options={})
-      perform_request Net::HTTP::Head, path, options
+    def head(path, options={}, &block)
+      perform_request Net::HTTP::Head, path, options, &block
     end
 
     # Perform an OPTIONS request to a path
-    def options(path, options={})
-      perform_request Net::HTTP::Options, path, options
+    def options(path, options={}, &block)
+      perform_request Net::HTTP::Options, path, options, &block
     end
 
     def default_options #:nodoc:
@@ -385,10 +394,10 @@ module HTTParty
 
     private
 
-      def perform_request(http_method, path, options) #:nodoc:
+      def perform_request(http_method, path, options, &block) #:nodoc:
         options = default_options.dup.merge(options)
         process_cookies(options)
-        Request.new(http_method, path, options).perform
+        Request.new(http_method, path, options).perform(&block)
       end
 
       def process_cookies(options) #:nodoc:
@@ -419,28 +428,32 @@ module HTTParty
     include HTTParty
   end
 
-  def self.get(*args)
-    Basement.get(*args)
+  def self.get(*args, &block)
+    Basement.get(*args, &block)
+  end
+
+  def self.post(*args, &block)
+    Basement.post(*args, &block)
   end
 
-  def self.post(*args)
-    Basement.post(*args)
+  def self.patch(*args, &block)
+    Basement.patch(*args, &block)
   end
 
-  def self.put(*args)
-    Basement.put(*args)
+  def self.put(*args, &block)
+    Basement.put(*args, &block)
   end
 
-  def self.delete(*args)
-    Basement.delete(*args)
+  def self.delete(*args, &block)
+    Basement.delete(*args, &block)
   end
 
-  def self.head(*args)
-    Basement.head(*args)
+  def self.head(*args, &block)
+    Basement.head(*args, &block)
   end
 
-  def self.options(*args)
-    Basement.options(*args)
+  def self.options(*args, &block)
+    Basement.options(*args, &block)
   end
 end
 

data/lib/httparty/cookie_hash.rb

@@ -1,7 +1,7 @@
 class HTTParty::CookieHash < Hash #:nodoc:
-  
+
   CLIENT_COOKIES = %w{path expires domain path secure HTTPOnly}
-  
+
   def add_cookies(value)
     case value
     when Hash

data/lib/httparty/core_extensions.rb

@@ -6,4 +6,27 @@ module HTTParty
       instance_methods.each { |m| undef_method m unless m =~ /^__|instance_eval/ }
     end
   end
+
+  unless defined?(Net::HTTP::Patch)
+    class Net::HTTP
+      def patch(path, data, initheader = nil, dest = nil, &block) #:nodoc:
+        res = nil
+        request(Patch.new(path, initheader), data) {|r|
+          r.read_body dest, &block
+          res = r
+        }
+        unless @newimpl
+          res.value
+          return res, res.body
+        end
+        res
+      end
+
+      class Patch < Net::HTTPRequest
+        METHOD = 'PATCH'
+        REQUEST_HAS_BODY = true
+        RESPONSE_HAS_BODY = true
+      end
+    end
+  end
 end

data/lib/httparty/hash_conversions.rb

@@ -48,4 +48,4 @@ module HTTParty
       param
     end
   end
-end
+end

data/lib/httparty/module_inheritable_attributes.rb

@@ -22,7 +22,7 @@ module HTTParty
           if instance_variable_get(ivar).respond_to?(:merge)
             method = <<-EOM
               def self.#{inheritable_attribute}
-                #{ivar} = superclass.#{inheritable_attribute}.merge #{ivar}
+                #{ivar} = superclass.#{inheritable_attribute}.merge Marshal.load(Marshal.dump(#{ivar}))
               end
             EOM
             subclass.class_eval method