jortt 3.0.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 08466fe7b01ea7758a6fecfecb4851ca0a4b091b
-  data.tar.gz: dfad854f25b7303b2015831b8b9aceb9f7e727ba
+SHA256:
+  metadata.gz: 513ee8d9eecbb8920fc1024eb60212600d50b1dd7bc0e13a7be95a7c9df1a6c9
+  data.tar.gz: 20a09a4838015eaba9bd913067cd036eb64d0d15552f1c03888cffbbbd6ff0ee
 SHA512:
-  metadata.gz: 499973d4e8032da74eba391c06d95ab62f298567b5cb50a9957e10a0e70f23e664501e5b34fbece628b1bbf88a59d54532bbcd7a20ec9def573f91783f44e2ad
-  data.tar.gz: c9522fd7d8485e967d14dce03d153b726a8459557ca616df9fcc0bc2de45d3fa484827e8c41385c119143dc6f400d4b34a6c2e3909b5ec4f509f1485b1e893b0
+  metadata.gz: c1b18f11a38b33492c1e57f724d2203583a8e8fbfa7950d9d56bbd18d378aa62ff88658865eb41196cb5fb15f9b5451b3db26158a52c546f6324efec6cd80265
+  data.tar.gz: 1f6adbbbb1e36f567115c6f71b0e6c10bc2b8027703de48d840b6652022d6e621911b706f2089abe04ed421e8d84203565747a404adc56317867fac0637590b9

data/.github/workflows/rspec.yml

@@ -0,0 +1,40 @@
+name: rspec
+
+on:
+  [push]
+
+env:
+  RACK_ENV: test
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - ruby-version: 3.0.0
+          - ruby-version: 2.7
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Cache bundler
+        uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-
+      - name: Install bundler
+        run: |
+          gem install bundler
+      - name: Install ruby dependencies
+        run: |
+          bundle config path vendor/bundle
+          bundle install --jobs 4
+      - name: Run tests
+        run: bundle exec rspec

data/.ruby-version

@@ -1 +1 @@
-2.3.0
+3.0.0

data/README.md

@@ -1,84 +1,117 @@
 # Jortt REST API client
 
-[![Inline docs](
-http://inch-ci.org/github/jorttbv/jortt-ruby.svg?branch=master&style=flat
-)](http://inch-ci.org/github/jorttbv/jortt-ruby)
-[![Code Climate](
-http://img.shields.io/codeclimate/github/jorttbv/jortt-ruby.svg?style=flat
-)](https://codeclimate.com/github/jorttbv/jortt-ruby)
+[![Maintainability](https://api.codeclimate.com/v1/badges/a99a88d28ad37a79dbf6/maintainability)](https://codeclimate.com/github/codeclimate/codeclimate/maintainability)
 [![Code Coverage](
 https://codecov.io/github/jorttbv/jortt-ruby/coverage.svg?branch=master
 )](https://codecov.io/github/jorttbv/jortt-ruby?branch=master)
-[![Build Status](
-http://img.shields.io/travis/jorttbv/jortt-ruby.svg?style=flat
-)](https://travis-ci.org/jorttbv/jortt-ruby)
+[![rspec Actions Status](https://github.com/jorttbv/jortt-ruby/workflows/rspec/badge.svg)](https://github.com/jorttbv/jortt-ruby/actions)
 
 A Ruby interface to the [Jortt](https://www.jortt.nl/) REST API.
 
-## Usage
+Check https://developer.jortt.nl/ for more info.
+
+> THIS VERSION IS FOR THE NEW OAUTH API. STILL ON THE LEGACY API? USE VERSION 4.x OF THIS GEM: [CLICK HERE](https://github.com/jorttbv/jortt-ruby/tree/v4.2.0)
+
+> THIS VERSION ONLY WORKS FOR CLIENT CREDENTIALS CURRENTLY.
+
+## Usage examples
 
 To create a jortt client:
 ```ruby
-jortt = Jortt.client(
-  app_name: "application-name-as-chosen-on-jortt.nl",
-  api_key: "api-key-as-provided-by-jortt.nl"
-)
+jortt = Jortt.client('<your-client-id>', '<your-client-secret>')
 ```
 
 ### Customers
 
-Accessing customers (`jortt.customers.search('Jortt')`) returns:
+All customers (`jortt.customers.index(page: 2)`) returns:
 ```ruby
 [{
-  company_name: 'Jortt',
-  address: {
-    street: "Transistorstraat 71C",
-    postal_code: "1322 CK",
-    city: "Almere",
-    country_code: "NL"
-  }
-},
-  company_name: 'ttroj',
-  address: {
-    street: "Jorttweg",
-    ...
-  }
+  "id": "f8fd3e4e-da1c-43a7-892f-1410ac13e38a",
+  "is_private": true,
+  "customer_name": "Jortt",
+  "address_street": "Rozengracht 75a",
+  ...
 }]
 ```
 
 Adding customers:
 ```ruby
 jortt.customers.create(
-  company_name: "Jortt B.V.",
-  attn: "Vibiemme", # Optional
-  extra_information: "The best cofee maker!", # Optional
-  address: {
-    street: "Transistorstraat 71C",
-    postal_code: "1322 CK",
-    city: "Almere",
-    country_code: "NL"
-  }
+  "is_private": true,
+  "customer_name": "Jortt",
+  ...
 )
 ```
 
 ### Invoices
+Get invoices by ID (`jortt.invoices.get('934d59dd-76f6-4716-9e0f-82a618e1be21')`) returns:
+```ruby
+{
+  "invoice_id": "934d59dd-76f6-4716-9e0f-82a618e1be21",
+  "recipient": {
+    "company_name": "Zilverline B.V.",
+    "attn": null,
+    "address": {
+      "street": "Cruquisweg 109F",
+      "city": "Amsterdam",
+      "postal_code": "1111SX",
+      "country": {
+        "code": "NL",
+        "name": "Nederland"
+      }
+    },
+    "email": "ben@jortt.nl",
+    "customer_id": "e1c5e15b-e34e-423e-a291-4ed43226a190",
+    "extra_information": null,
+    ...
+  }
+  ...
+}
+```
+
+
+Searching invoices (`jortt.invoices.index(query: '202001-002')`) returns:
+```ruby
+[{
+  "id": "f8fd3e4e-da1c-43a7-892f-1410ac13e38a",
+  "invoice_status": "draft",
+  "customer_id": "f8fd3e4e-da1c-43a7-892f-1410ac13e38a",
+  "invoice_number": "202001-002",
+  "invoice_date": "2020-02-23",
+  ...
+}]
+
+```
+
 
 Adding invoices:
 ```ruby
 jortt.invoices.create(
-  customer_id: "123456789", # Optional
-  delivery_period: "31-12-1234", # Optional
-  reference: "my-reference", # Optional
+  customer_id: "f8fd3e4e-da1c-43a7-892f-1410ac13e38a",
+  invoice_date: "2020-02-23",
+  delivery_period: "2020-02-01",
+  payment_term: 14,
+  net_amounts: true,
+  send_method: "email",
+  introduction: "example",
+  remarks: "example",
+  payment_method: "pay_later",
   line_items: [
-    {vat: 21, amount: 1359.50, quantity: 1, description: "Scrum Training"}
-  ]
+    {
+      description: "this is a description example",
+      units: 3.14,
+      amount_per_unit: {
+        value: "365.00",
+        currency: "EUR"
+      },
+      vat: 21,
+      ledger_account_id: "f8fd3e4e-da1c-43a7-892f-1410ac13e38a"
+    }
+  ],
+  reference: "123"
 )
 ```
 
-## Documentation
-
-Check https://app.jortt.nl/api-documentatie for more info.
-
 ## Development
 
 ### Running tests
@@ -95,3 +128,5 @@ by `require 'jortt/client'` and do your stuff).
 Make a fix, commit and push. Make sure the build is green. Then bump the
 version (edit `lib/jortt/client/version.rb`). Now `rake release` and follow
 the instructions (you need a rubygems.org account and permissions ;-)).
+
+Otherwise `gem build jortt.gemspec` and `gem push jortt-[version].gem`.

data/Rakefile

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/jortt.gemspec

@@ -8,13 +8,13 @@ Gem::Specification.new do |spec|
   spec.version       = Jortt::Client::VERSION
   spec.authors       = [
     'Bob Forma',
-    'Steven Weller',
+    'Michael Franken',
     'Lars Vonk',
     'Stephan van Diepen',
   ]
   spec.email         = [
     'bforma@zilverline.com',
-    'suweller@zilverline.com',
+    'mfranken@zilverline.com',
     'lvonk@zilverline.com',
     'svdiepen@zilverline.com',
   ]
@@ -27,14 +27,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'rest-client', '~> 1.6'
+  spec.add_runtime_dependency 'rest-client', ['>= 2.0', '< 2.2']
+  spec.add_runtime_dependency 'oauth2', '~> 1.4.4'
 
-  spec.add_development_dependency 'bundler', '~> 1.0'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'codecov', '~> 0.1'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.4.0'
-  spec.add_development_dependency 'rspec-its', '~> 1.2.0'
-  spec.add_development_dependency 'webmock', '~> 1.17'
-  spec.add_development_dependency 'rubocop', '~> 0.24.1'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.1.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.7'
+  spec.add_development_dependency 'rspec-its', '~> 1.2'
+  spec.add_development_dependency 'webmock', '~> 3.3'
+  spec.add_development_dependency 'vcr', '~> 6.0'
 end

data/lib/jortt.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'jortt/client'
 require 'jortt/client/version'
 

data/lib/jortt/client.rb

@@ -1,21 +1,26 @@
-# encoding: UTF-8
-require 'jortt/client/resource'
+require 'oauth2'
+
+require 'jortt/client/error'
+require 'jortt/client/customers'
+require 'jortt/client/invoices'
+require 'jortt/client/ledger_accounts'
 
 module Jortt
   ##
   # This class is the main interface used to communicate with the Jortt API.
   # It is by the {Jortt} module to create configured instances.
   class Client
-    BASE_URL = 'https://app.jortt.nl/api'
+    SITE = 'https://api.jortt.nl'
+    OAUTH_PROVIDER_URL = 'https://app.jortt.nl/oauth-provider/oauth'
 
-    attr_accessor :base_url, :app_name, :api_key
+    attr_accessor :token
 
     # Initialize a Jortt client.
     #
     # @example
     #   Jortt::Client.new(
-    #     app_name: <application-name, chosen in jortt.nl>
-    #     api_key: <api-key, as provided by jortt.nl>
+    #     "my-client-id",
+    #     "my-client-secret"
     #   )
     #
     # @params [ Hash ] opts Options for the client,
@@ -24,45 +29,92 @@ module Jortt
     # @return [ Jortt::Client ]
     #
     # @since 1.0.0
-    def initialize(opts)
-      self.base_url = opts.fetch(:base_url, BASE_URL)
-      self.app_name = opts.fetch(:app_name)
-      self.api_key = opts.fetch(:api_key)
+    def initialize(id, secret, opts = {})
+      oauth_provider_url = opts[:oauth_provider_url] || OAUTH_PROVIDER_URL
+
+      client = OAuth2::Client.new(id, secret,
+        site: opts[:site] || SITE,
+        token_url: "#{oauth_provider_url}/token",
+        authorize_url: "#{oauth_provider_url}/authorize",
+        auth_scheme: :basic_auth
+      )
+
+      @token = client.client_credentials.get_token(scope: "invoices:read invoices:write customers:read customers:write")
     end
 
-    # Access the customer resource.
+    # Access the customer resource to perform operations.
     #
     # @example
     #   client.customers
     #
-    # @return [ Jortt::Client::Resource ] entry to the customer resource.
+    # @return [ Jortt::Client::Customers ] entry to the customer resource.
     #
     # @since 1.0.0
     def customers
-      @customers ||= new_resource(self, :customer, :customers)
+      @customers ||= Jortt::Client::Customers.new(self)
     end
 
-    # Access the invoice resource.
+    # Access the invoices resource to perform operations.
     #
     # @example
     #   client.invoices
     #
-    # @return [ Jortt::Client::Resource ] entry to the invoice resource.
+    # @return [ Jortt::Client::Invoices ] entry to the invoice resource.
     #
     # @since 1.0.0
     def invoices
-      @invoices ||= new_resource(self, :invoice, :invoices)
+      @invoices ||= Jortt::Client::Invoices.new(self)
     end
 
-  private
-
-    # Creates a jortt client resource based on the passed configuration
+    # Access the ledger_accounts resource.
+    #
+    # @example
+    #   client.ledger_accounts
     #
-    # @return [ Jortt::Client::Resource ] entry to a resource.
+    # @return [ Jortt::Client::LedgerAccounts ] entry to the leger_accounts resource.
     #
-    # @since 1.0.1
-    def new_resource(*args)
-      Jortt::Client::Resource.new(*args)
+    # @since 5.0.0
+    def ledger_accounts
+      Jortt::Client::LedgerAccounts.new(self)
+    end
+
+    def get(path, params = {})
+      handle_response { token.get(path, params: params) }
+    end
+
+    def post(path, params = {})
+      handle_response { token.post(path, params: params) }
+    end
+
+    def put(path, params = {})
+      handle_response { token.put(path, params: params) }
+    end
+
+    def delete(path)
+      handle_response { token.delete(path) }
+    end
+
+    def handle_response(&block)
+      response = yield
+      return true if response.status == 204
+      response.parsed.fetch('data')
+    rescue OAuth2::Error => e
+      raise Error.from_response(e.response)
+    end
+
+    def paginated(path, params = {})
+      page = 1
+
+      Enumerator.new do |yielder|
+        loop do
+          response = token.get(path, params: params.merge(page: page)).parsed
+          response['data'].each { |item| yielder << item }
+          break if response['_links']['next'].nil?
+          page += 1
+        end
+      end
+    rescue OAuth2::Error => e
+      raise Error.from_response(e.response)
     end
 
   end

data/lib/jortt/client/customers.rb

@@ -0,0 +1,91 @@
+module Jortt # :nodoc:
+  class Client # :nodoc:
+    ##
+    # Exposes the operations available for a collection of customers.
+    #
+    # @see { Jortt::Client.customers }
+    class Customers
+      attr_accessor :client
+
+      def initialize(client)
+        @client = client
+      end
+
+      ##
+      # Returns all customers using the GET /customers endpoint.
+      # https://developer.jortt.nl/#list-customers
+      #
+      # @example
+      #   client.customers.index(query: 'Jane')
+      #
+      def index(query: nil)
+        client.paginated('/customers', query: query)
+      end
+
+      ##
+      # Returns a customer using the GET /customers/{customer_id} endpoint.
+      # https://developer.jortt.nl/#get-customer-by-id
+      #
+      # @example
+      #   client.customers.show("9afcd96e-caf8-40a1-96c9-1af16d0bc804")
+      #
+      def show(id)
+        client.get("/customers/#{id}")
+      end
+
+      ##
+      # Creates a Customer using the POST /customers endpoint.
+      # https://developer.jortt.nl/#create-customer
+      #
+      # @example
+      #   client.customers.create(
+      #     is_private: false,
+      #     customer_name: 'Nuka-Cola Corporation',
+      #     address_street: 'Vault 11',
+      #     address_postal_code: '1111AA',
+      #     address_city: 'Mojave Wasteland'
+      #   )
+      #
+      def create(payload)
+        client.post('/customers', payload)
+      end
+
+      ##
+      # Updates a Customer using the PUT /customers/{customer_id} endpoint.
+      # https://developer.jortt.nl/#update-customer
+      #
+      # @example
+      #   client.customers.update(
+      #     "9afcd96e-caf8-40a1-96c9-1af16d0bc804",
+      #     { address_extra_information: 'foobar' }
+      #   )
+      #
+      def update(id, payload)
+        client.put("/customers/#{id}", payload)
+      end
+
+      ##
+      # Deletes a Customer using the DELETE /customers/{customer_id} endpoint.
+      # https://developer.jortt.nl/#delete-a-customer
+      #
+      # @example
+      #   client.customers.delete("9afcd96e-caf8-40a1-96c9-1af16d0bc804")
+      #
+      def delete(id)
+        client.delete("/customers/#{id}")
+      end
+
+      ##
+      # Send direct debit authorization to a Customer using POST /customers/{customer_id}/direct_debit_mandate.
+      # https://developer.jortt.nl/#send-direct-debit-authorization-to-a-customer
+      #
+      # @example
+      #   client.customers.direct_debit_mandate("9afcd96e-caf8-40a1-96c9-1af16d0bc804")
+      #
+
+      def direct_debit_mandate(id)
+        client.post("/customers/#{id}/direct_debit_mandate")
+      end
+    end
+  end
+end