From 26fbfe7d7b31b94e692fce0488e7c58912d5fc08 Mon Sep 17 00:00:00 2001 From: Mikalai Okun Date: Wed, 29 Jul 2020 16:18:32 -0600 Subject: [PATCH 1/4] Update open_invoice.gemspec --- open_invoice.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open_invoice.gemspec b/open_invoice.gemspec index 9e1e896..a75a2d3 100644 --- a/open_invoice.gemspec +++ b/open_invoice.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.add_runtime_dependency "httparty", "~> 0.18.0" - spec.add_runtime_dependency "hashie", "~> 3.4.4" + spec.add_runtime_dependency "hashie", "~> 3.6.0" spec.add_runtime_dependency "activesupport" spec.add_development_dependency "bundler", "~> 2.0" From 254fdf0b6d35a2875ead42f8ecbb52573bcb71ed Mon Sep 17 00:00:00 2001 From: Mikalai Okun Date: Fri, 31 Jul 2020 12:01:18 -0600 Subject: [PATCH 2/4] Temp set-direct envs --- lib/open_invoice/http.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/open_invoice/http.rb b/lib/open_invoice/http.rb index 43bcb0f..ef513d5 100644 --- a/lib/open_invoice/http.rb +++ b/lib/open_invoice/http.rb @@ -4,14 +4,19 @@ module OpenInvoice class Http include HTTParty - base_uri OpenInvoice.configs.base_uri + # base_uri OpenInvoice.configs.base_uri + base_uri ENV["OPEN_INVOICE_BASE_URI"] + # base_uri "https://txjd9lkcvb.execute-api.us-west-2.amazonaws.com/FTONBOARD" headers "Content-Type" => "application/json" headers "Accept" => "application/json" - headers "X-API-KEY" => OpenInvoice.configs.api_token + # headers "X-API-KEY" => OpenInvoice.configs.api_token + headers "X-API-KEY" => ENV["OPEN_INVOICE_API_TOKEN"] + # headers "X-API-KEY" => "vAv8GkJ918ay2YTRlhkfhaO5tbSCfsXa9sQjGn4s2" debug_output $stdout if OpenInvoice.configs.verbose class << self def request(method, endpoint, opts = {}) + byebug request_opts = normalize_request_options(opts) response = send(method, endpoint, request_opts) From 2d22db58814e6d5ce5fe094b13d745b23071511d Mon Sep 17 00:00:00 2001 From: Mikalai Okun Date: Fri, 31 Jul 2020 12:02:34 -0600 Subject: [PATCH 3/4] removed byebug --- lib/open_invoice/http.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/open_invoice/http.rb b/lib/open_invoice/http.rb index ef513d5..2821a8d 100644 --- a/lib/open_invoice/http.rb +++ b/lib/open_invoice/http.rb @@ -16,7 +16,6 @@ class Http class << self def request(method, endpoint, opts = {}) - byebug request_opts = normalize_request_options(opts) response = send(method, endpoint, request_opts) From bb50b80ca5ce2bb646857ee1b0a527f4ac4316a6 Mon Sep 17 00:00:00 2001 From: mricher2000 Date: Thu, 2 May 2024 09:16:56 -0400 Subject: [PATCH 4/4] update oi endpoint versions --- lib/open_invoice/client.rb | 4 ---- lib/open_invoice/configure.rb | 3 +++ lib/open_invoice/entities/buyer.rb | 2 +- lib/open_invoice/entities/invoice.rb | 8 ++++---- lib/open_invoice/entities/payment.rb | 9 --------- lib/open_invoice/entities/user.rb | 2 +- 6 files changed, 9 insertions(+), 19 deletions(-) delete mode 100644 lib/open_invoice/entities/payment.rb diff --git a/lib/open_invoice/client.rb b/lib/open_invoice/client.rb index ac22c87..97385cb 100644 --- a/lib/open_invoice/client.rb +++ b/lib/open_invoice/client.rb @@ -31,9 +31,5 @@ def supplier def buyer @buyer ||= ::OpenInvoice::Entities::Buyer.new(supplier_uuid) end - - def payment - @buyer ||= ::OpenInvoice::Entities::Payment.new(supplier_uuid) - end end end diff --git a/lib/open_invoice/configure.rb b/lib/open_invoice/configure.rb index f5c1e2e..d931f1e 100644 --- a/lib/open_invoice/configure.rb +++ b/lib/open_invoice/configure.rb @@ -6,6 +6,9 @@ module Configure attr_writer(*KEYS) + VERSION_1 = "v1".freeze + VERSION_2 = "v2".freeze + def configure yield self self diff --git a/lib/open_invoice/entities/buyer.rb b/lib/open_invoice/entities/buyer.rb index b723dc6..fa24301 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, "/#{OpenInvoice::Configure::VERSION_2}/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..08c95b8 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, "/#{OpenInvoice::Configure::VERSION_1}/supplier/#{supplier_uuid}/invoices/page", opts) end def attachments(invoice_id, opts = {}) - request(:get, "/supplier/#{supplier_uuid}/invoices/#{invoice_id}/attachments", opts) + request(:get, "/#{OpenInvoice::Configure::VERSION_1}/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 = "/#{OpenInvoice::Configure::VERSION_1}/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, "/#{OpenInvoice::Configure::VERSION_1}/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 deleted file mode 100644 index b3987ca..0000000 --- a/lib/open_invoice/entities/payment.rb +++ /dev/null @@ -1,9 +0,0 @@ -module OpenInvoice - module Entities - class Payment < Base - def index(opts = {}) - request(:get, "/supplier/#{supplier_uuid}/payment", opts) - end - end - end -end diff --git a/lib/open_invoice/entities/user.rb b/lib/open_invoice/entities/user.rb index c8ec9b2..146175b 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, "/#{OpenInvoice::Configure::VERSION_1}/users/#{user_uuid}") end end end