xero-ruby 2.1.2 → 2.3.1

data/lib/xero-ruby/api/project_api.rb

@@ -3,15 +3,13 @@
 
 #This is the Xero Projects API
 
-The version of the OpenAPI document: 2.3.0
+The version of the OpenAPI document: 2.4.0
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1
 
 =end
 
-require 'cgi'
-
 module XeroRuby
   class ProjectApi
     attr_accessor :api_client
@@ -50,7 +48,8 @@ module XeroRuby
       local_var_path = '/projects'
 
       # camelize keys of incoming `where` opts
-      opts[:'where'] = opts[:'where'].map{|k,v| "#{@api_client.camelize_key(k)}#{v}"}.join(' AND ') if !opts[:'where'].nil?
+      opts[:'where'] = @api_client.parameterize_where(opts[:'where']) if !opts[:'where'].nil?
+
       # query parameters
       query_params = opts[:query_params] || {}
       
@@ -87,7 +86,7 @@ module XeroRuby
         :return_type => return_type
       )
 
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, "ProjectApi", new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: ProjectApi#create_project\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -133,7 +132,8 @@ module XeroRuby
       local_var_path = '/projects/{projectId}/time'.sub('{' + 'projectId' + '}', project_id.to_s)
 
       # camelize keys of incoming `where` opts
-      opts[:'where'] = opts[:'where'].map{|k,v| "#{@api_client.camelize_key(k)}#{v}"}.join(' AND ') if !opts[:'where'].nil?
+      opts[:'where'] = @api_client.parameterize_where(opts[:'where']) if !opts[:'where'].nil?
+
       # query parameters
       query_params = opts[:query_params] || {}
       
@@ -170,7 +170,7 @@ module XeroRuby
         :return_type => return_type
       )
 
-      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, "ProjectApi", new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: ProjectApi#create_time_entry\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -216,7 +216,8 @@ module XeroRuby
       local_var_path = '/projects/{projectId}/time/{timeEntryId}'.sub('{' + 'projectId' + '}', project_id.to_s).sub('{' + 'timeEntryId' + '}', time_entry_id.to_s)
 
       # camelize keys of incoming `where` opts
-      opts[:'where'] = opts[:'where'].map{|k,v| "#{@api_client.camelize_key(k)}#{v}"}.join(' AND ') if !opts[:'where'].nil?
+      opts[:'where'] = @api_client.parameterize_where(opts[:'where']) if !opts[:'where'].nil?
+
       # query parameters
       query_params = opts[:query_params] || {}
       
@@ -249,7 +250,7 @@ module XeroRuby
         :return_type => return_type
       )
 
-      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path, new_options)
+      data, status_code, headers = @api_client.call_api(:DELETE, local_var_path, "ProjectApi", new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: ProjectApi#delete_time_entry\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -289,7 +290,8 @@ module XeroRuby
       local_var_path = '/projects/{projectId}'.sub('{' + 'projectId' + '}', project_id.to_s)
 
       # camelize keys of incoming `where` opts
-      opts[:'where'] = opts[:'where'].map{|k,v| "#{@api_client.camelize_key(k)}#{v}"}.join(' AND ') if !opts[:'where'].nil?
+      opts[:'where'] = @api_client.parameterize_where(opts[:'where']) if !opts[:'where'].nil?
+
       # query parameters
       query_params = opts[:query_params] || {}
       
@@ -324,7 +326,7 @@ module XeroRuby
         :return_type => return_type
       )
 
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, "ProjectApi", new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: ProjectApi#get_project\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -370,7 +372,8 @@ module XeroRuby
       local_var_path = '/projectsusers'
 
       # camelize keys of incoming `where` opts
-      opts[:'where'] = opts[:'where'].map{|k,v| "#{@api_client.camelize_key(k)}#{v}"}.join(' AND ') if !opts[:'where'].nil?
+      opts[:'where'] = @api_client.parameterize_where(opts[:'where']) if !opts[:'where'].nil?
+
       # query parameters
       query_params = opts[:query_params] || {}
       query_params[:'page'] = opts[:'page'] if !opts[:'page'].nil?
@@ -407,7 +410,7 @@ module XeroRuby
         :return_type => return_type
       )
 
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, "ProjectApi", new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: ProjectApi#get_project_users\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -459,7 +462,8 @@ module XeroRuby
       local_var_path = '/projects'
 
       # camelize keys of incoming `where` opts
-      opts[:'where'] = opts[:'where'].map{|k,v| "#{@api_client.camelize_key(k)}#{v}"}.join(' AND ') if !opts[:'where'].nil?
+      opts[:'where'] = @api_client.parameterize_where(opts[:'where']) if !opts[:'where'].nil?
+
       # query parameters
       query_params = opts[:query_params] || {}
       query_params[:'projectIds'] = @api_client.build_collection_param(opts[:'project_ids'], :multi) if !opts[:'project_ids'].nil?
@@ -499,7 +503,7 @@ module XeroRuby
         :return_type => return_type
       )
 
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, "ProjectApi", new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: ProjectApi#get_projects\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -545,7 +549,8 @@ module XeroRuby
       local_var_path = '/projects/{projectId}/tasks/{taskId}'.sub('{' + 'projectId' + '}', project_id.to_s).sub('{' + 'taskId' + '}', task_id.to_s)
 
       # camelize keys of incoming `where` opts
-      opts[:'where'] = opts[:'where'].map{|k,v| "#{@api_client.camelize_key(k)}#{v}"}.join(' AND ') if !opts[:'where'].nil?
+      opts[:'where'] = @api_client.parameterize_where(opts[:'where']) if !opts[:'where'].nil?
+
       # query parameters
       query_params = opts[:query_params] || {}
       
@@ -580,7 +585,7 @@ module XeroRuby
         :return_type => return_type
       )
 
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, "ProjectApi", new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: ProjectApi#get_task\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -626,7 +631,8 @@ module XeroRuby
       local_var_path = '/projects/{projectId}/tasks'.sub('{' + 'projectId' + '}', project_id.to_s)
 
       # camelize keys of incoming `where` opts
-      opts[:'where'] = opts[:'where'].map{|k,v| "#{@api_client.camelize_key(k)}#{v}"}.join(' AND ') if !opts[:'where'].nil?
+      opts[:'where'] = @api_client.parameterize_where(opts[:'where']) if !opts[:'where'].nil?
+
       # query parameters
       query_params = opts[:query_params] || {}
       query_params[:'page'] = opts[:'page'] if !opts[:'page'].nil?
@@ -664,7 +670,7 @@ module XeroRuby
         :return_type => return_type
       )
 
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, "ProjectApi", new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: ProjectApi#get_tasks\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -724,7 +730,8 @@ module XeroRuby
       local_var_path = '/projects/{projectId}/time'.sub('{' + 'projectId' + '}', project_id.to_s)
 
       # camelize keys of incoming `where` opts
-      opts[:'where'] = opts[:'where'].map{|k,v| "#{@api_client.camelize_key(k)}#{v}"}.join(' AND ') if !opts[:'where'].nil?
+      opts[:'where'] = @api_client.parameterize_where(opts[:'where']) if !opts[:'where'].nil?
+
       # query parameters
       query_params = opts[:query_params] || {}
       query_params[:'userId'] = opts[:'user_id'] if !opts[:'user_id'].nil?
@@ -769,7 +776,7 @@ module XeroRuby
         :return_type => return_type
       )
 
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, "ProjectApi", new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: ProjectApi#get_time_entries\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -815,7 +822,8 @@ module XeroRuby
       local_var_path = '/projects/{projectId}/time/{timeEntryId}'.sub('{' + 'projectId' + '}', project_id.to_s).sub('{' + 'timeEntryId' + '}', time_entry_id.to_s)
 
       # camelize keys of incoming `where` opts
-      opts[:'where'] = opts[:'where'].map{|k,v| "#{@api_client.camelize_key(k)}#{v}"}.join(' AND ') if !opts[:'where'].nil?
+      opts[:'where'] = @api_client.parameterize_where(opts[:'where']) if !opts[:'where'].nil?
+
       # query parameters
       query_params = opts[:query_params] || {}
       
@@ -850,7 +858,7 @@ module XeroRuby
         :return_type => return_type
       )
 
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, "ProjectApi", new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: ProjectApi#get_time_entry\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -896,7 +904,8 @@ module XeroRuby
       local_var_path = '/projects/{projectId}'.sub('{' + 'projectId' + '}', project_id.to_s)
 
       # camelize keys of incoming `where` opts
-      opts[:'where'] = opts[:'where'].map{|k,v| "#{@api_client.camelize_key(k)}#{v}"}.join(' AND ') if !opts[:'where'].nil?
+      opts[:'where'] = @api_client.parameterize_where(opts[:'where']) if !opts[:'where'].nil?
+
       # query parameters
       query_params = opts[:query_params] || {}
       
@@ -933,7 +942,7 @@ module XeroRuby
         :return_type => return_type
       )
 
-      data, status_code, headers = @api_client.call_api(:PATCH, local_var_path, new_options)
+      data, status_code, headers = @api_client.call_api(:PATCH, local_var_path, "ProjectApi", new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: ProjectApi#patch_project\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -979,7 +988,8 @@ module XeroRuby
       local_var_path = '/projects/{projectId}'.sub('{' + 'projectId' + '}', project_id.to_s)
 
       # camelize keys of incoming `where` opts
-      opts[:'where'] = opts[:'where'].map{|k,v| "#{@api_client.camelize_key(k)}#{v}"}.join(' AND ') if !opts[:'where'].nil?
+      opts[:'where'] = @api_client.parameterize_where(opts[:'where']) if !opts[:'where'].nil?
+
       # query parameters
       query_params = opts[:query_params] || {}
       
@@ -1016,7 +1026,7 @@ module XeroRuby
         :return_type => return_type
       )
 
-      data, status_code, headers = @api_client.call_api(:PUT, local_var_path, new_options)
+      data, status_code, headers = @api_client.call_api(:PUT, local_var_path, "ProjectApi", new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: ProjectApi#update_project\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
@@ -1068,7 +1078,8 @@ module XeroRuby
       local_var_path = '/projects/{projectId}/time/{timeEntryId}'.sub('{' + 'projectId' + '}', project_id.to_s).sub('{' + 'timeEntryId' + '}', time_entry_id.to_s)
 
       # camelize keys of incoming `where` opts
-      opts[:'where'] = opts[:'where'].map{|k,v| "#{@api_client.camelize_key(k)}#{v}"}.join(' AND ') if !opts[:'where'].nil?
+      opts[:'where'] = @api_client.parameterize_where(opts[:'where']) if !opts[:'where'].nil?
+
       # query parameters
       query_params = opts[:query_params] || {}
       
@@ -1103,7 +1114,7 @@ module XeroRuby
         :return_type => return_type
       )
 
-      data, status_code, headers = @api_client.call_api(:PUT, local_var_path, new_options)
+      data, status_code, headers = @api_client.call_api(:PUT, local_var_path, "ProjectApi", new_options)
       if @api_client.config.debugging
         @api_client.config.logger.debug "API called: ProjectApi#update_time_entry\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end

data/lib/xero-ruby/api_client.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 2.3.0
+The version of the OpenAPI document: 2.4.0
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1
@@ -62,6 +62,26 @@ module XeroRuby
       XeroRuby::ProjectApi.new(self)
     end
 
+    def files_api
+      @config.base_url = @config.files_url
+      XeroRuby::FilesApi.new(self)
+    end
+
+    def payroll_au_api
+      @config.base_url = @config.payroll_au_url
+      XeroRuby::PayrollAuApi.new(self)
+    end
+
+    def payroll_nz_api
+      @config.base_url = @config.payroll_nz_url
+      XeroRuby::PayrollNzApi.new(self)
+    end
+    
+    def payroll_uk_api
+      @config.base_url = @config.payroll_uk_url
+      XeroRuby::PayrollUkApi.new(self)
+    end
+
     # Token Helpers
     def token_set
       XeroRuby.configure.token_set
@@ -132,7 +152,7 @@ module XeroRuby
     #
     # @return [Array<(Object, Integer, Hash)>] an array of 3 elements:
     #   the data deserialized from response body (could be nil), response status code and response headers.
-    def call_api(http_method, path, opts = {})
+    def call_api(http_method, path, api_client, opts = {})
       ssl_options = {
         :ca_file => @config.ssl_ca_file,
         :verify => @config.ssl_verify,
@@ -177,7 +197,7 @@ module XeroRuby
 
       if opts[:return_type]
         prepare_file(response) if opts[:return_type] == 'File'
-        data = deserialize(response, opts[:return_type])
+        data = deserialize(response, opts[:return_type], api_client)
       else
         data = nil
       end
@@ -241,8 +261,7 @@ module XeroRuby
         form_params.each do |key, value|
           case value
           when ::File, ::Tempfile
-            # TODO hardcode to application/octet-stream, need better way to detect content type
-            data[key] = Faraday::UploadIO.new(value.path, 'application/octet-stream', value.path)
+            data[form_params["name"]] = Faraday::UploadIO.new(value.path, form_params["mimeType"], value.path)
           when ::Array, nil
             # let Faraday handle Array and nil parameters
             data[key] = value
@@ -274,7 +293,7 @@ module XeroRuby
     #
     # @param [Response] response HTTP response
     # @param [String] return_type some examples: "User", "Array<User>", "Hash<String, Integer>"
-    def deserialize(response, return_type)
+    def deserialize(response, return_type, api_client)
       body = response.body
 
       # handle file downloading - return the File instance processed in request callbacks
@@ -301,14 +320,14 @@ module XeroRuby
         end
       end 
 
-      convert_to_type(data, return_type)
+      convert_to_type(data, return_type, api_client)
     end
 
     # Convert data to the given return type.
     # @param [Object] data Data to be converted
     # @param [String] return_type Return type
     # @return [Mixed] Data in a particular type
-    def convert_to_type(data, return_type)
+    def convert_to_type(data, return_type, api_client)
       return nil if data.nil?
       case return_type
       when 'String'
@@ -331,44 +350,35 @@ module XeroRuby
       when /\AArray<(.+)>\z/
         # e.g. Array<Pet>
         sub_type = $1
-        data.map { |item| convert_to_type(item, sub_type) }
+        data.map { |item| convert_to_type(item, sub_type, api_client) }
       when /\AHash\<String, (.+)\>\z/
         # e.g. Hash<String, Integer>
         sub_type = $1
         {}.tap do |hash|
-          data.each { |k, v| hash[k] = convert_to_type(v, sub_type) }
+          data.each { |k, v| hash[k] = convert_to_type(v, sub_type, api_client) }
         end
       else
-        api_set = api_set_prefix(return_type)
-        case api_set
-        when 'accounting'
+        case api_client
+        when 'AccountingApi'
           XeroRuby::Accounting.const_get(return_type).build_from_hash(data)
-        when 'assets'
+        when 'AssetApi'
           XeroRuby::Assets.const_get(return_type).build_from_hash(data)
-        when 'projects'
+        when 'ProjectApi'
           XeroRuby::Projects.const_get(return_type).build_from_hash(data)
-        # when 'newapiset' # add new namespace
-          # XeroRuby::<NewAPISet>.const_get(return_type).build_from_hash(data)
+        when 'FilesApi'
+          XeroRuby::Files.const_get(return_type).build_from_hash(data)
+        when 'PayrollAuApi'
+          XeroRuby::PayrollAu.const_get(return_type).build_from_hash(data)
+        when 'PayrollNzApi'
+          XeroRuby::PayrollNz.const_get(return_type).build_from_hash(data)
+        when 'PayrollUkApi'
+          XeroRuby::PayrollUk.const_get(return_type).build_from_hash(data)
         else
           XeroRuby::Accounting.const_get(return_type).build_from_hash(data)
         end
       end
     end
 
-    # Traverses the model tree to find the model's namespacing
-    # based on the deserializing model/return_type name
-    def api_set_prefix(return_type)
-      api_set = ''
-      Find.find("#{File.dirname(__FILE__)}/models/") do |path|
-        model_path = path.split('/')
-        matching_name = model_path.last.gsub('.rb','').gsub("_",'')
-        if return_type.downcase === matching_name
-          api_set = path.split('/')[-2]
-        end
-      end
-      return api_set
-    end
-
     # Save response body into a file in (the defined) temporary folder, using the filename
     # from the "Content-Disposition" header if provided, otherwise a random filename.
     # The response body is written to the file in chunks in order to handle files which
@@ -550,5 +560,38 @@ module XeroRuby
         fail "unknown collection format: #{collection_format.inspect}"
       end
     end
+
+    def parameterize_where(where_opts)
+      where_opts.map do |k,v|
+        case v
+        when Array
+          operator = v.first
+          query = v.last
+          if query.is_a?(Date)
+            "#{camelize_key(k)} #{operator} DateTime(#{query.strftime("%Y,%m,%d")})"
+          elsif [Float, Integer].member?(query.class)
+            %{#{camelize_key(k)} #{operator} #{query}}
+          elsif [true, false].member?(query)
+            %{#{camelize_key(k)} #{operator} #{query}}
+          else
+            if k == :contact_id
+              %{Contact.ContactID #{operator} guid("#{query}")}
+            elsif k == :contact_number
+              %{Contact.ContactNumber #{operator} "#{query}"}
+            else
+              %{#{camelize_key(k)} #{operator} "#{query}"}
+            end
+          end
+        when Range
+          if v.first.is_a?(DateTime) || v.first.is_a?(Date) || v.first.is_a?(Time)
+            "#{camelize_key(k)} >= DateTime(#{v.first.strftime("%Y,%m,%d")}) AND #{camelize_key(k)} <= DateTime(#{v.last.strftime("%Y,%m,%d")})" 
+          else
+            "#{camelize_key(k)} >= #{v.first} AND #{camelize_key(k)} <= #{v.last}"
+          end
+        else
+          %{#{camelize_key(k)} #{v}}
+        end
+      end.join(' AND ')
+    end
   end
 end

data/lib/xero-ruby/api_error.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 2.3.0
+The version of the OpenAPI document: 2.4.0
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1

data/lib/xero-ruby/configuration.rb

@@ -3,7 +3,7 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-The version of the OpenAPI document: 2.3.0
+The version of the OpenAPI document: 2.4.0
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1
@@ -30,6 +30,10 @@ module XeroRuby
     attr_accessor :accounting_url
     attr_accessor :asset_url
     attr_accessor :project_url
+    attr_accessor :files_url
+    attr_accessor :payroll_au_url
+    attr_accessor :payroll_nz_url
+    attr_accessor :payroll_uk_url
 
     # Defines API keys used with API Key authentications.
     #
@@ -139,6 +143,10 @@ module XeroRuby
       @accounting_url = 'https://api.xero.com/api.xro/2.0'
       @asset_url = 'https://api.xero.com/assets.xro/1.0'
       @project_url = 'https://api.xero.com/projects.xro/2.0/'
+      @files_url = 'https://api.xero.com/files.xro/1.0/'
+      @payroll_au_url = 'https://api.xero.com/payroll.xro/1.0/'
+      @payroll_nz_url = 'https://api.xero.com/payroll.xro/2.0/'
+      @payroll_uk_url = 'https://api.xero.com/payroll.xro/2.0/'
       @api_key = {}
       @api_key_prefix = {}
       @timeout = 0