xero-ruby 2.6.2 → 2.8.2

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/string_serialization.rb

@@ -0,0 +1,52 @@
+module XeroRuby
+  module StringSerialization
+    # START - Re-serializes snake_cased params to PascalCase required by XeroAPI
+    def to_camel_keys(value = self)
+      case value
+      when Array
+        value.map { |v| to_camel_keys(v) }
+      when Hash
+        Hash[value.map { |k, v| [camelize_key(k), to_camel_keys(v)] }]
+      else
+        value
+      end
+    end
+
+    def camelize_key(key, first_upper = true)
+      if key.is_a? Symbol
+        camelize(key.to_s, first_upper).to_sym
+      elsif key.is_a? String
+        camelize(key, first_upper)
+      else
+        key # can't camelize anything except strings and symbols
+      end
+    end
+
+    def camelize(word, first_upper = true)
+      if first_upper
+        str = word.to_s
+        str = gsubbed(str, /(?:^|_)([^_\s]+)/)
+        str = gsubbed(str, %r{/([^/]*)}, "::")
+        str
+      else
+        parts = word.split("_", 2)
+        parts[0] << camelize(parts[1]) if parts.size > 1
+        parts[0] || ""
+      end
+    end
+
+    def gsubbed(str, pattern, extra = "")
+      key_map_scronyms = {}
+      str = str.gsub(pattern) do
+        extra + (key_map_scronyms[Regexp.last_match(1)] || capitalize_first(Regexp.last_match(1)))
+      end
+      str
+    end
+
+    def capitalize_first(word)
+      split = word.split('')
+      "#{split[0].capitalize}#{split[1..-1].join}"
+    end
+    # END - Re-serializes snake_cased params to PascalCase required by XeroAPI
+  end
+end

data/lib/xero-ruby/version.rb

@@ -1,5 +1,5 @@
 =begin
-#Accounting API
+#Xero Accounting API
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
@@ -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.8.3
+The version of the XeroOpenAPI document: 2.10.4
 =end
 
 module XeroRuby
-  VERSION = '2.6.2'
+  VERSION = '2.8.2'
 end

data/lib/xero-ruby/where.rb

@@ -0,0 +1,65 @@
+module XeroRuby
+  class Where
+    include StringSerialization
+
+    UUID_REGEXP = /\A[0-9a-f]{8}\b-[0-9a-f]{4}\b-[0-9a-f]{4}\b-[0-9a-f]{4}\b-[0-9a-f]{12}\Z/i
+    STRING_FUNCTIONS = %w(Contains StartsWith EndsWith)
+
+    attr_reader :where_opts
+
+    def initialize(where_opts)
+      @where_opts = where_opts
+    end
+
+    def to_param
+      where_opts.map { |key, value| parameterize_option(key, value) }.join(' AND ')
+    end
+
+    private
+
+    def parameterize_option(key, value)
+      quoted_key = quote_key(key)
+
+      case value
+      when Array
+        operator, query = value
+
+        if STRING_FUNCTIONS.include?(camelize_key(operator))
+          "#{quoted_key}.#{camelize_key(operator)}(#{quote_value(query)})"
+        else
+        "#{quoted_key} #{operator} #{quote_value(query)}"
+        end
+      when Range
+        "#{quoted_key} >= #{quote_value(value.first)} AND #{quoted_key} <= #{quote_value(value.last)}"
+      when /^\./
+        "#{quoted_key}#{value}"
+      else
+        "#{quoted_key} #{value}"
+      end
+    end
+
+    def quote_key(key)
+      case key
+      when :contact_id
+        'Contact.ContactID'
+      when :contact_number
+        'Contact.ContactNumber'
+      else
+        camelize_key(key)
+      end
+    end
+
+    def quote_value(value)
+      case value
+      when DateTime, Date, Time
+        "DateTime(#{value.strftime("%Y,%m,%d")})"
+      when Numeric, false, true
+        value.to_s
+      when UUID_REGEXP
+        %{guid("#{value}")}
+      else
+        %{"#{value.to_s.gsub('"', '""')}"}
+      end
+    end
+  end
+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

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

@@ -6,7 +6,7 @@ describe XeroRuby::Configuration do
   describe 'urls' do
     it 'should have the default value' do
       expect(config.login_url).to eq('https://login.xero.com/identity/connect/authorize')
-      expect(config.token_url).to eq('https://identity.xero.com/connect/token')
+      expect(config.token_url).to eq('https://identity.xero.com/connect')
       expect(config.accounting_url).to eq('https://api.xero.com/api.xro/2.0')
       expect(config.asset_url).to eq('https://api.xero.com/assets.xro/1.0')
       expect(config.project_url).to eq('https://api.xero.com/projects.xro/2.0/')

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}
@@ -71,11 +71,11 @@ describe 'shared helper methdods' do
 
     describe '#attributes' do
       it 'can serialize invoice attributes into a snake_case hash' do
-        expect(invoice.attributes).to eq({currency_code: "USD", has_attachments: false, has_errors: false, invoice_number: "abc-123", total_discount: 100, type: "ACCPAY"})
+        expect(invoice.to_attributes).to eq({currency_code: "USD", has_attachments: false, has_errors: false, invoice_number: "abc-123", total_discount: 100, type: "ACCPAY"})
       end
   
       it 'can serialize contact attributes into a snake_case hash' do
-        expect(contact.attributes).to eq({account_number: "abc-123", contact_status: "ACTIVE", email_address: "email@gmail.com", first_name: 'Contact', has_attachments: false, has_validation_errors: false, last_name: "Name", name: "Contact Name"})
+        expect(contact.to_attributes).to eq({account_number: "abc-123", contact_status: "ACTIVE", email_address: "email@gmail.com", first_name: 'Contact', has_attachments: false, has_validation_errors: false, last_name: "Name", name: "Contact Name"})
       end
     end
   end

data/spec/where_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+describe XeroRuby::Where do
+  let(:query) { described_class.new(opts) }
+
+  subject { query.to_param }
+
+  describe "arrays" do
+    describe "a simple equality test" do
+      let(:opts) { { test_field: ['=', 'test'] } }
+
+      it { is_expected.to eq %{TestField = "test"} }
+    end
+
+    describe "a test with a date" do
+      let(:opts) { { test: ['=', Date.parse('2020-02-01')] } }
+
+      it { is_expected.to eq %{Test = DateTime(2020,02,01)} }
+    end
+
+    describe "multiple options" do
+      let(:opts) { { a: ['=', 1], b: ['=', 2] } }
+
+      it { is_expected.to eq %{A = 1 AND B = 2} }
+    end
+
+    describe "special keys" do
+      let(:opts) { { contact_id: 3, contact_number: 4 } }
+
+      it { is_expected.to eq %{Contact.ContactID 3 AND Contact.ContactNumber 4} }
+    end
+
+    describe "string functions" do
+      let(:opts) { { name: ['Contains', 'ero'] } }
+
+      it { is_expected.to eq %{Name.Contains("ero")} }
+    end
+
+    describe "special characters in the search string" do
+      let(:opts) { { a: ['=', 'quote"quote'] } }
+
+      it { is_expected.to eq %{A = "quote""quote"} }
+    end
+
+    describe "numbers" do
+      let(:opts) { { a: ['=', 10], b: ['=', 20.5] } }
+
+      it { is_expected.to eq %{A = 10 AND B = 20.5} }
+    end
+
+    describe "booleans" do
+      let(:opts) { { a: ['=', false], b: ['=', true] } }
+
+      it { is_expected.to eq %{A = false AND B = true} }
+    end
+
+    describe "UUIDs" do
+      let (:opts) { { a: ['=', '62c54cf8-eb9a-450e-8ca2-bb1fa9237940'] } }
+
+      it { is_expected.to eq %{A = guid("62c54cf8-eb9a-450e-8ca2-bb1fa9237940")} }
+    end
+  end
+
+  describe "ranges" do
+    let(:range) { Date.parse('2020-02-01')..Date.parse('2020-02-15') }
+    let(:opts) { { a: range } }
+
+    it { is_expected.to eq %{A >= DateTime(2020,02,01) AND A <= DateTime(2020,02,15)} }
+  end
+
+  describe "operators starting with a dot" do
+    let(:opts) { {a: '.Test("Hello")' } }
+
+    it { is_expected.to eq %{A.Test("Hello")} }
+  end
+
+  describe "unmatched operators" do
+    let(:opts) { {a: 'something unusual'} }
+
+    it { is_expected.to eq %{A something unusual} }
+  end
+end