quickbooks-ruby 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b68c87332554f06f7289cb0a36ab956223eebd6867f0c0696106d9ab0c2b3236
-  data.tar.gz: 523006400f30928bc0a7e8702300ed544e9da7128d9586eb84902164877393cb
+  metadata.gz: feb87ae00b9c17019bf64bc3ff8dd6bda994365b1d036a4cdca5ea5a31a8b44e
+  data.tar.gz: 40ddda6954c1a88faa24c496eec92d7f535ae8ef70a4911990417f657dda24de
 SHA512:
-  metadata.gz: 36d97d0f30ab9feda23278718dba10bf57cfe9a56eb35f9e7cb2860cca71244454b5a24fae1ec625ac9008a0fe12f8d547b49520f713b57b46cf59df4464048b
-  data.tar.gz: c2614aeec251e6580e89472fafcec0ea1b12b91a6c2ac10fc0b811fa13f4fc8b2a2fbb2578f5cf12a1e47574a7b4f7e9859316d783a735e960bf05abcf6153c8
+  metadata.gz: 550937bea11b0743baf7ebb1cbbb30bf198754459f97ec0e71585da2014b293c310492f977477d24491adefa794f9265f0068560c54a1fad811169aa259776cb
+  data.tar.gz: 4fc10dcd803293bd761a48e6ee560f87006f7563040d1496b7ac4a96fc8b639b136928ab4d4e6207c5a4147371a2cd31172efd96cce7b25e846f0b0e773a855d

data/lib/quickbooks-ruby.rb

@@ -6,7 +6,6 @@ require 'cgi'
 require 'uri'
 require 'date'
 require 'forwardable'
-require 'oauth'
 require 'oauth2'
 require 'net/http/post/multipart'
 require 'quickbooks/util/collection'
@@ -19,7 +18,6 @@ require 'quickbooks/faraday/middleware/gzip'
 #== OAuth Responses
 require 'quickbooks/service/responses/oauth_http_response'
 require 'quickbooks/service/responses/methods'
-require 'quickbooks/service/responses/oauth1_http_response'
 require 'quickbooks/service/responses/oauth2_http_response'
 
 #== Models
@@ -231,7 +229,16 @@ module Quickbooks
 
   class Error < StandardError; end
   class InvalidModelException < Error; end
-  class AuthorizationFailure < Error; end
+  class AuthorizationFailure < Error
+    attr_accessor :code, :detail, :type
+
+    def initialize(error_hash = {})
+      @code = error_hash[:code]
+      @detail = error_hash[:detail]
+      @type = error_hash[:type]
+      super(error_hash[:message])
+    end
+  end
   class Forbidden < Error; end
   class NotFound < Error; end
   class RequestTooLarge < Error; end
@@ -241,7 +248,7 @@ module Quickbooks
   class MissingRealmError < Error; end
 
   class IntuitRequestException < Error
-    attr_accessor :message, :code, :detail, :type, :request_xml, :request_json
+    attr_accessor :message, :code, :detail, :type, :intuit_tid, :request_xml, :request_json
 
     def initialize(msg)
       self.message = msg
@@ -249,10 +256,4 @@ module Quickbooks
     end
   end
 
-  class InvalidOauthAccessTokenObject < StandardError
-    def initialize(access_token)
-      super("Expected access token to be an instance of OAuth::AccessToken or OAuth2::AccessToken, got #{access_token.class}.")
-    end
-  end
-
 end

data/lib/quickbooks/model/preferences.rb

@@ -4,7 +4,7 @@ module Quickbooks
       XML_COLLECTION_NODE = "Preferences"
       XML_NODE            = "Preferences"
       REST_RESOURCE       = 'preferences'
-      MINORVERSION = 21
+      MINORVERSION = 32
 
       xml_name XML_NODE
 
@@ -28,9 +28,28 @@ module Quickbooks
       }
 
       xml_reader :sales_forms, :from => "SalesFormsPrefs", :as => create_preference_class(*%w(
-        CustomTxnNumbers? AllowDeposit? AllowDiscount? DefaultDiscountAccount? AllowEstimates? EstimateMessage?
-        ETransactionEnabledStatus? ETransactionAttachPDF? ETransactionPaymentEnabled? IPNSupportEnabled?
-        AllowServiceDate? AllowShipping? DefaultShippingAccount? DefaultTerms DefaultCustomerMessage
+        AllowDeposit?
+        AllowDiscount?
+        AllowEstimates?
+        AllowServiceDate?
+        AllowShipping?
+        AutoApplyCredit?
+        CustomField?
+        CustomTxnNumbers?
+        DefaultCustomerMessage
+        DefaultDiscountAccount?
+        DefaultShippingAccount?
+        DefaultTerms
+        EmailCopyToCompany?
+        EstimateMessage
+        ETransactionAttachPDF?
+        ETransactionEnabledStatus
+        ETransactionPaymentEnabled?
+        IPNSupportEnabled?
+        SalesEmailBcc
+        SalesEmailCc
+        UsingPriceLevels?
+        UsingProgressInvoicing?
       )) {
         xml_reader :custom_fields, :as => [CustomField], :from => 'CustomField', in: 'CustomField'
       }

data/lib/quickbooks/service/base_service.rb

@@ -7,8 +7,8 @@ module Quickbooks
       attr_accessor :company_id
       attr_accessor :oauth
       attr_reader :base_uri
-      attr_reader :last_response_body
       attr_reader :last_response_xml
+      attr_reader :last_response_intuit_tid
 
       XML_NS = %{xmlns="http://schema.intuit.com/finance/v3"}
       HTTP_CONTENT_TYPE = 'application/xml'
@@ -37,18 +37,13 @@ module Quickbooks
         @company_id = company_id
       end
 
-      def oauth_v1?
-        @oauth.is_a? OAuth::AccessToken
-      end
-
-      def oauth_v2?
-        @oauth.is_a? OAuth2::AccessToken
-      end
+      # def oauth_v2?
+      #   @oauth.is_a? OAuth2::AccessToken
+      # end
 
       # [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!
-        return unless oauth_v2?
         @oauth.client.connection = nil
         @oauth.client.connection.build do |builder|
           builder.use :gzip
@@ -264,37 +259,25 @@ module Quickbooks
         end
 
         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
         check_response(response, request: body)
       end
 
       def oauth_get(url, headers)
-        if oauth_v1?
-          @oauth.get(url, headers)
-        elsif oauth_v2?
-          @oauth.get(url, headers: headers, raise_errors: false)
-        else
-          raise InvalidOauthAccessTokenObject.new(@oauth)
-        end
+        @oauth.get(url, headers: headers, raise_errors: false)
       end
 
       def oauth_post(url, body, headers)
-        if oauth_v1?
-          @oauth.post(url, body, headers)
-        elsif oauth_v2?
-          @oauth.post(url, headers: headers, body: body, raise_errors: false)
-        else
-          raise InvalidOauthAccessTokenObject.new(@oauth)
-        end
+        @oauth.post(url, headers: headers, body: body, raise_errors: false)
       end
 
       def oauth_post_with_multipart(url, body, headers)
-        if oauth_v1?
-          @oauth.post_with_multipart(url, body, headers)
-        elsif oauth_v2?
-          @oauth.post_with_multipart(url, headers: headers, body: body, raise_errors: false)
-        else
-          raise InvalidOauthAccessTokenObject.new(@oauth)
-        end
+        @oauth.post_with_multipart(url, headers: headers, body: body, raise_errors: false)
       end
 
       def add_query_string_to_url(url, params)
@@ -308,12 +291,18 @@ module Quickbooks
       end
 
       def check_response(response, options = {})
-        log "------ QUICKBOOKS-RUBY RESPONSE ------"
-        log "RESPONSE CODE = #{response.code}"
-        if response.respond_to?(:headers)
-          log "RESPONSE HEADERS = #{response.headers}"
+        if is_json?
+          parse_json(response.plain_body)
+        elsif !is_pdf?
+          parse_xml(response.plain_body)
         end
-        log_response_body(response)
+
+        @last_response_intuit_tid = if response.respond_to?(:headers) && response.headers
+          response.headers['intuit_tid']
+        else
+          nil
+        end
+
         status = response.code.to_i
         case status
         when 200
@@ -326,7 +315,7 @@ module Quickbooks
         when 302
           raise "Unhandled HTTP Redirect"
         when 401
-          raise Quickbooks::AuthorizationFailure
+          raise Quickbooks::AuthorizationFailure, parse_intuit_error
         when 403
           message = parse_intuit_error[:message]
           if message.include?('ThrottleExceeded')
@@ -353,12 +342,10 @@ module Quickbooks
         log "RESPONSE BODY:"
         if is_json?
           log ">>>>#{response.plain_body.inspect}"
-          parse_json(response.plain_body)
         elsif is_pdf?
           log("BODY is a PDF : not dumping")
         else
           log(log_xml(response.plain_body))
-          parse_xml(response.plain_body)
         end
       end
 
@@ -400,6 +387,7 @@ module Quickbooks
         else
           ex.request_xml = options[:request]
         end
+        ex.intuit_tid = err[:intuit_tid]
         raise ex
       end
 
@@ -414,7 +402,7 @@ module Quickbooks
       end
 
       def parse_intuit_error
-        error = {:message => "", :detail => "", :type => nil, :code => 0}
+        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'].value
@@ -426,7 +414,7 @@ module Quickbooks
               error[:code] = code_attr.value
             end
             element_attr = error_element.attributes['element']
-            if code_attr
+            if element_attr
               error[:element] = code_attr.value
             end
             error[:message] = error_element.xpath("//xmlns:Message").text

data/lib/quickbooks/service/responses/oauth_http_response.rb

@@ -7,11 +7,7 @@ module Quickbooks
       class OAuthHttpResponse
 
         def self.wrap(response)
-          if response.is_a?(OAuth2::Response)
-            Quickbooks::Service::Responses::OAuth2HttpResponse.new(response)
-          else
-            Quickbooks::Service::Responses::OAuth1HttpResponse.new(response)
-          end
+          Quickbooks::Service::Responses::OAuth2HttpResponse.new(response)
         end
 
       end

data/lib/quickbooks/util/multipart.rb

@@ -1,78 +1,6 @@
 module OauthMultipart
 end
 
-require "oauth"
-
-OAuth::Consumer.class_eval do
-  def create_http_request(http_method, path, *arguments)
-    http_method = http_method.to_sym
-
-    if [:post, :put].include?(http_method)
-      data = arguments.shift
-    end
-
-    # if the base site contains a path, add it now
-    uri = URI.parse(site)
-    path = uri.path + path if uri.path
-
-    headers = arguments.first.is_a?(Hash) ? arguments.shift : {}
-
-    case http_method
-    when :post
-      request = Net::HTTP::Post.new(path,headers)
-      request["Content-Length"] = '0' # Default to 0
-    when :put
-      request = Net::HTTP::Put.new(path,headers)
-      request["Content-Length"] = '0' # Default to 0
-    when :get
-      request = Net::HTTP::Get.new(path,headers)
-    when :delete
-      request =  Net::HTTP::Delete.new(path,headers)
-
-    when :head
-      request = Net::HTTP::Head.new(path,headers)
-    when :multipart_post
-      request = Net::HTTP::Post::Multipart.new(path, headers)
-    else
-      raise ArgumentError, "Don't know how to handle http_method: :#{http_method.to_s}"
-    end
-
-    if data.is_a?(Hash)
-      form_data = {}
-      data.each {|k,v| form_data[k.to_s] = v if !v.nil?}
-      request.set_form_data(form_data)
-    elsif data
-      if data.respond_to?(:read)
-        request.body_stream = data
-        if data.respond_to?(:length)
-          request["Content-Length"] = data.length.to_s
-        elsif data.respond_to?(:stat) && data.stat.respond_to?(:size)
-          request["Content-Length"] = data.stat.size.to_s
-        else
-          raise ArgumentError, "Don't know how to send a body_stream that doesn't respond to .length or .stat.size"
-        end
-      else
-        request.body = data.to_s
-        request["Content-Length"] = request.body.length.to_s
-      end
-    end
-
-    request
-
-  end
-end
-
-OAuth::AccessToken.class_eval do
-
-  def post_with_multipart(*args)
-    multipart_post *args
-  end
-
-  def multipart_post(*args)
-   request(:multipart_post, *args)
-  end
-end
-
 OAuth2::AccessToken.class_eval do
 
   def post_with_multipart(*args)

data/lib/quickbooks/version.rb

@@ -1,5 +1,5 @@
 module Quickbooks
 
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: quickbooks-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Cody Caughlan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2019-12-19 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: oauth
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.7
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -53,21 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -98,16 +84,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +126,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -329,7 +329,6 @@ files:
 - lib/quickbooks/service/refund_receipt_change.rb
 - lib/quickbooks/service/reports.rb
 - lib/quickbooks/service/responses/methods.rb
-- lib/quickbooks/service/responses/oauth1_http_response.rb
 - lib/quickbooks/service/responses/oauth2_http_response.rb
 - lib/quickbooks/service/responses/oauth_http_response.rb
 - lib/quickbooks/service/sales_receipt.rb

data/lib/quickbooks/service/responses/oauth1_http_response.rb

@@ -1,42 +0,0 @@
-module Quickbooks
-  module Service
-    module Responses
-
-      class OAuth1HttpResponse < OAuthHttpResponse
-
-        attr_accessor :real_response
-
-        # net/http response
-        def initialize(response)
-          @real_response = response
-        end
-
-        def version
-          1
-        end
-
-        def code
-          @real_response.code.to_i
-        end
-
-        def plain_body
-          if @real_response.respond_to?(:plain_body)
-            @real_response.plain_body
-          else
-            nil
-          end
-        end
-
-        def headers
-          if @real_response.respond_to?(:headers)
-            @real_response.headers
-          else
-            nil
-          end
-        end
-
-      end
-
-    end
-  end
-end