noko 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f94cee93501cafa4e6da7bd8ef0999756bddc5522c75c80e14011ec51148c549
-  data.tar.gz: a01355b30b080a1a426d4ebfbeafe52e589dee5a3abb25549c45908327443e4b
+  metadata.gz: 1ff0fcc7691e060653275c30cdfb02fd4e19da5ee2f4e1468c6935f26d0c3454
+  data.tar.gz: 622da78be984693f095e5f931c32a52606d1a1cd8f440e53025251c20ebe3f4b
 SHA512:
-  metadata.gz: 28a0a6f65984f9ed798c53ca41c0c284241cac772f8f79890fe3bb7460f7b88dc44ec1f286b73eb3cd95c6a25eb647fee268adccc8e783d197f1e7edb53d6faa
-  data.tar.gz: e987e8941de9b126f5a097fe4799f896c291182fa086e923195d3af0a0d13610ad6c2989a6fbacdbfa19532f6fbbffbe975e0efe0ad921cb91c1ea79b37317c2
+  metadata.gz: 63232176cc36783f3891245dcc44a0ee800312038ae904216cc7f219533d2ce4df9382acc80b5b2f1b8bfc722aa29f924e8efda411e8281c912ca78f32cebbcf
+  data.tar.gz: bcb26ccd331dbc71c88193aba038c5f1c06272c0c93590d11486229bf77fdfb795010aa05d18d93b3bd8cdceff51b922bc4b52ad69cd5f6cf8c7c7a9e83d0701

data/CHANGES.md

@@ -0,0 +1,47 @@
+# 1.6.0
+
+* Added Noko::NotFound for 404 responses
+
+* Added Noko::ClientError for 4xx responses
+
+* Added Noko::ServerError for 5xx responses
+
+# 1.5.0
+
+* Added methods for marking entries invoiced (thanks @lcx)
+
+* Added methods for marking entries approved
+
+* Added methods for marking entries unapproved
+
+# 1.4.0
+
+* **(breaking change)** Renamed gem from freckles to noko. Steps to upgrade:
+
+  - rename the gem in your Gemfile from `gem 'freckles'` to `gem 'noko'`
+  - rename any requires from `require 'freckle'` to `require 'noko'`
+  - rename any module references from `Freckle` to `Noko`
+
+# 1.3.0
+
+* Updated to use nokotime.com hostnames (thanks @madrobby)
+
+* Updated to use X-NokoToken header
+
+# 1.2.0
+
+* Added methods for project group resources
+
+* Changed default user agent header to include version numbers
+
+* Removed deprecated #next_page attribute
+
+# 1.1.0
+
+* Added methods for returning Link header pagination urls
+
+* Deprecated #next_page attribute
+
+# 1.0.0
+
+* First version!

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2019 TIMCRAFT
+Copyright (c) 2015-2020 TIMCRAFT
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/README.md

@@ -1,38 +1,29 @@
 # noko
 
-[![Gem Version](https://badge.fury.io/rb/noko.svg)](https://badge.fury.io/rb/noko) [![Build Status](https://api.travis-ci.org/timcraft/noko.svg?branch=master)](https://travis-ci.org/timcraft/noko)
+[![Gem Version](https://badge.fury.io/rb/noko.svg)](https://badge.fury.io/rb/noko)
+![Build Status](https://github.com/timcraft/noko/workflows/Test/badge.svg)
 
 
-Ruby client for [Version 2 of the Noko/Freckle API](https://developer.nokotime.com/v2/).
+Ruby client for the [Noko API](https://developer.nokotime.com/v2/).
 
 
 ## Install
 
-Install using RubyGems:
+Using Bundler:
 
-```
-$ gem install noko
-```
-
-Add it to your Gemfile and install using Bundler:
-
-```ruby
-gem 'noko'
-```
+    $ bundle add noko
 
-Clone the repository:
+Using RubyGems:
 
-```
-git clone git@github.com:timcraft/noko.git
-```
+    $ gem install noko
 
 
-## Quick start
+## Getting started
 
 ```ruby
 require 'noko'
 
-noko = Noko::Client.new(token: 'YOUR PERSONAL ACCESS TOKEN')
+noko = Noko::Client.new(token: ENV.fetch('NOKO_TOKEN'))
 
 noko.get_projects.each do |project|
   puts project.name

data/lib/noko/client.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
 require 'noko/version'
 require 'noko/errors'
 require 'noko/link_header'
 require 'noko/params'
 require 'noko/record'
+require 'noko/response'
 require 'net/http'
 require 'json'
 
@@ -51,32 +53,12 @@ module Noko
         http_request.body = JSON.generate(body_object)
       end
 
-      parse(@http.request(http_request))
-    end
-
-    def parse(http_response)
-      case http_response
-      when Net::HTTPNoContent
-        :no_content
-      when Net::HTTPSuccess
-        if http_response['Content-Type'] && http_response['Content-Type'].split(';').first == 'application/json'
-          JSON.parse(http_response.body, symbolize_names: true, object_class: Record).tap do |object|
-            if http_response['Link']
-              object.singleton_class.module_eval { attr_accessor :link }
-              object.link = LinkHeader.parse(http_response['Link'])
-            end
-          end
-        else
-          http_response.body
-        end
-      when Net::HTTPBadRequest
-        object = JSON.parse(http_response.body, symbolize_names: true)
+      response = @http.request(http_request)
 
-        raise Error, object.fetch(:message)
-      when Net::HTTPUnauthorized
-        raise AuthenticationError
+      if response.is_a?(Net::HTTPSuccess)
+        Response.parse(response)
       else
-        raise Error, "unexpected #{http_response.code} response from #{@host}"
+        raise Response.error(response)
       end
     end
   end

data/lib/noko/client/account.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Noko
   class Client
     def get_account

data/lib/noko/client/current_user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Noko
   class Client
     def get_current_user

data/lib/noko/client/entries.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Noko
   class Client
     def get_entries(params = nil)

data/lib/noko/client/expenses.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Noko
   class Client
     def get_expenses(params = nil)

data/lib/noko/client/invoices.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Noko
   class Client
     def get_invoices(params = nil)

data/lib/noko/client/project_groups.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Noko
   class Client
     def get_project_groups(params = nil)

data/lib/noko/client/projects.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Noko
   class Client
     def get_projects(params = nil)

data/lib/noko/client/tags.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Noko
   class Client
     def get_tags(params = nil)

data/lib/noko/client/timers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Noko
   class Client
     def get_timers(params = nil)

data/lib/noko/client/users.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Noko
   class Client
     def get_users(params = nil)

data/lib/noko/errors.rb

@@ -1,5 +1,11 @@
 module Noko
-  class Error < StandardError; end
+  Error = Class.new(StandardError)
 
-  class AuthenticationError < Error; end
+  ClientError = Class.new(Error)
+
+  ServerError = Class.new(Error)
+
+  AuthenticationError = Class.new(ClientError)
+
+  NotFound = Class.new(ClientError)
 end

data/lib/noko/link_header.rb

@@ -2,7 +2,7 @@ require 'noko/record'
 require 'uri'
 
 module Noko
-  module LinkHeader # :nodoc:
+  module LinkHeader
     extend self
 
     REGEXP = /<([^>]+)>; rel="(\w+)"/
@@ -13,4 +13,6 @@ module Noko
       end
     end
   end
+
+  private_constant :LinkHeader
 end

data/lib/noko/params.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 require 'cgi'
 
 module Noko
-  module Params # :nodoc:
+  module Params
     extend self
 
     def join(path, params = nil)
@@ -24,4 +25,6 @@ module Noko
       CGI.escape(component.to_s)
     end
   end
+
+  private_constant :Params
 end

data/lib/noko/response.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+require 'net/http'
+require 'json'
+
+module Noko
+  module Response
+    extend self
+
+    def parse(response)
+      if response.is_a?(Net::HTTPNoContent)
+        return :no_content
+      end
+
+      if response.content_type == 'application/json'
+        object = JSON.parse(response.body, symbolize_names: true, object_class: Record)
+
+        if response['Link']
+          object.singleton_class.module_eval { attr_accessor :link }
+          object.link = LinkHeader.parse(response['Link'])
+        end
+
+        return object
+      end
+
+      response.body
+    end
+
+    def error(response)
+      if response.content_type == 'application/json'
+        body = JSON.parse(response.body)
+
+        error_class(response).new(body['message'])
+      else
+        error_class(response)
+      end
+    end
+
+    def error_class(object)
+      case object
+      when Net::HTTPBadRequest then Noko::ClientError
+      when Net::HTTPUnauthorized then Noko::AuthenticationError
+      when Net::HTTPNotFound then Noko::NotFound
+      when Net::HTTPClientError then Noko::ClientError
+      when Net::HTTPServerError then Noko::ServerError
+      else
+        Noko::Error
+      end
+    end
+  end
+
+  private_constant :Response
+end

data/lib/noko/version.rb

@@ -1,3 +1,3 @@
 module Noko
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 end

data/noko.gemspec

@@ -1,17 +1,20 @@
 Gem::Specification.new do |s|
   s.name = 'noko'
-  s.version = '1.5.0'
+  s.version = '1.6.0'
   s.license = 'MIT'
   s.platform = Gem::Platform::RUBY
   s.authors = ['Tim Craft']
   s.email = ['mail@timcraft.com']
   s.homepage = 'https://github.com/timcraft/noko'
-  s.description = 'Ruby client for Version 2 of the Noko/Freckle API'
-  s.summary = 'Ruby client for Version 2 of the Noko/Freckle API'
-  s.files = Dir.glob('{lib,test}/**/*') + %w(LICENSE.txt README.md noko.gemspec)
+  s.description = 'Ruby client for the Noko API'
+  s.summary = 'See description'
+  s.files = Dir.glob('lib/**/*.rb') + %w(CHANGES.md LICENSE.txt README.md noko.gemspec)
   s.required_ruby_version = '>= 1.9.3'
-  s.add_development_dependency('rake', '~> 12')
-  s.add_development_dependency('webmock', '~> 3.0')
-  s.add_development_dependency('minitest', '~> 5.0')
   s.require_path = 'lib'
+  s.metadata = {
+    'homepage' => 'https://github.com/timcraft/noko',
+    'source_code_uri' => 'https://github.com/timcraft/noko',
+    'bug_tracker_uri' => 'https://github.com/timcraft/noko/issues',
+    'changelog_uri' => 'https://github.com/timcraft/noko/blob/master/CHANGES.md'
+  }
 end

metadata

@@ -1,64 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: noko
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Tim Craft
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-04 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-description: Ruby client for Version 2 of the Noko/Freckle API
+date: 2020-05-08 00:00:00.000000000 Z
+dependencies: []
+description: Ruby client for the Noko API
 email:
 - mail@timcraft.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGES.md
 - LICENSE.txt
 - README.md
 - lib/noko.rb
@@ -77,27 +36,17 @@ files:
 - lib/noko/link_header.rb
 - lib/noko/params.rb
 - lib/noko/record.rb
+- lib/noko/response.rb
 - lib/noko/version.rb
 - noko.gemspec
-- test/noko/client/account_test.rb
-- test/noko/client/current_user_test.rb
-- test/noko/client/entries_test.rb
-- test/noko/client/errors_test.rb
-- test/noko/client/expenses_test.rb
-- test/noko/client/invoices_test.rb
-- test/noko/client/options_test.rb
-- test/noko/client/project_groups_test.rb
-- test/noko/client/projects_test.rb
-- test/noko/client/response_test.rb
-- test/noko/client/tags_test.rb
-- test/noko/client/timers_test.rb
-- test/noko/client/users_test.rb
-- test/noko/client_test.rb
-- test/noko/record_test.rb
 homepage: https://github.com/timcraft/noko
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage: https://github.com/timcraft/noko
+  source_code_uri: https://github.com/timcraft/noko
+  bug_tracker_uri: https://github.com/timcraft/noko/issues
+  changelog_uri: https://github.com/timcraft/noko/blob/master/CHANGES.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -113,8 +62,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: Ruby client for Version 2 of the Noko/Freckle API
+summary: See description
 test_files: []

data/test/noko/client/account_test.rb

@@ -1,9 +0,0 @@
-require_relative '../client_test'
-
-class ClientAccountTest < ClientTest
-  def test_get_account
-    expect_request(:get, "#{base_url}/account").with(auth_header).to_return(json_response)
-
-    assert_instance_of Noko::Record, client.get_account
-  end
-end

data/test/noko/client/current_user_test.rb

@@ -1,39 +0,0 @@
-require_relative '../client_test'
-
-class ClientCurrentUserTest < ClientTest
-  def test_get_current_user
-    expect_request(:get, "#{base_url}/current_user").with(auth_header).to_return(json_response)
-
-    assert_instance_of Noko::Record, client.get_current_user
-  end
-
-  def test_get_current_user_entries
-    expect_request(:get, "#{base_url}/current_user/entries").with(auth_header).to_return(json_array_response)
-
-    assert_equal [], client.get_current_user_entries
-  end
-
-  def test_get_current_user_entries_encodes_params
-    expect_request(:get, "#{base_url}/current_user/entries?billable=true")
-
-    client.get_current_user_entries(billable: true)
-  end
-
-  def test_get_current_user_expenses
-    expect_request(:get, "#{base_url}/current_user/expenses").with(auth_header).to_return(json_array_response)
-
-    assert_equal [], client.get_current_user_expenses
-  end
-
-  def test_get_current_user_expenses_encodes_params
-    expect_request(:get, "#{base_url}/current_user/expenses?invoiced=true")
-
-    client.get_current_user_expenses(invoiced: true)
-  end
-
-  def test_update_current_user
-    expect_request(:put, "#{base_url}/current_user").with(json_request).to_return(json_response)
-
-    assert_instance_of Noko::Record, client.update_current_user(week_start: 'monday')
-  end
-end

data/test/noko/client/entries_test.rb

@@ -1,91 +0,0 @@
-require_relative '../client_test'
-
-class ClientEntriesTest < ClientTest
-  def time
-    Time.now.utc
-  end
-
-  def date
-    Date.parse('2019-03-04')
-  end
-
-  def test_get_entries
-    expect_request(:get, "#{base_url}/entries").with(auth_header).to_return(json_array_response)
-
-    assert_equal [], client.get_entries
-  end
-
-  def test_get_entries_encodes_params
-    expect_request(:get, "#{base_url}/entries?billable=true")
-
-    client.get_entries(billable: true)
-  end
-
-  def test_get_entries_encodes_project_ids
-    expect_request(:get, "#{base_url}/entries?project_ids=123,456,789")
-
-    client.get_entries(project_ids: ids)
-  end
-
-  def test_get_entry
-    expect_request(:get, "#{base_url}/entries/#{id}").with(auth_header).to_return(json_response)
-
-    assert_instance_of Noko::Record, client.get_entry(id)
-  end
-
-  def test_create_entry
-    expect_request(:post, "#{base_url}/entries").with(json_request).to_return(json_response.merge(status: 201))
-
-    assert_instance_of Noko::Record, client.create_entry(date: Date.today, minutes: 60)
-  end
-
-  def test_update_entry
-    expect_request(:put, "#{base_url}/entries/#{id}").with(json_request).to_return(json_response)
-
-    assert_instance_of Noko::Record, client.update_entry(id, minutes: 120)
-  end
-
-  def test_delete_entry
-    expect_request(:delete, "#{base_url}/entries/#{id}").with(auth_header).to_return(status: 204)
-
-    assert_equal :no_content, client.delete_entry(id)
-  end
-
-  def test_mark_entry_invoiced
-    expect_request(:put, "#{base_url}/entries/#{id}/marked_as_invoiced").with(json_request).to_return(status: 204)
-
-    assert_equal :no_content, client.mark_entry_invoiced(id, date: date)
-  end
-
-  def test_mark_entries_invoiced
-    expect_request(:put, "#{base_url}/entries/marked_as_invoiced").with(json_request).to_return(status: 204)
-
-    assert_equal :no_content, client.mark_entries_invoiced(entry_ids: ids, date: date)
-  end
-
-  def test_mark_entry_approved
-    body = /\A{"approved_at":"\d{4}\-\d{2}\-\d{2}T\d{2}:\d{2}:\d{2}Z"}\z/
-
-    expect_request(:put, "#{base_url}/entries/#{id}/approved").with(json_request(body)).to_return(status: 204)
-
-    assert_equal :no_content, client.mark_entry_approved(id, approved_at: time.iso8601)
-  end
-
-  def test_mark_entries_approved
-    expect_request(:put, "#{base_url}/entries/approved").with(json_request).to_return(status: 204)
-
-    assert_equal :no_content, client.mark_entries_approved(entry_ids: ids, approved_at: time)
-  end
-
-  def test_mark_entry_unapproved
-    expect_request(:put, "#{base_url}/entries/#{id}/unapproved").with(headers: {'X-NokoToken' => token}).to_return(status: 204)
-
-    assert_equal :no_content, client.mark_entry_unapproved(id)
-  end
-
-  def test_mark_entries_unapproved
-    expect_request(:put, "#{base_url}/entries/unapproved").with(json_request).to_return(status: 204)
-
-    assert_equal :no_content, client.mark_entries_unapproved(entry_ids: ids)
-  end
-end

data/test/noko/client/errors_test.rb

@@ -1,27 +0,0 @@
-require_relative '../client_test'
-
-class ClientErrorsTest < ClientTest
-  def test_bad_request_errors
-    message = 'The Project cannot be deleted because it has entries, expenses, or invoices.'
-
-    response = json_response.merge(status: 400, body: %({"message":"#{message}"}))
-
-    stub_request(:delete, "#{base_url}/projects/#{id}").to_return(response)
-
-    exception = assert_raises(Noko::Error) do
-      client.delete_project(id)
-    end
-
-    assert_includes exception.message, message
-  end
-
-  def test_authentication_errors
-    response = json_response.merge(status: 401)
-
-    stub_request(:get, "#{base_url}/entries").to_return(response)
-
-    assert_raises(Noko::AuthenticationError) do
-      client.get_entries
-    end
-  end
-end

data/test/noko/client/expenses_test.rb

@@ -1,45 +0,0 @@
-require_relative '../client_test'
-
-class ClientExpensesTest < ClientTest
-  def test_get_expenses
-    expect_request(:get, "#{base_url}/expenses").with(auth_header).to_return(json_array_response)
-
-    assert_equal [], client.get_expenses
-  end
-
-  def test_get_expenses_encodes_params
-    expect_request(:get, "#{base_url}/expenses?invoiced=true")
-
-    client.get_expenses(invoiced: true)
-  end
-
-  def test_get_expenses_encodes_ids
-    expect_request(:get, "#{base_url}/expenses?project_ids=123,456,789")
-
-    client.get_expenses(project_ids: ids)
-  end
-
-  def test_get_expense
-    expect_request(:get, "#{base_url}/expenses/#{id}").with(auth_header).to_return(json_response)
-
-    assert_instance_of Noko::Record, client.get_expense(id)
-  end
-
-  def test_create_expense
-    expect_request(:post, "#{base_url}/expenses").with(json_request).to_return(json_response.merge(status: 201))
-
-    assert_instance_of Noko::Record, client.create_expense(date: Date.today, project_id: id, price: '14.55')
-  end
-
-  def test_update_expense
-    expect_request(:put, "#{base_url}/expenses/#{id}").with(json_request).to_return(json_response)
-
-    assert_instance_of Noko::Record, client.update_expense(id, price: '19.99')
-  end
-
-  def test_delete_expense
-    expect_request(:delete, "#{base_url}/expenses/#{id}").with(auth_header).to_return(status: 204)
-
-    assert_equal :no_content, client.delete_expense(id)
-  end
-end

data/test/noko/client/invoices_test.rb

@@ -1,75 +0,0 @@
-require_relative '../client_test'
-
-class ClientInvoicesTest < ClientTest
-  def test_get_invoices
-    expect_request(:get, "#{base_url}/invoices").with(auth_header).to_return(json_array_response)
-
-    assert_equal [], client.get_invoices
-  end
-
-  def test_get_invoices_encodes_params
-    expect_request(:get, "#{base_url}/invoices?state=unpaid")
-
-    client.get_invoices(state: :unpaid)
-  end
-
-  def test_get_invoice
-    expect_request(:get, "#{base_url}/invoices/#{id}").with(auth_header).to_return(json_response)
-
-    assert_instance_of Noko::Record, client.get_invoice(id)
-  end
-
-  def test_create_invoice
-    expect_request(:post, "#{base_url}/invoices").with(json_request).to_return(json_response.merge(status: 201))
-
-    assert_instance_of Noko::Record, client.create_invoice(invoice_date: Date.today)
-  end
-
-  def test_update_invoice
-    expect_request(:put, "#{base_url}/invoices/#{id}").with(json_request).to_return(json_response)
-
-    assert_instance_of Noko::Record, client.update_invoice(id, reference: 'AB 0001')
-  end
-
-  def test_mark_invoice_paid
-    expect_request(:put, "#{base_url}/invoices/#{id}/paid").with(auth_header).to_return(status: 204)
-
-    assert_equal :no_content, client.mark_invoice_paid(id)
-  end
-
-  def test_mark_invoice_unpaid
-    expect_request(:put, "#{base_url}/invoices/#{id}/unpaid").with(auth_header).to_return(status: 204)
-
-    assert_equal :no_content, client.mark_invoice_unpaid(id)
-  end
-
-  def test_get_invoice_entries
-    expect_request(:get, "#{base_url}/invoices/#{id}/entries").with(auth_header).to_return(json_array_response)
-
-    assert_equal [], client.get_invoice_entries(id)
-  end
-
-  def test_get_invoice_entries_encodes_params
-    expect_request(:get, "#{base_url}/invoices/#{id}/entries?billable=true")
-
-    client.get_invoice_entries(id, billable: true)
-  end
-
-  def test_get_invoice_expenses
-    expect_request(:get, "#{base_url}/invoices/#{id}/expenses").with(auth_header).to_return(json_array_response)
-
-    assert_equal [], client.get_invoice_expenses(id)
-  end
-
-  def test_get_invoice_expenses_encodes_params
-    expect_request(:get, "#{base_url}/invoices/#{id}/expenses?invoiced=false")
-
-    client.get_invoice_expenses(id, invoiced: false)
-  end
-
-  def test_delete_invoice
-    expect_request(:delete, "#{base_url}/invoices/#{id}").with(auth_header).to_return(status: 204)
-
-    assert_equal :no_content, client.delete_invoice(id)
-  end
-end

data/test/noko/client/options_test.rb

@@ -1,27 +0,0 @@
-require_relative '../client_test'
-
-class ClientOptionsTest < ClientTest
-  def user_agent
-    'account.nokotime.com'
-  end
-
-  def access_token
-    'oauth2-access-token'
-  end
-
-  def test_user_agent_option
-    client = Noko::Client.new(token: token, user_agent: user_agent)
-
-    expect_request(:get, "#{base_url}/entries").with(headers: {'User-Agent' => user_agent})
-
-    client.get_entries
-  end
-
-  def test_access_token_option
-    client = Noko::Client.new(access_token: access_token)
-
-    expect_request(:get, "#{base_url}/entries").with(headers: {'Authorization' => 'token oauth2-access-token'})
-
-    client.get_entries
-  end
-end

data/test/noko/client/project_groups_test.rb

@@ -1,63 +0,0 @@
-require_relative '../client_test'
-
-class ClientProjectGroupsTest < ClientTest
-  def test_get_project_groups
-    expect_request(:get, "#{base_url}/project_groups").with(auth_header).to_return(json_array_response)
-
-    assert_equal [], client.get_project_groups
-  end
-
-  def test_get_project_groups_encodes_params
-    expect_request(:get, "#{base_url}/project_groups?name=Sprockets")
-
-    client.get_project_groups(name: 'Sprockets')
-  end
-
-  def test_get_project_group
-    expect_request(:get, "#{base_url}/project_groups/#{id}").with(auth_header).to_return(json_response)
-
-    assert_instance_of Noko::Record, client.get_project_group(id)
-  end
-
-  def test_create_project_group
-    expect_request(:post, "#{base_url}/project_groups").with(json_request).to_return(json_response.merge(status: 201))
-
-    assert_instance_of Noko::Record, client.create_project_group(name: 'Sprockets, Inc.')
-  end
-
-  def test_get_project_group_entries
-    expect_request(:get, "#{base_url}/project_groups/#{id}/entries").with(auth_header).to_return(json_array_response)
-
-    assert_equal [], client.get_project_group_entries(id)
-  end
-
-  def test_get_project_group_entries_encodes_params
-    expect_request(:get, "#{base_url}/project_groups/#{id}/entries?billable=true")
-
-    client.get_project_group_entries(id, billable: true)
-  end
-
-  def test_get_project_group_projects
-    expect_request(:get, "#{base_url}/project_groups/#{id}/projects").with(auth_header).to_return(json_array_response)
-
-    assert_equal [], client.get_project_group_projects(id)
-  end
-
-  def test_get_project_group_projects_encodes_params
-    expect_request(:get, "#{base_url}/project_groups/#{id}/projects?billable=true")
-
-    client.get_project_group_projects(id, billable: true)
-  end
-
-  def test_update_project_group
-    expect_request(:put, "#{base_url}/project_groups/#{id}").with(json_request).to_return(json_response)
-
-    assert_instance_of Noko::Record, client.update_project_group(id, name: 'Sprockets, Inc.')
-  end
-
-  def test_delete_project_group
-    expect_request(:delete, "#{base_url}/project_groups/#{id}").with(auth_header).to_return(status: 204)
-
-    assert_equal :no_content, client.delete_project_group(id)
-  end
-end

data/test/noko/client/projects_test.rb

@@ -1,99 +0,0 @@
-require_relative '../client_test'
-
-class ClientProjectsTest < ClientTest
-  def test_get_projects
-    expect_request(:get, "#{base_url}/projects").with(auth_header).to_return(json_array_response)
-
-    assert_equal [], client.get_projects
-  end
-
-  def test_get_projects_encodes_params
-    expect_request(:get, "#{base_url}/projects?billable=true")
-
-    client.get_projects(billable: true)
-  end
-
-  def test_get_project
-    expect_request(:get, "#{base_url}/projects/#{id}").with(auth_header).to_return(json_response)
-
-    assert_instance_of Noko::Record, client.get_project(id)
-  end
-
-  def test_create_project
-    expect_request(:post, "#{base_url}/projects").with(json_request).to_return(json_response.merge(status: 201))
-
-    assert_instance_of Noko::Record, client.create_project(name: 'Gear GmbH')
-  end
-
-  def test_get_project_entries
-    expect_request(:get, "#{base_url}/projects/#{id}/entries").with(auth_header).to_return(json_array_response)
-
-    assert_equal [], client.get_project_entries(id)
-  end
-
-  def test_get_project_entries_encodes_params
-    expect_request(:get, "#{base_url}/projects/#{id}/entries?billable=true")
-
-    client.get_project_entries(id, billable: true)
-  end
-
-  def test_get_project_expenses
-    expect_request(:get, "#{base_url}/projects/#{id}/expenses").with(auth_header).to_return(json_array_response)
-
-    assert_equal [], client.get_project_expenses(id)
-  end
-
-  def test_get_project_expenses_encodes_params
-    expect_request(:get, "#{base_url}/projects/#{id}/expenses?invoiced=true")
-
-    client.get_project_expenses(id, invoiced: true)
-  end
-
-  def test_update_project
-    expect_request(:put, "#{base_url}/projects/#{id}").with(json_request).to_return(json_response)
-
-    assert_instance_of Noko::Record, client.update_project(id, color: '#ff9898')
-  end
-
-  def test_merge_projects
-    expect_request(:put, "#{base_url}/projects/#{id}/merge").with(json_request.merge(body: '{"project_id":5678}')).to_return(status: 204)
-
-    assert_equal :no_content, client.merge_projects(id, 5678)
-  end
-
-  def test_delete_project
-    expect_request(:delete, "#{base_url}/projects/#{id}").with(auth_header).to_return(status: 204)
-
-    assert_equal :no_content, client.delete_project(id)
-  end
-
-  def test_archive_project
-    expect_request(:put, "#{base_url}/projects/#{id}/archive").with(auth_header).to_return(status: 204)
-
-    assert_equal :no_content, client.archive_project(id)
-  end
-
-  def test_unarchive_project
-    expect_request(:put, "#{base_url}/projects/#{id}/unarchive").with(auth_header).to_return(status: 204)
-
-    assert_equal :no_content, client.unarchive_project(id)
-  end
-
-  def test_archive_projects
-    expect_request(:put, "#{base_url}/projects/archive").with(json_request.merge(body: '{"project_ids":[123]}')).to_return(status: 204)
-
-    assert_equal :no_content, client.archive_projects([id])
-  end
-
-  def test_unarchive_projects
-    expect_request(:put, "#{base_url}/projects/unarchive").with(json_request.merge(body: '{"project_ids":[123]}')).to_return(status: 204)
-
-    assert_equal :no_content, client.unarchive_projects([id])
-  end
-
-  def test_delete_projects
-    expect_request(:put, "#{base_url}/projects/delete").with(json_request.merge(body: '{"project_ids":[123]}')).to_return(status: 204)
-
-    assert_equal :no_content, client.delete_projects([id])
-  end
-end

data/test/noko/client/response_test.rb

@@ -1,39 +0,0 @@
-require_relative '../client_test'
-
-class ClientResponseTest < ClientTest
-  def response(headers)
-    {headers: json_response_headers.merge(headers), body: '[]'}
-  end
-
-  def test_rel_next_link
-    link = '<https://api.nokotime.com/v2/entries?page=3>; rel="next"'
-
-    expect_request(:get, "#{base_url}/entries").to_return(response('Link' => link))
-
-    assert_equal '/v2/entries?page=3', client.get_entries.link.next
-  end
-
-  def test_rel_prev_link
-    link = '<https://api.nokotime.com/v2/entries?page=2>; rel="prev"'
-
-    expect_request(:get, "#{base_url}/entries").to_return(response('Link' => link))
-
-    assert_equal '/v2/entries?page=2', client.get_entries.link.prev
-  end
-
-  def test_rel_last_link
-    link = '<https://api.nokotime.com/v2/entries?page=50>; rel="last"'
-
-    expect_request(:get, "#{base_url}/entries").to_return(response('Link' => link))
-
-    assert_equal '/v2/entries?page=50', client.get_entries.link.last
-  end
-
-  def test_rel_first_link
-    link = '<https://api.nokotime.com/v2/entries?page=1>; rel="first"'
-
-    expect_request(:get, "#{base_url}/entries").to_return(response('Link' => link))
-
-    assert_equal '/v2/entries?page=1', client.get_entries.link.first
-  end
-end

data/test/noko/client/tags_test.rb

@@ -1,63 +0,0 @@
-require_relative '../client_test'
-
-class ClientTagsTest < ClientTest
-  def test_get_tags
-    expect_request(:get, "#{base_url}/tags").with(auth_header).to_return(json_array_response)
-
-    assert_equal [], client.get_tags
-  end
-
-  def test_get_tags_encodes_params
-    expect_request(:get, "#{base_url}/tags?billable=true")
-
-    client.get_tags(billable: true)
-  end
-
-  def test_create_tags
-    expect_request(:post, "#{base_url}/tags").with(json_request).to_return(json_array_response.merge(status: 201))
-
-    assert_equal [], client.create_tags(%w[freckle])
-  end
-
-  def test_get_tag
-    expect_request(:get, "#{base_url}/tags/#{id}").with(auth_header).to_return(json_response)
-
-    assert_instance_of Noko::Record, client.get_tag(id)
-  end
-
-  def test_get_tag_entries
-    expect_request(:get, "#{base_url}/tags/#{id}/entries").with(auth_header).to_return(json_array_response)
-
-    assert_equal [], client.get_tag_entries(id)
-  end
-
-  def test_get_tag_entries_encodes_params
-    expect_request(:get, "#{base_url}/tags/#{id}/entries?billable=true")
-
-    client.get_tag_entries(id, billable: true)
-  end
-
-  def test_update_tag
-    expect_request(:put, "#{base_url}/tags/#{id}").with(json_request).to_return(json_response)
-
-    assert_instance_of Noko::Record, client.update_tag(id, name: 'freckle')
-  end
-
-  def test_merge_tags
-    expect_request(:put, "#{base_url}/tags/#{id}/merge").with(json_request.merge(body: '{"tag_id":5678}')).to_return(status: 204)
-
-    assert_equal :no_content, client.merge_tags(id, 5678)
-  end
-
-  def test_delete_tag
-    expect_request(:delete, "#{base_url}/tags/#{id}").with(auth_header).to_return(status: 204)
-
-    assert_equal :no_content, client.delete_tag(id)
-  end
-
-  def test_delete_tags
-    expect_request(:put, "#{base_url}/tags/delete").with(json_request.merge(body: '{"tag_ids":[123]}')).to_return(status: 204)
-
-    assert_equal :no_content, client.delete_tags([id])
-  end
-end

data/test/noko/client/timers_test.rb

@@ -1,57 +0,0 @@
-require_relative '../client_test'
-
-class ClientTimersTest < ClientTest
-  def test_get_timers
-    expect_request(:get, "#{base_url}/timers").with(auth_header).to_return(json_array_response)
-
-    assert_equal [], client.get_timers
-  end
-
-  def test_get_timers_encodes_params
-    expect_request(:get, "#{base_url}/timers?billable=true")
-
-    client.get_timers(billable: true)
-  end
-
-  def test_get_timers_encodes_ids
-    expect_request(:get, "#{base_url}/timers?projects=123,456,789")
-
-    client.get_timers(projects: ids)
-  end
-
-  def test_get_timer
-    expect_request(:get, "#{base_url}/projects/#{id}/timer").with(auth_header).to_return(json_response)
-
-    assert_instance_of Noko::Record, client.get_timer(id)
-  end
-
-  def test_update_timer
-    expect_request(:put, "#{base_url}/projects/#{id}/timer").with(json_request).to_return(json_response)
-
-    assert_instance_of Noko::Record, client.update_timer(id, description: 'Notes go here')
-  end
-
-  def test_start_timer
-    expect_request(:put, "#{base_url}/projects/#{id}/timer/start").with(auth_header).to_return(json_response)
-
-    assert_instance_of Noko::Record, client.start_timer(id)
-  end
-
-  def test_pause_timer
-    expect_request(:put, "#{base_url}/projects/#{id}/timer/pause").with(auth_header).to_return(json_response)
-
-    assert_instance_of Noko::Record, client.pause_timer(id)
-  end
-
-  def test_log_timer
-    expect_request(:put, "#{base_url}/projects/#{id}/timer/log").with(auth_header).to_return(status: 204)
-
-    assert_equal :no_content, client.log_timer(id, description: 'Serious #development work')
-  end
-
-  def test_discard_timer
-    expect_request(:delete, "#{base_url}/projects/#{id}/timer").with(auth_header).to_return(status: 204)
-
-    assert_equal :no_content, client.discard_timer(id)
-  end
-end

data/test/noko/client/users_test.rb

@@ -1,75 +0,0 @@
-require_relative '../client_test'
-
-class ClientUsersTest < ClientTest
-  def test_get_users
-    expect_request(:get, "#{base_url}/users").with(auth_header).to_return(json_array_response)
-
-    assert_equal [], client.get_users
-  end
-
-  def test_get_users_encodes_params
-    expect_request(:get, "#{base_url}/users?name=John")
-
-    client.get_users(name: 'John')
-  end
-
-  def test_get_user
-    expect_request(:get, "#{base_url}/users/#{id}").with(auth_header).to_return(json_response)
-
-    assert_instance_of Noko::Record, client.get_user(id)
-  end
-
-  def test_get_user_entries
-    expect_request(:get, "#{base_url}/users/#{id}/entries").with(auth_header).to_return(json_array_response)
-
-    assert_equal [], client.get_user_entries(id)
-  end
-
-  def test_get_user_entries_encodes_params
-    expect_request(:get, "#{base_url}/users/#{id}/entries?billable=true")
-
-    client.get_user_entries(id, billable: true)
-  end
-
-  def test_get_user_expenses
-    expect_request(:get, "#{base_url}/users/#{id}/expenses").with(auth_header).to_return(json_array_response)
-
-    assert_equal [], client.get_user_expenses(id)
-  end
-
-  def test_get_user_expenses_encodes_params
-    expect_request(:get, "#{base_url}/users/#{id}/expenses?invoiced=true")
-
-    client.get_user_expenses(id, invoiced: true)
-  end
-
-  def test_create_user
-    expect_request(:post, "#{base_url}/users").with(json_request).to_return(json_response.merge(status: 201))
-
-    assert_instance_of Noko::Record, client.create_user(email: 'alice@example.com')
-  end
-
-  def test_update_user
-    expect_request(:put, "#{base_url}/users/#{id}").with(json_request).to_return(json_response)
-
-    assert_instance_of Noko::Record, client.update_user(id, role: 'leader')
-  end
-
-  def test_delete_user
-    expect_request(:delete, "#{base_url}/users/#{id}").with(auth_header).to_return(status: 204)
-
-    assert_equal :no_content, client.delete_user(id)
-  end
-
-  def test_reactivate_user
-    expect_request(:put, "#{base_url}/users/#{id}/activate").with(auth_header).to_return(status: 204)
-
-    assert_equal :no_content, client.reactivate_user(id)
-  end
-
-  def test_deactivate_user
-    expect_request(:put, "#{base_url}/users/#{id}/deactivate").with(auth_header).to_return(status: 204)
-
-    assert_equal :no_content, client.deactivate_user(id)
-  end
-end

data/test/noko/client_test.rb

@@ -1,59 +0,0 @@
-require 'minitest/autorun'
-require 'webmock/minitest'
-require 'noko'
-
-class ClientTest < Minitest::Test
-  def token
-    'token-xxx'
-  end
-
-  def id
-    123
-  end
-
-  def ids
-    %w[123 456 789]
-  end
-
-  def base_url
-    'https://api.nokotime.com/v2'
-  end
-
-  def auth_header
-    {headers: {'X-NokoToken' => token}}
-  end
-
-  def json_request(body=/\A{.+}\z/)
-    {headers: {'X-NokoToken' => token, 'Content-Type' => 'application/json'}, body: body}
-  end
-
-  def json_response_headers
-    {'Content-Type' => 'application/json;charset=utf-8'}
-  end
-
-  def json_response
-    {headers: json_response_headers, body: '{}'}
-  end
-
-  def json_array_response
-    {headers: json_response_headers, body: '[]'}
-  end
-
-  attr_accessor :client
-  attr_accessor :request
-
-  def setup
-    WebMock.reset!
-
-    self.client = Noko::Client.new(token: token)
-    self.request = nil
-  end
-
-  def teardown
-    assert_requested(request) if request
-  end
-
-  def expect_request(*args)
-    self.request = stub_request(*args)
-  end
-end

data/test/noko/record_test.rb

@@ -1,28 +0,0 @@
-require 'minitest/autorun'
-require 'noko'
-
-class RecordTest < Minitest::Test
-  def id
-    123
-  end
-
-  attr_accessor :record
-
-  def setup
-    self.record = Noko::Record.new(project_id: id)
-  end
-
-  def test_square_brackets_returns_attribute_values
-    assert_equal id, record[:project_id]
-  end
-
-  def test_method_missing_returns_attribute_values
-    assert_equal id, record.project_id
-  end
-
-  def test_to_h_returns_attributes_hash
-    attributes = {project_id: id}
-
-    assert_equal attributes, record.to_h
-  end
-end