quickbooks-ruby 1.0.7 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 594f8d68572ba0677e421dd9b6bd94b9dddc4cebca01fb3563acc274221d531e
-  data.tar.gz: 65094892047b057642b59afedd9575e4cfcac52535d65b909a4be964277eb8d3
+  metadata.gz: a1eba3497acedc2c117a231b48c93ba08b99fa4571d667f5b78d62c5774ed3fd
+  data.tar.gz: ba1ee66b0ba3be2a95b245f1f3dd06fbc34179ed9d5df34472adcc435c8f4544
 SHA512:
-  metadata.gz: 0df95bc28c87dafd0aca1b9e4242cd01093e075344dc63431a6456fcc6d87c8e9611c0359a176642d304a563591e53a4f74cc7318826211e8bec90618d10906b
-  data.tar.gz: 5b4a6a44deb549a9fa9f4931e9b9628f9ee9982bbc377356ade7daab6040a3a3ef5f9f30e9fd73957d9f8f2f0b8521f87a604bee4674dcee1dccb57b5dc21518
+  metadata.gz: 92102915fcc2196839be5e5935265a8622b282af1db0459b23fc7cfe3546e23ab28aa82c414c2ebb2a2e4b51f96384cb976929c3dba0d1df7ee1812ce3e2e546
+  data.tar.gz: 65772e607f93e278811b71c8db7db9235c0fbc1a9304677c3e62a51c4a96b776adb448201c804f13d0f6a8fe968f932bcba829dc79bec91df5d2fa416d44f2d3

data/lib/quickbooks-ruby.rb

@@ -139,6 +139,7 @@ require 'quickbooks/service/attachable'
 require 'quickbooks/service/company_info'
 require 'quickbooks/service/company_currency'
 require 'quickbooks/service/customer_type'
+require 'quickbooks/service/custom_field'
 require 'quickbooks/service/customer'
 require 'quickbooks/service/department'
 require 'quickbooks/service/invoice'
@@ -190,6 +191,7 @@ Faraday::Middleware.register_middleware :gzip => lambda { Gzip }
 module Quickbooks
   @@sandbox_mode = false
   @@logger = nil
+  @@minorversion = 47
 
   class << self
     def sandbox_mode
@@ -200,6 +202,14 @@ module Quickbooks
       @@sandbox_mode = sandbox_mode
     end
 
+    def minorversion=(v)
+      @@minorversion = v
+    end
+
+    def minorversion
+      @@minorversion
+    end
+
     def logger
       @@logger ||= ::Logger.new($stdout) # TODO: replace with a real log file
     end

data/lib/quickbooks/model/account.rb

@@ -4,7 +4,6 @@ module Quickbooks
       XML_COLLECTION_NODE = "Account"
       XML_NODE = "Account"
       REST_RESOURCE = 'account'
-      MINORVERSION = 13
 
       ASSET = 'Asset'
       EQUITY = 'Equity'

data/lib/quickbooks/model/customer.rb

@@ -16,8 +16,6 @@ module Quickbooks
       include NameEntity::Quality
       include NameEntity::PermitAlterations
 
-      MINORVERSION = 33
-
       xml_name XML_NODE
       xml_accessor :id, :from => 'Id'
       xml_accessor :sync_token, :from => 'SyncToken', :as => Integer

data/lib/quickbooks/model/invoice.rb

@@ -17,7 +17,6 @@ module Quickbooks
       XML_COLLECTION_NODE = "Invoice"
       XML_NODE = "Invoice"
       EMAIL_STATUS_NEED_TO_SEND = 'NeedToSend'
-      MINORVERSION = 37
 
       xml_accessor :id, :from => 'Id'
       xml_accessor :sync_token, :from => 'SyncToken', :as => Integer

data/lib/quickbooks/model/item.rb

@@ -10,7 +10,6 @@ module Quickbooks
       XML_COLLECTION_NODE = "Item"
       XML_NODE = "Item"
       REST_RESOURCE = 'item'
-      MINORVERSION = 33
 
       INVENTORY_TYPE = 'Inventory'
       NON_INVENTORY_TYPE = 'NonInventory'
@@ -31,6 +30,7 @@ module Quickbooks
       xml_accessor :level, :from => 'Level', :as => Integer
       xml_accessor :pref_vendor_ref, :from => 'PrefVendorRef', :as => BaseReference
       xml_accessor :tax_classification_ref, :from => 'TaxClassificationRef', :as => BaseReference
+      xml_accessor :class_ref, :from => 'ClassRef', :as => BaseReference
 
       # read-only
       xml_accessor :fully_qualified_name, :from => 'FullyQualifiedName'
@@ -52,13 +52,11 @@ module Quickbooks
       xml_accessor :inv_start_date, :from => 'InvStartDate', :as => Date
       xml_accessor :custom_fields, :from => "CustomField", as: [CustomField]
       xml_accessor :print_grouped_items?, :from => 'PrintGroupedItems'
-
-
       xml_accessor :item_group_details, :from => 'ItemGroupDetail', :as => ItemGroupDetail
 
       reference_setters :parent_ref, :income_account_ref, :expense_account_ref
       reference_setters :asset_account_ref, :sales_tax_code_ref, :purchase_tax_code_ref
-      reference_setters :pref_vendor_ref, :tax_classification_ref
+      reference_setters :pref_vendor_ref, :tax_classification_ref, :class_ref
 
       #== Validations
       validates_length_of :name, :minimum => 1

data/lib/quickbooks/model/preferences.rb

@@ -4,7 +4,6 @@ module Quickbooks
       XML_COLLECTION_NODE = "Preferences"
       XML_NODE            = "Preferences"
       REST_RESOURCE       = 'preferences'
-      MINORVERSION = 32
 
       xml_name XML_NODE
 

data/lib/quickbooks/model/purchase_order.rb

@@ -8,7 +8,6 @@ module Quickbooks
       REST_RESOURCE = 'purchaseorder'
       XML_COLLECTION_NODE = "PurchaseOrder"
       XML_NODE = "PurchaseOrder"
-      MINORVERSION = 45
 
       xml_accessor :id, :from => 'Id'
       xml_accessor :sync_token, :from => 'SyncToken', :as => Integer

data/lib/quickbooks/service/access_token.rb

@@ -23,7 +23,8 @@ module Quickbooks
       def disconnect
         conn = Faraday.new
         conn.basic_auth oauth.client.id, oauth.client.secret
-        response = conn.post(DISCONNECT_URL, token: oauth.refresh_token || oauth.token)
+        url = "#{DISCONNECT_URL}?minorversion=#{Quickbooks.minorversion}"
+        response = conn.post(url, token: oauth.refresh_token || oauth.token)
 
         if response.success?
           Quickbooks::Model::AccessTokenResponse.new(error_code: "0")

data/lib/quickbooks/service/account.rb

@@ -7,11 +7,6 @@ module Quickbooks
         update(account, :sparse => true)
       end
 
-      def url_for_query(query = nil, start_position = 1, max_results = 20, options = {})
-        url = super(query, start_position, max_results, options)
-        "#{url}&minorversion=#{Quickbooks::Model::Account::MINORVERSION}"
-      end
-
       private
 
       def model

data/lib/quickbooks/service/base_service.rb

@@ -229,6 +229,8 @@ module Quickbooks
           body['file_metadata_0'] = param_part
         end
 
+        url = add_query_string_to_url(url, {})
+
         do_http(:upload, url, body, headers)
       end
 
@@ -292,7 +294,9 @@ module Quickbooks
         @oauth.post_with_multipart(url, headers: headers, body: body, raise_errors: false)
       end
 
-      def add_query_string_to_url(url, params)
+      def add_query_string_to_url(url, params = {})
+        params ||= {}
+        params['minorversion'] = Quickbooks.minorversion
         if params.is_a?(Hash) && !params.empty?
           keyvalues = params.collect { |k| "#{k.first}=#{k.last}" }.join("&")
           delim = url.index("?") != nil ? "&" : "?"

data/lib/quickbooks/service/custom_field.rb

@@ -0,0 +1,20 @@
+module Quickbooks
+  module Service
+    class CustomField < BaseService
+
+      def delete(customer_type)
+        raise Quickbooks::UnsupportedOperation.new('Deleting CustomerType is not supported by Intuit')
+      end
+
+      def create(customer_type)
+        raise Quickbooks::UnsupportedOperation.new('Creating/updating CustomerType is not supported by Intuit')
+      end
+
+      private
+
+      def model
+        Quickbooks::Model::CustomField
+      end
+    end
+  end
+end

data/lib/quickbooks/service/customer.rb

@@ -7,21 +7,11 @@ module Quickbooks
         update(customer, :sparse => true)
       end
 
-      def url_for_resource(resource)
-        url = super(resource)
-        "#{url}?minorversion=#{Quickbooks::Model::Customer::MINORVERSION}"
-      end
-
       def fetch_by_id(id, params = {})
-        url = "#{url_for_base}/customer/#{id}?minorversion=#{Quickbooks::Model::Customer::MINORVERSION}"
+        url = "#{url_for_base}/customer/#{id}"
         fetch_object(model, url, params)
       end
 
-      def url_for_query(query = nil, start_position = 1, max_results = 20, options = {})
-        url = super(query, start_position, max_results, options)
-        "#{url}&minorversion=#{Quickbooks::Model::Customer::MINORVERSION}"
-      end
-
       private
 
       def model

data/lib/quickbooks/service/invoice.rb

@@ -6,20 +6,11 @@ module Quickbooks
         delete_by_query_string(invoice)
       end
 
-      def url_for_resource(resource)
-        url = super(resource)
-      end
-
       def fetch_by_id(id, params = {})
-        url = "#{url_for_base}/invoice/#{id}?minorversion=#{Quickbooks::Model::Invoice::MINORVERSION}"
+        url = "#{url_for_base}/invoice/#{id}"
         fetch_object(model, url, params)
       end
 
-      def url_for_query(query = nil, start_position = 1, max_results = 20, options = {})
-        url = super(query, start_position, max_results, options)
-        "#{url}&minorversion=#{Quickbooks::Model::Invoice::MINORVERSION}"
-      end
-
       def send(invoice, email_address=nil)
         query = email_address.present? ? "?sendTo=#{email_address}" : ""
         url = "#{url_for_resource(model::REST_RESOURCE)}/#{invoice.id}/send#{query}"

data/lib/quickbooks/service/item.rb

@@ -7,21 +7,11 @@ module Quickbooks
         update(item, :sparse => true)
       end
 
-      def url_for_resource(resource)
-        url = super(resource)
-        "#{url}?minorversion=#{Quickbooks::Model::Item::MINORVERSION}"
-      end
-
       def fetch_by_id(id, params = {})
-        url = "#{url_for_base}/item/#{id}?minorversion=#{Quickbooks::Model::Item::MINORVERSION}"
+        url = "#{url_for_base}/item/#{id}"
         fetch_object(model, url, params)
       end
 
-      def url_for_query(query = nil, start_position = 1, max_results = 20, options = {})
-        url = super(query, start_position, max_results, options)
-        "#{url}&minorversion=#{Quickbooks::Model::Item::MINORVERSION}"
-      end
-
       private
 
       def model

data/lib/quickbooks/service/preferences.rb

@@ -2,11 +2,6 @@ module Quickbooks
   module Service
     class Preferences < BaseService
 
-      def url_for_query(query = nil, start_position = 1, max_results = 20, options = {})
-        url = super(query, start_position, max_results, options)
-        "#{url}&minorversion=#{Quickbooks::Model::Preferences::MINORVERSION}"
-      end
-
       private
 
       def model

data/lib/quickbooks/service/purchase_order.rb

@@ -7,13 +7,13 @@ module Quickbooks
       end
 
       def fetch_by_id(id, params = {})
-        url = "#{url_for_base}/purchaseorder/#{id}?minorversion=#{Quickbooks::Model::PurchaseOrder::MINORVERSION}"
+        url = "#{url_for_base}/purchaseorder/#{id}?minorversion=#{Quickbooks.minorversion}"
         fetch_object(model, url, params)
       end
 
       def url_for_query(query = nil, start_position = 1, max_results = 20, options = {})
         url = super(query, start_position, max_results, options)
-        "#{url}&minorversion=#{Quickbooks::Model::PurchaseOrder::MINORVERSION}"
+        "#{url}&minorversion=#{Quickbooks.minorversion}"
       end
 
     private

data/lib/quickbooks/service/service_crud_json.rb

@@ -8,7 +8,7 @@ module Quickbooks
 
       def create(entity, options = {})
         raise Quickbooks::InvalidModelException.new(entity.errors.full_messages.join(',')) unless entity.valid?
-        response = do_http(:post, url_for_resource(model.resource_for_singular), entity.to_json, options)
+        response = do_http_post(url_for_resource(model.resource_for_singular), entity.to_json, options)
         if response.code.to_i == 200
           JSON.parse(response.plain_body)
         else

data/lib/quickbooks/util/query_builder.rb

@@ -10,26 +10,27 @@ module Quickbooks
       end
 
       def clause(field, operator, value)
+        # replace with an escaped backslash
+        escape_single_quotes = -> field { field.to_s.gsub("'", "\\\\'") }
+
         value = case value
                 when DateTime, Time
                   value.iso8601
                 when Date
                   value.strftime('%Y-%m-%d')
                 when Array
-                  value = value.map{|v| v.to_s.gsub("'", "\\\\'") }
+                  value = value.map(&escape_single_quotes)
                 else
-                  # escape single quotes with an escaped backslash
-                  value = value.gsub("'", "\\\\'")
+                  value = escape_single_quotes.call(value)
                 end
 
         if operator.downcase == 'in' && value.is_a?(Array)
-          value = value.map{|v| "#{VALUE_QUOTE}#{v}#{VALUE_QUOTE}"}
+          value = value.map { |v| "#{VALUE_QUOTE}#{v}#{VALUE_QUOTE}" }
           "#{field} #{operator} (#{value.join(', ')})"
         else
           "#{field} #{operator} #{VALUE_QUOTE}#{value}#{VALUE_QUOTE}"
         end
       end
-
     end
   end
 end

data/lib/quickbooks/version.rb

@@ -1,5 +1,5 @@
 module Quickbooks
 
-  VERSION = "1.0.7"
+  VERSION = "1.0.12"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quickbooks-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.12
 platform: ruby
 authors:
 - Cody Caughlan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -28,16 +28,16 @@ dependencies:
   name: roxml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -294,6 +294,7 @@ files:
 - lib/quickbooks/service/company_info.rb
 - lib/quickbooks/service/credit_memo.rb
 - lib/quickbooks/service/credit_memo_change.rb
+- lib/quickbooks/service/custom_field.rb
 - lib/quickbooks/service/customer.rb
 - lib/quickbooks/service/customer_change.rb
 - lib/quickbooks/service/customer_type.rb