quickbooks-ruby 0.0.2 → 0.0.3

data/lib/quickbooks/model/discount_override.rb

@@ -1,10 +1,12 @@
 module Quickbooks
   module Model
     class DiscountOverride < BaseModel
-      xml_accessor :discount_ref, :from => 'DiscountRef', :as => Integer
+      xml_accessor :discount_ref, :from => 'DiscountRef', :as => BaseReference
       xml_accessor :percent_based, :from => 'PercentBased'
-      xml_accessor :discount_percent, :from => 'DiscountPercent', :as => Float
-      xml_accessor :discount_account_ref, :from => 'DiscountAccountRef', :as => Integer
+      xml_accessor :discount_percent, :from => 'DiscountPercent', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :discount_account_ref, :from => 'DiscountAccountRef', :as => BaseReference
+
+      reference_setters :discount_ref, :discount_account_ref
 
       def percent_based?
         percent_based.to_s == 'true'

data/lib/quickbooks/model/invoice.rb

@@ -13,49 +13,75 @@ module Quickbooks
       REST_RESOURCE = 'invoice'
       XML_COLLECTION_NODE = "Invoice"
       XML_NODE = "Invoice"
+      EMAIL_STATUS_NEED_TO_SEND = 'NeedToSend'
 
       xml_accessor :id, :from => 'Id', :as => Integer
       xml_accessor :sync_token, :from => 'SyncToken', :as => Integer
-      xml_accessor :meta_data, :from => 'MetaData', :as => Quickbooks::Model::MetaData
-      xml_accessor :custom_fields, :from => 'CustomField', :as => [Quickbooks::Model::CustomField]
+      xml_accessor :meta_data, :from => 'MetaData', :as => MetaData
+      xml_accessor :custom_fields, :from => 'CustomField', :as => [CustomField]
       xml_accessor :doc_number, :from => 'DocNumber'
       xml_accessor :txn_date, :from => 'TxnDate', :as => Date
       xml_accessor :private_note, :from => 'PrivateNote'
-      xml_accessor :linked_transactions, :from => 'LinkedTxn', :as => [Quickbooks::Model::LinkedTransaction]
-      xml_accessor :line_items, :from => 'Line', :as => [Quickbooks::Model::InvoiceLineItem]
+      xml_accessor :linked_transactions, :from => 'LinkedTxn', :as => [LinkedTransaction]
+      xml_accessor :line_items, :from => 'Line', :as => [InvoiceLineItem]
       xml_accessor :txn_tax_detail, :from => 'TxnTaxDetail'
-      xml_accessor :customer_ref, :from => 'CustomerRef', :as => Quickbooks::Model::CustomerRef
+      xml_accessor :customer_ref, :from => 'CustomerRef', :as => BaseReference
       xml_accessor :customer_memo, :from => 'CustomerMemo'
-      xml_accessor :billing_address, :from => 'BillAddr', :as => Quickbooks::Model::PhysicalAddress
-      xml_accessor :shipping_address, :from => 'ShipAddr', :as => Quickbooks::Model::PhysicalAddress
-      xml_accessor :class_ref, :from => 'ClassRef'
-      xml_accessor :sales_term_ref, :from => 'SalesTermRef', :as => Integer
+      xml_accessor :billing_address, :from => 'BillAddr', :as => PhysicalAddress
+      xml_accessor :shipping_address, :from => 'ShipAddr', :as => PhysicalAddress
+      xml_accessor :class_ref, :from => 'ClassRef', :as => BaseReference
+      xml_accessor :sales_term_ref, :from => 'SalesTermRef', :as => BaseReference
       xml_accessor :due_date, :from => 'DueDate', :as => Date
-      xml_accessor :ship_method_ref, :from => 'ShipMethodRef'
+      xml_accessor :ship_method_ref, :from => 'ShipMethodRef', :as => BaseReference
       xml_accessor :ship_date, :from => 'ShipDate', :as => Date
       xml_accessor :tracking_num, :from => 'TrackingNum'
-      xml_accessor :ar_account_ref, :from => 'ARAccountRef', :as => Integer
-      xml_accessor :total_amount, :from => 'TotalAmt', :as => Float
+      xml_accessor :ar_account_ref, :from => 'ARAccountRef', :as => BaseReference
+      xml_accessor :total_amount, :from => 'TotalAmt', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
       xml_accessor :apply_tax_after_discount, :from => 'ApplyTaxAfterDiscount'
       xml_accessor :print_status, :from => 'PrintStatus'
       xml_accessor :email_status, :from => 'EmailStatus'
-      xml_accessor :balance, :from => 'Balance', :as => Float
-      xml_accessor :deposit, :from => 'Deposit', :as => Float
-      xml_accessor :department_ref, :from => 'DepartmentRef'
+      xml_accessor :balance, :from => 'Balance', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :deposit, :from => 'Deposit', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :department_ref, :from => 'DepartmentRef', :as => BaseReference
       xml_accessor :allow_ipn_payment, :from => 'AllowIPNPayment'
+      xml_accessor :bill_email, :from => 'BillEmail', :as => EmailAddress
       xml_accessor :allow_online_payment, :from => 'AllowOnlinePayment'
       xml_accessor :allow_online_credit_card_payment, :from => 'AllowOnlineCreditCardPayment'
       xml_accessor :allow_online_ach_payment, :from => 'AllowOnlineACHPayment'
 
+      reference_setters :customer_ref, :class_ref, :sales_term_ref, :ship_method_ref
+      reference_setters :ar_account_ref, :department_ref
+
       #== Validations
       validates_length_of :line_items, :minimum => 1
       validate :existence_of_customer_ref
+      validate :required_bill_email_if_email_delivery
 
       def initialize
         ensure_line_items_initialization
         super
       end
 
+      def required_bill_email_if_email_delivery
+        return unless email_status_for_delivery?
+
+        if bill_email.nil?
+          errors.add(:bill_email, "BillEmail is required if EmailStatus=NeedToSend")
+        end
+      end
+
+      def billing_email_address=(email_address_string)
+        self.bill_email = EmailAddress.new(email_address_string)
+      end
+
+      def wants_billing_email_sent!
+        self.email_status = EMAIL_STATUS_NEED_TO_SEND
+      end
+
+      def email_status_for_delivery?
+        email_status == EMAIL_STATUS_NEED_TO_SEND
+      end
+
       def apply_tax_after_discount?
         apply_tax_after_discount.to_s == 'true'
       end
@@ -76,10 +102,6 @@ module Quickbooks
         allow_online_ach_payment.to_s == 'true'
       end
 
-      def customer_id=(customer_id)
-        self.customer_ref = Quickbooks::Model::CustomerRef.new(customer_id)
-      end
-
       private
 
       def existence_of_customer_ref

data/lib/quickbooks/model/invoice_line_item.rb

@@ -10,13 +10,13 @@ module Quickbooks
       xml_accessor :id, :from => 'Id', :as => Integer
       xml_accessor :line_num, :from => 'LineNum', :as => Integer
       xml_accessor :description, :from => 'Description'
-      xml_accessor :amount, :from => 'Amount', :as => Float
+      xml_accessor :amount, :from => 'Amount', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
       xml_accessor :detail_type, :from => 'DetailType'
 
       #== Various detail types
-      xml_accessor :sales_line_item_detail, :from => 'SalesItemLineDetail', :as => Quickbooks::Model::SalesItemLineDetail
-      xml_accessor :sub_total_line_detail, :from => 'SubTotalLineDetail', :as => Quickbooks::Model::SubTotalLineDetail
-      xml_accessor :payment_line_detail, :from => 'PaymentLineDetail', :as => Quickbooks::Model::PaymentLineDetail
+      xml_accessor :sales_line_item_detail, :from => 'SalesItemLineDetail', :as => SalesItemLineDetail
+      xml_accessor :sub_total_line_detail, :from => 'SubTotalLineDetail', :as => SubTotalLineDetail
+      xml_accessor :payment_line_detail, :from => 'PaymentLineDetail', :as => PaymentLineDetail
 
       def sales_item?
         detail_type.to_s == SALES_LINE_ITEM_DETAIL
@@ -28,14 +28,14 @@ module Quickbooks
 
       def sales_item!
         self.detail_type = SALES_LINE_ITEM_DETAIL
-        self.sales_line_item_detail = Quickbooks::Model::SalesItemLineDetail.new
+        self.sales_line_item_detail = SalesItemLineDetail.new
 
         yield self.sales_line_item_detail if block_given?
       end
 
       def payment_item!
         self.detail_type = PAYMENT_LINE_DETAIL
-        self.payment_line_detail = Quickbooks::Model::PaymentLineDetail.new
+        self.payment_line_detail = PaymentLineDetail.new
 
         yield self.payment_line_detail if block_given?
       end

data/lib/quickbooks/model/item.rb

@@ -19,31 +19,38 @@ module Quickbooks
       xml_name 'Item'
       xml_accessor :id, :from => 'Id', :as => Integer
       xml_accessor :sync_token, :from => 'SyncToken', :as => Integer
-      xml_accessor :meta_data, :from => 'MetaData', :as => Quickbooks::Model::MetaData
-      xml_accessor :attachable_ref, :from => 'AttachableRef', :as => Integer
+      xml_accessor :meta_data, :from => 'MetaData', :as => MetaData
       xml_accessor :name, :from => 'Name'
       xml_accessor :description, :from => 'Description'
       xml_accessor :active, :from => 'Active'
-      xml_accessor :parent_ref, :from => 'ParentRef', :as => Integer
       xml_accessor :sub_item, :from => 'SubItem'
-      xml_accessor :unit_price, :from => 'UnitPrice', :as => Float
-      xml_accessor :rate_percent, :from => 'RatePercent', :as => Float
-      xml_accessor :type, :from => 'Type'
-      xml_accessor :taxable, :from => 'Taxable'
-      xml_accessor :asset_account_ref, :from => 'AssetAccountRef', :as => Integer
-      xml_accessor :income_account_ref, :from => 'IncomeAccountRef', :as => Integer
-      xml_accessor :purchase_desc, :from => 'PurchaseDesc'
-      xml_accessor :purchase_cost, :from => 'PurchaseCost', :as => Float
-      xml_accessor :expense_account_ref, :from => 'ExpenseAccountRef', :as => Integer
-      xml_accessor :quantity_on_hand, :from => 'QtyOnHand', :as => Float
-      xml_accessor :sales_tax_code_ref, :from => 'SalesTaxCodeRef', :as => Integer
-      xml_accessor :purchase_tax_code_ref, :from => 'PurchaseTaxCodeRef', :as => Integer
-      xml_accessor :track_quantity_on_hand, :from => 'TrackQtyOnHand'
-      xml_accessor :asset_account, :from => 'AssetAccount', :as => Integer
+      xml_accessor :parent_ref, :from => 'ParentRef', :as => Integer
       xml_accessor :level, :from => 'Level', :as => Integer
+
+      # read-only
+      xml_accessor :fully_qualified_name, :from => 'FullyQualifiedName'
+
+      xml_accessor :taxable, :from => 'Taxable'
       xml_accessor :sales_tax_included, :from => 'SalesTaxIncluded'
+      xml_accessor :unit_price, :from => 'UnitPrice', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :rate_percent, :from => 'RatePercent', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :type, :from => 'Type'
+      xml_accessor :income_account_ref, :from => 'IncomeAccountRef', :as => BaseReference
+      xml_accessor :purchase_desc, :from => 'PurchaseDesc'
       xml_accessor :purchase_tax_included, :from => 'PurchaseTaxIncluded'
+      xml_accessor :purchase_cost, :from => 'PurchaseCost', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :expense_account_ref, :from => 'ExpenseAccountRef', :as => BaseReference
+      xml_accessor :asset_account_ref, :from => 'AssetAccountRef', :as => BaseReference
+      xml_accessor :track_quantity_on_hand, :from => 'TrackQtyOnHand'
+      xml_accessor :quantity_on_hand, :from => 'QtyOnHand', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :sales_tax_code_ref, :from => 'SalesTaxCodeRef', :as => BaseReference
+      xml_accessor :purchase_tax_code_ref, :from => 'PurchaseTaxCodeRef', :as => BaseReference
+      xml_accessor :inv_start_date, :from => 'InvStartDate', :as => Date
+
+      reference_setters :parent_ref, :income_account_ref, :expense_account_ref
+      reference_setters :asset_account_ref, :sales_tax_code_ref, :purchase_tax_code_ref
 
+      #== Validations
       validates_length_of :name, :minimum => 1
       validates_inclusion_of :type, :in => ITEM_TYPES
 

data/lib/quickbooks/model/line.rb

@@ -0,0 +1,28 @@
+module Quickbooks
+  module Model
+    class Line < BaseModel
+      #== Constants
+      SALES_LINE_ITEM_DETAIL = 'SalesItemLineDetail'
+      SUB_TOTAL_LINE_DETAIL = 'SubTotalLineDetail'
+      PAYMENT_LINE_DETAIL = 'PaymentLineDetail'
+
+      xml_accessor :id, :from => 'Id', :as => Integer
+      xml_accessor :line_num, :from => 'LineNum', :as => Integer
+      xml_accessor :description, :from => 'Description'
+      xml_accessor :amount, :from => 'Amount', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :detail_type, :from => 'DetailType'
+
+      #== Various detail types
+      xml_accessor :sales_item_line_detail, :from => 'SalesItemLineDetail', :as => SalesItemLineDetail
+      xml_accessor :sub_total_line_detail, :from => 'SubTotalLineDetail', :as => SubTotalLineDetail
+      xml_accessor :payment_line_detail, :from => 'PaymentLineDetail', :as => PaymentLineDetail
+
+      def sales_item!
+        self.detail_type = SALES_LINE_ITEM_DETAIL
+        self.sales_item_line_detail = SalesItemLineDetail.new
+
+        yield self.sales_item_line_detail if block_given?
+      end
+    end
+  end
+end

data/lib/quickbooks/model/payment_line_detail.rb

@@ -1,10 +1,12 @@
 module Quickbooks
   module Model
     class PaymentLineDetail < BaseModel
-      xml_accessor :item_ref, :from => 'ItemRef', :as => Integer
-      xml_accessor :class_ref, :from => 'ClassRef', :as => Integer
-      xml_accessor :balance, :from => 'Balance', :as => Float
-      xml_accessor :discount, :from => 'Discount', :as => Quickbooks::Model::DiscountOverride
+      xml_accessor :item_ref, :from => 'ItemRef', :as => BaseReference
+      xml_accessor :class_ref, :from => 'ClassRef', :as => BaseReference
+      xml_accessor :balance, :from => 'Balance', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :discount, :from => 'Discount', :as => DiscountOverride
+
+      reference_setters :item_ref, :class_ref
     end
   end
 end

data/lib/quickbooks/model/payment_method.rb

@@ -0,0 +1,14 @@
+module Quickbooks
+  module Model
+    class PaymentMethod < BaseModel
+      REST_RESOURCE = 'payment_method'
+      XML_COLLECTION_NODE = "PaymentMethod"
+      XML_NODE = "PaymentMethod"
+
+      xml_accessor :id, :from => 'Id', :as => Integer
+      xml_accessor :name, :from => 'Name'
+      xml_accessor :active, :from => 'Active'
+      xml_accessor :amount, :from => 'Amount', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+    end
+  end
+end

data/lib/quickbooks/model/physical_address.rb

@@ -12,13 +12,29 @@ module Quickbooks
       xml_accessor :country_sub_division_code, :from => 'CountrySubDivisionCode'
       xml_accessor :postal_code, :from => 'PostalCode'
       xml_accessor :note, :from => 'Note'
-      xml_accessor :lat, :from => 'Lat', :as => Float
-      xml_accessor :lon, :from => 'Long', :as => Float
+      xml_accessor :lat, :from => 'Lat'
+      xml_accessor :lon, :from => 'Long'
 
       def zip
         postal_code
       end
 
+      def lat_to_f
+        BigDecimal.new(lat)
+      end
+
+      def lon_to_f
+        BigDecimal.new(lon)
+      end
+
+      def have_lat?
+        lat.to_s != "INVALID"
+      end
+
+      def have_lon?
+        lon.to_s != "INVALID"
+      end
+
     end
   end
 end

data/lib/quickbooks/model/sales_item_line_detail.rb

@@ -1,14 +1,16 @@
 module Quickbooks
   module Model
     class SalesItemLineDetail < BaseModel
-      xml_accessor :item_ref, :from => 'ItemRef', :as => Integer
-      xml_accessor :class_ref, :from => 'ClassRef', :as => Integer
-      xml_accessor :unit_price, :from => 'UnitPrice', :as => Float
-      xml_accessor :rate_percent, :from => 'RatePercent', :as => Float
-      xml_accessor :price_level_ref, :from => 'PriceLevelRef', :as => Integer
-      xml_accessor :quantity, :from => 'Qty', :as => Float
-      xml_accessor :tax_code_ref, :from => 'TaxCodeRef'
+      xml_accessor :item_ref, :from => 'ItemRef', :as => BaseReference
+      xml_accessor :class_ref, :from => 'ClassRef', :as => BaseReference
+      xml_accessor :unit_price, :from => 'UnitPrice', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :rate_percent, :from => 'RatePercent', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :price_level_ref, :from => 'PriceLevelRef', :as => BaseReference
+      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
+
+      reference_setters :item_ref, :class_ref, :price_level_ref, :tax_code_ref
     end
   end
 end

data/lib/quickbooks/model/sales_receipt.rb

@@ -0,0 +1,44 @@
+module Quickbooks
+  module Model
+    class SalesReceipt < BaseModel
+      XML_COLLECTION_NODE = "SalesReceipt"
+      XML_NODE = "SalesReceipt"
+      REST_RESOURCE = 'salesreceipt'
+
+      xml_accessor :id, :from => 'Id', :as => Integer
+      xml_accessor :sync_token, :from => 'SyncToken', :as => Integer
+      xml_accessor :meta_data, :from => 'MetaData', :as => MetaData
+      xml_accessor :doc_number, :from => 'DocNumber'
+      xml_accessor :placed_on, :from => 'TxnDate', :as => Time
+
+      xml_accessor :line_items, :from => 'Line', :as => [Line]
+      xml_accessor :customer_ref, :from => 'CustomerRef', :as => BaseReference
+      xml_accessor :bill_email, :from => 'BillEmail', :as => EmailAddress
+      xml_accessor :bill_address, :from => 'BillAddr', :as => PhysicalAddress
+      xml_accessor :ship_address, :from => 'ShipAddr', :as => PhysicalAddress
+
+      xml_accessor :po_number, :from => 'PONumber'
+
+      xml_accessor :ship_method_ref, :from => 'ShipMethodRef', :as => BaseReference
+      xml_accessor :ship_date, :from => 'ShipDate', :as => Time
+      xml_accessor :tracking_num, :from => 'TrackingNum'
+
+      xml_accessor :payment_method_ref, :from => 'PaymentMethodRef', :as => BaseReference
+      xml_accessor :payment_ref_number, :from => 'PaymentRefNum'
+
+      xml_accessor :deposit_to_account_ref, :from => 'DepositToAccountRef', :as => BaseReference
+
+      # readonly
+      xml_accessor :total, :from => 'TotalAmt', :as => BigDecimal
+
+      reference_setters :customer_ref, :ship_method_ref, :payment_method_ref, :deposit_to_account_ref
+
+      validates_length_of :line_items, :minimum => 1
+
+      def email=(email)
+        self.bill_email = EmailAddress.new(email)
+      end
+
+    end
+  end
+end

data/lib/quickbooks/model/sub_total_line_detail.rb

@@ -1,11 +1,13 @@
 module Quickbooks
   module Model
     class SubTotalLineDetail < BaseModel
-      xml_accessor :item_ref, :from => 'ItemRef', :as => Integer
-      xml_accessor :class_ref, :from => 'ClassRef'
-      xml_accessor :unit_price, :from => 'UnitPrice', :as => Float
-      xml_accessor :quantity, :from => 'Qty', :as => Float
-      xml_accessor :tax_code_ref, :from => 'TaxCodeRef'
+      xml_accessor :item_ref, :from => 'ItemRef', :as => BaseReference
+      xml_accessor :class_ref, :from => 'ClassRef', :as => BaseReference
+      xml_accessor :unit_price, :from => 'UnitPrice', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :quantity, :from => 'Qty', :as => BigDecimal, :to_xml => Proc.new { |val| val.to_f }
+      xml_accessor :tax_code_ref, :from => 'TaxCodeRef', :as => BaseReference
+
+      reference_setters :item_ref, :class_ref, :tax_code_ref
     end
   end
 end

data/lib/quickbooks/service/account.rb

@@ -0,0 +1,22 @@
+module Quickbooks
+  module Service
+    class Account < BaseService
+      include ServiceCrud
+
+      def delete(account)
+        account.active = false
+        update(account, :sparse => true)
+      end
+
+      private
+
+      def default_model_query
+        "SELECT * FROM ACCOUNT"
+      end
+
+      def model
+        Quickbooks::Model::Account
+      end
+    end
+  end
+end

data/lib/quickbooks/service/base_service.rb

@@ -2,14 +2,19 @@
 require 'uri'
 require 'cgi'
 
-class IntuitRequestException < StandardError
-  attr_accessor :message, :code, :detail, :type
-  def initialize(msg)
-    self.message = msg
-    super(msg)
+unless Quickbooks::Util::ClassUtil.defined?("InvalidModelException")
+  class IntuitRequestException < StandardError
+    attr_accessor :message, :code, :detail, :type
+    def initialize(msg)
+      self.message = msg
+      super(msg)
+    end
   end
 end
-class AuthorizationFailure < StandardError; end
+
+unless Quickbooks::Util::ClassUtil.defined?("InvalidModelException")
+  class AuthorizationFailure < StandardError; end
+end
 
 module Quickbooks
   module Service
@@ -25,6 +30,7 @@ module Quickbooks
       XML_NS = %{xmlns="http://schema.intuit.com/finance/v3"}
       HTTP_CONTENT_TYPE = 'application/xml'
       HTTP_ACCEPT = 'application/xml'
+      HTTP_ACCEPT_ENCODING = 'gzip, deflate'
 
       def initialize()
         @base_uri = 'https://qb.sbfinance.intuit.com/v3/company'
@@ -51,19 +57,17 @@ module Quickbooks
         "#{@base_uri}/#{@company_id}"
       end
 
-      def url_for_query(query = "")
-        "#{url_for_base}/query?query=#{URI.encode(query)}"
+      def url_for_query(query = nil, start_position = 1, max_results = 20)
+        query ||= default_model_query
+        query = "#{query} STARTPOSITION #{start_position} MAXRESULTS #{max_results}"
+
+        "#{url_for_base}/query?query=#{URI.encode_www_form_component(query)}"
       end
 
       private
 
       def parse_xml(xml)
-        @last_response_xml =
-        begin
-          x = Nokogiri::XML(xml)
-          #x.document.remove_namespaces!
-          x
-        end
+        @last_response_xml = Nokogiri::XML(xml)
       end
 
       def valid_xml_document(xml)
@@ -94,43 +98,11 @@ module Quickbooks
         end
 
         max_results = (page * per_page)
-
-        query = "#{query} STARTPOSITION #{start_position} MAXRESULTS #{max_results}"
-        response = do_http_get(url_for_query(query))
+        response = do_http_get(url_for_query(query, start_position, max_results))
 
         parse_collection(response, model)
       end
 
-      #
-      # def fetch_collection2(model, custom_field_query = nil, filters = [], page = 1, per_page = 20, sort = nil, options ={})
-      #   raise ArgumentError, "missing model to instantiate" if model.nil?
-      #
-      #   post_body_tags = []
-      #
-      #   # pagination parameters must come first
-      #   post_body_tags << "<StartPage>#{page}</StartPage>"
-      #   post_body_tags << "<ChunkSize>#{per_page}</ChunkSize>"
-      #
-      #   # ... followed by any filters
-      #   if filters.is_a?(Array) && filters.length > 0
-      #     filters = enforce_filter_order(filters).compact
-      #     post_body_tags << filters.collect { |f| f.to_xml }
-      #     post_body_tags.flatten!
-      #   end
-      #
-      #   if sort
-      #     post_body_tags << sort.to_xml
-      #   end
-      #
-      #   post_body_tags << custom_field_query
-      #
-      #   xml_query_tag = "#{model::XML_NODE}Query"
-      #   body = %Q{<?xml version="1.0" encoding="utf-8"?>\n<#{xml_query_tag} xmlns="http://www.intuit.com/sb/cdm/v2">#{post_body_tags.join}</#{xml_query_tag}>}
-      #
-      #   response = do_http_post(url_for_resource(model::REST_RESOURCE), body, {}, {'Content-Type' => 'text/xml'})
-      #   parse_collection(response, model)
-      # end
-
       def parse_collection(response, model)
         if response
           collection = Quickbooks::Collection.new
@@ -205,13 +177,14 @@ module Quickbooks
         unless headers.has_key?('Content-Type')
           headers['Content-Type'] = 'text/xml'
         end
+
         response = do_http_post(url, body.strip, params, headers)
 
         result = nil
         if response
           case response.code.to_i
           when 200
-            result = Quickbooks::Model::RestResponse.from_xml(response.body)
+            result = Quickbooks::Model::RestResponse.from_xml(response.plain_body)
           when 401
             raise IntuitRequestException.new("Authorization failure: token timed out?")
           when 404
@@ -235,14 +208,28 @@ module Quickbooks
           raise "OAuth client has not been initialized. Initialize with setter access_token="
         end
         unless headers.has_key?('Content-Type')
-          headers.merge!({'Content-Type' => HTTP_CONTENT_TYPE})
+          headers['Content-Type'] = HTTP_CONTENT_TYPE
+        end
+        unless headers.has_key?('Accept')
+          headers['Accept'] = HTTP_ACCEPT
+        end
+        unless headers.has_key?('Accept-Encoding')
+          headers['Accept-Encoding'] = HTTP_ACCEPT_ENCODING
         end
-        # log "------ New Request ------"
-        # log "METHOD = #{method}"
-        # log "RESOURCE = #{url}"
-        # log "BODY(#{body.class}) = #{body == nil ? "<NIL>" : body.inspect}"
-        # log "HEADERS = #{headers.inspect}"
-        response = @oauth.request(method, url, body, headers)
+
+        #log "METHOD = #{method}"
+        #log "RESOURCE = #{url}"
+        #log "BODY(#{body.class}) = #{body == nil ? "<NIL>" : body.inspect}"
+        #log "HEADERS = #{headers.inspect}"
+
+        response = case method
+          when :get
+            @oauth.get(url, headers)
+          when :post
+            @oauth.post(url, body, headers)
+          else
+            raise "Dont know how to perform that HTTP operation"
+          end
         check_response(response)
       end
 
@@ -255,9 +242,7 @@ module Quickbooks
       end
 
       def check_response(response)
-        # puts "RESPONSE CODE = #{response.code}"
-        # puts "RESPONSE BODY = #{response.body}"
-        parse_xml(response.body)
+        parse_xml(response.plain_body)
         status = response.code.to_i
         case status
         when 200
@@ -274,13 +259,13 @@ module Quickbooks
         when 400, 500
           parse_and_raise_exception
         else
-          raise "HTTP Error Code: #{status}, Msg: #{response.body}"
+          raise "HTTP Error Code: #{status}, Msg: #{response.plain_body}"
         end
       end
 
       def parse_and_raise_exception
         err = parse_intuit_error
-        ex = IntuitRequestException.new(err[:message])
+        ex = IntuitRequestException.new("#{err[:message]}:\n\t#{err[:detail]}")
         ex.code = err[:code]
         ex.detail = err[:detail]
         ex.type = err[:type]