quickbooks-ruby 1.0.8 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffab8263cca62cc3969f22b01909705cdb4f73ef0fa85ab37d18f728e3edc990
-  data.tar.gz: 8dd7022c2615a07e6225bb4ce569b6cd6b24d8b8e405a203a4b4151813b88599
+  metadata.gz: bf1160c6870349d14bf78a92cffbe5ba9efc7bceeaadafd3e51ea34b4b7bfdf3
+  data.tar.gz: 635571fa507657b2d3c6f797c4b2f8906c127cf271a1d8209d73a41629d576dc
 SHA512:
-  metadata.gz: ea5558538936684066b819ec00f1203a7a7655cbafa85a0e7473567d975b5d1d0538c311d523ff075b5c4c906c470d6be60f45fc44cccb211987cb76a14d50ac
-  data.tar.gz: a0e7fca6ca6414716b5dc6da256772389c17e7d95d8ebf1fa0d42251aded6efd075e5514d3049ed2a2bbdca7b80911dd34b6da44e24d07356f0c05ad1d4543d5
+  metadata.gz: 1fc1352b4888a815049ccc95f4363636af5c157c8f2c67700250095b2a8cd1ba84c002247d405f533f82e0c0ba2d2c1fc62d41e95540e16b84be4ad3794953a3
+  data.tar.gz: 69749db040976fcbaa4124776b00c96acfdac938858b9f3b56dbfeb02ec0587f37b8884e4557a569f9c50734f5091003930675dc31d0c6cc5f6e761446c52fec

data/lib/quickbooks-ruby.rb

@@ -191,6 +191,7 @@ Faraday::Middleware.register_middleware :gzip => lambda { Gzip }
 module Quickbooks
   @@sandbox_mode = false
   @@logger = nil
+  @@minorversion = 47
 
   class << self
     def sandbox_mode
@@ -201,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
@@ -60,6 +59,7 @@ module Quickbooks
       xml_accessor :allow_online_credit_card_payment?, :from => 'AllowOnlineCreditCardPayment'
       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
 
 
       reference_setters
@@ -88,6 +88,9 @@ module Quickbooks
         self.bill_email = EmailAddress.new(email_address_string)
       end
 
+      def billing_email_cc_address=(email_address_string)
+        self.bill_email_cc = EmailAddress.new(email_address_string)
+      end
 
       def wants_billing_email_sent!
         self.email_status = EMAIL_STATUS_NEED_TO_SEND
@@ -97,7 +100,6 @@ module Quickbooks
         email_status == EMAIL_STATUS_NEED_TO_SEND
       end
 
-
       def existence_of_customer_ref
         if customer_ref.nil? || (customer_ref && customer_ref.value == 0)
           errors.add(:customer_ref, "CustomerRef is required and must be a non-zero value.")

data/lib/quickbooks/model/item.rb

@@ -10,7 +10,6 @@ module Quickbooks
       XML_COLLECTION_NODE = "Item"
       XML_NODE = "Item"
       REST_RESOURCE = 'item'
-      MINORVERSION = 47
 
       INVENTORY_TYPE = 'Inventory'
       NON_INVENTORY_TYPE = 'NonInventory'

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/model/report.rb

@@ -38,7 +38,7 @@ module Quickbooks
           value = el.attr('value')
 
           next nil if value.blank?
-          next value if value.to_s.match(/^\d+$|^\d+\.\d+$|^-\d+|^-\d+\.\d+$|^\.\d+$/).nil?
+          next value if value.to_s.match(/^\d+$|^\d+\.\d+$|^-\d+$|^-\d+\.\d+$|^\.\d+$/).nil?
           BigDecimal(value)
         end
       end

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/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.8"
+  VERSION = "1.0.13"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quickbooks-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.13
 platform: ruby
 authors:
 - Cody Caughlan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2020-10-07 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
@@ -98,44 +98,44 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -154,16 +154,16 @@ dependencies:
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '0'
 description: QBO V3 REST API to Quickbooks Online
 email: toolbag@gmail.com
 executables: []
@@ -345,7 +345,7 @@ homepage: http://github.com/ruckus/quickbooks-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -360,9 +360,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: REST API to Quickbooks Online
 test_files: []