httparty 0.17.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3e555084c3fc85098b7da66339a47958b2383014
-  data.tar.gz: 937364fd6bd11140590f15beb4b324fa89eef30c
+SHA256:
+  metadata.gz: 21274d1c09f3460352bc2aaf0cc00e6c0f9fb76eae45bc6dd0a65748c8d29463
+  data.tar.gz: c6900248181afef6fdf36381d4e33365345073a5a00f73498ac3e89259838f14
 SHA512:
-  metadata.gz: 0f0a8e29081a7c99e7ebebbe885e717326cbd45930ed096c88d953c7ef0a53e16eec6cdf6f273eaa6dd83e1a2eb42c861e7917c81e267e3085cc709e42fa4506
-  data.tar.gz: 1fcbb78cf1e3b7ede28e10f8de4ac40f34da5d1ec241dbfac9ff432e12f859ffd50457e469c39c3d4351f0a9997e916a1e09cb322fbe363b5e6df1e4ef7284f0
+  metadata.gz: 116978b76182751905d115a80ac0e350637564cad3c8d2bf8938ffcac99ff0e782bd810aa9889db3218ad147d38632c75fd85521682d22d7bb654de8cf1d0352
+  data.tar.gz: 2048e308a2d88288f9ab373f1472acd9955aeb7870c2a8cbfc128d0b71ace183bc7011a20f2f20ce7c2e37e400b4c9c6a3b695fc6dc36144e583a7151fc4a5e1

data/.rubocop_todo.yml

@@ -15,7 +15,7 @@ Lint/EndAlignment:
   Enabled: false
 
 # Offense count: 1
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Enabled: false
 
 # Offense count: 5

data/Changelog.md

@@ -1,3 +1,31 @@
+## 0.18.1
+
+* [Rename cop Lint/HandleExceptions to Lint/SuppressedException](https://github.com/jnunemaker/httparty/pull/699).
+* [Encode keys in query params](https://github.com/jnunemaker/httparty/pull/698).
+* [Fixed SSL doc example](https://github.com/jnunemaker/httparty/pull/692).
+* [Add a build status badge](https://github.com/jnunemaker/httparty/pull/701).
+
+
+## 0.18.0
+
+* [Support gzip/deflate transfer encoding when explicit headers are set](https://github.com/jnunemaker/httparty/pull/678).
+* [Support edge case cookie format with a blank attribute](https://github.com/jnunemaker/httparty/pull/685).
+
+## 0.17.3
+
+0.17.2 is broken https://github.com/jnunemaker/httparty/issues/681
+
+## 0.17.2
+
+* [Add Response#nil? deprecetion warning](https://github.com/jnunemaker/httparty/pull/680)
+
+## 0.17.1
+
+* [Pass options to dynamic block headers](https://github.com/jnunemaker/httparty/pull/661)
+* [Normalize urls with URI adapter to allow International Domain Names support](https://github.com/jnunemaker/httparty/pull/668)
+* [Add max_retries support](https://github.com/jnunemaker/httparty/pull/660)
+* [Minize gem size by removing test files](https://github.com/jnunemaker/httparty/pull/658)
+
 ## 0.17.0
 
 * [Fix encoding of streamed chunk](https://github.com/jnunemaker/httparty/pull/644)

data/Gemfile

@@ -16,6 +16,7 @@ group :test do
   gem 'aruba'
   gem 'cucumber', '~> 2.3'
   gem 'webmock'
+  gem 'addressable'
 end
 
 group :development, :test do

data/README.md

@@ -1,5 +1,7 @@
 # httparty
 
+[![Build Status](https://travis-ci.org/jnunemaker/httparty.svg?branch=master)](https://travis-ci.org/jnunemaker/httparty)
+
 Makes http fun again!  Ain't no party like a httparty, because a httparty don't stop.
 
 ## Install

data/docs/README.md

@@ -79,7 +79,7 @@ class Client
   base_uri "https://example.com"
 
   def self.fetch
-    get("/resources", pem: (File.read("#{File.expand_path('.')}/path/to/certs/cert.pem"), "123456")
+    get("/resources", pem: File.read("#{File.expand_path('.')}/path/to/certs/cert.pem"), pem_password: "123456")
   end
 end
 ```

data/httparty.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |s|
   test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
 
   s.files         = all_files - test_files
-  s.test_files    = test_files
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 end

data/lib/httparty.rb

@@ -17,6 +17,7 @@ require 'httparty/logger/logger'
 require 'httparty/request/body'
 require 'httparty/response_fragment'
 require 'httparty/text_encoder'
+require 'httparty/headers_processor'
 
 # @see HTTParty::ClassMethods
 module HTTParty
@@ -40,11 +41,11 @@ module HTTParty
   # [:+limit+:] Maximum number of redirects to follow. Takes precedences over :+no_follow+.
   # [:+query+:] Query string, or an object that responds to #to_hash representing it. Normalized according to the same rules as :+body+. If you specify this on a POST, you must use an object which responds to #to_hash. See also HTTParty::ClassMethods.default_params.
   # [:+timeout+:] Timeout for opening connection and reading data.
-  # [:+local_host:] Local address to bind to before connecting.
-  # [:+local_port:] Local port to bind to before connecting.
-  # [:+body_stream:] Allow streaming to a REST server to specify a body_stream.
-  # [:+stream_body:] Allow for streaming large files without loading them into memory.
-  # [:+multipart:] Force content-type to be multipart
+  # [:+local_host+:] Local address to bind to before connecting.
+  # [:+local_port+:] Local port to bind to before connecting.
+  # [:+body_stream+:] Allow streaming to a REST server to specify a body_stream.
+  # [:+stream_body+:] Allow for streaming large files without loading them into memory.
+  # [:+multipart+:] Force content-type to be multipart
   #
   # There are also another set of options with names corresponding to various class methods. The methods in question are those that let you set a class-wide default, and the options override the defaults on a request-by-request basis. Those options are:
   # * :+base_uri+: see HTTParty::ClassMethods.base_uri.
@@ -588,28 +589,11 @@ module HTTParty
 
     def perform_request(http_method, path, options, &block) #:nodoc:
       options = ModuleInheritableAttributes.hash_deep_dup(default_options).merge(options)
-      process_headers(options)
+      HeadersProcessor.new(headers, options).call
       process_cookies(options)
       Request.new(http_method, path, options).perform(&block)
     end
 
-    def process_headers(options)
-      if options[:headers]
-        if headers.any?
-          options[:headers] = headers.merge(options[:headers])
-        end
-
-        options[:headers] = Utils.stringify_keys(process_dynamic_headers(options[:headers]))
-      end
-    end
-
-    def process_dynamic_headers(headers)
-      headers.each_with_object({}) do |header, processed_headers|
-        key, value = header
-        processed_headers[key] = value.respond_to?(:call) ? value.call : value
-      end
-    end
-
     def process_cookies(options) #:nodoc:
       return unless options[:cookies] || default_cookies.any?
       options[:headers] ||= headers.dup

data/lib/httparty/connection_adapter.rb

@@ -137,6 +137,12 @@ module HTTParty
         end
       end
 
+      if add_max_retries?(options[:max_retries])
+        from_ruby_version('2.5.0', option: :max_retries) do
+          http.max_retries = options[:max_retries]
+        end
+      end
+
       if options[:debug_output]
         http.set_debug_output(options[:debug_output])
       end
@@ -177,6 +183,10 @@ module HTTParty
       timeout && (timeout.is_a?(Integer) || timeout.is_a?(Float))
     end
 
+    def add_max_retries?(max_retries)
+      max_retries && max_retries.is_a?(Integer) && max_retries >= 0
+    end
+
     def clean_host(host)
       strip_ipv6_brackets(host)
     end

data/lib/httparty/cookie_hash.rb

@@ -1,14 +1,14 @@
 class HTTParty::CookieHash < Hash #:nodoc:
-  CLIENT_COOKIES = %w(path expires domain path secure httponly)
+  CLIENT_COOKIES = %w(path expires domain path secure httponly samesite)
 
-  def add_cookies(value)
-    case value
+  def add_cookies(data)
+    case data
     when Hash
-      merge!(value)
+      merge!(data)
     when String
-      value.split('; ').each do |cookie|
-        array = cookie.split('=', 2)
-        self[array[0].to_sym] = array[1]
+      data.split('; ').each do |cookie|
+        key, value = cookie.split('=', 2)
+        self[key.to_sym] = value if key
       end
     else
       raise "add_cookies only takes a Hash or a String"

data/lib/httparty/hash_conversions.rb

@@ -27,7 +27,7 @@ module HTTParty
       normalized_keys = normalize_keys(key, value)
 
       normalized_keys.flatten.each_slice(2).inject('') do |string, (k, v)|
-        string + "#{k}=#{ERB::Util.url_encode(v.to_s)}&"
+        string + "#{ERB::Util.url_encode(k)}=#{ERB::Util.url_encode(v.to_s)}&"
       end
     end
 

data/lib/httparty/headers_processor.rb

@@ -0,0 +1,30 @@
+module HTTParty
+  class HeadersProcessor
+    attr_reader :headers, :options
+
+    def initialize(headers, options)
+      @headers = headers
+      @options = options
+    end
+
+    def call
+      return unless options[:headers]
+
+      options[:headers] = headers.merge(options[:headers]) if headers.any?
+      options[:headers] = Utils.stringify_keys(process_dynamic_headers)
+    end
+
+    private
+
+    def process_dynamic_headers
+      options[:headers].each_with_object({}) do |header, processed_headers|
+        key, value = header
+        processed_headers[key] = if value.respond_to?(:call)
+                                   value.arity == 0 ? value.call : value.call(options)
+                                 else
+                                   value
+                                 end
+      end
+    end
+  end
+end

data/lib/httparty/request.rb

@@ -71,7 +71,7 @@ module HTTParty
       @path = if uri.is_a?(uri_adapter)
         uri
       elsif String.try_convert(uri)
-        uri_adapter.parse uri
+        uri_adapter.parse(uri).normalize
       else
         raise ArgumentError,
           "bad argument (expected #{uri_adapter} object or URI string)"
@@ -95,9 +95,9 @@ module HTTParty
       end
 
       if path.relative? && path.host
-        new_uri = options[:uri_adapter].parse("#{@last_uri.scheme}:#{path}")
+        new_uri = options[:uri_adapter].parse("#{@last_uri.scheme}:#{path}").normalize
       elsif path.relative?
-        new_uri = options[:uri_adapter].parse("#{base_uri}#{path}")
+        new_uri = options[:uri_adapter].parse("#{base_uri}#{path}").normalize
       else
         new_uri = path.clone
       end
@@ -204,22 +204,15 @@ module HTTParty
     end
 
     def setup_raw_request
-      @raw_request = http_method.new(request_uri(uri))
-      @raw_request.body_stream = options[:body_stream] if options[:body_stream]
-
       if options[:headers].respond_to?(:to_hash)
         headers_hash = options[:headers].to_hash
-
-        @raw_request.initialize_http_header(headers_hash)
-        # If the caller specified a header of 'Accept-Encoding', assume they want to
-        # deal with encoding of content. Disable the internal logic in Net:HTTP
-        # that handles encoding, if the platform supports it.
-        if @raw_request.respond_to?(:decode_content) && (headers_hash.key?('Accept-Encoding') || headers_hash.key?('accept-encoding'))
-          # Using the '[]=' sets decode_content to false
-          @raw_request['accept-encoding'] = @raw_request['accept-encoding']
-        end
+      else
+        headers_hash = nil
       end
 
+      @raw_request = http_method.new(request_uri(uri), headers_hash)
+      @raw_request.body_stream = options[:body_stream] if options[:body_stream]
+
       if options[:body]
         body = Body.new(
           options[:body],
@@ -305,7 +298,7 @@ module HTTParty
 
     def handle_host_redirection
       check_duplicate_location_header
-      redirect_path = options[:uri_adapter].parse last_response['location']
+      redirect_path = options[:uri_adapter].parse(last_response['location']).normalize
       return if redirect_path.relative? || path.host == redirect_path.host
       @changed_hosts = true
     end

data/lib/httparty/response.rb

@@ -79,6 +79,7 @@ module HTTParty
     end
 
     def nil?
+      warn_about_nil_deprecation
       response.nil? || response.body.nil? || response.body.empty?
     end
 
@@ -134,6 +135,19 @@ module HTTParty
         ::Kernel.raise ::HTTParty::ResponseError.new(@response), "Code #{code} - #{body}"
       end
     end
+
+    private
+
+    def warn_about_nil_deprecation
+      trace_line = caller.reject { |line| line.include?('httparty') }.first
+      warning = "[DEPRECATION] HTTParty will no longer override `response#nil?`. " \
+        "This functionality will be removed in future versions. " \
+        "Please, add explicit check `response.body.nil? || response.body.empty?`. " \
+        "For more info refer to: https://github.com/jnunemaker/httparty/issues/568\n" \
+        "#{trace_line}"
+
+      warn(warning)
+    end
   end
 end
 

data/lib/httparty/version.rb

@@ -1,3 +1,3 @@
 module HTTParty
-  VERSION = "0.17.0"
+  VERSION = "0.18.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httparty
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.1
 platform: ruby
 authors:
 - John Nunemaker
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-20 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml
@@ -84,26 +84,13 @@ files:
 - examples/tripit_sign_in.rb
 - examples/twitter.rb
 - examples/whoismyrep.rb
-- features/basic_authentication.feature
-- features/command_line.feature
-- features/deals_with_http_error_codes.feature
-- features/digest_authentication.feature
-- features/handles_compressed_responses.feature
-- features/handles_multiple_formats.feature
-- features/steps/env.rb
-- features/steps/httparty_response_steps.rb
-- features/steps/httparty_steps.rb
-- features/steps/mongrel_helper.rb
-- features/steps/remote_service_steps.rb
-- features/supports_read_timeout_option.feature
-- features/supports_redirection.feature
-- features/supports_timeout_option.feature
 - httparty.gemspec
 - lib/httparty.rb
 - lib/httparty/connection_adapter.rb
 - lib/httparty/cookie_hash.rb
 - lib/httparty/exceptions.rb
 - lib/httparty/hash_conversions.rb
+- lib/httparty/headers_processor.rb
 - lib/httparty/logger/apache_formatter.rb
 - lib/httparty/logger/curl_formatter.rb
 - lib/httparty/logger/logger.rb
@@ -121,42 +108,6 @@ files:
 - lib/httparty/utils.rb
 - lib/httparty/version.rb
 - script/release
-- spec/fixtures/delicious.xml
-- spec/fixtures/empty.xml
-- spec/fixtures/example.html
-- spec/fixtures/ssl/generate.sh
-- spec/fixtures/ssl/generated/bogushost.crt
-- spec/fixtures/ssl/generated/ca.crt
-- spec/fixtures/ssl/generated/ca.key
-- spec/fixtures/ssl/generated/selfsigned.crt
-- spec/fixtures/ssl/generated/server.crt
-- spec/fixtures/ssl/generated/server.key
-- spec/fixtures/ssl/openssl-exts.cnf
-- spec/fixtures/tiny.gif
-- spec/fixtures/twitter.csv
-- spec/fixtures/twitter.json
-- spec/fixtures/twitter.xml
-- spec/fixtures/undefined_method_add_node_for_nil.xml
-- spec/httparty/connection_adapter_spec.rb
-- spec/httparty/cookie_hash_spec.rb
-- spec/httparty/exception_spec.rb
-- spec/httparty/hash_conversions_spec.rb
-- spec/httparty/logger/apache_formatter_spec.rb
-- spec/httparty/logger/curl_formatter_spec.rb
-- spec/httparty/logger/logger_spec.rb
-- spec/httparty/logger/logstash_formatter_spec.rb
-- spec/httparty/net_digest_auth_spec.rb
-- spec/httparty/parser_spec.rb
-- spec/httparty/request/body_spec.rb
-- spec/httparty/request_spec.rb
-- spec/httparty/response_fragment_spec.rb
-- spec/httparty/response_spec.rb
-- spec/httparty/ssl_spec.rb
-- spec/httparty_spec.rb
-- spec/spec_helper.rb
-- spec/support/ssl_test_helper.rb
-- spec/support/ssl_test_server.rb
-- spec/support/stub_response.rb
 - website/css/common.css
 - website/index.html
 homepage: https://github.com/jnunemaker/httparty
@@ -178,59 +129,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Makes http fun! Also, makes consuming restful web services dead easy.
-test_files:
-- features/basic_authentication.feature
-- features/command_line.feature
-- features/deals_with_http_error_codes.feature
-- features/digest_authentication.feature
-- features/handles_compressed_responses.feature
-- features/handles_multiple_formats.feature
-- features/steps/env.rb
-- features/steps/httparty_response_steps.rb
-- features/steps/httparty_steps.rb
-- features/steps/mongrel_helper.rb
-- features/steps/remote_service_steps.rb
-- features/supports_read_timeout_option.feature
-- features/supports_redirection.feature
-- features/supports_timeout_option.feature
-- spec/fixtures/delicious.xml
-- spec/fixtures/empty.xml
-- spec/fixtures/example.html
-- spec/fixtures/ssl/generate.sh
-- spec/fixtures/ssl/generated/bogushost.crt
-- spec/fixtures/ssl/generated/ca.crt
-- spec/fixtures/ssl/generated/ca.key
-- spec/fixtures/ssl/generated/selfsigned.crt
-- spec/fixtures/ssl/generated/server.crt
-- spec/fixtures/ssl/generated/server.key
-- spec/fixtures/ssl/openssl-exts.cnf
-- spec/fixtures/tiny.gif
-- spec/fixtures/twitter.csv
-- spec/fixtures/twitter.json
-- spec/fixtures/twitter.xml
-- spec/fixtures/undefined_method_add_node_for_nil.xml
-- spec/httparty/connection_adapter_spec.rb
-- spec/httparty/cookie_hash_spec.rb
-- spec/httparty/exception_spec.rb
-- spec/httparty/hash_conversions_spec.rb
-- spec/httparty/logger/apache_formatter_spec.rb
-- spec/httparty/logger/curl_formatter_spec.rb
-- spec/httparty/logger/logger_spec.rb
-- spec/httparty/logger/logstash_formatter_spec.rb
-- spec/httparty/net_digest_auth_spec.rb
-- spec/httparty/parser_spec.rb
-- spec/httparty/request/body_spec.rb
-- spec/httparty/request_spec.rb
-- spec/httparty/response_fragment_spec.rb
-- spec/httparty/response_spec.rb
-- spec/httparty/ssl_spec.rb
-- spec/httparty_spec.rb
-- spec/spec_helper.rb
-- spec/support/ssl_test_helper.rb
-- spec/support/ssl_test_server.rb
-- spec/support/stub_response.rb
+test_files: []