From 0ea95d7c2e19d15182d222413271d868b62ac0e0 Mon Sep 17 00:00:00 2001 From: mricher2000 Date: Fri, 19 Apr 2024 12:58:02 -0400 Subject: [PATCH 1/2] update urls as per docs --- lib/open_invoice/entities/buyer.rb | 2 +- lib/open_invoice/entities/invoice.rb | 8 ++++---- lib/open_invoice/entities/payment.rb | 2 +- lib/open_invoice/entities/supplier.rb | 2 +- lib/open_invoice/entities/user.rb | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/open_invoice/entities/buyer.rb b/lib/open_invoice/entities/buyer.rb index b723dc6..555b9a8 100644 --- a/lib/open_invoice/entities/buyer.rb +++ b/lib/open_invoice/entities/buyer.rb @@ -2,7 +2,7 @@ module OpenInvoice module Entities class Buyer < Base def index(opts = {}) - request(:get, "/supplier/#{supplier_uuid}/buyers", opts) + request(:get, "/v1/supplier/#{supplier_uuid}/buyers", opts) end end end diff --git a/lib/open_invoice/entities/invoice.rb b/lib/open_invoice/entities/invoice.rb index 7e98ef3..37a6aeb 100644 --- a/lib/open_invoice/entities/invoice.rb +++ b/lib/open_invoice/entities/invoice.rb @@ -4,15 +4,15 @@ module OpenInvoice module Entities class Invoice < Base def index(opts = {}) - request(:get, "/supplier/#{supplier_uuid}/invoices/page", opts) + request(:get, "/v1/supplier/#{supplier_uuid}/invoices/page", opts) end def attachments(invoice_id, opts = {}) - request(:get, "/supplier/#{supplier_uuid}/invoices/#{invoice_id}/attachments", opts) + request(:get, "/v1/supplier/#{supplier_uuid}/invoices/#{invoice_id}/attachments", opts) end def download_attachment(invoice_id, attachment_id, file_path, opts) - attachment_url = "/supplier/#{@supplier_uuid}/invoices/#{invoice_id}/attachments/#{attachment_id}" + attachment_url = "/v1/supplier/#{@supplier_uuid}/invoices/#{invoice_id}/attachments/#{attachment_id}" dirname = File.dirname(file_path) opts[:stream_body] = true FileUtils.mkdir_p(dirname) unless File.directory?(dirname) @@ -39,7 +39,7 @@ def download_attachment(invoice_id, attachment_id, file_path, opts) end def history(invoice_id, opts = {}) - request(:get, "/supplier/#{@supplier_uuid}/invoices/#{invoice_id}/history", opts) + request(:get, "/v1/supplier/#{@supplier_uuid}/invoices/#{invoice_id}/history", opts) end end end diff --git a/lib/open_invoice/entities/payment.rb b/lib/open_invoice/entities/payment.rb index b3987ca..60130d0 100644 --- a/lib/open_invoice/entities/payment.rb +++ b/lib/open_invoice/entities/payment.rb @@ -2,7 +2,7 @@ module OpenInvoice module Entities class Payment < Base def index(opts = {}) - request(:get, "/supplier/#{supplier_uuid}/payment", opts) + request(:get, "/v1/supplier/#{supplier_uuid}/payment", opts) end end end diff --git a/lib/open_invoice/entities/supplier.rb b/lib/open_invoice/entities/supplier.rb index b3e2d94..b70d068 100644 --- a/lib/open_invoice/entities/supplier.rb +++ b/lib/open_invoice/entities/supplier.rb @@ -2,7 +2,7 @@ module OpenInvoice module Entities class Supplier < Base def index(opts = {}) - request(:get, "/supplier/#{supplier_uuid}", opts) + request(:get, "/v1/supplier/#{supplier_uuid}", opts) end end end diff --git a/lib/open_invoice/entities/user.rb b/lib/open_invoice/entities/user.rb index c8ec9b2..8b240b2 100644 --- a/lib/open_invoice/entities/user.rb +++ b/lib/open_invoice/entities/user.rb @@ -8,7 +8,7 @@ def initialize(user_uuid) end def get - request(:get, "/users/#{user_uuid}") + request(:get, "/v1/users/#{user_uuid}") end end end From 92177a0a47c1868575491567690363a8aef89d1c Mon Sep 17 00:00:00 2001 From: mricher2000 Date: Mon, 22 Apr 2024 12:26:26 -0400 Subject: [PATCH 2/2] introduce api_version variable --- lib/open_invoice/entities/base.rb | 1 + lib/open_invoice/entities/buyer.rb | 2 +- lib/open_invoice/entities/invoice.rb | 8 ++++---- lib/open_invoice/entities/payment.rb | 2 +- lib/open_invoice/entities/supplier.rb | 2 +- lib/open_invoice/entities/user.rb | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/open_invoice/entities/base.rb b/lib/open_invoice/entities/base.rb index cd91b5c..e4650e5 100644 --- a/lib/open_invoice/entities/base.rb +++ b/lib/open_invoice/entities/base.rb @@ -9,6 +9,7 @@ class Base def initialize(supplier_uuid) @supplier_uuid = supplier_uuid + @api_version = "v1" end def self.request(*args) diff --git a/lib/open_invoice/entities/buyer.rb b/lib/open_invoice/entities/buyer.rb index 555b9a8..34d932e 100644 --- a/lib/open_invoice/entities/buyer.rb +++ b/lib/open_invoice/entities/buyer.rb @@ -2,7 +2,7 @@ module OpenInvoice module Entities class Buyer < Base def index(opts = {}) - request(:get, "/v1/supplier/#{supplier_uuid}/buyers", opts) + request(:get, "/#{@api_version}/supplier/#{supplier_uuid}/buyers", opts) end end end diff --git a/lib/open_invoice/entities/invoice.rb b/lib/open_invoice/entities/invoice.rb index 37a6aeb..4c0ba1f 100644 --- a/lib/open_invoice/entities/invoice.rb +++ b/lib/open_invoice/entities/invoice.rb @@ -4,15 +4,15 @@ module OpenInvoice module Entities class Invoice < Base def index(opts = {}) - request(:get, "/v1/supplier/#{supplier_uuid}/invoices/page", opts) + request(:get, "/#{@api_version}/supplier/#{supplier_uuid}/invoices/page", opts) end def attachments(invoice_id, opts = {}) - request(:get, "/v1/supplier/#{supplier_uuid}/invoices/#{invoice_id}/attachments", opts) + request(:get, "/#{@api_version}/supplier/#{supplier_uuid}/invoices/#{invoice_id}/attachments", opts) end def download_attachment(invoice_id, attachment_id, file_path, opts) - attachment_url = "/v1/supplier/#{@supplier_uuid}/invoices/#{invoice_id}/attachments/#{attachment_id}" + attachment_url = "/#{@api_version}/supplier/#{@supplier_uuid}/invoices/#{invoice_id}/attachments/#{attachment_id}" dirname = File.dirname(file_path) opts[:stream_body] = true FileUtils.mkdir_p(dirname) unless File.directory?(dirname) @@ -39,7 +39,7 @@ def download_attachment(invoice_id, attachment_id, file_path, opts) end def history(invoice_id, opts = {}) - request(:get, "/v1/supplier/#{@supplier_uuid}/invoices/#{invoice_id}/history", opts) + request(:get, "/#{@api_version}/supplier/#{@supplier_uuid}/invoices/#{invoice_id}/history", opts) end end end diff --git a/lib/open_invoice/entities/payment.rb b/lib/open_invoice/entities/payment.rb index 60130d0..2ae13d3 100644 --- a/lib/open_invoice/entities/payment.rb +++ b/lib/open_invoice/entities/payment.rb @@ -2,7 +2,7 @@ module OpenInvoice module Entities class Payment < Base def index(opts = {}) - request(:get, "/v1/supplier/#{supplier_uuid}/payment", opts) + request(:get, "/#{@api_version}/supplier/#{supplier_uuid}/payment", opts) end end end diff --git a/lib/open_invoice/entities/supplier.rb b/lib/open_invoice/entities/supplier.rb index b70d068..a142025 100644 --- a/lib/open_invoice/entities/supplier.rb +++ b/lib/open_invoice/entities/supplier.rb @@ -2,7 +2,7 @@ module OpenInvoice module Entities class Supplier < Base def index(opts = {}) - request(:get, "/v1/supplier/#{supplier_uuid}", opts) + request(:get, "/#{@api_version}/supplier/#{supplier_uuid}", opts) end end end diff --git a/lib/open_invoice/entities/user.rb b/lib/open_invoice/entities/user.rb index 8b240b2..3e2275e 100644 --- a/lib/open_invoice/entities/user.rb +++ b/lib/open_invoice/entities/user.rb @@ -8,7 +8,7 @@ def initialize(user_uuid) end def get - request(:get, "/v1/users/#{user_uuid}") + request(:get, "/#{@api_version}/users/#{user_uuid}") end end end