xeroizer 2.15.5 → 2.15.6

data/lib/xeroizer/models/tax_component.rb

@@ -0,0 +1,13 @@
+module Xeroizer
+  module Record
+    class TaxComponentModel < BaseModel
+      set_permissions :read
+    end
+
+    class TaxComponent < Base
+      string      :name
+      decimal     :rate
+      boolean     :is_compound
+    end
+  end
+end

data/lib/xeroizer/models/tax_rate.rb

@@ -5,9 +5,19 @@ module Xeroizer
             
       set_permissions :read
       
+      # TaxRates can be created using either POST or PUT.
+      # POST will also silently update the tax, which can
+      # be unexpected.  PUT is only for create.
+      def create_method
+        :http_put
+      end
     end
     
     class TaxRate < Base
+      set_primary_key :tax_type
+      set_possible_primary_keys :tax_type, :name
+      
+      set_primary_key :name
       
       string  :name
       string  :tax_type
@@ -19,8 +29,9 @@ module Xeroizer
       boolean :can_apply_to_revenue
       decimal :display_tax_rate
       decimal :effective_rate
-      
+
+      has_many :tax_components
     end
-    
+
   end
-end
+end

data/lib/xeroizer/models/user.rb

@@ -0,0 +1,26 @@
+module Xeroizer
+  module Record
+
+    class UserModel < BaseModel
+
+      set_api_controller_name 'User'
+      set_permissions :read
+
+    end
+
+    class User < Base
+
+      set_primary_key :user_id
+
+      guid         :user_id
+      string       :email_address
+      string       :first_name
+      string       :last_name
+      datetime_utc :updated_date_utc, :api_name => 'UpdatedDateUTC'
+      boolean      :is_subscriber
+      string       :organisation_role
+
+    end
+
+  end
+end

data/lib/xeroizer/oauth.rb

@@ -84,13 +84,13 @@ module Xeroizer
     #
     # @option params [String] :oauth_callback URL to redirect user to when they have authenticated your application with Xero. If not specified, the user will be shown an authorisation code on the screen that they need to get into your application.
     def request_token(params = {})
-      consumer.get_request_token(params)
+      consumer.get_request_token(params, {}, @consumer_options[:default_headers])
     end
     
     # Create an AccessToken from a PUBLIC/PARTNER authorisation.
     def authorize_from_request(rtoken, rsecret, params = {})
       request_token = ::OAuth::RequestToken.new(consumer, rtoken, rsecret)
-      access_token = request_token.get_access_token(params)
+      access_token = request_token.get_access_token(params, {}, @consumer_options[:default_headers])
       update_attributes_from_token(access_token)
     end
     
@@ -116,7 +116,7 @@ module Xeroizer
       access_token = old_token.get_access_token({
         :oauth_session_handle => (session_handle || @session_handle), 
         :token => old_token
-      })
+      }, {}, @consumer_options[:default_headers])
       update_attributes_from_token(access_token)
     end
 

data/lib/xeroizer/record/base.rb

@@ -6,60 +6,68 @@ require 'xeroizer/logging'
 
 module Xeroizer
   module Record
-    
+
     class Base
-      
+
       include ClassLevelInheritableAttributes
       class_inheritable_attributes :fields, :possible_primary_keys, :primary_key_name, :summary_only, :validators
-                 
+
       attr_reader :attributes
       attr_reader :parent
+      attr_reader :model
       attr_accessor :errors
       attr_accessor :complete_record_downloaded
-      
+
       include ModelDefinitionHelper
       include RecordAssociationHelper
       include ValidationHelper
       include XmlHelper
-      
+
       class << self
 
         # Build a record with attributes set to the value of attributes.
         def build(attributes, parent)
           record = new(parent)
           attributes.each do | key, value |
-            record.send("#{key}=".to_sym, value)
+            attr = record.respond_to?("#{key}=") ? key : record.class.fields[key][:internal_name]
+            record.send("#{attr}=", value)
           end
           record
         end
-        
+
       end
-      
+
       public
-      
+
         def initialize(parent)
           @parent = parent
+          @model = new_model_class(self.class.name.demodulize)
           @attributes = {}
         end
-        
+
         def new_model_class(model_name)
-          Xeroizer::Record.const_get("#{model_name}Model".to_sym).new(parent.application, model_name.to_s)
+          Xeroizer::Record.const_get("#{model_name}Model".to_sym).new(parent.try(:application), model_name.to_s)
         end
-        
+
         def [](attribute)
           self.send(attribute)
         end
-        
+
         def []=(attribute, value)
           parent.mark_dirty(self) if parent
           self.send("#{attribute}=".to_sym, value)
         end
 
+        def non_calculated_attributes
+          attributes.reject {|name| self.class.fields[name][:calculated] }
+        end
+
         def attributes=(new_attributes)
           return unless new_attributes.is_a?(Hash)
           parent.mark_dirty(self) if parent
           new_attributes.each do | key, value |
-            self.send("#{key}=".to_sym, value)
+            attr = respond_to?("#{key}=") ? key : self.class.fields[key][:internal_name]
+            self.send("#{attr}=", value)
           end
         end
 
@@ -67,11 +75,11 @@ module Xeroizer
           self.attributes = attributes
           save
         end
-        
+
         def new_record?
           id.nil?
         end
-        
+
         # Check to see if the complete record is downloaded.
         def complete_record_downloaded?
           if !!self.class.list_contains_summary_only?
@@ -80,7 +88,7 @@ module Xeroizer
             true
           end
         end
-        
+
         # Downloads the complete record if we only have a summary of the record.
         def download_complete_record!
           record = self.parent.find(self.id)
@@ -89,7 +97,7 @@ module Xeroizer
           parent.mark_clean(self)
           self
         end
-        
+
         def save
           return false unless valid?
           if new_record?
@@ -105,7 +113,7 @@ module Xeroizer
           parent.mark_clean(self)
           true
         end
-        
+
         def to_json(*args)
           to_h.to_json(*args)
         end
@@ -128,37 +136,38 @@ module Xeroizer
           end.join(", ")
           "#<#{self.class} #{attribute_string}>"
         end
-                
+
       protected
-      
+
         # Attempt to create a new record.
         def create
           request = to_xml
           log "[CREATE SENT] (#{__FILE__}:#{__LINE__}) #{request}"
-          
-          response = parent.http_post(request)
+
+          response = parent.send(parent.create_method, request)
+
           log "[CREATE RECEIVED] (#{__FILE__}:#{__LINE__}) #{response}"
-          
+
           parse_save_response(response)
         end
-        
+
         # Attempt to update an existing record.
         def update
           if self.class.possible_primary_keys && self.class.possible_primary_keys.all? { | possible_key | self[possible_key].nil? }
             raise RecordKeyMustBeDefined.new(self.class.possible_primary_keys)
           end
-          
+
           request = to_xml
-          
+
           log "[UPDATE SENT] (#{__FILE__}:#{__LINE__}) \r\n#{request}"
-          
+
           response = parent.http_post(request)
 
           log "[UPDATE RECEIVED] (#{__FILE__}:#{__LINE__}) \r\n#{response}"
 
           parse_save_response(response)
         end
-        
+
         # Parse the response from a create/update request.
         def parse_save_response(response_xml)
           response = parent.parse_response(response_xml)
@@ -172,8 +181,8 @@ module Xeroizer
         def log(what)
           Xeroizer::Logging::Log.info what
         end
-                     
+
     end
-    
+
   end
 end

data/lib/xeroizer/record/base_model.rb

@@ -2,19 +2,19 @@ require 'xeroizer/record/base_model_http_proxy'
 
 module Xeroizer
   module Record
-    
+
     class BaseModel
 
       include ClassLevelInheritableAttributes
       class_inheritable_attributes :api_controller_name
-      
+
       module InvaidPermissionError; end
       class InvalidPermissionError < StandardError
         include InvaidPermissionError
       end
       ALLOWED_PERMISSIONS = [:read, :write, :update]
       class_inheritable_attributes :permissions
-      
+
       class_inheritable_attributes :xml_root_name
       class_inheritable_attributes :optional_xml_root_name
       class_inheritable_attributes :xml_node_name
@@ -27,18 +27,18 @@ module Xeroizer
       attr_reader :model_name
       attr :model_class
       attr_reader :response
-      
+
       class << self
-        
-        # Method to allow override of the default controller name used 
-        # in the API URLs. 
+
+        # Method to allow override of the default controller name used
+        # in the API URLs.
         #
         # Default: pluaralized model name (e.g. if the controller name is
         # Invoice then the default is Invoices.
         def set_api_controller_name(controller_name)
           self.api_controller_name = controller_name
         end
-        
+
         # Set the permissions allowed for this class type.
         # There are no permissions set by default.
         # Valid permissions are :read, :write, :update.
@@ -49,34 +49,34 @@ module Xeroizer
             self.permissions[permission] = true
           end
         end
-        
+
         # Method to allow override of the default XML node name.
         #
         # Default: singularized model name in camel-case.
         def set_xml_node_name(node_name)
           self.xml_node_name = node_name
         end
-        
+
         # Method to allow override of the default XML root name to use
         # in has_many associations.
         def set_xml_root_name(root_name)
           self.xml_root_name = root_name
         end
-        
+
         # Method to add an extra top-level node to use in has_many associations.
         def set_optional_xml_root_name(optional_root_name)
-          self.optional_root_name = optional_root_name
+          self.optional_xml_root_name = optional_root_name
         end
-        
+
       end
-            
+
       public
-        
+
         def initialize(application, model_name)
           @application = application
           @model_name = model_name
         end
-        
+
         # Retrieve the controller name.
         #
         # Default: pluaralized model name (e.g. if the controller name is
@@ -84,11 +84,11 @@ module Xeroizer
         def api_controller_name
           self.class.api_controller_name || model_name.pluralize
         end
-        
+
         def model_class
           @model_class ||= Xeroizer::Record.const_get(model_name.to_sym)
         end
-        
+
         # Build a record with attributes set to the value of attributes.
         def build(attributes = {})
           model_class.build(attributes, self).tap do |resource|
@@ -113,15 +113,15 @@ module Xeroizer
         def create(attributes = {})
           build(attributes).tap { |resource| resource.save }
         end
-        
-        # Retreive full record list for this model. 
+
+        # Retreive full record list for this model.
         def all(options = {})
           raise MethodNotAllowed.new(self, :all) unless self.class.permissions[:read]
           response_xml = http_get(parse_params(options))
           response = parse_response(response_xml, options)
           response.response_items || []
         end
-        
+
         # Helper method to retrieve just the first element from
         # the full record list.
         def first(options = {})
@@ -129,7 +129,7 @@ module Xeroizer
           result = all(options)
           result.first if result.is_a?(Array)
         end
-        
+
         # Retrieve record matching the passed in ID.
         def find(id, options = {})
           raise MethodNotAllowed.new(self, :all) unless self.class.permissions[:read]
@@ -141,6 +141,7 @@ module Xeroizer
         end
 
         def batch_save(chunk_size = DEFAULT_RECORDS_PER_BATCH_SAVE)
+          no_errors = true
           @objects = {}
           @allow_batch_operations = true
 
@@ -149,15 +150,16 @@ module Xeroizer
           if @objects[model_class]
             objects = @objects[model_class].values.compact
             return false unless objects.all?(&:valid?)
-            actions = objects.group_by {|o| o.new_record? ? :http_put : :http_post }
+            actions = objects.group_by {|o| o.new_record? ? create_method : :http_post }
             actions.each_pair do |http_method, records|
               records.each_slice(chunk_size) do |some_records|
                 request = to_bulk_xml(some_records)
                 response = parse_response(self.send(http_method, request, {:summarizeErrors => false}))
                 response.response_items.each_with_index do |record, i|
                   if record and record.is_a?(model_class)
-                    some_records[i].attributes = record.attributes
+                    some_records[i].attributes = record.non_calculated_attributes
                     some_records[i].errors = record.errors
+                    no_errors = record.errors.nil? || record.errors.empty? if no_errors
                     some_records[i].saved!
                   end
                 end
@@ -167,7 +169,7 @@ module Xeroizer
 
           @objects = {}
           @allow_batch_operations = false
-          true
+          no_errors
         end
 
         def parse_response(response_xml, options = {})
@@ -179,6 +181,10 @@ module Xeroizer
           end
         end
 
+        def create_method
+          :http_put
+        end
+
       protected
 
         # Parse the records part of the XML response and builds model instances as necessary.