stethoscope 0.1.2 → 0.2.0

data/.rvmrc

@@ -0,0 +1,7 @@
+
+if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
+  && -s "${rvm_path:-$HOME/.rvm}/environments/ruby-1.8.7-p302@stethoscope" ]] ; then
+  \. "${rvm_path:-$HOME/.rvm}/environments/ruby-1.8.7-p302@stethoscope"
+else
+  rvm --create use  "ruby-1.8.7-p302@stethoscope"
+fi

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stethoscope (0.0.1)
+    stethoscope (0.2.0)
       dictionary (>= 1.0)
       rack (> 1.0)
       tilt (>= 1.0)
@@ -10,6 +10,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     dictionary (1.0.0)
+    json_pure (1.5.3)
     nanotest (0.9.4.1)
     nanotest_extensions (0.6.3)
     rack (1.2.1)
@@ -17,19 +18,17 @@ GEM
       rack (>= 1.0)
     rake (0.8.7)
     rspec-core (2.0.0.beta.20)
-    tilt (1.0.1)
+    tilt (1.3.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (>= 1.0.0)
-  dictionary (>= 1.0)
+  json_pure
   nanotest
   nanotest_extensions
-  rack (> 1.0)
   rack-test
   rake
   rspec-core (>= 2.0.0.beta.20)
   stethoscope!
-  tilt (>= 1.0)

data/lib/stethoscope/rails.rb

@@ -5,8 +5,8 @@ if defined?(Rails::Railtie)
       initializer 'stethoscope.middleare' do |app|
         app.middleware.use Stethoscope
 
-        require 'stethoscope/checks/active_record'  if defined? ( ActiveRecord )
-        require 'stethoscope/checks/data_mapper'    if defined? ( DataMapper   )
+        require 'stethoscope/checks/active_record' if defined?(ActiveRecord)
+        require 'stethoscope/checks/data_mapper'   if defined?(DataMapper)
       end
     end
   end

data/lib/stethoscope/template.erb

@@ -10,11 +10,11 @@
         <p class='error'>No Checks Enabled</p>
       <% else %>
         <ul class='checks'>
-        <% checks.each do |name, hash| %>
+        <% checks.each do |(name, hash)| %>
           <li>
             <strong><%= name %>:</strong>
             <ul>
-              <% hash.each do |item, value| %>
+              <% hash.each do |(item, value)| %>
                 <li>
                   <% if item.to_s == 'error' %>
                     <h4><%= item.class %></h4>

data/lib/stethoscope/version.rb

@@ -1,3 +1,3 @@
 class Stethoscope
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/stethoscope.rb

@@ -1,5 +1,6 @@
 require 'dictionary'
 require 'tilt'
+require 'json'
 require 'stethoscope/rails'
 
 # Stethoscope is Rack middleware that provides a heartbeat function to an application.
@@ -110,28 +111,40 @@ class Stethoscope
 
   def call(env)
     request = Rack::Request.new(env)
-    if request.path == Stethoscope.url
-      responses  = Dictionary.new do |d,k|
-        dict = Dictionary.new
-        dict[:status] = 200
-        d[k] = dict
-      end
+    return @app.call(env) unless check_heartbeat?(request.path)
+    responses = Hash.new do |h,k|
+      h[k] = {:status => 200}
+    end
 
-      Stethoscope.checks.each do |name, check|
-        begin
-          check.call(responses[name])
-        rescue => e
-          responses[name][:error]  = e
-          responses[name][:status] = 500
-        end
+    Stethoscope.checks.each do |name, check|
+      begin
+        check.call(responses[name])
+      rescue => e
+        responses[name][:error]  = e
+        responses[name][:status] = 500
       end
+    end
 
-      status = responses.any?{ |k,v| v[:status] && !((200..299).include?(v[:status])) } ? 500 : 200
-      result = Stethoscope.template.render(Object.new, :checks => responses)
+    status = responses.any?{ |k,v| v[:status] && !((200..299).include?(v[:status])) } ? 500 : 200
+    _format = format(request.path)
 
-      Rack::Response.new(result, status).finish
-    else
-      @app.call(env)
+    case format(request.path)
+    when :html
+      result = Stethoscope.template.render(Object.new, :checks => responses)
+    when :json
+      result = {:checks => responses, :status => status}.to_json
     end
+
+    Rack::Response.new(result, status).finish
+  end
+
+  private
+  def check_heartbeat?(path)
+    path == self.class.url || path == (self.class.url + '.json')
+  end
+
+  def format(path)
+    return :json if path == (self.class.url + '.json')
+    :html
   end
 end

data/stethoscope.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "stethoscope"
 
-  s.add_dependency              "rack",        ">  1.0"
-  s.add_dependency              "dictionary",  ">= 1.0"
-  s.add_dependency              "tilt",        ">= 1.0"
+  s.add_dependency              "rack",          ">  1.0"
+  s.add_dependency              "dictionary",    ">= 1.0"
+  s.add_dependency              "tilt",          ">= 1.0"
 
   s.add_development_dependency  "bundler",     ">= 1.0.0"
   s.add_development_dependency  "rspec-core",  ">= 2.0.0.beta.20"
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency  "nanotest_extensions"
   s.add_development_dependency  "rake"
   s.add_development_dependency  "rack-test"
+  s.add_development_dependency  'json_pure'
 
 
   s.files        = `git ls-files`.split("\n")

data/test/test_stethoscope.rb

@@ -37,6 +37,18 @@ class TestStethoscope
       assert {response.body.to_s =~ /Ba-Boomp/ }
     end
 
+    test do
+      Stethoscope.check(:foo){ |response| response[:status] = 200; response[:test1] = :test1 }
+      Stethoscope.check(:bar){ |response| response[:status] = 200; response[:test2] = :test2 }
+
+      response = get "/heartbeat.json"
+      assert { response.status == 200    }
+      assert { response.body !~ /default/ }
+      result = JSON.parse(response.body)
+      assert { result['status'] == 200 }
+      assert { result['checks'] == {'foo' => {'status' => 200, 'test1' => 'test1'}, 'bar' => {'status' => 200, 'test2' => 'test2'} } }
+    end
+
     # Check checks
     context do
       setup    { $captures = []  }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stethoscope
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 +10:00
-default_executable: 
+date: 2011-08-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -153,6 +152,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: json_pure
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
 description: Heartbeat middleware for responding to heartbeat pings
 email: 
 - has.sox@gmail.com
@@ -164,6 +177,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rvmrc
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -178,7 +192,6 @@ files:
 - stethoscope.gemspec
 - test/test_helper.rb
 - test/test_stethoscope.rb
-has_rdoc: true
 homepage: http://rubygems.org/gems/stethoscope
 licenses: []
 
@@ -210,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: stethoscope
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Heartbeat middleware for responding to heartbeat pings