httparty 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e555084c3fc85098b7da66339a47958b2383014
-  data.tar.gz: 937364fd6bd11140590f15beb4b324fa89eef30c
+  metadata.gz: f061610c664e42b9d4d712d08fff7ca07f544f9a
+  data.tar.gz: 5e532cd3467fbb0e39bd8f87adc2364d505fbd5f
 SHA512:
-  metadata.gz: 0f0a8e29081a7c99e7ebebbe885e717326cbd45930ed096c88d953c7ef0a53e16eec6cdf6f273eaa6dd83e1a2eb42c861e7917c81e267e3085cc709e42fa4506
-  data.tar.gz: 1fcbb78cf1e3b7ede28e10f8de4ac40f34da5d1ec241dbfac9ff432e12f859ffd50457e469c39c3d4351f0a9997e916a1e09cb322fbe363b5e6df1e4ef7284f0
+  metadata.gz: 99deed9c0f2786c0afb4944badd7dca54739c21a8e7f30308ce432397f552e0d7cc641be5603828d82eda8f3d7d5290875f01e8d35e89c522dd0222e4a428247
+  data.tar.gz: 691fc41871c19e7a2a3b220dbdb14165aa2aaa61439854822be74468d96caeaab96d874e6d6b41f0f95b226342250a2c7b45add712595d42640acd9bc0a4cd51

data/Changelog.md

@@ -1,3 +1,10 @@
+## 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/648)
+* [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/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
@@ -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/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
@@ -305,7 +305,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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httparty
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.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: 2019-09-18 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
@@ -183,54 +134,4 @@ rubygems_version: 2.6.14
 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: []

data/features/basic_authentication.feature

@@ -1,20 +0,0 @@
-Feature:  Basic Authentication
-
-  As a developer
-  I want to be able to use a service that requires Basic Authentication
-  Because that is not an uncommon requirement
-
-  Scenario: Passing no credentials to a page requiring Basic Authentication
-    Given a restricted page at '/basic_auth.html'
-    When I call HTTParty#get with '/basic_auth.html'
-    Then it should return a response with a 401 response code
-
-  Scenario: Passing proper credentials to a page requiring Basic Authentication
-    Given a remote service that returns 'Authenticated Page'
-    And that service is accessed at the path '/basic_auth.html'
-    And that service is protected by Basic Authentication
-    And that service requires the username 'jcash' with the password 'maninblack'
-    When I call HTTParty#get with '/basic_auth.html' and a basic_auth hash:
-       | username | password   |
-       | jcash    | maninblack |
-    Then the return value should match 'Authenticated Page'

data/features/command_line.feature

@@ -1,95 +0,0 @@
-@command_line
-Feature: Command Line
-
-  As a developer
-  I want to be able to harness the power of HTTParty from the command line
-  Because that would make quick testing and debugging easy
-
-  Scenario: Show help information
-    When I run `httparty --help`
-    Then the output should contain "-f, --format [FORMAT]"
-
-  Scenario: Show current version
-    When I run `httparty --version`
-    Then the output should contain "Version:"
-    And the output should not contain "You need to provide a URL"
-
-  Scenario: Make a get request
-    Given a remote deflate service on port '4001'
-    And the response from the service has a body of 'GET request'
-    And that service is accessed at the path '/fun'
-    When I run `httparty http://0.0.0.0:4001/fun`
-    Then the output should contain "GET request"
-
-  Scenario: Make a post request
-    Given a remote deflate service on port '4002'
-    And the response from the service has a body of 'POST request'
-    And that service is accessed at the path '/fun'
-    When I run `httparty http://0.0.0.0:4002/fun --action post --data "a=1&b=2"`
-    Then the output should contain "POST request"
-
-  Scenario: Make a put request
-    Given a remote deflate service on port '4003'
-    And the response from the service has a body of 'PUT request'
-    And that service is accessed at the path '/fun'
-    When I run `httparty http://0.0.0.0:4003/fun --action put --data "a=1&b=2"`
-    Then the output should contain "PUT request"
-
-  Scenario: Make a delete request
-    Given a remote deflate service on port '4004'
-    And the response from the service has a body of 'DELETE request'
-    And that service is accessed at the path '/fun'
-    When I run `httparty http://0.0.0.0:4004/fun --action delete`
-    Then the output should contain "DELETE request"
-
-  Scenario: Set a verbose mode
-    Given a remote deflate service on port '4005'
-    And the response from the service has a body of 'Some request'
-    And that service is accessed at the path '/fun'
-    When I run `httparty http://0.0.0.0:4005/fun --verbose`
-    Then the output should contain "content-length"
-
-  Scenario: Use service with basic authentication
-    Given a remote deflate service on port '4006'
-    And the response from the service has a body of 'Successfull authentication'
-    And that service is accessed at the path '/fun'
-    And that service is protected by Basic Authentication
-    And that service requires the username 'user' with the password 'pass'
-    When I run `httparty http://0.0.0.0:4006/fun --user 'user:pass'`
-    Then the output should contain "Successfull authentication"
-
-  Scenario: Get response in plain format
-    Given a remote deflate service on port '4007'
-    And the response from the service has a body of 'Some request'
-    And that service is accessed at the path '/fun'
-    When I run `httparty http://0.0.0.0:4007/fun --format plain`
-    Then the output should contain "Some request"
-
-  Scenario: Get response in json format
-    Given a remote deflate service on port '4008'
-    Given a remote service that returns '{ "jennings": "waylon", "cash": "johnny" }'
-    And that service is accessed at the path '/service.json'
-    And the response from the service has a Content-Type of 'application/json'
-    When I run `httparty http://0.0.0.0:4008/service.json --format json`
-    Then the output should contain '"jennings": "waylon"'
-
-  Scenario: Get response in xml format
-    Given a remote deflate service on port '4009'
-    Given a remote service that returns '<singer>waylon jennings</singer>'
-    And that service is accessed at the path '/service.xml'
-    And the response from the service has a Content-Type of 'text/xml'
-    When I run `httparty http://0.0.0.0:4009/service.xml --format xml`
-    Then the output should contain "<singer>"
-
-  Scenario: Get response in csv format
-    Given a remote deflate service on port '4010'
-    Given a remote service that returns:
-      """
-      "Last Name","Name"
-      "jennings","waylon"
-      "cash","johnny"
-      """
-    And that service is accessed at the path '/service.csv'
-    And the response from the service has a Content-Type of 'application/csv'
-    When I run `httparty http://0.0.0.0:4010/service.csv --format csv`
-    Then the output should contain '["Last Name", "Name"]'

data/features/deals_with_http_error_codes.feature

@@ -1,26 +0,0 @@
-Feature: Deals with HTTP error codes
-
-  As a developer
-  I want to be informed of non-successful responses
-  Because sometimes thing explode
-  And I should probably know what happened
-
-  Scenario: A response of '404 - Not Found'
-    Given a remote service that returns a 404 status code
-    And that service is accessed at the path '/404_service.html'
-    When I call HTTParty#get with '/404_service.html'
-    Then it should return a response with a 404 response code
-
-  Scenario: A response of '500 - Internal Server Error'
-    Given a remote service that returns a 500 status code
-    And that service is accessed at the path '/500_service.html'
-    When I call HTTParty#get with '/500_service.html'
-    Then it should return a response with a 500 response code
-
-  Scenario: A non-successful response where I need the body
-    Given a remote service that returns a 400 status code
-    And the response from the service has a body of 'Bad response'
-    And that service is accessed at the path '/400_service.html'
-    When I call HTTParty#get with '/400_service.html'
-    Then it should return a response with a 400 response code
-    And the return value should match 'Bad response'