xero-ruby 2.1.2 → 2.2.2

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

@@ -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

@@ -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

@@ -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/models/accounting/account.rb

@@ -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

data/lib/xero-ruby/models/accounting/organisation.rb

@@ -114,7 +114,6 @@ module XeroRuby::Accounting
     N6_MONTHLY = "6MONTHLY".freeze
     QUARTERLY = "QUARTERLY".freeze
     YEARLY = "YEARLY".freeze
-    # duplicate definitions generated: https://github.com/XeroAPI/xero-ruby/issues/53#issuecomment-668893305
     # NONE = "NONE".freeze
     
     # The default for LineAmountTypes on sales transactions
@@ -137,7 +136,6 @@ module XeroRuby::Accounting
     
     # Organisation Entity Type
     attr_accessor :organisation_entity_type
-    # duplicate definitions generated: https://github.com/XeroAPI/xero-ruby/issues/53#issuecomment-668893305
     # ACCOUNTING_PRACTICE = "ACCOUNTING_PRACTICE".freeze
     # COMPANY = "COMPANY".freeze
     # CHARITY = "CHARITY".freeze

data/lib/xero-ruby/models/accounting/time_zone.rb

@@ -84,6 +84,7 @@ module XeroRuby::Accounting
     RUSSIATIMEZONE11 = "RUSSIATIMEZONE11".freeze
     NEWZEALANDSTANDARDTIME = "NEWZEALANDSTANDARDTIME".freeze
     UTC12 = "UTC+12".freeze
+    UTC13 = "UTC+13".freeze
     FIJISTANDARDTIME = "FIJISTANDARDTIME".freeze
     KAMCHATKASTANDARDTIME = "KAMCHATKASTANDARDTIME".freeze
     TONGASTANDARDTIME = "TONGASTANDARDTIME".freeze

data/lib/xero-ruby/version.rb

@@ -11,5 +11,5 @@ OpenAPI Generator version: 4.3.1
 =end
 
 module XeroRuby
-  VERSION = '2.1.2'
+  VERSION = '2.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xero-ruby
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.2
 platform: ruby
 authors:
 - Xero API Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -534,6 +534,7 @@ files:
 - spec/projects/models/time_entry_create_or_update_spec.rb
 - spec/projects/models/time_entry_spec.rb
 - spec/spec_helper.rb
+- xero-ruby.gem
 - xero-ruby.gemspec
 homepage: https://developer.xero.com
 licenses: