quickbooks-ruby 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dba56b54b2268020885411d264f5c4b6314d553
-  data.tar.gz: e80fd5e293a8815acba2a21ad382943207cb95c1
+  metadata.gz: cd738a2e9e6bfa63ccf460226aa60dfe3688713d
+  data.tar.gz: e91dc8fc720d196c8075fe706667ec8c6c657e24
 SHA512:
-  metadata.gz: 388f2bb468bc4ee848b5b82c8e98648579612221bddcb5342f391b60d576b8288ccec064b1dfa97e1fc6212b404da77a25dde46cfdd49922a1481e371dcc626b
-  data.tar.gz: 1c8b6eaa47a883cbd2380ddfc8e71fd0b74743049cfd872f026440d906b579c9d089903bbbbc88a8337638a53a687a462a9b192f580bcc17863d4e966a3a0ea8
+  metadata.gz: c466d28cb539140345cddc3a39bd11678b659c2150d98b6fcf8b8e04640fae6ab028f00de73bc17512a38af3f0baa03715973dc32463c2d475a9348b9a3ada63
+  data.tar.gz: e2dca1296eedcbf25578ec27e6eae67fd95ec1c382147cc5d554b7a44ddce2aa914be370c51391ad62cb71ddadfc04906e08084cf07f48a3518cfb854cbc8990

data/lib/quickbooks-ruby.rb

@@ -106,7 +106,7 @@ require 'quickbooks/model/invoice_change'
 require 'quickbooks/model/customer_change'
 require 'quickbooks/model/vendor_change'
 require 'quickbooks/model/item_change'
-require 'quickbooks/model/reports'
+require 'quickbooks/model/report'
 require 'quickbooks/model/credit_memo_change'
 require 'quickbooks/model/payment_change'
 

data/lib/quickbooks/model/report.rb

@@ -0,0 +1,52 @@
+module Quickbooks
+  module Model
+    class Report < BaseModel
+
+      attr_accessor :xml
+
+      def all_rows
+        @all_rows ||= xml.css("ColData:first-child").map {|node| parse_row(node.parent) }
+      end
+
+      def columns
+        @columns ||= begin
+          nodes = xml.css('Column')
+          nodes.map do |node|
+            # There is also a ColType field, but it does not seem valuable to capture
+            node.at('ColTitle').content
+          end
+        end
+      end
+
+      def find_row(label)
+        all_rows.find {|r| r[0] == label }
+      end
+
+      private
+
+      # Parses the given row:
+      #   <Row type="Data">
+      #     <ColData value="Checking" id="35"/>
+      #     <ColData value="1201.00"/>
+      #     <ColData value="200.50"/>
+      #   </Row>
+      #
+      #  To:
+      #   ['Checking', BigDecimal(1201.00), BigDecimal(200.50)]
+      def parse_row(row_node)
+        row_node.elements.map.with_index do |el, i|
+          value = el.attr('value')
+
+          if i.zero? # Return the first column as a string, its the label.
+            value
+          elsif value.blank?
+            nil
+          else
+            BigDecimal(value)
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/quickbooks/service/base_service.rb

@@ -125,13 +125,9 @@ module Quickbooks
             collection.count = xml.xpath(path_to_nodes).count
             if collection.count > 0
               xml.xpath(path_to_nodes).each do |xa|
-                entry = model.from_xml(xa)
-                addition = xml.xpath(path_to_nodes)[0].xpath("//xmlns:Currency").children.to_s if "#{model::XML_NODE}" == "Reports"
-                entry.currency = addition if "#{model::XML_NODE}" == "Reports"
-                collection.body = response.body if "#{model::XML_NODE}" == "Reports"
-                results << entry
+                results << model.from_xml(xa)
               end
-            end              
+            end
 
             collection.entries = results
           rescue => ex

data/lib/quickbooks/service/reports.rb

@@ -1,3 +1,4 @@
+# Docs: https://developer.intuit.com/docs/0100_accounting/0400_references/reports
 module Quickbooks
   module Service
     class Reports < BaseService
@@ -16,21 +17,15 @@ module Quickbooks
         end
       end
 
-      def fetch_collection(model, date_macro, object_query, options = {})
-        response = do_http_get(url_for_query(object_query, date_macro, options))
-
-        parse_collection(response, model)
-
-      end
-
       def query(object_query = 'BalanceSheet', date_macro = 'This Fiscal Year-to-date', options = {})
-        fetch_collection(model, date_macro , object_query, options)
+        do_http_get(url_for_query(object_query, date_macro, options))
+        model.new(:xml => @last_response_xml)
       end
 
       private
 
       def model
-        Quickbooks::Model::Reports
+        Quickbooks::Model::Report
       end
 
     end

data/lib/quickbooks/version.rb

@@ -1,5 +1,5 @@
 module Quickbooks
 
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quickbooks-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Cody Caughlan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -42,42 +42,42 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -112,14 +112,14 @@ dependencies:
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
@@ -184,6 +184,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/quickbooks-ruby.rb
 - lib/quickbooks/model/access_token_response.rb
 - lib/quickbooks/model/account.rb
 - lib/quickbooks/model/account_based_expense_line_detail.rb
@@ -255,7 +256,7 @@ files:
 - lib/quickbooks/model/purchase_order.rb
 - lib/quickbooks/model/purchase_tax_rate_list.rb
 - lib/quickbooks/model/refund_receipt.rb
-- lib/quickbooks/model/reports.rb
+- lib/quickbooks/model/report.rb
 - lib/quickbooks/model/sales_item_line_detail.rb
 - lib/quickbooks/model/sales_receipt.rb
 - lib/quickbooks/model/sales_tax_rate_list.rb
@@ -331,7 +332,6 @@ files:
 - lib/quickbooks/util/name_entity.rb
 - lib/quickbooks/util/query_builder.rb
 - lib/quickbooks/version.rb
-- lib/quickbooks-ruby.rb
 homepage: http://github.com/ruckus/quickbooks-ruby
 licenses:
 - MIT
@@ -342,17 +342,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: REST API to Quickbooks Online

data/lib/quickbooks/model/reports.rb

@@ -1,17 +0,0 @@
-module Quickbooks
-  module Model
-    class Reports < BaseModel
-      XML_COLLECTION_NODE = "Reports"
-      XML_NODE = "Reports"
-      REST_RESOURCE = 'reports'
-
-      REPORT_TYPES = ['BalanceSheet', 'ProfitandLoss', 'ProfitAndLossDetail', 'TrialBalance', 'CashFlow', 'InventoryValuationSummary', 'CustomerSales', 'ItemSales', 'DepartmentSales', 'ClassSales', 'CustomerIncome', 'CustomerBalance', 'CustomerBalanceDetail', 'AgedReceivables', 'AgedReceivableDetail', 'VendorBalance', 'VendorBalanceDetail', 'AgedPayables', 'AgedPayableDetail', 'VendorExpenses', 'GeneralLedgerDetail']
-
-      xml_name XML_NODE
-
-      xml_accessor :currency, :from => 'Header/Currency'
-      xml_accessor :body
-
-    end
-  end
-end