xero_gateway-float 2.0.18 → 2.1.1

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -12,3 +12,9 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
+desc "Deploy gem"
+task :deploy do
+  `rm -rf *.gem`
+  `gem build xero_gateway.gemspec`
+  `gem push *.gem`
+end

data/examples/partner_app.rb

@@ -23,7 +23,7 @@ oauth_verifier = gets.chomp
 
 gateway.authorize_from_request(gateway.request_token.token, gateway.request_token.secret, :oauth_verifier => oauth_verifier)
 
-puts "Your access token/secret: #{gateway.access_token.token}, #{gateway.access_token.secret}. Expires: #{gateway.authorization_expires_at}"
+puts "Your access token/secret: #{gateway.access_token.token}, #{gateway.access_token.secret}. Expires: #{gateway.expires_at}"
 puts "(Good for 30 Minutes - but we can renew it!)"
 
 puts "Session Handle: #{gateway.session_handle}"
@@ -33,4 +33,4 @@ pp gateway.get_contacts.contacts.map(&:name)
 
 # Renew!
 gateway.renew_access_token(gateway.access_token.token, gateway.access_token.secret, gateway.session_handle)
-puts "Your renewed access token/secret is:  #{gateway.access_token.token}, #{gateway.access_token.secret}. Expires: #{gateway.authorization_expires_at}"
+puts "Your renewed access token/secret is:  #{gateway.access_token.token}, #{gateway.access_token.secret}. Expires: #{gateway.expires_at}"

data/lib/xero_gateway/accounts_list.rb

@@ -1,10 +1,6 @@
 module XeroGateway
   class AccountsList
     
-    class Error < RuntimeError; end
-    class NoGatewayError < Error; end
-    class AccountsListNotLoadedError < Error; end
-    
     # Xero::Gateway associated with this invoice.
     attr_accessor :gateway
     

data/lib/xero_gateway/bank_transaction.rb

@@ -3,8 +3,6 @@ module XeroGateway
     include Dates
     include LineItemCalculations
 
-    class NoGatewayError < Error; end
-
     GUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/ unless defined?(GUID_REGEX)
 
     TYPES = {

data/lib/xero_gateway/contact.rb

@@ -1,10 +1,7 @@
 module XeroGateway
   class Contact
     include Dates
-    
-    class Error < RuntimeError; end
-    class NoGatewayError < Error; end
-    
+        
     GUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/ unless defined?(GUID_REGEX)
     
     CONTACT_STATUS = {
@@ -126,14 +123,14 @@ module XeroGateway
     end
     
     # Creates this contact record (using gateway.create_contact) with the associated gateway.
-    # If no gateway set, raise a Xero::Contact::NoGatewayError exception.
+    # If no gateway set, raise a NoGatewayError exception.
     def create
       raise NoGatewayError unless gateway
       gateway.create_contact(self)
     end
     
     # Creates this contact record (using gateway.update_contact) with the associated gateway.
-    # If no gateway set, raise a Xero::Contact::NoGatewayError exception.
+    # If no gateway set, raise a NoGatewayError exception.
     def update
       raise NoGatewayError unless gateway
       gateway.update_contact(self)
@@ -143,7 +140,7 @@ module XeroGateway
       b.Contact {
         b.ContactID self.contact_id if self.contact_id
         b.ContactNumber self.contact_number if self.contact_number
-        b.Name self.name
+        b.Name self.name if self.name
         b.EmailAddress self.email if self.email
         b.FirstName self.first_name if self.first_name
         b.LastName self.last_name if self.last_name
@@ -157,10 +154,10 @@ module XeroGateway
         b.DefaultCurrency if self.default_currency
         b.Addresses {
           addresses.each { |address| address.to_xml(b) }
-        }
+        } if self.addresses.any?
         b.Phones {
           phones.each { |phone| phone.to_xml(b) }
-        }
+        } if self.phones.any?
       }
     end
     

data/lib/xero_gateway/credit_note.rb

@@ -4,8 +4,6 @@ module XeroGateway
     include Money
     include LineItemCalculations
     
-    class NoGatewayError < Error; end
-    
     CREDIT_NOTE_TYPE = {
       'ACCRECCREDIT' =>           'Accounts Receivable',
       'ACCPAYCREDIT' =>           'Accounts Payable'
@@ -163,7 +161,7 @@ module XeroGateway
     end
     
     # Creates this credit_note record (using gateway.create_credit_note) with the associated gateway.
-    # If no gateway set, raise a Xero::CreditNote::NoGatewayError exception.
+    # If no gateway set, raise a NoGatewayError exception.
     def create
       raise NoGatewayError unless gateway
       gateway.create_credit_note(self)

data/lib/xero_gateway/error.rb

@@ -14,5 +14,21 @@ module XeroGateway
       end
       return true
     end
+
+    # pass a REXML::Element error object to 
+    # have returned a new Error object
+    def self.parse(error_element)
+      description = REXML::XPath.first(error_element, "Description")
+      date = REXML::XPath.first(error_element, "//DateTime")
+      type = REXML::XPath.first(error_element, "//ExceptionType")
+      message = REXML::XPath.first(error_element, "//Message")
+      Error.new(
+        :description => (description.text if description),
+        :date_time => (date.text if date),
+        :type => (type.text if type),
+        :message => (message.text if message)
+      )
+    end
+
   end
 end

data/lib/xero_gateway/exceptions.rb

@@ -1,4 +1,8 @@
 module XeroGateway
+  class NoGatewayError < StandardError; end
+  class AccountsListNotLoadedError < StandardError; end
+  class InvalidLineItemError < StandardError; end
+
   class ApiException < StandardError
     
     def initialize(type, message, request_xml, response_xml)
@@ -43,4 +47,5 @@ module XeroGateway
   class InvoiceNotFoundError < StandardError; end
   class BankTransactionNotFoundError < StandardError; end
   class CreditNoteNotFoundError < StandardError; end
+  class ManualJournalNotFoundError < StandardError; end
 end