pliny 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f4e78e4099e7a811247f8cf6bbb1d2ee8850716
-  data.tar.gz: a7051ec4fe9bfa69c7c817b4fa5f271be119dc1e
+  metadata.gz: 13b0d6020bd07cb9d55632ccc06ee95bf4114fbd
+  data.tar.gz: 40fd92d34a2c2c75e124a5893454335b14ffdd1b
 SHA512:
-  metadata.gz: a116d663a3409d028f39906dd30308ae5a3cf55b8b60334af914001c39f6c5281e5b329056cbd37b968132335a08566371f73a0df0ddf050f46fbda9daab45e0
-  data.tar.gz: d5a2a86e30b5cb2146d0c684f374d85b3d794abe212962d041ac91be861b0006cb691fe29f430b6d61e825f847860e9481df29fae57e2929c012951fdd5bc279
+  metadata.gz: c240442d80aea58d7327885bb1c573152ed5d831420da2b6f0e07e0c7838101c8d5aeeed1e44a8ebdb344fe36dfba0b8679ccd7e1c4b82b773c1af7685dac509
+  data.tar.gz: dfc01de138d783f33cc28b640382155311e363e4137e4791fb9e15a07b93df2a72350d5ec983b81face3c9fb5d8912fe116d6ce4a1971c9c29d51a7afc885000

data/lib/pliny.rb

@@ -1,5 +1,4 @@
 require "multi_json"
-require "rack-timeout"
 require "sinatra/base"
 
 require_relative "pliny/version"

data/lib/pliny/tasks/db.rake

@@ -34,7 +34,9 @@ begin
     task :seed do
       if File.exist?('./db/seeds.rb')
         database_urls.each do |database_url|
-          Sequel.connect(database_url)
+          # make a DB instance available to the seeds file
+          self.class.send(:remove_const, 'DB') if self.class.const_defined?('DB')
+          self.class.const_set('DB', Sequel.connect(database_url))
           load 'db/seeds.rb'
         end
         disconnect

data/lib/pliny/version.rb

@@ -1,3 +1,3 @@
 module Pliny
-  VERSION = "0.13.1"
+  VERSION = "0.14.0"
 end

data/lib/template/Gemfile

@@ -4,10 +4,11 @@ ruby "2.2.3"
 gem "multi_json"
 gem "oj"
 gem "pg"
-gem "pliny", "~> 0.13"
+gem "pliny", "~> 0.14"
 gem "pry"
 gem "puma", "~> 2.10"
 gem "rack-ssl"
+gem "rack-timeout", "~> 0.3"
 gem "rake"
 gem "rollbar", require: "rollbar/middleware/sinatra"
 gem "sequel", "~> 4.16"

data/lib/template/config/initializers/database.rb

@@ -5,6 +5,6 @@ database_setup_proc = lambda do |conn|
   conn.execute "SET application_name = '#{process_identifier}'"
 end
 
-Sequel.connect(Config.database_url,
+DB = Sequel.connect(Config.database_url,
   max_connections: Config.db_pool,
   after_connect: database_setup_proc)

data/lib/template/db/seeds.rb

@@ -4,6 +4,5 @@
 # db with db:setup).
 #
 # Seeding can occur multiple times during the execution of a single Rake task
-# because seeding should occur in all environments (development, testing,
-# etc.). The currently connected database can be accessed via
-# `Sequel::DATABASES.last`.
+# because it applies to all your app environments (eg: test and development).
+# An instance of the current database connection is available as `DB`.

data/lib/template/lib/endpoints/health.rb

@@ -0,0 +1,29 @@
+module Endpoints
+  class Health < Base
+    namespace '/health' do
+      get do
+        encode({})
+      end
+
+      get '/db' do
+        database?
+        database_available?
+        encode({})
+      end
+
+      private
+
+      def database?
+        fail Pliny::Errors::NotFound if DB.nil?
+      end
+
+      def database_available?
+        fail Pliny::Errors::ServiceUnavailable unless DB.test_connection
+      rescue Sequel::Error => e
+        message = e.message.strip
+        Pliny.log(db: true, health: true, at: 'exception', message: message)
+        raise Pliny::Errors::ServiceUnavailable
+      end
+    end
+  end
+end

data/lib/template/lib/routes.rb

@@ -15,6 +15,7 @@ Routes = Rack::Builder.new do
 
   use Pliny::Router do
     # mount all endpoints here
+    mount Endpoints::Health
     mount Endpoints::Schema
   end
 

data/lib/template/spec/endpoints/health_spec.rb

@@ -0,0 +1,55 @@
+require "spec_helper"
+
+RSpec.describe Endpoints::Health do
+  include Rack::Test::Methods
+
+  def app
+    Endpoints::Health
+  end
+
+  describe 'GET /health' do
+    it 'returns a 200' do
+      get '/health'
+      assert_equal(200, last_response.status)
+      assert_equal('application/json;charset=utf-8', last_response.headers['Content-Type'])
+      assert_equal(2, last_response.headers['Content-Length'].to_i)
+      assert_equal({}, MultiJson.decode(last_response.body))
+    end
+  end
+
+  describe 'GET /health/db' do
+    it 'raises a 404 when no database is available' do
+      allow(DB).to receive(:nil?).and_return(true)
+
+      assert_raises Pliny::Errors::NotFound do
+        get '/health/db'
+      end
+    end
+
+    it 'raises a 503 on Sequel exceptions' do
+      allow(DB).to receive(:test_connection).and_raise(Sequel::Error)
+
+      assert_raises Pliny::Errors::ServiceUnavailable do
+        get '/health/db'
+      end
+    end
+
+    it 'raises a 503 when connection testing fails' do
+      allow(DB).to receive(:test_connection).and_return(false)
+
+      assert_raises Pliny::Errors::ServiceUnavailable do
+        get '/health/db'
+      end
+    end
+
+    it 'returns a 200' do
+      allow(DB).to receive(:test_connection).and_return(true)
+
+      get '/health/db'
+      assert_equal(200, last_response.status)
+      assert_equal('application/json;charset=utf-8', last_response.headers['Content-Type'])
+      assert_equal(2, last_response.headers['Content-Length'].to_i)
+      assert_equal({}, MultiJson.decode(last_response.body))
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Brandur Leach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -65,26 +65,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
-- !ruby/object:Gem::Dependency
-  name: rack-timeout
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -422,6 +402,7 @@ files:
 - lib/template/db/seeds.rb
 - lib/template/lib/application.rb
 - lib/template/lib/endpoints/base.rb
+- lib/template/lib/endpoints/health.rb
 - lib/template/lib/endpoints/root.rb
 - lib/template/lib/endpoints/schema.rb
 - lib/template/lib/initializer.rb
@@ -431,6 +412,7 @@ files:
 - lib/template/lib/tasks/spec.rake
 - lib/template/schema/meta.json
 - lib/template/schema/schemata/.gitkeep
+- lib/template/spec/endpoints/health_spec.rb
 - lib/template/spec/endpoints/schema_spec.rb
 - lib/template/spec/spec_helper.rb
 - lib/template/spec/spec_support/auto_define_rack_app.rb
@@ -482,7 +464,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Basic tooling to support API apps in Sinatra