httparty 0.24.2 → 0.24.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5140fa45bdc5cad9c43dedc767d225a8d303df17e7684fb229e15b5b719c7581
-  data.tar.gz: df6926136fccc436033ebdec116d46d90c9d4cc41425e064f9caa8954d174ae2
+  metadata.gz: 2389baaffd615950f7d364a762d1c7e046e6e1819070b6974137a79737ed5cef
+  data.tar.gz: 33be08cb6b537efbbe5f691eff3308c9a126f03998d8cda1827ee946edadaffd
 SHA512:
-  metadata.gz: 0a9f6122cbddaf9929f6c0e2ecf790438b980b9c878ebb638a7ceb0f3404faf5ab722a0eeedc7d239513176a8806c5bd7963316228ab3cedc4e5a592fdea0f63
-  data.tar.gz: 140dd82771ccf6d1e97d427c7e60c00728e05389124a68b1dc9a6b24ef4fdbd2356dd2d1b3e7836afa17b70020fdff7f3e2a652c34eb6945cb40ef546cfa82a4
+  metadata.gz: 205b2eda67b38f7d4febba842ee9fd13450ffae372f92455ed925b9646ad68872e6a60c7efe7ab97635209737eba19f1efddf8fd6ea58732b8552986304890f9
+  data.tar.gz: 431bf5342636a7a88bf3d64116535e20d547f089f6cabea8f66700215d9aaafc6ad8903e8205105183d24bb55115d676b28e6026d9c1a0aa969a74d6e53ec471

data/.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
           - 3.4
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/README.md

@@ -19,7 +19,7 @@ gem install httparty
 
 ```ruby
 # Use the class methods to get down to business quickly
-response = HTTParty.get('http://api.stackexchange.com/2.2/questions?site=stackoverflow')
+response = HTTParty.get('https://api.stackexchange.com/2.2/questions?site=stackoverflow')
 
 puts response.body, response.code, response.message, response.headers.inspect
 

data/examples/tripit_sign_in.rb

@@ -9,7 +9,7 @@ class TripIt
   def initialize(email, password)
     @email = email
     get_response = self.class.get('/account/login')
-    get_response_cookie = parse_cookie(get_response.headers['Set-Cookie'])
+    get_response_cookie = parse_cookie(get_response)
 
     post_response = self.class.post(
       '/account/login',
@@ -20,7 +20,7 @@ class TripIt
       headers: {'Cookie' => get_response_cookie.to_cookie_string }
     )
 
-    @cookie = parse_cookie(post_response.headers['Set-Cookie'])
+    @cookie = parse_cookie(post_response)
   end
 
   def account_settings

data/lib/httparty/parser.rb

@@ -103,11 +103,12 @@ module HTTParty
     # @return [nil] when the response body is nil, an empty string, spaces only or "null"
     def parse
       return nil if body.nil?
+      # The bom has to be removed before the blank body checks below, otherwise a
+      # body that is nothing but a bom is handed to the format parser as an
+      # empty string and blows up instead of being reported as nil.
+      @body = strip_utf8_bom(body)
       return nil if body == 'null'
       return nil if body.valid_encoding? && body.strip.empty?
-      if body.valid_encoding? && body.encoding == Encoding::UTF_8
-        @body = body.gsub(/\A#{UTF8_BOM}/, '')
-      end
       if supports_format?
         parse_supported_format
       else
@@ -119,14 +120,44 @@ module HTTParty
 
     def xml
       require 'multi_xml'
-      MultiXml.parse(body)
+      (defined?(MultiXML) ? MultiXML : MultiXml).parse(body)
     end
 
     UTF8_BOM = "\xEF\xBB\xBF"
+    UTF8_BOM_ENCODINGS = [Encoding::UTF_8, Encoding::US_ASCII, Encoding::BINARY].freeze
+
+    # Compares bytes rather than characters because Net::HTTP hands bodies
+    # over as ASCII-8BIT when the response has no charset, and a UTF-8 regex
+    # would never match those. ASCII-8BIT bodies in a format we don't parse
+    # are left alone, since they may be genuine binary data (images, files).
+    def strip_utf8_bom(string)
+      return string unless UTF8_BOM_ENCODINGS.include?(string.encoding)
+      return string if string.encoding == Encoding::BINARY && !supports_format?
+      return string.byteslice(UTF8_BOM.bytesize..-1) if utf8_bom?(string)
+
+      # Valid UTF-8 bodies have always been handed back as a copy, so mutating
+      # parsed_response doesn't also change response.body. Other encodings
+      # (ASCII-8BIT, US-ASCII, ISO-8859-1, invalid UTF-8) have always been
+      # handed back as the same object, and still are.
+      if string.encoding == Encoding::UTF_8 && string.valid_encoding?
+        string.dup
+      else
+        string
+      end
+    end
+
+    # Checks bytes one at a time so the common no-BOM case allocates nothing.
+    def utf8_bom?(string)
+      string.getbyte(0) == 0xEF && string.getbyte(1) == 0xBB && string.getbyte(2) == 0xBF
+    end
 
     def json
       require 'json'
-      JSON.parse(body, :quirks_mode => true, :allow_nan => true)
+      if JSON::VERSION.to_i >= 3
+        JSON.parse(body, :allow_nan => true)
+      else
+        JSON.parse(body, :quirks_mode => true, :allow_nan => true)
+      end
     end
 
     def csv

data/lib/httparty/response.rb

@@ -133,13 +133,27 @@ module HTTParty
     end
 
     def throw_exception
-      if @request.options[:raise_on].to_a.detect { |c| code.to_s.match(/#{c.to_s}/) }
+      raise_on = @request.options[:raise_on]
+      return if raise_on.nil?
+
+      matchers = raise_on.is_a?(Range) ? [raise_on] : [*raise_on]
+
+      if matchers.any? { |matcher| code_matches?(matcher) }
         ::Kernel.raise ::HTTParty::ResponseError.new(@response), "Code #{code} - #{body}"
       end
     end
 
     private
 
+    def code_matches?(matcher)
+      case matcher
+      when Range
+        matcher.cover?(code) || matcher.cover?(code.to_s)
+      else
+        /#{matcher}/.match?(code.to_s)
+      end
+    end
+
     def warn_about_nil_deprecation
       trace_line = caller.reject { |line| line.include?('httparty') }.first
       warning = "[DEPRECATION] HTTParty will no longer override `response#nil?`. " \

data/lib/httparty/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTParty
-  VERSION = '0.24.2'
+  VERSION = '0.24.3'
 end

data/lib/httparty.rb

@@ -84,14 +84,15 @@ module HTTParty
       default_options[:log_format] = format
     end
 
-    # Raises HTTParty::ResponseError if response's code matches this statuses
+    # Raises HTTParty::ResponseError if the response status matches a code,
+    # range, or regular expression string.
     #
     #   class Foo
     #     include HTTParty
-    #     raise_on [404, 500, '5[0-9]*']
+    #     raise_on [404, 500..599, '3[0-9]*']
     #   end
     def raise_on(codes = [])
-      default_options[:raise_on] = *codes
+      default_options[:raise_on] = codes.is_a?(Range) ? [codes] : [*codes]
     end
 
     # Allows setting http proxy information to be used

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httparty
 version: !ruby/object:Gem::Version
-  version: 0.24.2
+  version: 0.24.3
 platform: ruby
 authors:
 - John Nunemaker
 - Sandro Turriate
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv
@@ -148,8 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 4.0.18
 specification_version: 4
 summary: Makes http fun! Also, makes consuming restful web services dead easy.
 test_files: []