Use faraday middleware to parse json and webmocks for specs

.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/.idea/

lib/moneybird/client.rb

@@ -1,6 +1,8 @@
+require 'faraday_middleware'
+
 module Moneybird
   class Client
-    attr_reader :bearer_token, :_last_response
+    attr_reader :bearer_token
     attr_accessor :errors
     attr_writer :http, :faraday_adapter
 
@@ -9,7 +11,7 @@ def initialize(bearer_token)
     end
 
     def base_url
-      "https://moneybird.com/api/#{version}/"
+      "https://moneybird.com/"
     end
 
     def version
@@ -21,50 +23,32 @@ def faraday_adapter
     end
 
     def http
-      @http ||= begin
-        uri = uri_for_path(base_url)
-        http = Faraday.new(:url => uri) do |faraday|
-          faraday.request  :url_encoded
-          faraday.adapter  faraday_adapter
-        end
-        http
+      @http ||= Faraday.new(url: base_url) do |faraday|
+        faraday.headers = faraday_headers
+        faraday.request :url_encoded
+        faraday.response :json
+        faraday.adapter faraday_adapter
       end
     end
 
-    def headers
-      {
-        'Accept' => 'application/json',
-        'Content-Type' => 'application/json',
-        'Authorization' => "Bearer #{bearer_token}"
-      }
-    end
-
-    def uri_for_path(path)
-      URI.parse(File.join(base_url, path))
-    end
-
-    def get(path, headers={})
-      uri = uri_for_path(path)
-      @_last_response = http.get(uri.request_uri, nil, self.headers.merge(headers))
-    end
-
-    def patch(path, body=nil, headers={})
-      uri = uri_for_path(path)
-      @_last_response = http.patch(uri.request_uri, body, self.headers.merge(headers))
+    %i[get patch post delete].each do |call|
+      define_method call do |path, options = {}|
+        http.public_send(call, "/api/#{version}/#{path}", options).body
+      end
     end
 
-    def post(path, body=nil, headers={})
-      uri = uri_for_path(path)
-      @_last_response = http.post(uri.request_uri, body, self.headers.merge(headers))
+    def administrations
+      Moneybird::Service::Administration.new(self).all
     end
 
-    def delete(path, headers={})
-      uri = uri_for_path(path)
-      @_last_response = http.delete(uri.request_uri, nil, self.headers.merge(headers))
-    end
+    private
 
-    def administrations
-      Moneybird::Service::Administration.new(self).all
+    def faraday_headers
+      {
+        'Accept' => 'application/json',
+        'Content-Type' => 'application/json',
+        'Authorization' => "Bearer #{bearer_token}"
+      }
     end
   end
 end

lib/moneybird/service/administration.rb

@@ -9,14 +9,16 @@ def initialize(client)
       @client = client
     end
 
-    def resource_class
-      Moneybird::Resource::Administration
-    end
-
     def find(id)
       all.find{ |administration| administration.id.to_i == id }
     end
 
+    private
+
+    def resource_class
+      Moneybird::Resource::Administration
+    end
+
     def path
       '/administrations'
     end

lib/moneybird/service/contact.rb

@@ -7,20 +7,18 @@ class Contact
     include Moneybird::Traits::Save
     include Moneybird::Traits::Delete
 
+    def find_by_customer_id(customer_id)
+      build client.get("#{path}/customer_id/#{customer_id}")
+    end
+
+    private
+
     def resource_class
       Moneybird::Resource::Contact
     end
 
     def path
       "#{administration_id}/contacts"
     end
-
-    def find_by_customer_id(customer_id)
-      result = client.get("#{path}/customer_id/#{customer_id}")
-
-      if result.status.to_i == GET_SUCCESS_CODE
-        build(JSON.parse(result.body))
-      end
-    end
   end
 end

lib/moneybird/service/document_style.rb

@@ -4,6 +4,8 @@ class DocumentStyle
     include Moneybird::Traits::Service
     include Moneybird::Traits::FindAll
 
+    private
+
     def resource_class
       Moneybird::Resource::DocumentStyle
     end

lib/moneybird/service/documents/general_document.rb

@@ -7,6 +7,8 @@ class GeneralDocument
     include Moneybird::Traits::Save
     include Moneybird::Traits::Delete
 
+    private
+
     def resource_class
       Moneybird::Resource::Documents::GeneralDocument
     end

lib/moneybird/service/documents/general_journal_document.rb

@@ -7,6 +7,8 @@ class GeneralJournalDocument
     include Moneybird::Traits::Save
     include Moneybird::Traits::Delete
 
+    private
+
     def resource_class
       Moneybird::Resource::Documents::GeneralJournalDocument
     end

lib/moneybird/service/documents/purchase_invoice.rb

@@ -7,6 +7,8 @@ class PurchaseInvoice
     include Moneybird::Traits::Save
     include Moneybird::Traits::Delete
 
+    private
+
     def resource_class
       Moneybird::Resource::Documents::Receipt
     end

lib/moneybird/service/documents/receipt.rb

@@ -7,6 +7,8 @@ class Receipt
     include Moneybird::Traits::Save
     include Moneybird::Traits::Delete
 
+    private
+
     def resource_class
       Moneybird::Resource::Documents::Receipt
     end

lib/moneybird/service/documents/typeless_document.rb

@@ -7,6 +7,8 @@ class TypelessDocument
     include Moneybird::Traits::Save
     include Moneybird::Traits::Delete
 
+    private
+
     def resource_class
       Moneybird::Resource::Documents::TypelessDocument
     end

lib/moneybird/service/estimate.rb

@@ -7,6 +7,8 @@ class Estimate
     include Moneybird::Traits::Save
     include Moneybird::Traits::Delete
 
+    private
+
     def resource_class
       Moneybird::Resource::Estimate
     end

lib/moneybird/service/financial_account.rb

@@ -4,6 +4,8 @@ class FinancialAccount
     include Moneybird::Traits::Service
     include Moneybird::Traits::FindAll
 
+    private
+
     def resource_class
       Moneybird::Resource::FinancialAccount
     end

lib/moneybird/service/financial_mutation.rb

@@ -4,6 +4,8 @@ class FinancialMutation
     include Moneybird::Traits::Service
     include Moneybird::Traits::FindAll
 
+    private
+
     def resource_class
       Moneybird::Resource::FinancialMutation
     end

lib/moneybird/service/identity.rb

@@ -7,6 +7,8 @@ class Identity
     include Moneybird::Traits::Save
     include Moneybird::Traits::Delete
 
+    private
+
     def resource_class
       Moneybird::Resource::Identity
     end

lib/moneybird/service/ledger_account.rb

@@ -7,6 +7,8 @@ class LedgerAccount
     include Moneybird::Traits::Save
     include Moneybird::Traits::Delete
 
+    private
+
     def resource_class
       Moneybird::Resource::LedgerAccount
     end

lib/moneybird/service/product.rb

@@ -7,6 +7,8 @@ class Product
     include Moneybird::Traits::Save
     include Moneybird::Traits::Delete
 
+    private
+
     def resource_class
       Moneybird::Resource::Product
     end

lib/moneybird/service/purchase_invoice.rb

@@ -7,6 +7,8 @@ class PurchaseInvoice
     include Moneybird::Traits::Save
     include Moneybird::Traits::Delete
 
+    private
+
     def resource_class
       Moneybird::Resource::PurchaseInvoice
     end

lib/moneybird/service/recurring_sales_invoice.rb

@@ -7,6 +7,8 @@ class RecurringSalesInvoice
     include Moneybird::Traits::Save
     include Moneybird::Traits::Delete
 
+    private
+
     def resource_class
       Moneybird::Resource::RecurringSalesInvoice
     end

lib/moneybird/service/sales_invoice.rb

@@ -7,6 +7,8 @@ class SalesInvoice
     include Moneybird::Traits::Save
     include Moneybird::Traits::Delete
 
+    private
+
     def resource_class
       Moneybird::Resource::SalesInvoice
     end

lib/moneybird/service/tax_rate.rb

@@ -4,6 +4,8 @@ class TaxRate
     include Moneybird::Traits::Service
     include Moneybird::Traits::FindAll
 
+    private
+
     def resource_class
       Moneybird::Resource::TaxRate
     end

lib/moneybird/service/webhook.rb

@@ -6,6 +6,8 @@ class Webhook
     include Moneybird::Traits::Delete
     include Moneybird::Traits::Save
 
+    private
+
     def resource_class
       Moneybird::Resource::Webhook
     end

lib/moneybird/service/workflow.rb

@@ -4,6 +4,8 @@ class Workflow
     include Moneybird::Traits::Service
     include Moneybird::Traits::FindAll
 
+    private
+
     def resource_class
       Moneybird::Resource::Workflow
     end

lib/moneybird/traits/delete.rb

@@ -1,14 +1,8 @@
 module Moneybird
   module Traits
     module Delete
-      DELETE_SUCCESS_CODE = 204
-
       def delete(resource)
         client.delete(resource_path(resource))
-        if client._last_response.status.to_i != DELETE_SUCCESS_CODE
-          resource.errors = client._last_response.body
-          return false
-        end
         true
       end
     end

lib/moneybird/traits/find.rb

@@ -1,14 +1,8 @@
 module Moneybird
   module Traits
     module Find
-      GET_SUCCESS_CODE = 200
-
       def find(id)
-        result = client.get("#{path}/#{id}")
-
-        if result.status.to_i == GET_SUCCESS_CODE
-          build(JSON.parse(result.body))
-        end
+        build client.get("#{path}/#{id}")
       end
     end
   end

lib/moneybird/traits/find_all.rb

@@ -1,15 +1,9 @@
 module Moneybird
   module Traits
     module FindAll
-      GET_SUCCESS_CODE = 200
-
       def all
-        result = client.get(path)
-
-        if result.status.to_i == GET_SUCCESS_CODE
-          JSON.parse(result.body).map do |resource|
-            build(resource)
-          end
+        client.get(path).map do |resource|
+          build resource
         end
       end
     end