quickbooks-ruby 1.0.21 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fef9e529bfa1fb897b03273cad08ac6fe1fe45c30667f655a3a44dddaa36d10a
-  data.tar.gz: 5dfe60a549caac7c0ecefd10b9ea3396916bccc440e3011ed804d1e02308cbdf
+  metadata.gz: 8168dc0e28267b4342b56bdfc689af6a7edb151694fe1fca9fd6e9a827528687
+  data.tar.gz: e6f4f347dff9732e61298357fc74d7ec68cde532718279cb1d785cd6b38909d7
 SHA512:
-  metadata.gz: 797e5336baeec1e26e813d9975f1721f187f72cff7abcfd87f01fef579d9669b686af0fd31a3812150365a99388fe69b074d0b6ed8fb5ed3437afc1d4ee49b2e
-  data.tar.gz: 15c7ffea9da64f530709637aec045c3b2d235216a08cf197b86a9597820083810525674781e28e2299508a6b58758a487d7c8b42f0eb25f4ae50c0a3034ed373
+  metadata.gz: 88b3bf54416112c1aff009c9c6e9dce8ab437ec806a855627f9abf6dda1804a2419f94bbbe07d04aaa91503bfe8a7a630c0b85fb8f174bb805a4fe901138bd20
+  data.tar.gz: 25421b3b29a88dcca907940274b84b1d10f819489da6a66ffbd7d8b835a3a7d84667ec69bb63d9828df0e6ed916b6183c372d5e05f1a475d01d5f2ffefb56527

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/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/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/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
 

data/lib/quickbooks/version.rb

@@ -1,5 +1,5 @@
 module Quickbooks
 
-  VERSION = "1.0.21"
+  VERSION = "2.0.2"
 
 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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: quickbooks-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.21
+  version: 2.0.2
 platform: ruby
 authors:
 - Cody Caughlan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-26 00:00:00.000000000 Z
+date: 2023-01-02 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
@@ -100,14 +100,42 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: faraday-multipart
+  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: 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
@@ -199,7 +227,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
@@ -383,15 +410,14 @@ 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
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: REST API to Quickbooks Online

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