xero-ruby 2.1.0 → 2.2.4

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

@@ -3,7 +3,7 @@
 
 #This is the Xero Assets API
 
-The version of the OpenAPI document: 2.2.12
+The version of the OpenAPI document: 2.3.2
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1
@@ -52,7 +52,8 @@ module XeroRuby
       local_var_path = '/Assets'
 
       # 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] || {}
       
@@ -66,7 +67,7 @@ module XeroRuby
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
       # HTTP header 'Content-Type'
       header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
-      header_params[:'Xero-Tenant-Id'] = xero_tenant_id
+      header_params[:'xero-tenant-id'] = xero_tenant_id
 
       # form parameters
       form_params = opts[:form_params] || {}
@@ -125,7 +126,8 @@ module XeroRuby
       local_var_path = '/AssetTypes'
 
       # 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] || {}
       
@@ -139,7 +141,7 @@ module XeroRuby
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
       # HTTP header 'Content-Type'
       header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
-      header_params[:'Xero-Tenant-Id'] = xero_tenant_id
+      header_params[:'xero-tenant-id'] = xero_tenant_id
 
       # form parameters
       form_params = opts[:form_params] || {}
@@ -202,7 +204,8 @@ module XeroRuby
       local_var_path = '/Assets/{id}'.sub('{' + 'id' + '}', 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] || {}
       
@@ -214,7 +217,7 @@ module XeroRuby
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      header_params[:'Xero-Tenant-Id'] = xero_tenant_id
+      header_params[:'xero-tenant-id'] = xero_tenant_id
 
       # form parameters
       form_params = opts[:form_params] || {}
@@ -271,7 +274,8 @@ module XeroRuby
       local_var_path = '/Settings'
 
       # 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] || {}
       
@@ -283,7 +287,7 @@ module XeroRuby
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      header_params[:'Xero-Tenant-Id'] = xero_tenant_id
+      header_params[:'xero-tenant-id'] = xero_tenant_id
 
       # form parameters
       form_params = opts[:form_params] || {}
@@ -340,7 +344,8 @@ module XeroRuby
       local_var_path = '/AssetTypes'
 
       # 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] || {}
       
@@ -352,7 +357,7 @@ module XeroRuby
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      header_params[:'Xero-Tenant-Id'] = xero_tenant_id
+      header_params[:'xero-tenant-id'] = xero_tenant_id
 
       # form parameters
       form_params = opts[:form_params] || {}
@@ -437,7 +442,8 @@ module XeroRuby
       local_var_path = '/Assets'
 
       # 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[:'status'] = status
@@ -455,7 +461,7 @@ module XeroRuby
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json'])
-      header_params[:'Xero-Tenant-Id'] = xero_tenant_id
+      header_params[:'xero-tenant-id'] = xero_tenant_id
 
       # form parameters
       form_params = opts[:form_params] || {}

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

@@ -3,7 +3,7 @@
 
 #This is the Xero Projects API
 
-The version of the OpenAPI document: 2.2.12
+The version of the OpenAPI document: 2.3.2
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1
@@ -50,7 +50,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] || {}
       
@@ -133,7 +134,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] || {}
       
@@ -216,7 +218,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] || {}
       
@@ -289,7 +292,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] || {}
       
@@ -370,7 +374,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?
@@ -459,7 +464,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?
@@ -545,7 +551,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] || {}
       
@@ -626,7 +633,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?
@@ -724,7 +732,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?
@@ -815,7 +824,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] || {}
       
@@ -896,7 +906,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] || {}
       
@@ -979,7 +990,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] || {}
       
@@ -1068,7 +1080,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] || {}
       

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.2.12
+The version of the OpenAPI document: 2.3.2
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1
@@ -550,5 +550,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.2.12
+The version of the OpenAPI document: 2.3.2
 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.2.12
+The version of the OpenAPI document: 2.3.2
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1
@@ -218,7 +218,7 @@ module XeroRuby
       [
         {
           url: "https://api.xero.com/api.xro/2.0",
-          description: "Xero Accounting API servers",
+          description: "Xero Accounting API server",
         }
       ]
     end

data/lib/xero-ruby/models/accounting/account.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.2.12
+The version of the OpenAPI document: 2.3.2
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1
@@ -91,7 +91,6 @@ module XeroRuby::Accounting
     CISLABOURINCOME = "CISLABOURINCOME".freeze
     CISLIABILITY = "CISLIABILITY".freeze
     CISMATERIALS = "CISMATERIALS".freeze
-    # duplicate definitions generated: https://github.com/XeroAPI/xero-ruby/issues/53#issuecomment-668893305
     # EMPTY = "".freeze
     
     # Shown if set
@@ -290,10 +289,6 @@ module XeroRuby::Accounting
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      if !@code.nil? && @code.to_s.length > 10
-        invalid_properties.push('invalid value for "code", the character length must be smaller than or equal to 10.')
-      end
-
       if !@name.nil? && @name.to_s.length > 150
         invalid_properties.push('invalid value for "name", the character length must be smaller than or equal to 150.')
       end
@@ -304,7 +299,6 @@ module XeroRuby::Accounting
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if !@code.nil? && @code.to_s.length > 10
       return false if !@name.nil? && @name.to_s.length > 150
       status_validator = EnumAttributeValidator.new('String', ["ACTIVE", "ARCHIVED", "DELETED"])
       return false unless status_validator.valid?(@status)
@@ -317,16 +311,6 @@ module XeroRuby::Accounting
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] code Value to be assigned
-    def code=(code)
-      if !code.nil? && code.to_s.length > 10
-        fail ArgumentError, 'invalid value for "code", the character length must be smaller than or equal to 10.'
-      end
-
-      @code = code
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] name Value to be assigned
     def name=(name)
@@ -531,7 +515,7 @@ module XeroRuby::Accounting
     # customized data_parser
     def parse_date(datestring)
       seconds_since_epoch = datestring.scan(/[0-9]+/)[0].to_i / 1000.0
-      return Time.at(seconds_since_epoch).to_s
+      return Time.at(seconds_since_epoch).strftime('%Y-%m-%dT%l:%M:%S%z').to_s
     end
   end
 end

data/lib/xero-ruby/models/accounting/account_type.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.2.12
+The version of the OpenAPI document: 2.3.2
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1

data/lib/xero-ruby/models/accounting/accounts.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.2.12
+The version of the OpenAPI document: 2.3.2
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1
@@ -204,7 +204,7 @@ module XeroRuby::Accounting
     # customized data_parser
     def parse_date(datestring)
       seconds_since_epoch = datestring.scan(/[0-9]+/)[0].to_i / 1000.0
-      return Time.at(seconds_since_epoch).to_s
+      return Time.at(seconds_since_epoch).strftime('%Y-%m-%dT%l:%M:%S%z').to_s
     end
   end
 end

data/lib/xero-ruby/models/accounting/accounts_payable.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.2.12
+The version of the OpenAPI document: 2.3.2
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1
@@ -212,7 +212,7 @@ module XeroRuby::Accounting
     # customized data_parser
     def parse_date(datestring)
       seconds_since_epoch = datestring.scan(/[0-9]+/)[0].to_i / 1000.0
-      return Time.at(seconds_since_epoch).to_s
+      return Time.at(seconds_since_epoch).strftime('%Y-%m-%dT%l:%M:%S%z').to_s
     end
   end
 end

data/lib/xero-ruby/models/accounting/accounts_receivable.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.2.12
+The version of the OpenAPI document: 2.3.2
 Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1
@@ -212,7 +212,7 @@ module XeroRuby::Accounting
     # customized data_parser
     def parse_date(datestring)
       seconds_since_epoch = datestring.scan(/[0-9]+/)[0].to_i / 1000.0
-      return Time.at(seconds_since_epoch).to_s
+      return Time.at(seconds_since_epoch).strftime('%Y-%m-%dT%l:%M:%S%z').to_s
     end
   end
 end