xeroizer 2.15.5 → 2.15.6

data/lib/xeroizer/record/base_model_http_proxy.rb

@@ -16,7 +16,8 @@ module Xeroizer
           # Parse parameters for GET requests.
           def parse_params(options)
             params = {}
-            params[:ModifiedAfter]  = options[:modified_since] if options[:modified_since]          
+            params[:ModifiedAfter]  = options[:modified_since] if options[:modified_since]
+            params[:includeArchived]  = options[:include_archived] if options[:include_archived]
             params[:order]        = options[:order] if options[:order]
 
             if options[:where]
@@ -26,6 +27,7 @@ module Xeroizer
                                 end
             end
             params[:offset] = options[:offset] if options[:offset]
+            params[:page] = options[:page] if options[:page]
             params
           end
         
@@ -106,6 +108,7 @@ module Xeroizer
               when :decimal     then [field[:api_name], expression, value.to_s]
               when :date        then [field[:api_name], expression, "DateTime.Parse(\"#{value.strftime("%Y-%m-%d")}\")"]
               when :datetime    then [field[:api_name], expression, "DateTime.Parse(\"#{value.utc.strftime("%Y-%m-%dT%H:%M:%S")}\")"]
+              when :datetime_utc then [field[:api_name], expression, "DateTime.Parse(\"#{value.utc.strftime("%Y-%m-%dT%H:%M:%S")}\")"]
               when :belongs_to  then
               when :has_many    then
             end

data/lib/xeroizer/record/record_association_helper.rb

@@ -1,41 +1,41 @@
 module Xeroizer
   module Record
     module RecordAssociationHelper
-      
+
       def self.included(base)
-        base.extend(ClassMethods)    
+        base.extend(ClassMethods)
       end
-      
+
       module ClassMethods
-        
+
         def belongs_to(field_name, options = {})
           internal_field_name = options[:internal_name] || field_name
           internal_singular_field_name = internal_field_name.to_s.singularize
-          
+
           define_association_attribute(field_name, internal_singular_field_name, :belongs_to, options)
-        
+
           # Create a #build_record_name method to build the record.
           define_method "build_#{internal_singular_field_name}" do | *args |
             attributes = args.size == 1 ? args.first : {}
-          
+
             # The name of the record model.
             model_name = options[:model_name] ? options[:model_name].to_sym : field_name.to_s.singularize.camelize.to_sym
-          
+
             # The record's parent instance for this current application.
             model_parent = new_model_class(model_name)
-          
+
             # Create a new record, binding it to it's parent instance.
             record = Xeroizer::Record.const_get(model_name).build(attributes, model_parent)
             self.attributes[field_name] = record
           end
         end
-      
+
         def has_many(field_name, options = {})
           internal_field_name = options[:internal_name] || field_name
           internal_singular_field_name = internal_field_name.to_s.singularize
-        
+
           define_association_attribute(field_name, internal_field_name, :has_many, options)
-                  
+
           # Create an #add_record_name method to build the record and add to the attributes.
           define_method "add_#{internal_singular_field_name}" do | *args |
             # The name of the record model.
@@ -43,7 +43,7 @@ module Xeroizer
 
             # The record's parent instance for this current application.
             model_parent = new_model_class(model_name)
-          
+
             # The class of this record.
             record_class = Xeroizer::Record.const_get(model_name)
 
@@ -55,15 +55,15 @@ module Xeroizer
             records = []
             if args.size == 1 && args.first.is_a?(Array)
               records = args.first
-            elsif args.size > 0 
+            elsif args.size > 0
               records = args
             else
               raise StandardError.new("Invalid arguments for #{self.class.name}#add_#{internal_singular_field_name}(#{args.inspect}).")
             end
-          
+
             # Ensure that complete record is downloaded before adding new records
-            self.send(field_name)
-            
+            self.send(internal_field_name)
+
             # Add each record.
             last_record = nil
             records.each do | record |
@@ -73,34 +73,34 @@ module Xeroizer
               self.attributes[field_name] << record
               last_record = record
             end
-            
+
             last_record # last record
           end
-          
+
         end
-        
+
         def define_association_attribute(field_name, internal_field_name, association_type, options)
           define_simple_attribute(field_name, association_type, options.merge!(:skip_writer => true), ((association_type == :has_many) ? [] : nil))
-          
+
           internal_field_name = options[:internal_name] || field_name
           internal_singular_field_name = internal_field_name.to_s.singularize
           model_name = options[:model_name] ? options[:model_name].to_sym : field_name.to_s.singularize.camelize.to_sym
-    
-          define_method "#{internal_field_name}=".to_sym do | value | 
+
+          define_method "#{internal_field_name}=".to_sym do | value |
             record_class = Xeroizer::Record.const_get(model_name)
             case value
-              when Hash 
+              when Hash
                 self.attributes[field_name] = ((association_type == :has_many) ? [] : nil)
                 case association_type
-                  when :has_many  
+                  when :has_many
                     self.attributes[field_name] = []
                     self.send("add_#{internal_singular_field_name}".to_sym, value)
-                    
-                  when :belongs_to  
+
+                  when :belongs_to
                     self.attributes[field_name] = Xeroizer::Record.const_get(model_name).build(value, new_model_class(model_name))
-                    
+
                 end
-                
+
               when Array
                 self.attributes[field_name] = ((association_type == :has_many) ? [] : nil)
                 value.each do | single_value |
@@ -110,18 +110,18 @@ module Xeroizer
                     else                   raise AssociationTypeMismatch.new(record_class, single_value.class)
                   end
                 end
-                
+
               when record_class
                 self.attributes[field_name] = ((association_type == :has_many) ? [value] : value)
-                
+
               when NilClass
                 self.attributes[field_name] = []
-                
+
               else
                 raise AssociationTypeMismatch.new(record_class, value.class)
             end
           end
-          
+
           # Override reader for this association if this association belongs
           # to a summary-typed record. This will automatically attempt to download
           # the complete version of the record before accessing the association.
@@ -132,9 +132,9 @@ module Xeroizer
             end
           end
         end
-        
+
       end
-      
+
     end
   end
 end

data/lib/xeroizer/record/xml_helper.rb

@@ -61,7 +61,7 @@ module Xeroizer
           # Turn a record into its XML representation.
           def to_xml(b = Builder::XmlMarkup.new(:indent => 2))
             optional_root_tag(parent.class.optional_xml_root_name, b) do |b|
-              b.tag!(parent.class.xml_node_name || parent.model_name) { 
+              b.tag!(model.class.xml_node_name || model.model_name) {
                 attributes.each do | key, value |
                   field = self.class.fields[key]
                   value = self.send(key) if field[:calculated]

data/lib/xeroizer/report/factory.rb

@@ -10,6 +10,7 @@ module Xeroizer
 
       attr_reader :application
       attr_reader :report_type
+      attr_reader :response_xml
       
       public
       
@@ -21,7 +22,7 @@ module Xeroizer
         # Retreive a report with the `options` as a hash containing
         # valid query-string parameters to pass to the API.
         def get(options = {})
-          response_xml = options[:cache_file] ? File.read(options[:cache_file]) : http_get(options)          
+          @response_xml = options[:cache_file] ? File.read(options[:cache_file]) : http_get(options)
           response = Response.parse(response_xml, options) do | response, elements |
             parse_reports(response, elements)
           end

data/lib/xeroizer/version.rb

@@ -0,0 +1,3 @@
+module Xeroizer
+  VERSION = "2.15.6".freeze
+end

data/test/stub_responses/organisation.xml

@@ -20,6 +20,36 @@
       <FinancialYearEndMonth>6</FinancialYearEndMonth>
       <PeriodLockDate>2008-06-30T00:00:00</PeriodLockDate>
       <CreatedDateUTC>2011-05-19T05:26:03.95</CreatedDateUTC>
+      <Addresses>
+        <Address>
+          <AddressType>STREET</AddressType>
+        </Address>
+        <Address>
+          <AddressType>POBOX</AddressType>
+          <AddressLine1>23 Main Street</AddressLine1>
+          <AddressLine2>Central City</AddressLine2>
+          <City>Oaktown</City>
+          <Region>NY</Region>
+          <PostalCode>12123</PostalCode>
+          <Country>USA</Country>
+        </Address>
+      </Addresses>
+      <Phones>
+        <Phone>
+          <PhoneType>DDI</PhoneType>
+        </Phone>
+        <Phone>
+          <PhoneType>MOBILE</PhoneType>
+        </Phone>
+        <Phone>
+          <PhoneType>DEFAULT</PhoneType>
+          <PhoneNumber>1234 5678</PhoneNumber>
+          <PhoneAreaCode>800</PhoneAreaCode>
+        </Phone>
+        <Phone>
+          <PhoneType>FAX</PhoneType>
+        </Phone>
+      </Phones>
     </Organisation>
   </Organisations>
 </Response>

data/test/stub_responses/tax_rates.xml

@@ -14,6 +14,14 @@
       <CanApplyToRevenue>true</CanApplyToRevenue>
       <DisplayTaxRate>0.0000</DisplayTaxRate>
       <EffectiveRate>0.0000</EffectiveRate>
+      <Status>ACTIVE</Status>
+      <TaxComponents>
+        <TaxComponent>
+          <Name>GST</Name>
+          <Rate>0.0000</Rate>
+          <IsCompound>false</IsCompound>
+        </TaxComponent>
+      </TaxComponents>
     </TaxRate>
     <TaxRate>
       <Name>GST Free Exports</Name>
@@ -25,6 +33,14 @@
       <CanApplyToRevenue>true</CanApplyToRevenue>
       <DisplayTaxRate>0.0000</DisplayTaxRate>
       <EffectiveRate>0.0000</EffectiveRate>
+      <Status>ACTIVE</Status>
+      <TaxComponents>
+        <TaxComponent>
+          <Name>GST</Name>
+          <Rate>0.0000</Rate>
+          <IsCompound>false</IsCompound>
+        </TaxComponent>
+      </TaxComponents>
     </TaxRate>
     <TaxRate>
       <Name>GST Free Income</Name>
@@ -36,6 +52,14 @@
       <CanApplyToRevenue>true</CanApplyToRevenue>
       <DisplayTaxRate>0.0000</DisplayTaxRate>
       <EffectiveRate>0.0000</EffectiveRate>
+      <Status>ACTIVE</Status>
+      <TaxComponents>
+        <TaxComponent>
+          <Name>GST</Name>
+          <Rate>0.0000</Rate>
+          <IsCompound>false</IsCompound>
+        </TaxComponent>
+      </TaxComponents>
     </TaxRate>
     <TaxRate>
       <Name>GST on Capital</Name>
@@ -47,6 +71,14 @@
       <CanApplyToRevenue>false</CanApplyToRevenue>
       <DisplayTaxRate>10.0000</DisplayTaxRate>
       <EffectiveRate>10.0000</EffectiveRate>
+      <Status>ACTIVE</Status>
+      <TaxComponents>
+        <TaxComponent>
+          <Name>GST</Name>
+          <Rate>10.0000</Rate>
+          <IsCompound>false</IsCompound>
+        </TaxComponent>
+      </TaxComponents>
     </TaxRate>
     <TaxRate>
       <Name>GST on Capital Imports</Name>
@@ -58,6 +90,14 @@
       <CanApplyToRevenue>false</CanApplyToRevenue>
       <DisplayTaxRate>0.0000</DisplayTaxRate>
       <EffectiveRate>0.0000</EffectiveRate>
+      <Status>ACTIVE</Status>
+      <TaxComponents>
+        <TaxComponent>
+          <Name>GST</Name>
+          <Rate>0.0000</Rate>
+          <IsCompound>false</IsCompound>
+        </TaxComponent>
+      </TaxComponents>
     </TaxRate>
     <TaxRate>
       <Name>GST on Expenses</Name>
@@ -69,6 +109,14 @@
       <CanApplyToRevenue>false</CanApplyToRevenue>
       <DisplayTaxRate>10.0000</DisplayTaxRate>
       <EffectiveRate>10.0000</EffectiveRate>
+      <Status>ACTIVE</Status>
+      <TaxComponents>
+        <TaxComponent>
+          <Name>GST</Name>
+          <Rate>10.0000</Rate>
+          <IsCompound>false</IsCompound>
+        </TaxComponent>
+      </TaxComponents>
     </TaxRate>
     <TaxRate>
       <Name>GST on Imports</Name>
@@ -80,6 +128,14 @@
       <CanApplyToRevenue>false</CanApplyToRevenue>
       <DisplayTaxRate>0.0000</DisplayTaxRate>
       <EffectiveRate>0.0000</EffectiveRate>
+      <Status>ACTIVE</Status>
+      <TaxComponents>
+        <TaxComponent>
+          <Name>GST</Name>
+          <Rate>0.0000</Rate>
+          <IsCompound>false</IsCompound>
+        </TaxComponent>
+      </TaxComponents>
     </TaxRate>
     <TaxRate>
       <Name>GST on Income</Name>
@@ -91,6 +147,14 @@
       <CanApplyToRevenue>true</CanApplyToRevenue>
       <DisplayTaxRate>10.0000</DisplayTaxRate>
       <EffectiveRate>10.0000</EffectiveRate>
+      <Status>ACTIVE</Status>
+      <TaxComponents>
+        <TaxComponent>
+          <Name>GST</Name>
+          <Rate>10.0000</Rate>
+          <IsCompound>false</IsCompound>
+        </TaxComponent>
+      </TaxComponents>
     </TaxRate>
     <TaxRate>
       <Name>Input Taxed</Name>
@@ -102,6 +166,14 @@
       <CanApplyToRevenue>true</CanApplyToRevenue>
       <DisplayTaxRate>0.0000</DisplayTaxRate>
       <EffectiveRate>0.0000</EffectiveRate>
+      <Status>ACTIVE</Status>
+      <TaxComponents>
+        <TaxComponent>
+          <Name>GST</Name>
+          <Rate>0.0000</Rate>
+          <IsCompound>false</IsCompound>
+        </TaxComponent>
+      </TaxComponents>
     </TaxRate>
     <TaxRate>
       <Name>No GST</Name>
@@ -113,6 +185,14 @@
       <CanApplyToRevenue>true</CanApplyToRevenue>
       <DisplayTaxRate>0.0000</DisplayTaxRate>
       <EffectiveRate>0.0000</EffectiveRate>
+      <Status>ACTIVE</Status>
+      <TaxComponents>
+        <TaxComponent>
+          <Name>GST</Name>
+          <Rate>0.0000</Rate>
+          <IsCompound>false</IsCompound>
+        </TaxComponent>
+      </TaxComponents>
     </TaxRate>
   </TaxRates>
-</Response>
+</Response>

data/test/stub_responses/users.xml

@@ -0,0 +1,17 @@
+<Response xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Id>82fc227d-ad9f-42ed-98aa-583abc49bb54</Id>
+  <Status>OK</Status>
+  <ProviderName>Test Provider Name</ProviderName>
+  <DateTimeUTC>2013-12-05T05:36:43.1758494Z</DateTimeUTC>
+  <Users>
+    <User>
+      <UserID>1a535a0d-68fa-403a-b101-36c019c1995a</UserID>
+      <EmailAddress>user.name@example.com</EmailAddress>
+      <FirstName>User</FirstName>
+      <LastName>Name</LastName>
+      <UpdatedDateUTC>2013-07-08T07:27:11.62</UpdatedDateUTC>
+      <IsSubscriber>true</IsSubscriber>
+      <OrganisationRole>STANDARD</OrganisationRole>
+    </User>
+  </Users>
+</Response>

data/test/unit/generic_application_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class GenericApplicationTest < Test::Unit::TestCase
+  include TestHelper
+
+  def setup
+    @headers = {"User-Agent" => "Xeroizer/2.15.5"}
+    @client = Xeroizer::GenericApplication.new(CONSUMER_KEY, CONSUMER_SECRET, :default_headers => @headers)
+  end
+
+  context "initialization" do
+
+    should "pass default headers" do
+      assert_equal(@headers, @client.default_headers)
+    end
+
+  end
+
+end
+
+

data/test/unit/http_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+class HttpTest < Test::Unit::TestCase
+  include TestHelper
+
+  def setup
+    @headers = {"User-Agent" => "Xeroizer/2.15.5"}
+    @application = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET, :default_headers => @headers)
+  end
+
+  context "default_headers" do
+    should "recognize default_headers" do
+      Xeroizer::OAuth.any_instance.expects(:get).with("/test", has_entry(@headers)).returns(stub(:plain_body => "", :code => "200"))
+      @application.http_get(@application.client, "http://example.com/test")
+    end
+  end
+end
+