xero 0.0.1.1 → 0.0.2

data/README.md

@@ -1,6 +1,6 @@
 # Xero
 
-TODO: Write a gem description
+ActiveModel compliant library for talking with the Xero API
 
 ## Installation
 
@@ -18,7 +18,10 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+    client = Xero::Clients::PrivateApplication.new
+    contacts = client.contacts
+    invoices = client.invoices
+    items = client.items
 
 ## Contributing
 

data/lib/xero/associations/belongs_to.rb

@@ -4,7 +4,6 @@ module Xero
       extend ActiveSupport::Concern
 
       module ClassMethods
-
         def belongs_to(association_name, options = {})
 
           attr_accessor :"#{association_name}_id"

data/lib/xero/associations/has_many.rb

@@ -16,22 +16,19 @@ module Xero
           end
 
           define_method "#{association_name}=" do |value|
+            klass = options[:class_name] || association_name.to_s.singularize
+            klass = "Xero::Models::#{klass.to_s.classify}".constantize
+
             if value.is_a?(Hash) && value[value.keys.first].is_a?(Array)
-              klass = options[:class_name] || association_name.to_s.singularize
-              klass = "Xero::Models::#{klass.to_s.classify}".constantize
               value[value.keys.first].each do |item|
                 self.send(association_name).send :<<, klass.new(item)
               end
+            elsif value.is_a?(Array) && value.all? { |a| a.is_a?(klass) }
+              instance_variable_set(
+                :"@#{association_name}", HasManyProxy.new(value)
+              )
             end
-
-            # if value.is_a?(Hash)
-            #   klass = options[:class_name] || association_name.to_s.singularize
-            #   value = "Xero::Models::#{klass.to_s.classify}".constantize.
-            #     new(value)
-            # end
-            # instance_variable_set(
-            #   :"@#{association_name}", HasManyProxy.new(value)
-            # )
+            self.send(association_name)
           end
         end
       end

data/lib/xero/associations/has_many_proxy.rb

@@ -6,6 +6,10 @@ module Xero
         @target = ::Array.new(*args)
       end
 
+      def xero_attributes
+        target.map(&:xero_attributes)
+      end
+
       protected
 
       def target

data/lib/xero/client.rb

@@ -53,8 +53,10 @@ module Xero
     def save(model)
       model.tap do |item|
         response = self.connection.post(model.class.path, model.to_xero_xml)
-        attrs = Hash.from_xml(response.body)['Response']['Items']['Item']
-        model.id = attrs["#{model.class.to_s.demodulize}ID"]
+        attrs = Hash.from_xml(response.body)['Response'][
+          "#{model.class.to_s.demodulize.pluralize}"
+        ][model.class.to_s.demodulize]
+        model.attributes = attrs
         model.new_record = false
       end
     end

data/lib/xero/models/base_model.rb

@@ -14,7 +14,11 @@ module Xero
 
       def initialize(attributes = {})
         @new_record = true
-        cleanup_hash(attributes).each { |key, value| send("#{key}=", value) }
+        self.attributes = attributes
+      end
+
+      def attributes=(attrs)
+        cleanup_hash(attrs).each { |key, value| send("#{key}=", value) }
       end
 
       def save
@@ -25,10 +29,11 @@ module Xero
       def xero_attributes(attrs = nil)
         attrs ||= attributes.clone
         attrs.delete('id')
+        attrs.delete('updated_date_utc')
         attrs.keys.each do |key|
           value = attrs.delete(key)
           value = xero_attributes(value) if value.is_a?(Hash)
-          attrs[key.to_s.camelize] = value.to_s
+          attrs[key.to_s.camelize] = value.to_s unless value.blank?
         end
         attrs
       end

data/lib/xero/models/contact.rb

@@ -22,6 +22,8 @@ module Xero
 
       has_many :addresses
       has_many :phones
+
+      validates :name, presence: true
     end
   end
 end

data/lib/xero/models/invoice.rb

@@ -4,6 +4,8 @@ module Xero
 
       self.path = 'Invoices'
 
+      TYPES = ['ACCPAY', 'ACCREC']
+
       attribute :type
       attribute :date, type: Date
       attribute :due_date, type: Date
@@ -27,11 +29,22 @@ module Xero
       attribute :sent_to_contact, type: Boolean
       attribute :currency_rate
 
-      has_one :contact
+      has_one  :contact
       has_many :line_items
       has_many :payments
 
       validates :type, presence: true
+      validates :contact, presence: true
+      validates :line_items, presence: true
+
+      def to_xero_xml
+        xero_attributes(attributes.clone).
+          merge('Contact' => contact.xero_attributes).
+          merge('LineItems' => line_items.xero_attributes).
+          merge('Payments' => payments.xero_attributes).
+          to_xml(root: 'Invoice')
+      end
+
     end
   end
 end

data/lib/xero/version.rb

@@ -1,3 +1,3 @@
 module Xero
-  VERSION = "0.0.1.1"
+  VERSION = "0.0.2"
 end

data/spec/lib/xero/clients/private_application_spec.rb

@@ -131,31 +131,68 @@ describe Xero::Clients::PrivateApplication do
   describe '#save' do
     before { configure }
 
-    let(:item) do
-      Xero::Models::Item.new code: 'test-product',
-        description: 'just testing',
-        purchase_details: purchase_detail_attributes,
-        sales_details: sales_detail_attributes
-    end
+    context 'when saving an item' do
+      let(:item) do
+        Xero::Models::Item.new code: 'test-product',
+          description: 'just testing',
+          purchase_details: purchase_detail_attributes,
+          sales_details: sales_detail_attributes
+      end
 
-    let(:purchase_detail_attributes) do
-      { unit_price: 100, account_code: '620', tax_type: 'NONE' }
-    end
+      let(:purchase_detail_attributes) do
+        { unit_price: 100, account_code: '620', tax_type: 'NONE' }
+      end
 
-    let(:sales_detail_attributes) do
-      { unit_price: 550, account_code: '200', tax_type: 'NONE' }
-    end
+      let(:sales_detail_attributes) do
+        { unit_price: 550, account_code: '200', tax_type: 'NONE' }
+      end
 
-    before do
-      VCR.use_cassette('create_item') { client.save(item) }
-    end
+      before do
+        VCR.use_cassette('create_item') { client.save(item) }
+      end
 
-    it 'should populate the item id' do
-      item.id.should_not be_blank
+      it 'should populate the item id' do
+        item.id.should_not be_blank
+      end
+
+      it 'should be persisted' do
+        item.should be_persisted
+      end
     end
 
-    it 'should be persisted' do
-      item.should be_persisted
+    context 'when saving an invoice' do
+      let(:invoice) do
+        Xero::Models::Invoice.new(
+          type: 'ACCREC', contact: contact, line_items: line_items
+        )
+      end
+
+      let(:contact) do
+        Xero::Models::Contact.new(name: 'Xero Gem Test Contact')
+      end
+
+      let(:line_items) { [line_item] }
+
+      let(:line_item) do
+        Xero::Models::LineItem.new(
+          description: 'A test line item from the xero gem',
+          quantity: 2.0,
+          unit_amount: 150.5,
+          account_code: 200
+        )
+      end
+
+      before do
+        VCR.use_cassette('save_invoice') { client.save(invoice) }
+      end
+
+      it 'should persist the invoice' do
+        invoice.should be_persisted
+      end
+
+      it 'should populate the contact id' do
+        invoice.contact.id.should_not be_blank
+      end
     end
   end
 

data/spec/lib/xero/models/contact_spec.rb

@@ -1,4 +1,6 @@
 require 'spec_helper'
 
 describe Xero::Models::Contact do
+
+  it { should validate_presence_of(:name) }
 end

data/spec/lib/xero/models/invoice_spec.rb

@@ -3,4 +3,8 @@ require 'spec_helper'
 describe Xero::Models::Invoice do
 
   it { should validate_presence_of(:type) }
+
+  it { should validate_presence_of(:contact) }
+
+  it { should validate_presence_of(:line_items) }
 end

data/spec/vcr_cassettes/save_invoice.yml

@@ -0,0 +1,83 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://api.xero.com/api.xro/2.0/Invoices
+    body:
+      encoding: US-ASCII
+      string: xml=%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22UTF-8%22%3F%3E%0A%3CInvoice%3E%0A%20%20%3CType%3EACCREC%3C%2FType%3E%0A%20%20%3CContact%3E%0A%20%20%20%20%3CName%3EXero%20Gem%20Test%20Contact%3C%2FName%3E%0A%20%20%3C%2FContact%3E%0A%20%20%3CLineItems%20type%3D%22array%22%3E%0A%20%20%20%20%3CLineItem%3E%0A%20%20%20%20%20%20%3CDescription%3EA%20test%20line%20item%20from%20the%20xero%20gem%3C%2FDescription%3E%0A%20%20%20%20%20%20%3CQuantity%3E2.0%3C%2FQuantity%3E%0A%20%20%20%20%20%20%3CUnitAmount%3E150.5%3C%2FUnitAmount%3E%0A%20%20%20%20%20%20%3CAccountCode%3E200%3C%2FAccountCode%3E%0A%20%20%20%20%3C%2FLineItem%3E%0A%20%20%3C%2FLineItems%3E%0A%20%20%3CPayments%20type%3D%22array%22%2F%3E%0A%3C%2FInvoice%3E%0A
+    headers:
+      charset:
+      - utf-8
+      accept:
+      - ! '*/*'
+      user-agent:
+      - OAuth gem v0.4.7
+      content-length:
+      - '0'
+      content-type:
+      - application/x-www-form-urlencoded
+      authorization:
+      - OAuth oauth_consumer_key="TYMATGTPO5QEAWP8I307AOMBHSOJI2", oauth_nonce="op3Dhu2katMP8le9vB7p3vC1UHIJPHjNmMSZD3RYJ4",
+        oauth_signature="XDBdEuzFijTwE68oekbRE%2BArEv0gt13xMS6izN7qkCf4s6BuRt%2FtIjFKPCHsDXBfaPS%2FVykUTG77PNvvciWc7ImNQv5c23Gm7Mrvtkzw3aH1g%2Fd75QknBp%2FBo8Ik80Rn87Ug3NgKTCCgzlXe7uJ5Nvps02E7LLsb2uWd4nLyEQA%3D",
+        oauth_signature_method="RSA-SHA1", oauth_timestamp="1351978764", oauth_token="TYMATGTPO5QEAWP8I307AOMBHSOJI2",
+        oauth_version="1.0"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      cache-control:
+      - private
+      content-type:
+      - text/xml; charset=utf-8
+      server:
+      - Microsoft-IIS/7.0
+      x-aspnetmvc-version:
+      - '2.0'
+      www-authenticate:
+      - OAuth Realm="api.xero.com"
+      x-aspnet-version:
+      - 4.0.30319
+      x-s:
+      - api2
+      x-powered-by:
+      - ASP.NET
+      date:
+      - Sat, 03 Nov 2012 21:39:22 GMT
+      connection:
+      - close
+      content-length:
+      - '2343'
+    body:
+      encoding: US-ASCII
+      string: ! "<Response xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\r\n
+        \ <Id>5321e06c-062f-4b99-9fe5-e48b56e04c5a</Id>\r\n  <Status>OK</Status>\r\n
+        \ <ProviderName>GoHiring</ProviderName>\r\n  <DateTimeUTC>2012-11-03T21:39:22.937917Z</DateTimeUTC>\r\n
+        \ <Invoices>\r\n    <Invoice>\r\n      <Contact>\r\n        <ContactID>a18c8d85-7ac1-4f14-b470-50adf56ee45f</ContactID>\r\n
+        \       <ContactStatus>ACTIVE</ContactStatus>\r\n        <Name>Xero Gem Test
+        Contact</Name>\r\n        <Addresses>\r\n          <Address>\r\n            <AddressType>POBOX</AddressType>\r\n
+        \         </Address>\r\n          <Address>\r\n            <AddressType>STREET</AddressType>\r\n
+        \         </Address>\r\n        </Addresses>\r\n        <Phones>\r\n          <Phone>\r\n
+        \           <PhoneType>DDI</PhoneType>\r\n          </Phone>\r\n          <Phone>\r\n
+        \           <PhoneType>MOBILE</PhoneType>\r\n          </Phone>\r\n          <Phone>\r\n
+        \           <PhoneType>FAX</PhoneType>\r\n          </Phone>\r\n          <Phone>\r\n
+        \           <PhoneType>DEFAULT</PhoneType>\r\n          </Phone>\r\n        </Phones>\r\n
+        \       <UpdatedDateUTC>2012-11-03T21:39:17.313</UpdatedDateUTC>\r\n        <IsSupplier>false</IsSupplier>\r\n
+        \       <IsCustomer>true</IsCustomer>\r\n      </Contact>\r\n      <Date>2012-11-03T00:00:00</Date>\r\n
+        \     <Status>DRAFT</Status>\r\n      <LineAmountTypes>Exclusive</LineAmountTypes>\r\n
+        \     <LineItems>\r\n        <LineItem>\r\n          <Description>A test line
+        item from the xero gem</Description>\r\n          <UnitAmount>150.50</UnitAmount>\r\n
+        \         <TaxType>OUTPUT</TaxType>\r\n          <TaxAmount>0.00</TaxAmount>\r\n
+        \         <LineAmount>301.00</LineAmount>\r\n          <AccountCode>200</AccountCode>\r\n
+        \         <Quantity>2.0000</Quantity>\r\n        </LineItem>\r\n      </LineItems>\r\n
+        \     <SubTotal>301.00</SubTotal>\r\n      <TotalTax>0.00</TotalTax>\r\n      <Total>301.00</Total>\r\n
+        \     <UpdatedDateUTC>2012-11-03T21:39:22.89</UpdatedDateUTC>\r\n      <CurrencyCode>EUR</CurrencyCode>\r\n
+        \     <Type>ACCREC</Type>\r\n      <InvoiceID>22f90b95-d952-4664-88f9-06900af307e5</InvoiceID>\r\n
+        \     <InvoiceNumber>INV-0003</InvoiceNumber>\r\n      <AmountDue>301.00</AmountDue>\r\n
+        \     <AmountPaid>0.00</AmountPaid>\r\n      <SentToContact>false</SentToContact>\r\n
+        \     <CurrencyRate>1.000000</CurrencyRate>\r\n      <HasAttachments>false</HasAttachments>\r\n
+        \   </Invoice>\r\n  </Invoices>\r\n</Response>"
+    http_version: '1.1'
+  recorded_at: Sat, 03 Nov 2012 21:39:27 GMT
+recorded_with: VCR 2.2.5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xero
 version: !ruby/object:Gem::Version
-  version: 0.0.1.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-03 00:00:00.000000000 Z
+date: 2012-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -221,6 +221,7 @@ files:
 - spec/vcr_cassettes/get_item.yml
 - spec/vcr_cassettes/get_items.yml
 - spec/vcr_cassettes/invoices.yml
+- spec/vcr_cassettes/save_invoice.yml
 - xero.gemspec
 homepage: https://github.com/mattbeedle/xero
 licenses: []
@@ -272,3 +273,4 @@ test_files:
 - spec/vcr_cassettes/get_item.yml
 - spec/vcr_cassettes/get_items.yml
 - spec/vcr_cassettes/invoices.yml
+- spec/vcr_cassettes/save_invoice.yml