quickeebooks 0.1.9 → 0.1.10

data/lib/quickeebooks/version.rb

@@ -1,5 +1,5 @@
 module Quickeebooks
 
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 
 end

data/lib/quickeebooks/windows/service/job.rb

@@ -5,7 +5,11 @@ module Quickeebooks
   module Windows
     module Service
       class Job < Quickeebooks::Windows::Service::ServiceBase
-
+        
+        FILTER_ORDER = %w{OfferingId IteratorId StartPage ChunkSize IncludeTagElements CDCAsOf SynchronizedFilter
+          DraftFilter ObjectStateEnable CustomFieldEnable CustomFieldQueryParam CustomFieldFilter CustomFieldDefinitionSet
+          ListIdSet StartCreatedTMS EndCreatedTMS StartModifiedTMS EndModifiedTMS CustomerIdSet IncludeFinancialIndicator}
+        
         def list(filters = [], page = 1, per_page = 20, sort = nil, options = {})
           filters << Quickeebooks::Shared::Service::Filter.new(:boolean, :field => 'CustomFieldEnable', :value => true)
           fetch_collection(Quickeebooks::Windows::Model::Job, nil, filters, page, per_page, sort, options)
@@ -15,7 +19,7 @@ module Quickeebooks
           url = "#{url_for_resource(Quickeebooks::Windows::Model::Job::REST_RESOURCE)}/#{id}"
           fetch_object(Quickeebooks::Windows::Model::Job, url, {:idDomain => idDomain})
         end
-
+        
       end
     end
     

data/lib/quickeebooks/windows/service/payment_method.rb

@@ -1,13 +1,3 @@
-# require 'quickeebooks/windows/service/service_base'
-# require 'quickeebooks/windows/model/payment'
-# require 'quickeebooks/windows/model/payment_method'
-# require 'quickeebooks/windows/model/payment_line_item'
-# require 'quickeebooks/windows/model/payment_detail'
-# require 'quickeebooks/windows/model/credit_card'
-# require 'quickeebooks/windows/model/credit_charge_info'
-# require 'quickeebooks/windows/model/credit_charge_response'
-# require 'nokogiri'
-
 module Quickeebooks
   module Windows
     module Service

data/lib/quickeebooks/windows/service/service_base.rb

@@ -54,6 +54,20 @@ module Quickeebooks
           "#{@base_uri}/#{raw}/v2/#{@realm_id}"
         end
 
+        # Intuit API requires that filters obey a specific ordering
+        # Each Service implementation should have a +FILTER_ORDER+ Array constant
+        # defined. If this is defined than any filters given will be re-ordered
+        # to match the required ordering
+        def enforce_filter_order(filters)
+          if self.class.const_defined?(:FILTER_ORDER)
+            self.class.const_get(:FILTER_ORDER).map do |field|
+              filters.detect { |f| f.field.to_s == field }
+            end.compact
+          else
+            filters
+          end
+        end
+
         private
 
         def parse_xml(xml)
@@ -93,6 +107,7 @@ module Quickeebooks
 
           # ... 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
@@ -198,7 +213,7 @@ module Quickeebooks
           when 200
             # even HTTP 200 can contain an error, so we always have to peek for an Error
             if response_is_error?
-              parse_and_raise_exceptione
+              parse_and_raise_exception
             else
               response
             end
@@ -213,7 +228,7 @@ module Quickeebooks
           end
         end
 
-        def parse_and_raise_exceptione
+        def parse_and_raise_exception
           err = parse_intuit_error
           ex = IntuitRequestException.new(err[:message])
           ex.code = err[:code]

data/spec/quickeebooks/windows/services/job_spec.rb

@@ -39,8 +39,36 @@ describe "Quickeebooks::Windows::Service::Job" do
     my_job.dba_name.should == "EngeniusMicro"
     my_job.acct_num.should == ".0000"
     my_job.job_parent_name.should == ".0000.001"
+  end
+  
+  it "gets a REST error when filters are not in expected order" do
+    xml = windowsFixture("job_list_error_invalid_filter_ordering.xml")
+    model = Quickeebooks::Windows::Model::Job
+    service = Quickeebooks::Windows::Service::Job.new
+    service.access_token = @oauth
+    service.realm_id = @realm_id
+    FakeWeb.register_uri(:post, service.url_for_resource(model::REST_RESOURCE), :status => ["200", "OK"], :body => xml)
+    
+    
+    filters = []
+    filters << Quickeebooks::Windows::Service::Filter.new(:datetime, :field => 'StartCreatedTMS', :value => Time.mktime(2013, 6, 1))
+    filters << Quickeebooks::Windows::Service::Filter.new(:datetime, :field => 'EndCreatedTMS', :value => Time.mktime(2013, 6, 10))
+    
+    expect { response = service.list(filters) }.to raise_error(IntuitRequestException)
+  end
+  
+  it "reorders filters according to the Service specification" do
+    service = Quickeebooks::Windows::Service::Job.new
 
-
+    f1 = Quickeebooks::Windows::Service::Filter.new(:datetime, :field => 'StartCreatedTMS', :value => Time.mktime(2013, 6, 1))
+    f2 = Quickeebooks::Windows::Service::Filter.new(:boolean, :field => 'CustomFieldEnable', :value => true)
+    f3 = Quickeebooks::Windows::Service::Filter.new(:datetime, :field => 'EndCreatedTMS', :value => Time.mktime(2013, 6, 10))
+    
+    out_of_order = [f1, f2, f3]
+    in_order = [f2, f1, f3]
+    reordered = service.enforce_filter_order(out_of_order)
+    
+    reordered.should == in_order
   end
 
 end

data/spec/xml/windows/job_list_error_invalid_filter_ordering.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RestResponse xmlns="http://www.intuit.com/sb/cdm/v2">
+	<Error RequestId="9dd3bf46bbd246318a4963575f8263bb">
+		<RequestName>ErrorRequest</RequestName>
+		<ProcessedTime>2013-06-06T17:58:31.512Z</ProcessedTime>
+		<ErrorCode>-2001</ErrorCode>
+		<ErrorDesc>cvc-complex-type.2.4.a: Invalid content was found starting with element 'CustomFieldEnable'. One of '{"http://www.intuit.com/sb/cdm/v2":CustomerIdSet, "http://www.intuit.com/sb/cdm/v2":IncludeFinancialIndicator}' is expected.</ErrorDesc>
+	</Error>
+</RestResponse>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quickeebooks
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roxml
@@ -535,6 +535,7 @@ files:
 - spec/xml/windows/http_401.xml
 - spec/xml/windows/invoice_success_create.xml
 - spec/xml/windows/invoices.xml
+- spec/xml/windows/job_list_error_invalid_filter_ordering.xml
 - spec/xml/windows/jobs.xml
 - spec/xml/windows/payment_create_success.xml
 - spec/xml/windows/payment_methods.xml