underway 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ea67c9db9aa37c2b89c6b4e6c5d70c96808a0628
-  data.tar.gz: 2e44144648905e30991c8e561f2b6e86073804e2
+SHA256:
+  metadata.gz: 625bebc01bb77601adbae0c81624ca3d8855ed867116b9387ac038a46d1b70e8
+  data.tar.gz: b9e918961a7dd95bed609e6ada573df2346901c8951ab50bee6eb880edbd5a55
 SHA512:
-  metadata.gz: 940689feca04bf0f6eaa358920d22b60039b1e001fb10da571171ca9547693eda20427b83854ff56757e696f1dc4d9cba28bb969e4815817cf8875d18b3643d3
-  data.tar.gz: '020818b8d5c4a3b06aca9e77efecc4c04a2ac5a0e1eec7bf05f4bda408c77e385d89737e7a7c545c6f462928e8d11f01fb3a9d06404b57c8c0ac9784503a4ad6'
+  metadata.gz: 3ed6fcb4ae357a182dacb84fa821cb1252628f7d3ef92b59df5db468483b9f839d9d8d6f9cba9f0095df2545cd828c5275390b06bdd5fe425b5c90e0b8fa3e5b
+  data.tar.gz: 59d44eb123657d17e837a7b0b8eb2f2f8396ffc743b1e5a0046554823e07768f6672fda2fb7777140c599ee59df02353c61a32501795999f9b124ec8d5396f2f

data/.github/workflows/ruby.yml

@@ -0,0 +1,21 @@
+name: RSpec
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-18.04
+
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Ruby 2.5
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.5.x
+    - name: Build and test with Rake
+      run: |
+        sudo apt-get install libsqlite3-dev
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        bundle exec rake test

data/.gitignore

@@ -1,7 +1,7 @@
 config.json
 config.json.localhost
 config.json.prod*
-*.pem
+./*.pem
 *.db
 *.gem
 *.rbc

data/.travis.yml

@@ -4,4 +4,4 @@ rvm:
   - 2.4
   - 2.5
 before_install:
-  - gem install -v 2.0.1 bundler --no-rdoc --no-ri
+  - gem install -v 2.0.1 bundler

data/CHANGELOG.md

@@ -5,6 +5,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased][unreleased]
 - Nothing
 
+## [2.0.0] - 2020-07-17
+### Added
+- `Underway::Api.configure` can now accept individual attributes instead of
+  just a config file. When supplying a config file, the `app_root` is no longer
+  required, just pass the absolute or relative path to the file
+
+### Changed
+- `Underway::Settings.config` is no longer supported. Use
+  `Underway::Settings.configuration` instead
+- `Underway::Settings.configuration.raw` is no longer supported. It is no
+  longer possible to retrieve arbitrary values from the config
+
 ## [1.1.0] - 2019-05-21
 ### Added
 - `Underway::Api.client_for` helper that returns a configured `Octokit` client
@@ -23,7 +35,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - First release
 
-[unreleased]: https://github.com/jamesmartin/underway/compare/v1.1.0...HEAD
+[unreleased]: https://github.com/jamesmartin/underway/compare/v2.0.0...HEAD
+[2.0.0]: https://github.com/jamesmartin/underway/compare/v1.1.0...v2.0.0
 [1.1.0]: https://github.com/jamesmartin/underway/compare/v1.0.1...v1.1.0
 [1.0.1]: https://github.com/jamesmartin/underway/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/jamesmartin/underway/compare/5c7f4d7d3bfc...v1.0.0

data/README.md

@@ -27,7 +27,7 @@ changes are documented in the
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "underway", "~> 1.0"
+gem "underway", "~> 1.1"
 ```
 
 And then run:
@@ -73,12 +73,27 @@ Sinatra application, do something like this:
 ```ruby
 require "underway"
 
-# This assumes that your configuration file and private key file is located in
-# the same directory as the current ruby file.
+Underway::Settings.configure do |config|
+  # Note: config.app_root is no longer supported as of version 2.0. Just pass
+  # the absolute or relative path to the configuration file.
+  config.config_filename = "./config.json"
+end
+```
+
+You can also configure Underway by individually setting its configuration
+attributes:
+
+```ruby
+require "underway"
 
 Underway::Settings.configure do |config|
-  config.app_root = __FILE__
-  config.config_filename = "config.json"
+  config.app_id = "some-app-id"
+  config.client_id = "some-client-id"
+  config.client_secret = "some-client-secret"
+  config.database_url = "/some/db/url"
+  config.github_api_host = "https://api.github.com"
+  config.webhook_secret = "some-webhook-secret"
+  config.private_key = "my-pem"
 end
 ```
 

data/lib/underway/api.rb

@@ -4,24 +4,24 @@ require "octokit"
 module Underway
   class Api
     # Returns a Sawyer::Resource or PORO from the GitHub REST API
-    def self.invoke(route, headers: {}, method: :get)
+    def self.invoke(route, headers: {}, data: {}, method: :get)
       debug_octokit! if verbose_logging?
 
-      Octokit.api_endpoint = Underway::Settings.config.raw["github_api_host"]
+      Octokit.api_endpoint = Underway::Settings.configuration.github_api_host
 
       if !headers[:authorization] && !headers["Authorization"]
         Octokit.bearer_token = generate_jwt
       end
 
-      final_headers = {
+      options = {
         accept: "application/vnd.github.machine-man-preview+json",
         headers: headers
       }
 
       begin
         case method
-        when :post then Octokit.post(route, final_headers)
-        else Octokit.get(route, final_headers)
+        when :post then Octokit.post(route, options.merge(data))
+        else Octokit.get(route, options)
         end
       rescue Octokit::Error => e
         { error: e.to_s }
@@ -37,7 +37,7 @@ module Underway
       return if token.nil?
 
       client = Octokit::Client.new(
-        api_endpoint: Underway::Settings.config.raw["github_api_host"],
+        api_endpoint: Underway::Settings.configuration.github_api_host,
         access_token: token
       )
     end
@@ -49,15 +49,15 @@ module Underway
         # JWT expiration time (10 minute maximum)
         exp: Time.now.to_i + (10 * 60),
         # GitHub Apps identifier
-        iss: Underway::Settings.config.app_issuer
+        iss: Underway::Settings.configuration.app_id
       }
 
-      JWT.encode(payload, Underway::Settings.config.private_key, "RS256")
+      JWT.encode(payload, Underway::Settings.configuration.private_key, "RS256")
     end
 
     # Returns a valid auth token for the installation
     def self.installation_token(id:)
-      if token = Underway::Settings.config.token_cache.lookup_installation_auth_token(id: id)
+      if token = Underway::Settings.configuration.token_cache.lookup_installation_auth_token(id: id)
         log("token cache: hit")
         return token
       else
@@ -73,7 +73,7 @@ module Underway
 
         token = res.token
         expires_at = res.expires_at.to_s
-        Underway::Settings.config.token_cache.store_installation_auth_token(id: id, token: token, expires_at: expires_at)
+        Underway::Settings.configuration.token_cache.store_installation_auth_token(id: id, token: token, expires_at: expires_at)
         token
       end
     end
@@ -90,12 +90,12 @@ module Underway
     end
 
     def self.verbose_logging?
-      !!Underway::Settings.config.verbose_logging
+      !!Underway::Settings.configuration.verbose_logging
     end
 
     def self.log(message)
       if verbose_logging?
-        ::Underway::Settings.config.logger.info(message)
+        ::Underway::Settings.configuration.logger.info(message)
       end
     end
   end

data/lib/underway/settings.rb

@@ -5,25 +5,39 @@ require "json"
 module Underway
   class Settings
     class Configuration
-      attr_reader :config, :logger
+      SUPPORTED_SETTINGS = [
+        :app_id,
+        :client_id,
+        :client_secret,
+        :database_url,
+        :github_api_host,
+        :logger,
+        :private_key,
+        :private_key_filename,
+        :verbose_logging,
+        :webhook_secret,
+      ].freeze
+
+      attr_reader :app_id, :client_id, :client_secret, :database_url,
+        :github_api_host, :private_key_filename, :logger, :verbose_logging, :webhook_secret, :config_filename
+
 
       def initialize
         @logger = Underway::Logger.new
       end
 
       def load!
-        @config = JSON.parse(
-          @app_root.join(@config_filename).read
-        )
-      end
-
-      # TODO: deprecate
-      def raw
-        @config
-      end
-
-      def app_root=(directory)
-        @app_root = Pathname.new(directory).dirname
+        if config_filename
+          config = JSON.parse(
+            Pathname.new(config_filename).read
+          )
+
+          SUPPORTED_SETTINGS.map(&:to_s).each do |setting|
+            if config[setting]
+              send("#{setting}=", config[setting])
+            end
+          end
+        end
       end
 
       def config_filename=(filename)
@@ -34,42 +48,67 @@ module Underway
         @logger = logger
       end
 
+      def database_url=(url)
+        @database_url = url
+      end
+
       def db
         @db ||=
           begin
-            Underway::DB.configure(config["database_url"])
+            Underway::DB.configure(database_url)
             Underway::DB.instance.database
           end
       end
 
+      def github_api_host=(host)
+        @github_api_host = host
+      end
+
       # The Integration ID
       # From "About -> ID" at github.com/settings/apps/<app-name>
-      def app_issuer
-        @app_issuer ||= config["app_id"]
+      def app_id=(id)
+        @app_id = id
+      end
+
+      def client_id=(id)
+        @client_id = id
+      end
+
+      def client_secret=(secret)
+        @client_secret = secret
       end
 
       # Integration webhook secret (for validating that webhooks come from GitHub)
-      def webhook_secret
-        @webhook_secret ||= config["webhook_secret"]
+      def webhook_secret=(secret)
+        @webhook_secret = secret
       end
 
-      def private_key_filename
-        @app_root.join(config["private_key_filename"])
+      def private_key_filename=(filename)
+        @private_key_filename = filename
       end
 
       # PEM file for request signing (PKCS#1 RSAPrivateKey format)
       # (Download from github.com/settings/apps/<app-name> "Private key")
       def private_pem
-        @private_pem ||= File.read(private_key_filename)
+        @private_pem ||= Pathname.new(private_key_filename).read
       end
 
-      # Private Key for the App, generated based on the PEM file
+      # Private Key for the App.
+      # Either the explicitly configured private_key value or the contents of
+      # the configured private_key_filename.
       def private_key
-        @private_key ||= OpenSSL::PKey::RSA.new(private_pem)
+        @private_key ||=
+          unless private_key_filename.nil?
+            OpenSSL::PKey::RSA.new(private_pem)
+          end
       end
 
-      def verbose_logging
-        @verbose ||= config["verbose_logging"]
+      def private_key=(key)
+        @private_key = OpenSSL::PKey::RSA.new(key)
+      end
+
+      def verbose_logging=(verbose)
+        @verbose_logging = !!verbose
       end
 
       def token_cache
@@ -77,12 +116,12 @@ module Underway
       end
 
       def oauth_authorize_url
-        uri = Addressable::URI.parse(config["github_api_host"])
-        "#{uri.scheme}://#{uri.domain}/login/oauth/authorize?client_id=#{config["client_id"]}"
+        uri = Addressable::URI.parse(github_api_host)
+        "#{uri.scheme}://#{uri.domain}/login/oauth/authorize?client_id=#{client_id}"
       end
 
       def oauth_access_token_url(code)
-        api_host = Addressable::URI.parse(config["github_api_host"])
+        api_host = Addressable::URI.parse(github_api_host)
         template = Addressable::Template.new(
           "{scheme}://{host}/login/oauth/access_token{?code,client_id,client_secret}"
         )
@@ -90,8 +129,8 @@ module Underway
           "scheme" => api_host.scheme,
           "host" => api_host.domain,
           "code" => code,
-          "client_id" => config["client_id"],
-          "client_secret" => config["client_secret"]
+          "client_id" => client_id,
+          "client_secret" => client_secret
         )
       end
     end
@@ -102,6 +141,8 @@ module Underway
       attr_reader :configuration
 
       def configure
+        reset_configuration!
+
         if block_given?
           yield configuration
         else
@@ -111,9 +152,8 @@ module Underway
         configuration.load!
       end
 
-      # TODO: remove me
-      def config
-        configuration
+      def reset_configuration!
+        @configuration = Configuration.new
       end
     end
 

data/lib/underway/sinatra.rb

@@ -8,12 +8,12 @@ module Sinatra
     end
 
     def verbose_logging?
-      !!::Underway::Settings.config.verbose_logging
+      !!::Underway::Settings.configuration.verbose_logging
     end
 
     def log(message)
       if verbose_logging?
-        ::Underway::Settings.config.logger.info(message)
+        ::Underway::Settings.configuration.logger.info(message)
       end
     end
 

data/lib/underway/sinatra/app_info.rb

@@ -30,7 +30,7 @@ module Sinatra
             </pre>
             <h2>Private PEM file</h2>
             <pre>
-              #{::Underway::Settings.config.private_key_filename}
+              #{::Underway::Settings.configuration.private_key_filename}
             </pre>
           EOS
         end

data/lib/underway/version.rb

@@ -1,3 +1,3 @@
 module Underway
-  VERSION = "1.1.0"
+  VERSION = "2.0.0"
 end

data/test/fixtures/fixture-cfg.json

@@ -0,0 +1,10 @@
+{
+  "app_id":"fixture-app-id",
+  "client_id": "fixture-client-id",
+  "client_secret": "fixture-client-secret",
+  "database_url":"/fixture/db/url",
+  "github_api_host":"https://fixture.example.com",
+  "private_key_filename":"./test.pem",
+  "verbose_logging":true,
+  "webhook_secret":"fixture-webhook-secret"
+}

data/test/fixtures/test-cert.pem

@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICljCCAX4CCQCkfmagknruqTANBgkqhkiG9w0BAQsFADANMQswCQYDVQQGEwJV
+UzAeFw0yMDA3MTcwMzI3MDlaFw0yMDA4MTYwMzI3MDlaMA0xCzAJBgNVBAYTAlVT
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxds9chO6mpmM54MlrIkO
+dK7u42x7VlmSAV/uGqvZi+E/aqiZzgSxqL4LPh7Owv++m6CZR3q7bzwBWTR6h6wC
+mSqoP6n3nYKb270KOQdPKSkd4Br6WrS3qdLzAj3mz9Af3XvEUU0sfOocdDmVPDH2
+NbqsAEmRee8tknMPaXwpBEXQaYTudHGF9mXVaZoAUYUDB5G/mofQLKnRIc7qVxC9
+I9gYfI3Olxr83X1GbBQDRZT3YUoPpt5eH/9d3/ev60tf5KT7pNBJnvHjVfqpTkpq
+AIblfgDtdpUsmpwzoGDuExOoi5ew4sA7bJmhh4iWKugX626RplqmvrZohXlF2q35
+7QIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCxRNDfbHixwUReMPchWbDHVdYzU9kf
+GEeooaYImxX+JbXU0f9aj+4DEaAETZUMFfJxdF3qCJgiS62LKGXQ96Inj7cdo9Z8
+7JXXvKt8o5j7gsf5fNSsPSSJFQz7V7DneRJpFICaqae+CDJ9y7G6ZVRYW26D4z7w
+21Fl2dk0LU1KqcBFqdXmwFJRdqv+Xoj9NaAydmhPWDz/3nI88cJRQ4l6xr7KHeXz
+w7fHBWbu48B8LAKeokYZ7+pVil7hXNw1cQjOLZOJLLVt8whcMZF6vNqonHHFx8Yd
+upx5+kTTWHuTXEh2rtTfdcWeo5V8Pnt3r4uItUsg+dgyl4l+YPQvpF9A
+-----END CERTIFICATE-----

data/test/fixtures/test.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDF2z1yE7qamYzn
+gyWsiQ50ru7jbHtWWZIBX+4aq9mL4T9qqJnOBLGovgs+Hs7C/76boJlHertvPAFZ
+NHqHrAKZKqg/qfedgpvbvQo5B08pKR3gGvpatLep0vMCPebP0B/de8RRTSx86hx0
+OZU8MfY1uqwASZF57y2Scw9pfCkERdBphO50cYX2ZdVpmgBRhQMHkb+ah9AsqdEh
+zupXEL0j2Bh8jc6XGvzdfUZsFANFlPdhSg+m3l4f/13f96/rS1/kpPuk0Eme8eNV
++qlOSmoAhuV+AO12lSyanDOgYO4TE6iLl7DiwDtsmaGHiJYq6BfrbpGmWqa+tmiF
+eUXarfntAgMBAAECggEACoMdfqQhs/kYjWxgYgxeIkDxHFA1NV9I7J3GLtCWnGH5
+VpdipJmHPunp+wD0B1RDMk2UF0IkF0Le53hsUi0Hbk/f5JIJP+sikMg4dNM4l31B
+wxhr2MnlQDafBq13R+9M4h2jTpaFGJXvsRUmIq6c4DnszY8bFZlpmHBYj0gzfbCH
+3YYR1A+1q0JK2Prn2bcGmm2gDZ5+eXhFFMsB2Y3qS9r+Xsd+Uou/v4UG+2sa0zqA
+fSkXahjMc0DD9LizCJCdKgCW0USASpraUXZt6RUPwmhZPvMabOP2q46A6hb8v6Iv
+d/htdFseYCPO1IRlvLzvN/S0HduJHvXNr6KRxt5hGQKBgQD3zMjv79lqpcnHJRMj
+r++DAeo9ImpzQPRh9kWPkyd0ZRde96xvzEYjw8ZkQrKEsjZeLcnNYrQTopTZD3QS
+6FPOTKGPVa8B6aF/ee3C1A3y/Z26IE9qdqt7Y6x/ukA5ZDSDi3F153BPXlAEDu4J
+Xsci6eQn3O7TPjAhj+HoY2EktwKBgQDMZ1zn3SW6V9FG7qwmQOm7UfPJ/LTPLMsn
+7HL0+JHOIQdvbTd0stu8xm6Afje3dNWTfcm8z9bgw1GUcEzuhuO87QWRhXBGKBHU
+Us4o1E0qcQmLSfbQfcCNhMhCx7KCfwOtTAfVwl1la3+nvXnjUlQhfogzx/nxm/QR
+6yHr/a9aewKBgEOInzatEn77QfuxQf8W4tq8ed9BcuuIR1IvcRPJEhapum3aaDdr
+3629nGMUvlxlyWVvazE7dkJnq9NgX80LXlO6FMngmzqVNrtsOn0/l7Gipwrj5WDp
+iKCvMIL6+qfphFpZdYmhkr0+weXpP7x0BSehwNmQX9JYf3uWIAZal04PAoGBAIoY
+hz8rPNMRg5VtqKbLkl3490EO10VlGPgnGl+BFFj0HabdXesc77IxSfTL0W7Do4vb
+HxHORXli3FnyKTe5sGEyrWFsircLWUhejWQuUtgKuIz/cp3XZ+D0xavAaU0a7OwH
+AwAbKahcoUk9jPzU4XwjlXeOcsIWQCZe+nMK2I7DAoGASrLFEgT3vyUBaGC0T/wy
+O+lK0uHx4BakVLRzpL3c4E7Dv1uyr+wPv0r5R8ta1Ur6JeG/sR2lqIdMZHWC/eYs
+0r+z8duYu3pO+Y3ncQUOs7xDJKAz+QdhZF7OPNcUV4/eq9yFriB1jXLPnlBk14zK
+s3xzrmV7lPXyzloTldj5FpE=
+-----END PRIVATE KEY-----

data/test/lib/settings_test.rb

@@ -0,0 +1,62 @@
+require_relative "../test_helper"
+require "pry"
+
+class SettingsTest < Minitest::Test
+
+  def setup
+    Underway::Settings.reset_configuration!
+  end
+
+  def test_can_set_settings_explicitly
+    pem = File.read(File.join(File.dirname(__FILE__), "../fixtures/test.pem"))
+
+    Underway::Settings.configure do |config|
+      config.app_id = "some-app-id"
+      config.client_id = "some-client-id"
+      config.client_secret = "some-client-secret"
+      config.database_url = "/some/db/url"
+      config.github_api_host = "https://test.example.com"
+      config.webhook_secret = "some-webhook-secret"
+      config.private_key = pem
+    end
+
+    config = Underway::Settings.configuration
+    assert_equal "some-app-id", config.app_id
+    assert_equal "some-client-id", config.client_id
+    assert_equal "some-client-secret", config.client_secret
+    assert_equal "/some/db/url", config.database_url
+    assert_equal "https://test.example.com", config.github_api_host
+    assert_equal OpenSSL::PKey::RSA.new(pem).to_pem, config.private_key.to_pem
+    assert_equal "some-webhook-secret", config.webhook_secret
+  end
+
+  def test_can_set_settings_from_config_file
+    fixture_pem_path = File.absolute_path(File.join(File.dirname(__FILE__), "../fixtures/test.pem"))
+
+    fixture_config_file_path = File.join(File.dirname(__FILE__), "../fixtures/fixture-cfg.json")
+    fixture_config = JSON.parse(File.read(fixture_config_file_path))
+    fixture_config["private_key_filename"] = fixture_pem_path
+
+    # Write the config to a tempfile to update the private_key_filename so it
+    # can be read from disk by the settings code.
+    test_config = Tempfile.open("config.json") do |f|
+      f.write(fixture_config.to_json)
+      f
+    end
+
+    Underway::Settings.configure do |config|
+      config.config_filename = test_config.path
+    end
+
+    config = Underway::Settings.configuration
+
+    assert_equal "fixture-app-id", config.app_id
+    assert_equal "fixture-client-id", config.client_id
+    assert_equal "fixture-client-secret", config.client_secret
+    assert_equal "/fixture/db/url", config.database_url
+    assert_equal "https://fixture.example.com", config.github_api_host
+    fixture_pem = OpenSSL::PKey::RSA.new(File.read(fixture_pem_path))
+    assert_equal fixture_pem.to_pem, config.private_key.to_pem
+    assert_equal "fixture-webhook-secret", config.webhook_secret
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: underway
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - James Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-21 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -171,6 +171,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".ruby-version"
 - ".travis.yml"
@@ -193,7 +194,11 @@ files:
 - lib/underway/sinatra/app_info.rb
 - lib/underway/token_cache.rb
 - lib/underway/version.rb
+- test/fixtures/fixture-cfg.json
+- test/fixtures/test-cert.pem
+- test/fixtures/test.pem
 - test/lib/sawyer_to_json_test.rb
+- test/lib/settings_test.rb
 - test/lib/token_cache_test.rb
 - test/sequel_helper.rb
 - test/test_helper.rb
@@ -217,13 +222,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Quick prototyping helpers for building GitHub Apps.
 test_files:
+- test/fixtures/fixture-cfg.json
+- test/fixtures/test-cert.pem
+- test/fixtures/test.pem
 - test/lib/sawyer_to_json_test.rb
+- test/lib/settings_test.rb
 - test/lib/token_cache_test.rb
 - test/sequel_helper.rb
 - test/test_helper.rb