moneybird 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fd3bbfa23e8c17db1d1acdec2a586d9cea28276e
-  data.tar.gz: e2ad36cff2837ac4f4e760620bbff99124751d5f
+SHA256:
+  metadata.gz: 4765ac62f2740e67304409f4e00320ab578467f7fe95681fe7e23f3749d5c826
+  data.tar.gz: 98e590e61c8089a5ac94ee13e5b0a074ca11253117625b173190ac6543fe355f
 SHA512:
-  metadata.gz: 69b3618158f91006fd4f956ffe2d3384dd247c0891b1f6600c450b735a56ee171da47b854e92237cf43733a97406214c2c25425b838ca2399dc086848c61289a
-  data.tar.gz: e7af996d8a016de028db757602dc0697a14a64746fe592d29a12ef315f4d165e6aefc0b95802c702ea51252e053e8a939aeb6c607465f2476751139b7f7551ff
+  metadata.gz: e6c1994278c86217b870285f46089507076f7c4445a9c231fe0733d3128ac0c3468187497bc3bf0de6855a88235d1da81df234c4cbe5f881d2e00de02458763d
+  data.tar.gz: 5c64e52708e35013a116dce3c97492bab860d0185cf1525a0f675463001e88cdd6128665bb6c83ccdf04b50af527bea314966f72138f32eb3862d6d0ceb58657

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 rvm:
-  - 2.2.2
+  - 2.4
+  - 2.5
+  - 2.6
 before_install: gem install bundler -v 1.11.2
 
 addons:

data/lib/moneybird.rb

@@ -56,7 +56,6 @@ require 'moneybird/resource/financial_mutation'
 require 'moneybird/resource/identity'
 require 'moneybird/resource/ledger_account'
 require 'moneybird/resource/product'
-require 'moneybird/resource/purchase_invoice' # Depends on generic and invoice resources
 require 'moneybird/resource/recurring_sales_invoice' # Depends on generic and invoice resources
 require 'moneybird/resource/sales_invoice' # Depends on generic and invoice resources
 require 'moneybird/resource/synchronization'
@@ -90,12 +89,12 @@ require 'moneybird/service/financial_mutation'
 require 'moneybird/service/identity'
 require 'moneybird/service/ledger_account'
 require 'moneybird/service/product'
-require 'moneybird/service/purchase_invoice'
 require 'moneybird/service/recurring_sales_invoice'
 require 'moneybird/service/sales_invoice'
 require 'moneybird/service/tax_rate'
 require 'moneybird/service/webhook'
 require 'moneybird/service/workflow'
+require 'moneybird/service/payment'
 
 ##
 # Special cases
@@ -103,4 +102,4 @@ require 'moneybird/resource/administration' # Depends on services
 require 'moneybird/service/administration' # Depends on administration resource
 require 'moneybird/client'
 require 'moneybird/version'
-require 'moneybird/webhook'
+require 'moneybird/webhook'

data/lib/moneybird/client.rb

@@ -29,9 +29,7 @@ module Moneybird
         faraday.response :json
         faraday.use Moneybird::Middleware::ErrorHandling
         faraday.use Moneybird::Middleware::Pagination
-        # faraday.response :logger do |logger|
-        #   logger.filter(/(Bearer)\s(\S+)/, '\1[REMOVED]')
-        # end
+
         faraday.adapter faraday_adapter
       end
     end

data/lib/moneybird/resource.rb

@@ -16,6 +16,7 @@ module Moneybird
 
     def attributes=(attributes)
       @attributes = attributes
+      self.client ||= attributes[:client]
       attributes.each do |attribute, value|
         if respond_to?(writer = attribute.to_s + '=')
           send(writer, value)

data/lib/moneybird/resource/documents/purchase_invoice.rb

@@ -4,46 +4,54 @@ module Moneybird::Resource::Documents
     extend Moneybird::Resource::ClassMethods
 
     has_attributes %i(
-      id
       administration_id
+      attachments
       contact
       contact_id
-      reference
+      created_at
+      currency
       date
+      details
       due_date
       entry_number
-      state
+      events
       exchange_rate
-      created_at
-      updated_at
-      version
+      id
       notes
-      attachments
-      events
-      currency
-      revenue_invoice
-      prices_are_incl_tax
       origin
       paid_at
-      tax_number
-      total_price_excl_tax
-      total_price_excl_tax_base
-      total_price_incl_tax
-      total_price_incl_tax_base
-      details
       payments
-      currency
-      revenue_invoice
       prices_are_incl_tax
-      origin
-      paid_at
+      reference
+      revenue_invoice
+      state
       tax_number
       total_price_excl_tax
       total_price_excl_tax_base
       total_price_incl_tax
       total_price_incl_tax_base
-      details
-      payments
+      updated_at
+      version
     )
+
+    def notes=(notes)
+      @notes ||= notes.map{ |note| Moneybird::Resource::Generic::Note.build(note) }
+    end
+
+    def contact=(attributes)
+      @contact = Moneybird::Resource::Contact.build(attributes)
+    end
+
+    def details=(line_items)
+      @details = line_items.map{ |line_item| Moneybird::Resource::Invoice::Details.build(line_item) }
+    end
+
+    def events=(events)
+      @events ||= events.map{ |event| Moneybird::Resource::Generic::Event.build(event) }
+    end
+
+    def payments=(payments)
+      @payments ||= payments.map{ |payment| Moneybird::Resource::Invoice::Payment.build(payment) }
+    end
   end
-end
+end

data/lib/moneybird/resource/documents/receipt.rb

@@ -4,32 +4,54 @@ module Moneybird::Resource::Documents
     extend Moneybird::Resource::ClassMethods
 
     has_attributes %i(
-      id
       administration_id
+      attachments
+      contact
+      contact_id
+      created_at
       currency
-      revenue_invoice
-      prices_are_incl_tax
+      date
+      details
+      due_date
+      entry_number
+      events
+      exchange_rate
+      id
+      notes
       origin
       paid_at
-      tax_number
-      total_price_excl_tax
-      total_price_excl_tax_base
-      total_price_incl_tax
-      total_price_incl_tax_base
-      details
       payments
-      currency
-      revenue_invoice
       prices_are_incl_tax
-      origin
-      paid_at
+      reference
+      revenue_invoice
+      state
       tax_number
       total_price_excl_tax
       total_price_excl_tax_base
       total_price_incl_tax
       total_price_incl_tax_base
-      details
-      payments
+      updated_at
+      version
     )
+
+    def notes=(notes)
+      @notes ||= notes.map{ |note| Moneybird::Resource::Generic::Note.build(note) }
+    end
+
+    def contact=(attributes)
+      @contact = Moneybird::Resource::Contact.build(attributes)
+    end
+
+    def details=(line_items)
+      @details = line_items.map{ |line_item| Moneybird::Resource::Invoice::Details.build(line_item) }
+    end
+
+    def events=(events)
+      @events ||= events.map{ |event| Moneybird::Resource::Generic::Event.build(event) }
+    end
+
+    def payments=(payments)
+      @payments ||= payments.map{ |payment| Moneybird::Resource::Invoice::Payment.build(payment) }
+    end
   end
-end
+end

data/lib/moneybird/resource/sales_invoice.rb

@@ -57,10 +57,15 @@ module Moneybird::Resource
     end
 
     def send_invoice(options = {})
-      invoice_service = Moneybird::Service::SalesInvoice.new(@client, administration_id)
+      invoice_service = Moneybird::Service::SalesInvoice.new(client, administration_id)
       invoice_service.send_invoice(self, options)
     end
 
+    def payments=(payments)
+      payment_data = payments.map{ |payment| Moneybird::Resource::Invoice::Payment.build(payment) }
+      @payments = Moneybird::Service::Payment.new(client, administration_id, preloaded_data: payment_data, invoice_id: id)
+    end
+
     def details=(line_items)
       @details = line_items.map{ |line_item| Moneybird::Resource::Invoice::Details.build(line_item) }
     end

data/lib/moneybird/service/administration.rb

@@ -3,10 +3,11 @@ module Moneybird::Service
     include Moneybird::Traits::FindAll
     include Moneybird::Traits::Service
 
-    attr_reader :client
+    attr_reader :client, :preloaded_data
 
     def initialize(client)
       @client = client
+      @preloaded_data = nil
     end
 
     def find(id)
@@ -20,7 +21,7 @@ module Moneybird::Service
     end
 
     def path
-      '/administrations'
+      'administrations'
     end
   end
 end

data/lib/moneybird/service/{purchase_invoice.rb → payment.rb}

@@ -1,8 +1,7 @@
 module Moneybird::Service
-  class PurchaseInvoice
+  class Payment
     include Moneybird::Traits::AdministrationService
     include Moneybird::Traits::Service
-    include Moneybird::Traits::Find
     include Moneybird::Traits::FindAll
     include Moneybird::Traits::Save
     include Moneybird::Traits::Delete
@@ -10,11 +9,11 @@ module Moneybird::Service
     private
 
     def resource_class
-      Moneybird::Resource::PurchaseInvoice
+      Moneybird::Resource::Invoice::Payment
     end
 
     def path
-      "#{administration_id}/documents/purchase_invoices"
+      "#{administration_id}/sales_invoices/#{options[:invoice_id]}/payments"
     end
   end
-end
+end

data/lib/moneybird/traits/administration_service.rb

@@ -1,11 +1,13 @@
 module Moneybird
   module Traits
     module AdministrationService
-      attr_reader :client, :administration_id
+      attr_reader :client, :administration_id, :preloaded_data, :options
 
-      def initialize(client, administration_id)
+      def initialize(client, administration_id, options = {})
         @client = client
         @administration_id = administration_id
+        @preloaded_data = options.delete(:preloaded_data)
+        @options = options
       end
     end
   end

data/lib/moneybird/traits/find_all.rb

@@ -14,9 +14,15 @@ module Moneybird
 
       def each(params = {})
         return enum_for(:each, params) unless block_given?
-        each_page(params).each do |resources|
-          resources.each do |resource|
-            yield resource
+        if preloaded_data
+          preloaded_data.each do |data|
+            yield data
+          end
+        else
+          each_page(params).each do |resources|
+            resources.each do |resource|
+              yield resource
+            end
           end
         end
       end

data/lib/moneybird/version.rb

@@ -1,3 +1,3 @@
 module Moneybird
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

data/moneybird.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "link_header", "~> 0.0.8"
 
   spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "codeclimate-test-reporter"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "webmock", "~> 3.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moneybird
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Maarten van Vliet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +190,6 @@ files:
 - lib/moneybird/resource/invoice/payment.rb
 - lib/moneybird/resource/ledger_account.rb
 - lib/moneybird/resource/product.rb
-- lib/moneybird/resource/purchase_invoice.rb
 - lib/moneybird/resource/recurring_sales_invoice.rb
 - lib/moneybird/resource/sales_invoice.rb
 - lib/moneybird/resource/synchronization.rb
@@ -210,8 +209,8 @@ files:
 - lib/moneybird/service/financial_mutation.rb
 - lib/moneybird/service/identity.rb
 - lib/moneybird/service/ledger_account.rb
+- lib/moneybird/service/payment.rb
 - lib/moneybird/service/product.rb
-- lib/moneybird/service/purchase_invoice.rb
 - lib/moneybird/service/recurring_sales_invoice.rb
 - lib/moneybird/service/sales_invoice.rb
 - lib/moneybird/service/tax_rate.rb
@@ -247,8 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Library to interface with Moneybird API

data/lib/moneybird/resource/purchase_invoice.rb

@@ -1,57 +0,0 @@
-module Moneybird::Resource
-  class PurchaseInvoice
-    include Moneybird::Resource
-    extend Moneybird::Resource::ClassMethods
-
-    has_attributes %i(
-      administration_id
-      attachments
-      contact
-      contact_id
-      created_at
-      currency
-      date
-      details
-      due_date
-      entry_number
-      events
-      exchange_rate
-      id
-      notes
-      origin
-      paid_at
-      payments
-      prices_are_incl_tax
-      reference
-      revenue_invoice
-      state
-      tax_number
-      total_price_excl_tax
-      total_price_excl_tax_base
-      total_price_incl_tax
-      total_price_incl_tax_base
-      updated_at
-      version
-    )
-
-    def notes=(notes)
-      @notes ||= notes.map{ |note| Moneybird::Resource::Generic::Note.build(note) }
-    end
-
-    def contact=(attributes)
-      @contact = Moneybird::Resource::Contact.build(attributes)
-    end
-
-    def details=(line_items)
-      @details = line_items.map{ |line_item| Moneybird::Resource::Invoice::Details.build(line_item) }
-    end
-
-    def events=(events)
-      @events ||= events.map{ |event| Moneybird::Resource::Generic::Event.build(event) }
-    end
-
-    def payments=(payments)
-      @payments ||= payments.map{ |payment| Moneybird::Resource::Invoice::Payment.build(payment) }
-    end
-  end
-end