httsoiree 0.13.1.1 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b96e1f9c5ddf1d48bf3c1e775c74b3e8ee7ae37b
-  data.tar.gz: c12b50e32aa15f2d29266305d9bb55d0d36a2895
+  metadata.gz: 3c7ed88eddd591d2874d80dafab53ea630a49c97
+  data.tar.gz: 98ab50d2c6e1854bbe432541278e77f547a07388
 SHA512:
-  metadata.gz: f5142045a09dedf5b7e62e898173aaf7d12ff5a0818d3d451d50bd645a7a2317f8f38d932062e5397288ef93216c8706a013109198d94f324457abca99c73cf9
-  data.tar.gz: 95bb1a46d509354a2b7b0233bb19d4f0bcf299de8bca27fedae2033df2b934f5da7349051bbe657547ca6a908902f2a3bb6b6b4b1790d30f8bbf20d6c7a2503e
+  metadata.gz: 963f349a908e914f7a32662da3cdc245afb8c6e7f876224ff9f82a41e826d3b78255314df9a4480bd188460120353c881f89e0bb06ba565b12f1742f1fea6b20
+  data.tar.gz: 378d4875409f133f4ec7be1dac5df54a93e588fab2cbafa1ef3cfb27807f1528d580af3939762b9e8810e85ddb8f9e2aeb2d995bbaeaf7e386772fd1cf2ca902

data/History

@@ -1,8 +1,76 @@
-== 0.10.1 2013-01-26
+== 0.13.3
+* minor improvement
+  * added option to allow for streaming large files without loading them into memory (672cdae)
+
+== 0.13.2
+* minor improvement
+  * [Set correct path on redirect to filename](https://github.com/jnunemaker/httparty/pull/337)
+  * ensure logger works with curl format
+
+== 0.13.1 2014-04-08
+* new
+  * [Added ability to specify a body_stream in HttpRequest](https://github.com/jnunemaker/httparty/pull/275)
+  * [Added read_timeout and open_timeout options](https://github.com/jnunemaker/httparty/pull/278)
+* change
+  * [Initialize HTTParty requests with an URI object and a String](https://github.com/jnunemaker/httparty/pull/274)
+* minor improvement
+  * [Add stackexchange API example](https://github.com/jnunemaker/httparty/pull/280)
+
+== 0.13.0 2014-02-14
+* new
+  * [Add CSV support](https://github.com/jnunemaker/httparty/pull/269)
+  * [Allows PKCS12 client certificates](https://github.com/jnunemaker/httparty/pull/246)
+* bug fix
+  * [Digest auth no longer fails when multiple headers are sent by the server](https://github.com/jnunemaker/httparty/pull/272)
+  * [Use 'Basement.copy' when calling 'HTTParty.copy'](https://github.com/jnunemaker/httparty/pull/268)
+  * [No longer appends ampersand when queries are embedded in paths](https://github.com/jnunemaker/httparty/pull/252)
+* change
+  * [Merge - instead of overwrite - default headers with request provided headers](https://github.com/jnunemaker/httparty/pull/270)
+  * [Modernize respond_to implementations to support second param](https://github.com/jnunemaker/httparty/pull/264)
+  * [Sort query parameters by key before processing](https://github.com/jnunemaker/httparty/pull/245)
+* minor improvement
+  * [Add HTTParty::Error base class](https://github.com/jnunemaker/httparty/pull/260)
+
+== 0.12.0 2013-10-10
+* new
+  * [Added initial logging support](https://github.com/jnunemaker/httparty/pull/243)
+  * [Add support for local host and port binding](https://github.com/jnunemaker/httparty/pull/238)
+  * [content_type_charset_support](https://github.com/jnunemaker/httparty/commit/82e351f0904e8ecc856015ff2854698a2ca47fbc)
+* bug fix
+  * [No longer attempt to decompress the body on HEAD requests](https://github.com/jnunemaker/httparty/commit/f2b8cc3d49e0e9363d7054b14f30c340d7b8e7f1)
+  * [Adding java check in aliasing of multiple choices](https://github.com/jnunemaker/httparty/pull/204/commits)
+* change
+  * [MIME-type files of javascript are returned as a string instead of JSON](https://github.com/jnunemaker/httparty/pull/239)
+  * [Made SSL connections use the system certificate store by default](https://github.com/jnunemaker/httparty/pull/226)
+  * [Do not pass proxy options to Net::HTTP connection if not specified](https://github.com/jnunemaker/httparty/pull/222)
+  * [Replace multi_json with stdlib json](https://github.com/jnunemaker/httparty/pull/214)
+    * [Require Ruby >= 1.9.3]
+  * [Response returns array of returned cookie strings](https://github.com/jnunemaker/httparty/pull/218)
+    * [Allow '=' within value of a cookie]
+* minor improvements
+  * [Improve documentation of ssl_ca_file, ssl_ca_path](https://github.com/jnunemaker/httparty/pull/223)
+  * [Fix example URLs](https://github.com/jnunemaker/httparty/pull/232)
+
+== 0.11.0 2013-04-10
+* new
+  * [Add COPY http request handling](https://github.com/jnunemaker/httparty/pull/190)
+  * [Ruby 2.0 tests](https://github.com/jnunemaker/httparty/pull/194)
+    * [Ruby >= 2.0.0 support both multiple_choice? and multiple_choices?]
+* bug fix
+  * [Maintain blocks passed to 'perform' in redirects](https://github.com/jnunemaker/httparty/pull/191)
+  * [Fixed nc value being quoted, this was against spec](https://github.com/jnunemaker/httparty/pull/196)
+  * [Request#uri no longer duplicates non-relative-path params](https://github.com/jnunemaker/httparty/pull/189)
+* change
+  * [Client-side-only cookie attributes are removed: case-insensitive](https://github.com/jnunemaker/httparty/pull/188)
 
+== 0.10.2 2013-01-26
+* bug fix
+  * [hash_conversions misnamed variable](https://github.com/jnunemaker/httparty/pull/187)
+
+== 0.10.1 2013-01-26
 * new
-  * [added support for MOVE requests](https://github.com/jnunemaker/httparty/pull/183)
-  * [bump multi xml version](https://github.com/jnunemaker/httparty/pull/181)
+  * [Added support for MOVE requests](https://github.com/jnunemaker/httparty/pull/183)
+  * [Bump multi xml version](https://github.com/jnunemaker/httparty/pull/181)
 
 == 0.10.0 2013-01-10
 * changes
@@ -12,7 +80,6 @@
 * new
   * [support for connection adapters](https://github.com/jnunemaker/httparty/pull/157)
   * [allow ssl_version on ruby 1.9](https://github.com/jnunemaker/httparty/pull/159)
-
 * bug fixes
   * [don't treat port 4430 as ssl](https://github.com/jnunemaker/httparty/commit/a296b1c97f83d7dcc6ef85720a43664c265685ac)
   * [deep clone default options](https://github.com/jnunemaker/httparty/commit/f74227d30f9389b4b23a888c9af49fb9b8248e1f)
@@ -282,20 +349,20 @@
 == 0.1.3 2008-08-22
 
 * 3 major enhancements:
-	* Added http_proxy key for setting proxy server and port (francxk@gmail.com)
-	* Now raises exception when http error occurs (francxk@gmail.com)
-	* Changed auto format detection from file extension to response content type (Jay Pignata)
+  * Added http_proxy key for setting proxy server and port (francxk@gmail.com)
+  * Now raises exception when http error occurs (francxk@gmail.com)
+  * Changed auto format detection from file extension to response content type (Jay Pignata)
 
 == 0.1.2 2008-08-09
 
 * 1 major enhancement:
-	* default_params were not being appended to query string if option[:query] was blank
+  * default_params were not being appended to query string if option[:query] was blank
 
 == 0.1.1 2008-07-30
 
 * 2 major enhancement:
-	* Added :basic_auth key for options when making a request
-	* :query and :body both now work with query string or hash
+  * Added :basic_auth key for options when making a request
+  * :query and :body both now work with query string or hash
 
 == 0.1.0 2008-07-27
 

data/README.md

@@ -71,11 +71,4 @@ httsoiree "https://api.stackexchange.com/2.2/questions?site=stackoverflow"
 
 ## Contributing
 
-* Fork the project.
-* Run `bundle`
-* Run `bundle exec rake`
-* 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.
-* Run `bundle exec rake` (No, REALLY :))
-* 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.
+Contribute to https://github.com/jnunemaker/httparty. This fork will stay pegged to the latest version.

data/Rakefile

@@ -3,7 +3,6 @@ Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.ruby_opts << '-rubygems'
   spec.libs << 'lib' << 'spec'
   spec.spec_files = FileList['spec/**/*_spec.rb']
-  spec.spec_opts = ['--options', 'spec/spec.opts']
 end
 
 require 'cucumber/rake/task'

data/examples/README.md

@@ -0,0 +1,64 @@
+## Examples
+
+* [Amazon Book Search](aaws.rb)
+    * Httparty included into poro class
+    * Uses `get` requests
+    * Transforms query params to uppercased params
+
+* [Google Search](google.rb)
+  * Httparty included into poro class
+  * Uses `get` requests
+
+* [Crack Custom Parser](crack.rb)
+    * Creates a custom parser for XML using crack gem
+    * Uses `get` request
+
+* [Create HTML Nokogiri parser](nokogiri_html_parser.rb)   
+    * Adds Html as a format
+    * passed the body of request to Nokogiri
+    
+* [More Custom Parsers](custom_parsers.rb)
+  * Create an additional parser for atom or make it the ONLY parser
+  
+* [Basic Auth, Delicious](delicious.rb)
+  * Basic Auth, shows how to merge those into options
+  * Uses `get` requests
+  
+* [Passing Headers, User Agent](headers_and_user_agents.rb)
+  * Use the class method of Httparty
+  * Pass the User-Agent in the headers
+  * Uses `get` requests
+  
+* [Basic Post Request](basic.rb)
+    * Httparty included into poro class
+    * Uses `post` requests
+
+* [Access Rubyurl Shortener](rubyurl.rb)
+  * Httparty included into poro class
+  * Uses `post` requests
+  
+* [Add a custom log file](logging.rb)
+  * create a log file and have httparty log requests
+
+* [Accessing StackExchange](stackexchange.rb)
+  * Httparty included into poro class
+  * Creates methods for different endpoints
+  * Uses `get` requests
+  
+* [Accessing Tripit](tripit_sign_in.rb)
+  * Httparty included into poro class
+  * Example of using `debug_output` to see headers/urls passed
+  * Getting and using Cookies
+  * Uses `get` requests
+  
+* [Accessing Twitter](twitter.rb)
+  * Httparty included into poro class
+  * Basic Auth
+  * Loads settings from a config file 
+  * Uses `get` requests
+  * Uses `post` requests
+  
+* [Accessing WhoIsMyRep](whoismyrep.rb)
+  * Httparty included into poro class
+  * Uses `get` requests     
+  * Two ways to pass params to get, inline on the url or in query hash

data/lib/httparty/connection_adapter.rb

@@ -153,6 +153,7 @@ module HTTParty
         end
 
         # Client certificate authentication
+        # Note: options[:pem] must contain the content of a PEM file having the private key appended
         if options[:pem]
           http.cert = OpenSSL::X509::Certificate.new(options[:pem])
           http.key = OpenSSL::PKey::RSA.new(options[:pem], options[:pem_password])

data/lib/httparty/logger/logger.rb

@@ -5,7 +5,7 @@ module HTTParty
   module Logger
     def self.build(logger, level, formatter)
       level  ||= :info
-      format ||= :apache
+      formatter ||= :apache
 
       case formatter
       when :curl

data/lib/httparty/net_digest_auth.rb

@@ -44,7 +44,10 @@ module Net
     private
 
       def parse(response_header)
-        response_header['www-authenticate'] =~ /Digest (.*)/
+        header = response_header['www-authenticate']
+          .gsub(/qop=(auth(?:-int)?)/, %Q(qop="\\1"))
+
+        header =~ /Digest (.*)/
         params = {}
         $1.gsub(/(\w+)="(.*?)"/) { params[$1] = $2 }
         params

data/lib/httparty/request.rb

@@ -40,6 +40,7 @@ module HTTParty
         parser: Parser,
         connection_adapter: ConnectionAdapter
       }.merge(o)
+      set_basic_auth_from_uri
     end
 
     def path=(uri)
@@ -55,6 +56,10 @@ module HTTParty
     end
 
     def uri
+      if redirect && path.relative? && path.path[0] != "/"
+        path.path = @last_uri.path.gsub(/[^\/]+$/, "") + path.path
+      end
+
       new_uri = path.relative? ? URI.parse("#{base_uri}#{path}") : path.clone
 
       # avoid double query string on redirects [#12]
@@ -95,7 +100,7 @@ module HTTParty
           chunks = []
 
           http_response.read_body do |fragment|
-            chunks << fragment
+            chunks << fragment unless options[:stream_body]
             block.call(fragment)
           end
 
@@ -335,5 +340,12 @@ module HTTParty
     def post?
       Net::HTTP::Post == http_method
     end
+
+    def set_basic_auth_from_uri
+      if path.userinfo
+        username, password = path.userinfo.split(':')
+        options[:basic_auth] = {:username => username, :password => password}
+      end
+    end
   end
 end

data/lib/httparty/version.rb

@@ -1,3 +1,3 @@
 module HTTParty
-  VERSION = "0.13.1.1"
+  VERSION = "0.13.3"
 end

data/spec/httparty/net_digest_auth_spec.rb

@@ -75,6 +75,17 @@ describe Net::HTTPHeader::DigestAuthenticator do
     end
   end
 
+  context "when quality of protection (qop) is unquoted" do
+    before do
+      @digest = setup_digest({
+        'www-authenticate' => 'Digest realm="myhost@testrealm.com", nonce="NONCE", qop=auth',
+      })
+    end
+
+    it "should still set qop" do
+      authorization_header.should include(%Q(qop="auth"))
+    end
+  end
 
   context "with unspecified quality of protection (qop)" do
     before do

data/spec/httparty/request_spec.rb

@@ -56,6 +56,23 @@ describe HTTParty::Request do
       request = HTTParty::Request.new(Net::HTTP::Get, 'http://google.com', connection_adapter: my_adapter)
       request.connection_adapter.should == my_adapter
     end
+
+    context "when basic authentication credentials provided in uri" do
+      context "when basic auth options wasn't set explicitly" do
+        it "sets basic auth from uri" do
+          request = HTTParty::Request.new(Net::HTTP::Get, 'http://user1:pass1@example.com')
+          request.options[:basic_auth].should == {:username => 'user1', :password => 'pass1'}
+        end
+      end
+
+      context "when basic auth options was set explicitly" do
+        it "uses basic auth from url anyway" do
+          basic_auth = {:username => 'user2', :password => 'pass2'}
+          request = HTTParty::Request.new(Net::HTTP::Get, 'http://user1:pass1@example.com', :basic_auth => basic_auth)
+          request.options[:basic_auth].should == {:username => 'user1', :password => 'pass1'}
+        end
+      end
+    end
   end
 
   describe "#format" do
@@ -127,6 +144,32 @@ describe HTTParty::Request do
   end
 
   describe "#uri" do
+    context "redirects" do
+      it "returns correct path when the server sets the location header to a filename" do
+        @request.last_uri = URI.parse("http://example.com/foo/bar")
+        @request.path = URI.parse("bar?foo=bar")
+        @request.redirect = true
+
+        @request.uri.should == URI.parse("http://example.com/foo/bar?foo=bar")
+      end
+
+      it "returns correct path when the server sets the location header to an absolute path" do
+        @request.last_uri = URI.parse("http://example.com/foo/bar")
+        @request.path = URI.parse("/bar?foo=bar")
+        @request.redirect = true
+
+        @request.uri.should == URI.parse("http://example.com/bar?foo=bar")
+      end
+
+      it "returns correct path when the server sets the location header to a full uri" do
+        @request.last_uri = URI.parse("http://example.com/foo/bar")
+        @request.path = URI.parse("http://example.com/bar?foo=bar")
+        @request.redirect = true
+
+        @request.uri.should == URI.parse("http://example.com/bar?foo=bar")
+      end
+    end
+
     context "query strings" do
       it "does not add an empty query string when default_params are blank" do
         @request.options[:default_params] = {}
@@ -346,7 +389,6 @@ describe HTTParty::Request do
       end
     end
 
-
     describe 'with non-200 responses' do
       context "3xx responses" do
         it 'returns a valid object for 304 not modified' do

data/spec/httparty_spec.rb

@@ -699,6 +699,16 @@ describe HTTParty do
       end.should == chunks.join
     end
 
+    it "should return an empty body if stream_body option is turned on" do
+      chunks = ["Chunk1", "Chunk2", "Chunk3", "Chunk4"]
+      options = {stream_body: true, format: 'html'}
+      stub_chunked_http_response_with(chunks, options)
+
+      HTTParty.get('http://www.google.com', options) do |fragment|
+        chunks.should include(fragment)
+      end.should == nil
+    end
+
     it "should be able parse response type json automatically" do
       stub_http_response_with('twitter.json')
       tweets = HTTParty.get('http://twitter.com/statuses/public_timeline.json')

data/spec/support/stub_response.rb

@@ -13,14 +13,14 @@ module HTTParty
       HTTParty::Request.should_receive(:new).and_return(http_request)
     end
 
-    def stub_chunked_http_response_with(chunks)
+    def stub_chunked_http_response_with(chunks, options={format: "html"})
       response = Net::HTTPResponse.new("1.1", 200, nil)
       response.stub(:chunked_data).and_return(chunks)
       def response.read_body(&block)
         @body || chunked_data.each(&block)
       end
 
-      http_request = HTTParty::Request.new(Net::HTTP::Get, 'http://localhost', format: "html")
+      http_request = HTTParty::Request.new(Net::HTTP::Get, 'http://localhost', options)
       http_request.stub_chain(:http, :request).and_yield(response).and_return(response)
 
       HTTParty::Request.should_receive(:new).and_return(http_request)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httsoiree
 version: !ruby/object:Gem::Version
-  version: 0.13.1.1
+  version: 0.13.3
 platform: ruby
 authors:
 - John Nunemaker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2015-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -60,6 +60,7 @@ files:
 - bin/httparty
 - bin/httsoiree
 - cucumber.yml
+- examples/README.md
 - examples/aaws.rb
 - examples/basic.rb
 - examples/crack.rb
@@ -135,7 +136,6 @@ files:
 - spec/httparty/response_spec.rb
 - spec/httparty/ssl_spec.rb
 - spec/httparty_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/ssl_test_helper.rb
 - spec/support/ssl_test_server.rb
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Makes http fun! Also, makes consuming restful web services dead easy.
@@ -209,9 +209,7 @@ test_files:
 - spec/httparty/response_spec.rb
 - spec/httparty/ssl_spec.rb
 - spec/httparty_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/ssl_test_helper.rb
 - spec/support/ssl_test_server.rb
 - spec/support/stub_response.rb
-has_rdoc: 

data/spec/spec.opts

@@ -1,2 +0,0 @@
---colour
---backtrace