xero-ruby 2.7.1 → 2.9.1

data/lib/xero-ruby/models/payroll_uk/payslip.rb

@@ -511,7 +511,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/payroll_uk/payslip_object.rb

@@ -202,7 +202,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/payroll_uk/payslips.rb

@@ -204,7 +204,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/payroll_uk/problem.rb

@@ -235,7 +235,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/payroll_uk/reimbursement.rb

@@ -222,7 +222,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/payroll_uk/reimbursement_line.rb

@@ -202,7 +202,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/payroll_uk/reimbursement_object.rb

@@ -202,7 +202,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/payroll_uk/reimbursements.rb

@@ -204,7 +204,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/payroll_uk/salary_and_wage.rb

@@ -46,6 +46,7 @@ module XeroRuby::PayrollUk
     # The type of the payment of the corresponding salary and wages
     attr_accessor :payment_type
     SALARY = "Salary".freeze
+    HOURLY = "Hourly".freeze
     
     class EnumAttributeValidator
       attr_reader :datatype
@@ -193,7 +194,7 @@ module XeroRuby::PayrollUk
       status_validator = EnumAttributeValidator.new('String', ["Active", "Pending", "History"])
       return false unless status_validator.valid?(@status)
       return false if @payment_type.nil?
-      payment_type_validator = EnumAttributeValidator.new('String', ["Salary"])
+      payment_type_validator = EnumAttributeValidator.new('String', ["Salary", "Hourly"])
       return false unless payment_type_validator.valid?(@payment_type)
       true
     end
@@ -211,7 +212,7 @@ module XeroRuby::PayrollUk
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] payment_type Object to be assigned
     def payment_type=(payment_type)
-      validator = EnumAttributeValidator.new('String', ["Salary"])
+      validator = EnumAttributeValidator.new('String', ["Salary", "Hourly"])
       unless validator.valid?(payment_type)
         fail ArgumentError, "invalid value for \"payment_type\", must be one of #{validator.allowable_values}."
       end
@@ -342,7 +343,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/payroll_uk/salary_and_wage_object.rb

@@ -202,7 +202,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/payroll_uk/salary_and_wages.rb

@@ -204,7 +204,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/payroll_uk/settings.rb

@@ -202,7 +202,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/payroll_uk/statutory_deduction.rb

@@ -222,7 +222,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/payroll_uk/tax_line.rb

@@ -232,7 +232,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/payroll_uk/timesheet.rb

@@ -321,7 +321,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/payroll_uk/timesheet_earnings_line.rb

@@ -232,7 +232,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/payroll_uk/timesheet_line.rb

@@ -237,7 +237,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/payroll_uk/timesheet_line_object.rb

@@ -202,7 +202,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/payroll_uk/timesheet_object.rb

@@ -202,7 +202,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/payroll_uk/timesheets.rb

@@ -204,7 +204,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/payroll_uk/tracking_categories.rb

@@ -202,7 +202,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/payroll_uk/tracking_category.rb

@@ -192,7 +192,7 @@ module XeroRuby::PayrollUk
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/projects/amount.rb

@@ -192,7 +192,7 @@ module XeroRuby::Projects
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/projects/error.rb

@@ -192,7 +192,7 @@ module XeroRuby::Projects
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/projects/pagination.rb

@@ -212,7 +212,7 @@ module XeroRuby::Projects
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/projects/project.rb

@@ -397,7 +397,7 @@ module XeroRuby::Projects
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/projects/project_create_or_update.rb

@@ -217,7 +217,7 @@ module XeroRuby::Projects
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/projects/project_patch.rb

@@ -187,7 +187,7 @@ module XeroRuby::Projects
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/projects/project_user.rb

@@ -202,7 +202,7 @@ module XeroRuby::Projects
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/projects/project_users.rb

@@ -194,7 +194,7 @@ module XeroRuby::Projects
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/projects/projects.rb

@@ -194,7 +194,7 @@ module XeroRuby::Projects
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/projects/task.rb

@@ -359,7 +359,7 @@ module XeroRuby::Projects
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/projects/task_create_or_update.rb

@@ -227,7 +227,7 @@ module XeroRuby::Projects
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/projects/tasks.rb

@@ -194,7 +194,7 @@ module XeroRuby::Projects
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/projects/time_entries.rb

@@ -194,7 +194,7 @@ module XeroRuby::Projects
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/projects/time_entry.rb

@@ -298,7 +298,7 @@ module XeroRuby::Projects
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/models/projects/time_entry_create_or_update.rb

@@ -242,7 +242,7 @@ module XeroRuby::Projects
     end
 
     # Returns the object in the form of hash with snake_case
-    def attributes
+    def to_attributes
       to_hash(downcase: true)
     end
 

data/lib/xero-ruby/version.rb

@@ -7,9 +7,9 @@ Contact: api@xero.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 4.3.1
 
-The version of the XeroOpenAPI document: 2.9.4
+The version of the XeroOpenAPI document: 2.10.5
 =end
 
 module XeroRuby
-  VERSION = '2.7.1'
+  VERSION = '2.9.1'
 end

data/spec/api_client_spec.rb

@@ -1,4 +1,4 @@
-require './spec_helper'
+require 'spec_helper'
 
 describe XeroRuby::ApiClient do
   context 'initialization' do
@@ -47,7 +47,7 @@ describe XeroRuby::ApiClient do
             state: 'i-am-customer-state'
           }
           api_client = XeroRuby::ApiClient.new(credentials: creds)
-          expect(api_client.authorization_url).to eq('https://login.xero.com/identity/connect/authorize?response_type=code&client_id=abc&redirect_uri=https://mydomain.com/callback&scope=openid profile email accounting.transactions accounting.settings&state=i-am-customer-state')
+          expect(api_client.authorization_url).to eq('https://login.xero.com/identity/connect/authorize?response_type=code&client_id=abc&redirect_uri=https://mydomain.com/callback&scope=openid+profile+email+accounting.transactions+accounting.settings&state=i-am-customer-state')
         end
 
         it "Does not append state if it is not provided" do
@@ -58,7 +58,7 @@ describe XeroRuby::ApiClient do
             scopes: 'openid profile email accounting.transactions accounting.settings'
           }
           api_client = XeroRuby::ApiClient.new(credentials: creds)
-          expect(api_client.authorization_url).to eq('https://login.xero.com/identity/connect/authorize?response_type=code&client_id=abc&redirect_uri=https://mydomain.com/callback&scope=openid profile email accounting.transactions accounting.settings')
+          expect(api_client.authorization_url).to eq('https://login.xero.com/identity/connect/authorize?response_type=code&client_id=abc&redirect_uri=https://mydomain.com/callback&scope=openid+profile+email+accounting.transactions+accounting.settings')
         end
       end
     end
@@ -137,6 +137,17 @@ describe XeroRuby::ApiClient do
       api_client.connections
       expect(api_client.config.base_url).to eq('https://api.xero.com')  
     end
+
+    it "does not mutate the original opts hash" do
+      expect(api_client).to receive(:call_api).and_return('')
+      opts = {
+        where: {
+          invoice_number: ['=', "INV-0060"]
+        }
+      }
+      api_client.accounting_api.get_invoices('active_tenant_id', opts)
+      expect(opts).to eq({:where=>{:invoice_number=>["=", "INV-0060"]}})
+    end
   end
 
   describe '#deserialize' do
@@ -360,4 +371,85 @@ describe XeroRuby::ApiClient do
       expect(api_client.sanitize_filename('.\sun.gif')).to eq('sun.gif')
     end
   end
+
+  describe 'thread safety in the XeroClient' do
+    let(:creds) {{
+      client_id: 'abc',
+      client_secret: '123',
+      redirect_uri: 'https://mydomain.com/callback',
+      scopes: 'openid profile email accounting.transactions'
+    }}
+    let(:api_client_1) {XeroRuby::ApiClient.new(credentials: creds)}
+    let(:api_client_2) {XeroRuby::ApiClient.new(credentials: creds)}
+    let(:api_client_3) {XeroRuby::ApiClient.new(credentials: creds)}
+
+    let(:tkn_set_1){{id_token: "abc.123.1", access_token: "xxx.yyy.zzz.111"}}
+    let(:tkn_set_2){{id_token: "efg.456.2", access_token: "xxx.yyy.zzz.222"}}
+    
+    describe 'when configuration is changed, other instantiations of the client are not affected' do
+      it 'applies to #set_access_token' do
+        expect(api_client_1.access_token).to eq(nil)
+        expect(api_client_2.access_token).to eq(nil)
+        expect(api_client_3.access_token).to eq(nil)
+
+        api_client_1.set_access_token("ACCESS_TOKEN_1")
+        expect(api_client_1.access_token).to eq("ACCESS_TOKEN_1")
+        expect(api_client_2.access_token).to eq(nil)
+        expect(api_client_3.access_token).to eq(nil)
+
+        api_client_2.set_access_token("ACCESS_TOKEN_2")
+        expect(api_client_1.access_token).to eq("ACCESS_TOKEN_1")
+        expect(api_client_2.access_token).to eq("ACCESS_TOKEN_2")
+        expect(api_client_3.access_token).to eq(nil)
+
+        api_client_3.set_access_token("ACCESS_TOKEN_3")
+        expect(api_client_1.access_token).to eq("ACCESS_TOKEN_1")
+        expect(api_client_2.access_token).to eq("ACCESS_TOKEN_2")
+        expect(api_client_3.access_token).to eq("ACCESS_TOKEN_3")
+      end
+
+      it 'applies to #set_id_token' do
+        expect(api_client_1.id_token).to eq(nil)
+        expect(api_client_2.id_token).to eq(nil)
+
+        api_client_1.set_id_token("id_token_1")
+        expect(api_client_1.id_token).to eq("id_token_1")
+        expect(api_client_2.id_token).to eq(nil)
+
+        api_client_2.set_id_token("id_token_2")
+        expect(api_client_1.id_token).to eq("id_token_1")
+        expect(api_client_2.id_token).to eq("id_token_2")
+      end
+
+      it 'applies to #set_token_set' do 
+        expect(api_client_1.token_set).to eq(nil)
+        expect(api_client_2.token_set).to eq(nil)
+
+        api_client_1.set_token_set(tkn_set_1)
+        expect(api_client_1.token_set).to eq(tkn_set_1)
+        expect(api_client_2.token_set).to eq(nil)
+
+        api_client_2.set_token_set(tkn_set_2)
+        expect(api_client_1.token_set).to eq(tkn_set_1)
+        expect(api_client_2.token_set).to eq(tkn_set_2)
+      end
+      
+      it 'applies to #base_url' do
+        expect(api_client_1.config.base_url).to eq(nil)
+        expect(api_client_2.config.base_url).to eq(nil)
+
+        api_client_1.accounting_api
+        expect(api_client_1.config.base_url).to eq(api_client_1.config.accounting_url)
+        expect(api_client_2.config.base_url).to eq(nil)
+        
+        api_client_2.files_api
+        expect(api_client_1.config.base_url).to eq(api_client_1.config.accounting_url)
+        expect(api_client_2.config.base_url).to eq(api_client_1.config.files_url)
+
+        api_client_2.project_api
+        expect(api_client_1.config.base_url).to eq(api_client_1.config.accounting_url)
+        expect(api_client_2.config.base_url).to eq(api_client_1.config.project_url)
+      end
+    end
+  end
 end