httparty-responsibly 0.17.0.r1 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9366a457655b713f32e9163acbfcf09e1aec5b8ad843664f1dafa02171ffda9
-  data.tar.gz: fb62c7d8f4192454f5312d7cd2f2540f365fb6ff22d6794da1e6f9ab460d2529
+  metadata.gz: 9d55763430b397dfb7a4a427e64b1d83abd6543fb93fa8ad77ed19d935187296
+  data.tar.gz: 1d811112d3f705fa58c9eafb8d593af35e4485f8e3509c1053539011d610a843
 SHA512:
-  metadata.gz: 2797c8d27fd23fc0d86ea2335388d37649782bf395c59fcda6b4fa45dc6766038291b79be44614077f02c1a966911d03f845e76f615ee60315918df40ef0ed65
-  data.tar.gz: 217f9ba516f18298080a69ae914c4aba037ae1b2622ed4ca58694888d583872b198f82f767e069e6ccdfed70e2a3a56f19c81b7bc03fa0cd1787e03e959447a0
+  metadata.gz: 25c5aaf3cea1618606343b09fd8087884bb2fc6ebf7882f242c6e9b241ba03c82b39b8c840fa44eebb05c43ad53af04b4eafa28ed1a67a0424646c91ed510e37
+  data.tar.gz: 8219e2ebacf83db3fd4322eb7185bc5fa490f4cd2c2a6fc172f3a265c65c65700cfab189bb1052f65c85612bf27d3258eb07d730ba11f301ac8b819489651b91

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/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/httparty-responsibly.gemspec

@@ -4,10 +4,10 @@ require "httparty/version"
 
 Gem::Specification.new do |s|
   s.name        = "httparty-responsibly"
-  s.version     = HTTParty::VERSION + '.r1'
+  s.version     = HTTParty::VERSION
   s.platform    = Gem::Platform::RUBY
   s.licenses    = ['MIT']
-  s.authors     = ["John Nunemaker", "Sandro Turriate", "James Denness"]
+  s.authors     = ["John Nunemaker", "Sandro Turriate"]
   s.email       = ["nunemaker@gmail.com", "james@denness.org"]
   s.homepage    = "https://github.com/scarybot/httparty-responsibly"
   s.summary     = "An up-to-date fork of jnunemaker's httparty, without the post-install nonsense."

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,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: httparty-responsibly
 version: !ruby/object:Gem::Version
-  version: 0.17.0.r1
+  version: 0.17.1
 platform: ruby
 authors:
 - John Nunemaker
 - Sandro Turriate
-- James Denness
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2019-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml
@@ -93,6 +92,7 @@ files:
 - 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
@@ -127,9 +127,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: