quickbooks-ruby 1.0.24 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d1813766ca37fe161babf9afc01d1ee20eabb6e52a65dbc5f9d5d535a1ab0e6
-  data.tar.gz: 75e3fa238c73483049a1f5ea0e87b51d71d9a800d5199c7c27fd3f07069a6092
+  metadata.gz: cc115bc7b925447fecb75976b448e66406441c9fd56208e964ac34844fdcd37a
+  data.tar.gz: fd1ca0b526c14cdadda7a1e276c3dcedb9b8c68e7c76be0aa074df30c63e0382
 SHA512:
-  metadata.gz: 526fb65758bd681ff76f3b63fe078af62479e1568b185131fd08b0a5ddd72e6ce635cf7bf705ee466a41b4f60060c1fe171ccece7e6148ba33d59b785a4b5493
-  data.tar.gz: 390e88df2ac26d751fb85b6d888cf28227b6d2a706984ea70a5a9aaec0fa2fa003eff9ae11fe53d79a423a03a952a6d6b5d7bf211126a48fc22a52632822716a
+  metadata.gz: ce9c6d1732ab2d6ffd2a9ea57c2dad7f091867bb9af828a8bb25140f79a7d739cccd4f59d9b45665ec500d50241e2fbd65c833f4f307d71ba84543cdaec71725
+  data.tar.gz: 9bd4d94b4270280b142d93c3ee9bff0b579d4009fc5afe9a217404d201df6e74ea6db8a7fc5b33e48f16e919ea6716bd77f5aeb4e362421db659d1d9f8ac0bf4

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', :as => BigDecimal, to_xml: Proc.new { |val| val.to_f }
+      xml_accessor :tax_inclusive_amount, from: 'TaxInclusiveAmt', 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', :as => BigDecimal, to_xml: Proc.new { |val| val.to_f }
+      xml_accessor :tax_inclusive_amount, from: 'TaxInclusiveAmt', 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_purchases => %w(TrackingByCustomer? BillableExpenseTracking? DefaultTerms? DefaultMarkup? POCustomField),
+        :vendor_and_purchase  => %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/purchase.rb

@@ -32,7 +32,6 @@ module Quickbooks
       xml_accessor :txn_tax_detail, :from => 'TxnTaxDetail', :as => TransactionTaxDetail
 
       xml_accessor :payment_type, :from => 'PaymentType'
-      xml_accessor :payment_method_ref, :from => 'PaymentMethodRef', :as => BaseReference
       xml_accessor :entity_ref, :from => 'EntityRef', :as => BaseReference
       xml_accessor :remit_to_address, :from => 'RemitToAddr', :as => PhysicalAddress
       xml_accessor :total, :from => 'TotalAmt', :as => BigDecimal, :to_xml => to_xml_big_decimal

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', :as => BigDecimal, to_xml: Proc.new { |val| val.to_f }
+      xml_accessor :tax_inclusive_amount, from: 'TaxInclusiveAmt', 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,7 @@ 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)
+          f.request(:authorization, :basic, oauth.client.id, oauth.client.secret)
         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
 
@@ -83,11 +82,7 @@ module Quickbooks
         query ||= default_model_query
         query = "#{query} STARTPOSITION #{start_position} MAXRESULTS #{max_results}"
 
-        URI("#{url_for_base}/query").tap do |uri|
-          params = Faraday::Utils::ParamsHash.new
-          params.update(options.merge(query: query))
-          uri.query = params.to_query
-        end.to_s
+        "#{url_for_base}/query?query=#{CGI.escape(query)}"
       end
 
       private
@@ -120,7 +115,7 @@ module Quickbooks
         start_position = ((page - 1) * per_page) + 1 # page=2, per_page=10 then we want to start at 11
         max_results = per_page
 
-        response = do_http_get(url_for_query(query, start_position, max_results, options.except(:page, :per_page)))
+        response = do_http_get(url_for_query(query, start_position, max_results))
 
         parse_collection(response, model)
       end
@@ -433,6 +428,8 @@ module Quickbooks
         begin
           @last_response_xml.xpath("//xmlns:IntuitResponse/xmlns:Fault")[0] != nil
         rescue Nokogiri::XML::XPath::SyntaxError => exception
+          #puts @last_response_xml.to_xml.to_s
+          #puts "WTF: #{exception.inspect}:#{exception.backtrace.join("\n")}"
           true
         end
       end
@@ -441,20 +438,20 @@ module Quickbooks
         error = {:message => "", :detail => "", :type => nil, :code => 0, :intuit_tid => @last_response_intuit_tid}
         fault = @last_response_xml.xpath("//xmlns:IntuitResponse/xmlns:Fault")[0]
         if fault
-          error[:type] = fault.attributes['type'].try(:value)
+          error[:type] = fault.attributes['type'].value
 
           error_element = fault.xpath("//xmlns:Error")[0]
           if error_element
             code_attr = error_element.attributes['code']
             if code_attr
-              error[:code] = code_attr.try(:value)
+              error[:code] = code_attr.value
             end
             element_attr = error_element.attributes['element']
             if element_attr
-              error[:element] = code_attr.try(:value)
+              error[:element] = code_attr.value
             end
-            error[:message] = error_element.xpath("//xmlns:Message").try(:text)
-            error[:detail] = error_element.xpath("//xmlns:Detail").try(:text)
+            error[:message] = error_element.xpath("//xmlns:Message").text
+            error[:detail] = error_element.xpath("//xmlns:Detail").text
           end
         end
 

data/lib/quickbooks/service/change_service.rb

@@ -2,7 +2,7 @@ module Quickbooks
   module Service
     class ChangeService < BaseService
 
-      def url_for_query(query = nil, start_position = 1, max_results = 20, options = {})
+      def url_for_query(query = nil, start_position = 1, max_results = 20)
         q = entity
         q = "#{q}&#{query}" if query.present?
 

data/lib/quickbooks/service/refund_receipt.rb

@@ -6,12 +6,6 @@ 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/util/logging.rb

@@ -1,10 +1,8 @@
 module Quickbooks
   module Util
     module Logging
-      attr_writer :log
-
       def log(msg)
-        ::Quickbooks.log(msg) if log?
+        ::Quickbooks.log(msg)
       end
 
       def log_multiple(messages)
@@ -16,7 +14,7 @@ module Quickbooks
       end
 
       def log?
-        defined?(@log) ? @log : ::Quickbooks.log?
+        ::Quickbooks.log?
       end
 
       def condense_logs?

data/lib/quickbooks/version.rb

@@ -1,5 +1,5 @@
 module Quickbooks
 
-  VERSION = "1.0.24"
+  VERSION = "2.0"
 
 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
@@ -248,8 +246,10 @@ module Quickbooks
     end
 
     def log(msg)
-      logger.info(msg)
-      logger.flush if logger.respond_to?(:flush)
+      if log?
+        logger.info(msg)
+        logger.flush if logger.respond_to?(:flush)
+      end
     end
   end # << self
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: quickbooks-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.24
+  version: '2.0'
 platform: ruby
 authors:
 - Cody Caughlan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2022-11-10 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: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !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
@@ -375,7 +402,7 @@ homepage: http://github.com/ruckus/quickbooks-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -383,15 +410,16 @@ 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: []
-rubygems_version: 3.1.6
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+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