xero-ruby 2.8.0 → 2.9.1

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

@@ -36,6 +36,7 @@ module XeroRuby::PayrollNz
     DRAFT = "Draft".freeze
     APPROVED = "Approved".freeze
     COMPLETED = "Completed".freeze
+    REQUESTED = "Requested".freeze
     
     # The Total Hours of the Timesheet
     attr_accessor :total_hours
@@ -182,7 +183,7 @@ module XeroRuby::PayrollNz
       return false if @employee_id.nil?
       return false if @start_date.nil?
       return false if @end_date.nil?
-      status_validator = EnumAttributeValidator.new('String', ["Draft", "Approved", "Completed"])
+      status_validator = EnumAttributeValidator.new('String', ["Draft", "Approved", "Completed", "Requested"])
       return false unless status_validator.valid?(@status)
       true
     end
@@ -190,7 +191,7 @@ module XeroRuby::PayrollNz
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] status Object to be assigned
     def status=(status)
-      validator = EnumAttributeValidator.new('String', ["Draft", "Approved", "Completed"])
+      validator = EnumAttributeValidator.new('String', ["Draft", "Approved", "Completed", "Requested"])
       unless validator.valid?(status)
         fail ArgumentError, "invalid value for \"status\", must be one of #{validator.allowable_values}."
       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

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.8.0'
+  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

data/spec/api_error_spec.rb

@@ -1,4 +1,4 @@
-require './spec_helper'
+require 'spec_helper'
 
 describe XeroRuby::ApiError do
   context 'initialization' do

data/spec/configuration_spec.rb

@@ -16,4 +16,21 @@ describe XeroRuby::Configuration do
       expect(config.payroll_uk_url).to eq('https://api.xero.com/payroll.xro/2.0/')
     end
   end
+
+  describe 'config' do
+    it 'should apply the default configuration options' do
+      client = XeroRuby::ApiClient.new(credentials: {})
+      expect(client.config.login_url).to eq('https://login.xero.com/identity/connect/authorize')
+    end
+
+    it 'should allow you to overwrite the default configuration options' do
+      client = XeroRuby::ApiClient.new(credentials: {}, config: {login_url: 'ngrok.login.xero.test'})
+      expect(client.config.login_url).to eq('ngrok.login.xero.test')
+    end
+
+    it 'should allow you to set the timeout config option' do
+      client = XeroRuby::ApiClient.new(credentials: {}, config: {timeout: 30})
+      expect(client.config.timeout).to eq(30)
+    end
+  end
 end

data/spec/files/models/inline_object_spec.rb

@@ -14,13 +14,13 @@ require 'spec_helper'
 require 'json'
 require 'date'
 
-# Unit tests for XeroRuby::Files::InlineObject
+# Unit tests for XeroRuby::Files::FileObject
 # Automatically generated by openapi-generator (https://openapi-generator.tech)
 # Please update as you see appropriate
 describe 'InlineObject' do
   before do
     # run before each test
-    @instance = XeroRuby::Files::InlineObject.new
+    @instance = XeroRuby::Files::FileObject.new
   end
 
   after do
@@ -29,7 +29,7 @@ describe 'InlineObject' do
 
   describe 'test an instance of InlineObject' do
     it 'should create an instance of InlineObject' do
-      expect(@instance).to be_instance_of(XeroRuby::Files::InlineObject)
+      expect(@instance).to be_instance_of(XeroRuby::Files::FileObject)
     end
   end
   describe 'test attribute "body"' do

data/spec/helper_methods_spec.rb

@@ -1,6 +1,6 @@
-require './spec_helper'
+require 'spec_helper'
 
-describe 'shared helper methdods' do
+describe 'shared helper methods' do
 
   describe '#parse_date' do
     let(:model_instance) {XeroRuby::Accounting::Account.new}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xero-ruby
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Xero API Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -232,9 +232,9 @@ files:
 - lib/xero-ruby/models/files/files.rb
 - lib/xero-ruby/models/files/folder.rb
 - lib/xero-ruby/models/files/folders.rb
-- lib/xero-ruby/models/files/inline_object.rb
 - lib/xero-ruby/models/files/object_group.rb
 - lib/xero-ruby/models/files/object_type.rb
+- lib/xero-ruby/models/files/upload_object.rb
 - lib/xero-ruby/models/files/user.rb
 - lib/xero-ruby/models/payroll_au/account.rb
 - lib/xero-ruby/models/payroll_au/account_type.rb