mini_check 0.1.1 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmI4NmNjN2U5YTMyZDQzOTE2NmRmYmU4NGJmOWZkZjc4OWJkNmM2Nw==
+    MTNjYTk4MjlmODFmYzMwNjhhNTE5MzA5MGJjNTg5MTBlMmVkNzQ4Yw==
   data.tar.gz: !binary |-
-    ZTE2NGIxNzQ4OGFlZTk1MTc5OTgwODljMGJmN2FlM2Q5NTcwOGE2Mw==
+    MGNjNDMwMmNmYTM2NWNhYWNhMDUxMmQ1NmM5ZGRiYWEwOTk2MzlhYg==
 SHA512:
   metadata.gz: !binary |-
-    MGY3YTY5YTVmNTE1NjRmMGE1Y2U4MGJjMGQ4Njk5ZjZmMzY2MDM2MGU5Yzg4
-    YTA1ZmZiMDIxZjk0ODFjYTc1NzlmMWI4MGNkYWVhMzEwODg5MTJmOGMwNjdm
-    NWZlMGVkYjdhZDBiMzg4YzMzZjM3Y2VkNDA1ZWU5NGVhYWE1NmQ=
+    MTUwNmZjYTY3YmE0NmIxMzJjN2IyOTVjYjAwMzBkMGExOWMzYjU2Y2Y5NGU1
+    YTE1NDFmNGQ2MTRjZDgwOTVmYjkxOGRmMWFmMzk3YTc1YjI3MjQ1N2U0NjYx
+    NWVjZTA5MmRkYzA4ODFkOWU4N2NhMjE1ODg4YThjMmNjOTA5Njg=
   data.tar.gz: !binary |-
-    OTJiNmUwNjFlOTNlNzM1ZGNiNzBkMjgzZTYxMTcxZTQ1YTczMTQ3YzA0ODZm
-    MmFhOTY0ODg2NDgzMzViNGQzMDcyNTQ2YWY4MzFhZmIyMjcyMDA3NjVmMTgx
-    NjIwMzFmZDM2ZGMzNjI2NDA4OTZkN2MzZGUzY2ZhNTAzMTJmNDY=
+    ODJmZmZlNWI3ODc0YjM1Y2E3NTE5NDg5MGU4NzNlMzlhOGNjZGMwYTg0NGU0
+    ZWRkNDAzYmZkNzAxMTk0ODZkNDVmMGRmNWY1YWMxN2M2YTllNTQ1NWIwZmQy
+    ODJlMTJlMTE3YTFjZjc4ODNiYmY1MTNlYWRlZjA5MDE2ODI3MDA=

data/Gemfile

@@ -9,4 +9,3 @@ group :test, :development do
   gem 'rack-test'
   gem 'codeclimate-test-reporter', require: false
 end
-

data/README.md

@@ -22,10 +22,8 @@ MyHealthCheck.register('health.db_connection'){ MyApp.db_connection.fetch('show
 Mount it in your `config.ru`:
 
 ```ruby
-run Rack::Cascade.new([
-  MyHealthCheck,
-  MyApp,
-])
+use MyHealthCheck
+run MyApp
 ```
 
 If you now visit `http://localhost:XXXX/healthcheck` you should get something like:

data/lib/mini_check/check.rb

@@ -8,7 +8,7 @@ module MiniCheck
     def initialize args = {}, &block
       args = {name: args} if !args.is_a?(Hash)
       args[:action] = block if block_given?
-      
+
       set_attributes args
     end
 
@@ -29,12 +29,19 @@ module MiniCheck
     def to_hash
       {}.tap do |h|
         h[:healthy] = healthy?
-        h[:error] = {message: exception.message, stack: exception.backtrace} if exception
+        h[:error] = error_hash if exception
       end
     end
 
     private
 
+    def error_hash
+      {
+        message: exception.message,
+        stack: exception.backtrace
+      }
+    end
+
     def set_attributes args = {}
       args.each do |k,v|
         send("#{k}=", v)

data/lib/mini_check/checks_collection.rb

@@ -1,24 +1,19 @@
 module MiniCheck
   class ChecksCollection < Array
     def to_hash
-      resp = {}
-      each.map do |check|
-        resp[check.name] = check.to_hash
-      end
-
-      resp
+      Hash[map { |check| [check.name, check.to_hash] }]
     end
 
     def healthy?
-      !detect{|c| !c.healthy? }
+      all?(&:healthy?)
     end
 
     def run
-      each{|c| c.run }
+      each(&:run)
     end
-    
+
     def register name, &block
-      self.<< Check.new(name, &block)
+      push(Check.new(name, &block))
     end
   end
 end

data/lib/mini_check/rack_app.rb

@@ -17,7 +17,7 @@ module MiniCheck
         checks.run
         [status, headers, [body]]
       else
-        [404, headers, []]
+        host_app.call(env)
       end
     end
 
@@ -25,6 +25,12 @@ module MiniCheck
       checks.register name, &block
     end
 
+    def new(app)
+      copy = self.dup
+      copy.host_app = app
+      copy
+    end
+
     private
 
     def set_attributes args = {}
@@ -41,12 +47,16 @@ module MiniCheck
       checks.to_hash.to_json
     end
 
-    def generally_healthy?
-      checks.healthy?
+    def status
+      checks.healthy? ? 200 : 500
     end
 
-    def status
-      generally_healthy? ? 200 : 500
+    protected
+
+    attr_accessor :host_app
+
+    def host_app
+      @host_app ||= lambda{|env|  [404, {}, []]}
     end
   end
 end

data/lib/mini_check/version.rb

@@ -1,3 +1,3 @@
 module MiniCheck
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/spec/mini_check/rack_app_spec.rb

@@ -34,10 +34,16 @@ describe MiniCheck::RackApp do
     end
 
     context 'unknown path' do
-      it 'returns status 404' do
+      it 'returns status 404 when no host app is given' do
         get '/blahblah'
         expect(status).to eq(404)
       end
+
+      it 'delegates to the host app if given' do
+        app.send(:host_app=, lambda{|env| [999, {}, []] })
+        get '/blahblah'
+        expect(status).to eq(999)
+      end
     end
 
     context 'unknown verb' do
@@ -68,22 +74,98 @@ describe MiniCheck::RackApp do
       end
 
       it 'calls run on the checks' do
-        expect(checks).to receive(:run).and_return(true)
+        expect(checks).to receive(:run)
         do_request
       end
 
-      it 'returns each check' do
-        expect(checks).to receive(:healthy?).and_return(true)
+      it 'has status 200 when checks are healthy' do
+        allow(checks).to receive(:healthy?).and_return(true)
         do_request
+        expect(status).to eq(200)
       end
 
-      it 'has status 500 when one check is failing' do
-        expect(checks).to receive(:healthy?).and_return(true)
+      it 'has status 500 when checks are failing' do
+        allow(checks).to receive(:healthy?).and_return(false)
         do_request
+        expect(status).to eq(500)
+      end
+    end
+
+    describe 'rack integration' do
+      describe 'mounted with cascade' do
+        let(:check_app){ MiniCheck::RackApp.new path: '/health'}
+        let(:host_app){ lambda{|env| [host_app_status, {}, host_app_body] } }
+        let(:host_app_status){ 201 }
+        let(:host_app_body){ 'Host app talking' }
+
+        let(:app) do
+          rack_app = Rack::Cascade.new([check_app, host_app])
+          Rack::Builder.new do
+            run rack_app
+          end
+        end
+
+        it 'mini_check replies if the request matches' do
+          get '/health'
+          expect(last_response.status).to eq(check_app.send(:status))
+          expect(last_response.body).to eq(check_app.send(:body))
+        end
+
+        it 'host_app replies if the request doesn\'t match' do
+          get '/somehting_else'
+          expect(last_response.status).to eq(host_app_status)
+          expect(last_response.body).to eq(host_app_body)
+        end
+      end
+
+      describe 'mounted as a middleware' do
+        let(:check_app){ MiniCheck::RackApp.new path: '/health'}
+        let(:host_app){ lambda{|env| [host_app_status, {}, host_app_body] } }
+        let(:host_app_status){ 201 }
+        let(:host_app_body){ 'Host app talking' }
+
+        let(:app) do
+          rack_app = Rack::Builder.new
+          rack_app.use check_app
+          rack_app.run host_app
+          rack_app
+        end
+
+        it 'mini_check replies if the request matches' do
+          get '/health'
+          expect(last_response.status).to eq(check_app.send(:status))
+          expect(last_response.body).to eq(check_app.send(:body))
+        end
+
+        it 'host_app replies if the request doesn\'t match' do
+          get '/somehting_else'
+          expect(last_response.status).to eq(host_app_status)
+          expect(last_response.body).to eq(host_app_body)
+        end
       end
     end
   end
 
+  describe 'new' do
+    let(:host_app){ double('host_app') }
+
+    it 'returns a copy of itself' do
+      copy = subject.new(host_app)
+      expect(copy).not_to be(subject)
+      expect(copy).to be_a(MiniCheck::RackApp)
+    end
+
+    it 'sets host_app as the argument on the copy, not itself' do
+      copy = subject.new(host_app)
+      expect(copy.send(:host_app)).to be(host_app)
+      expect(subject.send(:host_app)).not_to be(host_app)
+    end
+
+    it 'sets its checks to the copy' do
+      copy = subject.new(host_app)
+      expect(copy.checks).to be(subject.checks)
+    end
+  end
   describe 'register' do
     it 'forwards to checks' do
       name = 'asd'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_check
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Manuel Morales
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler