quickbooks-ruby 1.0.19 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 148ff447b167aedd01e7a5c6659b2f35c596b3fbc5bdcfe31848fcdb6a9b25fd
-  data.tar.gz: a7e0951c0bc2abf8b7af00768316811624ea9d5affe32063507d76cf178576ad
+  metadata.gz: 3090c1e6be59c03b4f8802cd3d56771e01ba508166db446e3bb9a372739d5dd0
+  data.tar.gz: 4fdb76a07e05ee92dd3c837622e32ce23cb41ede769928ff198f8cb91d58f5c7
 SHA512:
-  metadata.gz: 83f4e3f6f299c3abb17836c7121179f4e2d39b96028e3734a3a59fbc9251464223d62dcee929b0c8963d35bba0bfb53445e1142e77d979f869c74f7d271bf360
-  data.tar.gz: f2b3327d90e9402edb469bce97d7a4da8c84b4b4b86b07d45f363faff8684b001f60c5085c5bcc1149820b419d42205c74babd0c4149a1819adb9d3345f017de
+  metadata.gz: 26045642638563196533afd56d2a36afa2cdd2a1a8c95a54e6faf0546e99491d144802ae9624df4d1d205e23553965120eeca2fd1b484705a185bcab6633822a
+  data.tar.gz: ea5208b840894935844c3a8d3ff06f880877e48b62fb1a1b8b112f82def2d5d4b7960d3008124891bdaa2cd3044711975ffc2404468cc53f54b2b14b5bc4aeb5

data/lib/quickbooks/model/account_based_expense_line_detail.rb

@@ -7,7 +7,7 @@ module Quickbooks
       xml_accessor :billable_status, :from => 'BillableStatus'
       xml_accessor :tax_amount, :from => 'UnitPrice', :as => BigDecimal, :to_xml => to_xml_big_decimal
       xml_accessor :tax_code_ref, :from => 'TaxCodeRef', :as => BaseReference
-      xml_accessor :tax_inclusive_amount, from: 'TaxInclusiveAmt', to_xml: Proc.new { |val| val.to_f }
+      xml_accessor :tax_inclusive_amount, from: 'TaxInclusiveAmt', :as => BigDecimal, to_xml: Proc.new { |val| val.to_f }
 
       reference_setters :customer_ref, :class_ref, :account_ref, :tax_code_ref
 

data/lib/quickbooks/model/base_model.rb

@@ -30,6 +30,7 @@ module Quickbooks
 
       def as_json(options = nil)
         options = {} if options.nil?
+        options = options.dup if options.frozen?
         except_conditions = ["roxml_references"]
         except_conditions << options[:except]
         options[:except] = except_conditions.flatten.uniq.compact

data/lib/quickbooks/model/bill.rb

@@ -31,6 +31,7 @@ module Quickbooks
       xml_accessor :due_date, :from => 'DueDate', :as => Date
       xml_accessor :remit_to_address, :from => 'RemitToAddr', :as => PhysicalAddress
       xml_accessor :ship_address, :from => 'ShipAddr', :as => PhysicalAddress
+      xml_accessor :mailing_address, :from => 'VendorAddr', :as => PhysicalAddress
       xml_accessor :exchange_rate, :from => 'ExchangeRate', :as => BigDecimal, :to_xml => to_xml_big_decimal
       xml_accessor :balance, :from => 'Balance', :as => BigDecimal, :to_xml => to_xml_big_decimal
 

data/lib/quickbooks/model/invoice.rb

@@ -61,6 +61,7 @@ module Quickbooks
       xml_accessor :allow_online_ach_payment?, :from => 'AllowOnlineACHPayment'
       xml_accessor :deposit_to_account_ref, :from => 'DepositToAccountRef', :as => BaseReference
       xml_accessor :bill_email_cc, :from => 'BillEmailCc', :as => EmailAddress
+      xml_accessor :bill_email_bcc, :from => 'BillEmailBcc', :as => EmailAddress
 
 
       reference_setters
@@ -93,6 +94,10 @@ module Quickbooks
         self.bill_email_cc = EmailAddress.new(email_address_string)
       end
 
+      def billing_email_bcc_address=(email_address_string)
+        self.bill_email_bcc = EmailAddress.new(email_address_string)
+      end
+
       def wants_billing_email_sent!
         self.email_status = EMAIL_STATUS_NEED_TO_SEND
       end

data/lib/quickbooks/model/item_based_expense_line_detail.rb

@@ -13,7 +13,7 @@ module Quickbooks
       xml_accessor :tax_code_ref, :from => 'TaxCodeRef', :as => BaseReference
       xml_accessor :customer_ref, :from => 'CustomerRef', :as => BaseReference
       xml_accessor :billable_status, :from => 'BillableStatus'
-      xml_accessor :tax_inclusive_amount, from: 'TaxInclusiveAmt', to_xml: Proc.new { |val| val.to_f }
+      xml_accessor :tax_inclusive_amount, from: 'TaxInclusiveAmt', :as => BigDecimal, to_xml: Proc.new { |val| val.to_f }
 
       reference_setters :item_ref, :class_ref, :price_level_ref, :customer_ref, :tax_code_ref
     end

data/lib/quickbooks/model/preferences.rb

@@ -19,7 +19,7 @@ module Quickbooks
       PREFERENCE_SECTIONS = {
         :accounting_info      => %w(TrackDepartments DepartmentTerminology ClassTrackingPerTxnLine? ClassTrackingPerTxn? CustomerTerminology),
         :product_and_services => %w(ForSales? ForPurchase? QuantityWithPriceAndRate? QuantityOnHand?),
-        :vendor_and_purchase  => %w(TrackingByCustomer? BillableExpenseTracking? DefaultTerms? DefaultMarkup? POCustomField),
+        :vendor_and_purchases => %w(TrackingByCustomer? BillableExpenseTracking? DefaultTerms? DefaultMarkup? POCustomField),
         :time_tracking        => %w(UseServices? BillCustomers? ShowBillRateToAll WorkWeekStartDate MarkTimeEntiresBillable?),
         :tax                  => %w(UsingSalesTax? PartnerTaxEnabled?),
         :currency             => %w(MultiCurrencyEnabled? HomeCurrency),

data/lib/quickbooks/model/sales_item_line_detail.rb

@@ -9,7 +9,7 @@ module Quickbooks
       xml_accessor :quantity, :from => 'Qty', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
       xml_accessor :tax_code_ref, :from => 'TaxCodeRef', :as => BaseReference
       xml_accessor :service_date, :from => 'ServiceDate', :as => Date
-      xml_accessor :tax_inclusive_amount, from: 'TaxInclusiveAmt', to_xml: Proc.new { |val| val.to_f }
+      xml_accessor :tax_inclusive_amount, from: 'TaxInclusiveAmt', :as => BigDecimal, to_xml: Proc.new { |val| val.to_f }
 
       reference_setters :item_ref, :class_ref, :price_level_ref, :tax_code_ref
     end

data/lib/quickbooks/model/sales_receipt.rb

@@ -22,6 +22,7 @@ module Quickbooks
       xml_accessor :bill_address, :from => 'BillAddr', :as => PhysicalAddress
       xml_accessor :delivery_info, :from => 'DeliveryInfo', :as => DeliveryInfo
       xml_accessor :ship_address, :from => 'ShipAddr', :as => PhysicalAddress
+      xml_accessor :ship_from_address, :from => 'ShipFromAddr', :as => PhysicalAddress
       xml_accessor :po_number, :from => 'PONumber'
       xml_accessor :ship_method_ref, :from => 'ShipMethodRef', :as => BaseReference
       xml_accessor :ship_date, :from => 'ShipDate', :as => Time

data/lib/quickbooks/model/vendor_credit.rb

@@ -28,6 +28,8 @@ module Quickbooks
 
       xml_accessor :currency_ref, :from => 'CurrencyRef', :as => BaseReference
       xml_accessor :exchange_rate, :from => 'ExchangeRate', :as => BigDecimal, :to_xml => to_xml_big_decimal
+      
+      xml_accessor :linked_transactions, :from => 'LinkedTxn', :as => [LinkedTransaction]
 
       reference_setters
 

data/lib/quickbooks/service/access_token.rb

@@ -22,7 +22,12 @@ module Quickbooks
       def disconnect
         connection = Faraday.new(headers: { 'Content-Type' => 'application/json' }) do |f|
           f.adapter(::Quickbooks.http_adapter)
-          f.basic_auth(oauth.client.id, oauth.client.secret)
+
+          if Gem.loaded_specs['faraday'].version >= Gem::Version.create('2.0')
+            f.request(:authorization, :basic, oauth.client.id, oauth.client.secret)
+          else
+            f.basic_auth(oauth.client.id, oauth.client.secret)
+          end
         end
 
         url = "#{DISCONNECT_URL}?minorversion=#{Quickbooks.minorversion}"

data/lib/quickbooks/service/base_service.rb

@@ -49,12 +49,11 @@ module Quickbooks
       # [OAuth2] The default Faraday connection does not have gzip or multipart support.
       # We need to reset the existing connection and build a new one.
       def rebuild_connection!
-        @oauth.client.connection = nil
-        @oauth.client.connection.build do |builder|
-          builder.use :gzip
-          builder.request :multipart
-          builder.request :url_encoded
-          builder.adapter ::Quickbooks.http_adapter
+        @oauth.client.connection = Faraday.new do |f|
+          f.request :multipart
+          f.request :gzip
+          f.request :url_encoded
+          f.adapter ::Quickbooks.http_adapter
         end
       end
 
@@ -225,7 +224,7 @@ module Quickbooks
         if metadata
           standalone_prefix = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'
           meta_data_xml = "#{standalone_prefix}\n#{metadata.to_xml_ns.to_s}"
-          param_part = UploadIO.new(StringIO.new(meta_data_xml), "application/xml")
+          param_part = Faraday::UploadIO.new(StringIO.new(meta_data_xml), "application/xml")
           body['file_metadata_0'] = param_part
         end
 
@@ -248,11 +247,7 @@ module Quickbooks
           headers['Accept-Encoding'] = HTTP_ACCEPT_ENCODING
         end
 
-        log "------ QUICKBOOKS-RUBY REQUEST ------"
-        log "METHOD = #{method}"
-        log "RESOURCE = #{url}"
-        log_request_body(body)
-        log "REQUEST HEADERS = #{headers.inspect}"
+        log_request(method, url, body, headers)
 
         request_info = RequestInfo.new(url, headers, body, method)
         before_request.call(request_info) if before_request
@@ -273,12 +268,8 @@ module Quickbooks
         after_request.call(request_info, raw_response.body) if after_request
 
         response = Quickbooks::Service::Responses::OAuthHttpResponse.wrap(raw_response)
-        log "------ QUICKBOOKS-RUBY RESPONSE ------"
-        log "RESPONSE CODE = #{response.code}"
-        log_response_body(response)
-        if response.respond_to?(:headers)
-          log "RESPONSE HEADERS = #{response.headers}"
-        end
+        log_response(response)
+
         check_response(response, request: body)
       end
 
@@ -354,50 +345,78 @@ module Quickbooks
         end
       end
 
-      def log_response_body(response)
-        log "RESPONSE BODY:"
-        if is_json?
-          log ">>>>#{response.plain_body.inspect}"
-        elsif is_pdf?
-          log("BODY is a PDF : not dumping")
-        else
-          log(log_xml(response.plain_body))
-        end
+      def log_request(method, url, body, headers)
+        messages = []
+        messages << "------ QUICKBOOKS-RUBY REQUEST ------"
+        messages << "METHOD = #{method}"
+        messages << "RESOURCE = #{url}"
+        messages.concat(request_body_messages(body))
+        messages << "REQUEST HEADERS = #{headers.inspect}"
+
+        log_multiple(messages)
       end
 
-      def log_request_body(body)
-        log "REQUEST BODY:"
+      def request_body_messages(body)
+        messages = []
+        messages <<  "REQUEST BODY:"
         if is_json?
-          log(body.inspect)
+          messages <<  body.inspect
         elsif is_pdf?
-          log("BODY is a PDF : not dumping")
+          messages <<  "BODY is a PDF : not dumping"
         else
           #multipart request for uploads arrive here in a Hash with UploadIO vals
           if body.is_a?(Hash)
             body.each do |k,v|
-              log('BODY PART:')
+              messages << 'BODY PART:'
               val_content = v.inspect
-              if v.is_a?(UploadIO)
+              if v.is_a?(Faraday::UploadIO)
                 if v.content_type == 'application/xml'
                   if v.io.is_a?(StringIO)
                     val_content = log_xml(v.io.string)
                   end
                 end
               end
-              log("#{k}: #{val_content}")
+              messages << "#{k}: #{val_content}"
             end
           else
-            log(log_xml(body))
+            messages << log_xml(body)
           end
         end
+        messages
+      end
+
+      def log_response(response)
+        messages = []
+        messages << "------ QUICKBOOKS-RUBY RESPONSE ------"
+        messages << "RESPONSE CODE = #{response.code}"
+        messages.concat(response_body_messages(response))
+        messages << "RESPONSE HEADERS = #{response.headers}" if response.respond_to?(:headers)
+
+        log_multiple(messages)
+      end
+
+      def response_body_messages(response)
+        messages = []
+        messages << "RESPONSE BODY:"
+        if is_json?
+          messages << ">>>>#{response.plain_body.inspect}"
+        elsif is_pdf?
+          messages << "BODY is a PDF : not dumping"
+        else
+          messages << log_xml(response.plain_body)
+        end
+
+        messages
       end
 
       def parse_and_raise_exception(options = {})
         err = parse_intuit_error
-        ex = Quickbooks::IntuitRequestException.new("#{err[:message]}:\n\t#{err[:detail]}")
+        element_msg = err[:element] ? "#{err[:element]}: " : ""
+        ex = Quickbooks::IntuitRequestException.new("#{element_msg}#{err[:message]}:\n\t#{err[:detail]}")
         ex.code = err[:code]
         ex.detail = err[:detail]
         ex.type = err[:type]
+        ex.element = err[:element] if err[:element]
         if is_json?
           ex.request_json = options[:request]
         else
@@ -431,7 +450,7 @@ module Quickbooks
             end
             element_attr = error_element.attributes['element']
             if element_attr
-              error[:element] = code_attr.value
+              error[:element] = element_attr.try(:value)
             end
             error[:message] = error_element.xpath("//xmlns:Message").text
             error[:detail] = error_element.xpath("//xmlns:Detail").text

data/lib/quickbooks/service/payment.rb

@@ -19,6 +19,12 @@ module Quickbooks
         end
       end
 
+      def pdf(payment)
+        url = "#{url_for_resource(model::REST_RESOURCE)}/#{payment.id}/pdf"
+        response = do_http_raw_get(url, {}, {'Accept' => 'application/pdf'})
+        response.plain_body
+      end
+
       private
 
       def model

data/lib/quickbooks/service/refund_receipt.rb

@@ -6,6 +6,12 @@ module Quickbooks
         delete_by_query_string(refund_receipt)
       end
 
+      def pdf(refund_receipt)
+        url = "#{url_for_resource(model::REST_RESOURCE)}/#{refund_receipt.id}/pdf"
+        response = do_http_raw_get(url, {}, {'Accept' => 'application/pdf'})
+        response.plain_body
+      end
+
       private
 
       def model

data/lib/quickbooks/service/upload.rb

@@ -9,7 +9,7 @@ module Quickbooks
       # attachable: Quickbooks::Model::Attachable meta-data details, can be null
       def upload(path_to_file, mime_type, attachable = nil)
         url = url_for_resource("upload")
-        uploadIO = class_for_io.new(path_to_file, mime_type)
+        uploadIO = Faraday::UploadIO.new(path_to_file, mime_type)
         response = do_http_file_upload(uploadIO, url, attachable)
         prefix = "AttachableResponse/xmlns:Attachable"
         if response.code.to_i == 200
@@ -19,10 +19,6 @@ module Quickbooks
         end
       end
 
-      def class_for_io
-        oauth.is_a?(OAuth2::AccessToken) ? Faraday::UploadIO : UploadIO
-      end
-
       def download(uploadId)
         url = url_for_resource("download/#{uploadId}")
         do_http_get(url, {}, headers)

data/lib/quickbooks/util/logging.rb

@@ -1,12 +1,26 @@
 module Quickbooks
   module Util
     module Logging
+      attr_writer :log
+
       def log(msg)
-        ::Quickbooks.log(msg)
+        ::Quickbooks.log(msg) if log?
+      end
+
+      def log_multiple(messages)
+        if condense_logs?
+          log(messages.join("\n"))
+        else
+          messages.each(&method(:log))
+        end
       end
 
       def log?
-        ::Quickbooks.log?
+        defined?(@log) ? @log : ::Quickbooks.log?
+      end
+
+      def condense_logs?
+        ::Quickbooks.condense_logs?
       end
 
       def log_xml(str)

data/lib/quickbooks/version.rb

@@ -1,5 +1,5 @@
 module Quickbooks
 
-  VERSION = "1.0.19"
+  VERSION = "2.0.7"
 
 end

data/lib/quickbooks-ruby.rb

@@ -8,12 +8,13 @@ require 'date'
 require 'forwardable'
 require 'oauth2'
 require 'net/http/post/multipart'
+require 'faraday/multipart'
+require 'faraday/gzip'
 require 'quickbooks/util/collection'
 require 'quickbooks/util/logging'
 require 'quickbooks/util/http_encoding_helper'
 require 'quickbooks/util/name_entity'
 require 'quickbooks/util/query_builder'
-require 'quickbooks/faraday/middleware/gzip'
 
 #== OAuth Responses
 require 'quickbooks/service/responses/oauth_http_response'
@@ -187,9 +188,6 @@ require 'quickbooks/service/transfer'
 require 'quickbooks/service/change_data_capture'
 require 'quickbooks/service/refund_receipt_change'
 
-# Register Faraday Middleware
-Faraday::Middleware.register_middleware :gzip => lambda { Gzip }
-
 module Quickbooks
   @@sandbox_mode = false
   @@logger = nil
@@ -230,23 +228,26 @@ module Quickbooks
     end
 
     # set logging on or off
-    attr_writer :log, :log_xml_pretty_print
+    attr_writer :log, :log_xml_pretty_print, :condense_logs
 
     # Returns whether to log. Defaults to 'false'.
     def log?
       @log ||= false
     end
 
+    # Returns whether to limit log lines
+    def condense_logs?
+      @condense_logs ||= false
+    end
+
     # pretty printing the xml in the logs is "on" by default
     def log_xml_pretty_print?
       defined?(@log_xml_pretty_print) ? @log_xml_pretty_print : true
     end
 
     def log(msg)
-      if log?
-        logger.info(msg)
-        logger.flush if logger.respond_to?(:flush)
-      end
+      logger.info(msg)
+      logger.flush if logger.respond_to?(:flush)
     end
   end # << self
 
@@ -272,7 +273,7 @@ module Quickbooks
   class UnsupportedOperation < Error; end
 
   class IntuitRequestException < Error
-    attr_accessor :message, :code, :detail, :type, :intuit_tid, :request_xml, :request_json
+    attr_accessor :message, :code, :detail, :element, :type, :intuit_tid, :request_xml, :request_json
 
     def initialize(msg)
       self.message = msg

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: quickbooks-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 2.0.7
 platform: ruby
 authors:
 - Cody Caughlan
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2025-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: roxml
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,54 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: faraday-multipart
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: faraday-gzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +233,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/quickbooks-ruby.rb
-- lib/quickbooks/faraday/middleware/gzip.rb
 - lib/quickbooks/model/access_token_response.rb
 - lib/quickbooks/model/account.rb
 - lib/quickbooks/model/account_based_expense_line_detail.rb
@@ -361,7 +408,7 @@ homepage: http://github.com/ruckus/quickbooks-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -369,16 +416,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6.2
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: REST API to Quickbooks Online
 test_files: []

data/lib/quickbooks/faraday/middleware/gzip.rb

@@ -1,74 +0,0 @@
-# https://github.com/lostisland/faraday_middleware/blob/master/lib/faraday_middleware/gzip.rb
-
-require 'faraday'
-
-# Middleware to automatically decompress response bodies. If the
-# "Accept-Encoding" header wasn't set in the request, this sets it to
-# "gzip,deflate" and appropriately handles the compressed response from the
-# server. This resembles what Ruby 1.9+ does internally in Net::HTTP#get.
-#
-# This middleware is NOT necessary when these adapters are used:
-# - net_http on Ruby 1.9+
-# - net_http_persistent on Ruby 2.0+
-# - em_http
-class Gzip < Faraday::Middleware
-  dependency 'zlib'
-
-  ACCEPT_ENCODING = 'Accept-Encoding'.freeze
-  CONTENT_ENCODING = 'Content-Encoding'.freeze
-  CONTENT_LENGTH = 'Content-Length'.freeze
-  SUPPORTED_ENCODINGS = 'gzip,deflate,br'.freeze
-  RUBY_ENCODING = '1.9'.respond_to?(:force_encoding)
-
-  def call(env)
-    env[:request_headers][ACCEPT_ENCODING] ||= SUPPORTED_ENCODINGS
-    @app.call(env).on_complete do |response_env|
-      break if response_env[:response_headers].nil?
-
-      case response_env[:response_headers][CONTENT_ENCODING]
-      when 'gzip'
-        reset_body(response_env, &method(:uncompress_gzip))
-      when 'deflate'
-        reset_body(response_env, &method(:inflate))
-      when 'br'
-        reset_body(response_env, &method(:brotli_inflate))
-      end
-    end
-  end
-
-  def reset_body(env)
-    env[:body] = yield(env[:body])
-    env[:response_headers].delete(CONTENT_ENCODING)
-    env[:response_headers][CONTENT_LENGTH] = env[:body].length
-  end
-
-  def uncompress_gzip(body)
-    io = StringIO.new(body)
-    gzip_reader = if RUBY_ENCODING
-      Zlib::GzipReader.new(io, :encoding => 'ASCII-8BIT')
-    else
-      Zlib::GzipReader.new(io)
-    end
-    gzip_reader.read
-  end
-
-  def inflate(body)
-    # Inflate as a DEFLATE (RFC 1950+RFC 1951) stream
-    Zlib::Inflate.inflate(body)
-  rescue Zlib::DataError
-    # Fall back to inflating as a "raw" deflate stream which
-    # Microsoft servers return
-    inflate = Zlib::Inflate.new(-Zlib::MAX_WBITS)
-    begin
-      inflate.inflate(body)
-    ensure
-      inflate.close
-    end
-  end
-
-  def brotli_inflate(body)
-    self.class.dependency 'brotli'
-
-    Brotli.inflate(body)
-  end
-end