easymon 1.0.9 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e3c6dbe76e00da8ea581456f3629db07caf8feb
-  data.tar.gz: 3ebe3496b6880dc63b076c92c1e319a406a3865b
+  metadata.gz: 2f61e81b90d2bee2ab041290388bdc30971b544d
+  data.tar.gz: 7d1cc5cb52e9210533cd4f4dce9786c710e76405
 SHA512:
-  metadata.gz: 42a4731f64e2201753c66dccf6132d12073505f583425e2a20f505fb403561704600d33b702870614ecf247029224b5211ea39163af38a32e02accc3a1304483
-  data.tar.gz: e8a181963593e0367d5563c62bc06504af6cacb27ae4f5e557155947f8cb378c9c4112208c7990aa39f7099aaa55c6b6c3dddbdce85d575b9eaed8b43233cebb
+  metadata.gz: 0104d61a2ae1fdbecc7b2178caf0eb610eb32b3a4c2d0bc5d413bb6abe75840a1e73b8b285e42a8a48291061e92783f6053d5a29f5e3280aca7ed3e9102ee7be
+  data.tar.gz: e4e71ccaac26b483bdbca036c942de0cf55103341ecbe4947bf57ca5ba3c13656366fa725aeb75fae30513aab2673650e2fc968c710cfb11d46a2b4670ec8019

data/README.md

@@ -223,6 +223,10 @@ Here's the most direct way to get your work merged into the project:
 If you're going to make a major change ask first to maje sure it's in line with 
 the project goals.
 
+## To Do
+
+See the issues page. :smile:
+
 ## Authors
 
 * [Nathan Anderson](mailto:andnat@gmail.com)

data/lib/easymon/checklist.rb

@@ -36,12 +36,16 @@ module Easymon
       "\n - Total Time - " + Easymon.timing_to_ms(self.timing) + "ms"
     end
     
-    def to_json(*args)
-      combined = []
+    def to_hash
+      combined = {}
       results.each do |name, result|
-        combined << result.to_hash.merge({"name" => name})
+        combined[name] = result.to_hash
       end
-      combined.to_json
+      combined
+    end
+    
+    def as_json(*args)
+      to_hash
     end
     
     def success?

data/lib/easymon/result.rb

@@ -22,12 +22,12 @@ module Easymon
         "#{message} - #{Easymon.timing_to_ms(timing)}ms"
     end
     
-    def to_json(options = {})
-      to_hash.to_json
+    def as_json(options = {})
+      to_hash
     end
     
     def to_hash
-      {:success => success, :message => message, :timing => timing_to_ms(timing)}
+      {:success => success, :message => message, :timing => Easymon.timing_to_ms(timing)}
     end
   end
 end

data/lib/easymon/version.rb

@@ -1,3 +1,3 @@
 module Easymon
-  VERSION = "1.0.9"
+  VERSION = "1.1"
 end

data/lib/easymon.rb

@@ -44,19 +44,20 @@ module Easymon
       require 'easymon/checks_controller'
 
       mapper.instance_eval do
-        connect "#{path}", :controller => "easymon/checks", :action => "index"
-        connect "#{path}/:check", :controller => "easymon/checks", :action => "show"
+        connect "#{path}.:format", :controller => "easymon/checks", :action => "index"
+        connect "#{path}/:check.:format", :controller => "easymon/checks", :action => "show"
       end
     elsif Easymon.rails30?
       # Greater than 3.0, but less than 3.1
       mapper.instance_eval do
-        get "#{path}" => 'easymon/checks#index'
+        get "#{path}(.:format)" => 'easymon/checks#index'
         get "#{path}/:check" => 'easymon/checks#show'
       end
     elsif Easymon.mountable_engine?
       # Rails 3.1+
       mapper.instance_eval do
-        get "/", :to => "checks#index"
+        get "/(.:format)", :to => "checks#index"
+        root :to => "checks#index"
         get "/:check", :to => "checks#show"
       end
     end

data/test/controllers/easymon/checks_controller_test.rb

@@ -4,28 +4,28 @@ module Easymon
   class ChecksControllerTest < ActionController::TestCase
     
     test "index when no checks are defined" do
-      get :index, use_route: :easymon
+      get :index, :use_route => :easymon
       assert_response :service_unavailable
       assert_equal "No Checks Defined", response.body
     end
     
     test "index when all checks pass" do
       Easymon::Repository.add("database", Easymon::ActiveRecordCheck.new(ActiveRecord::Base))
-      get :index, use_route: :easymon
+      get :index, :use_route => :easymon
       assert_response :success, "Expected success, got 503: #{response.body}"
       assert response.body.include?("OK"), "Should include 'OK' in response body"
     end
 
     test "index when a critical check fails" do
-      Easymon::Repository.add("database", Easymon::ActiveRecordCheck.new(ActiveRecord::Base), true)
+      Easymon::Repository.add("database", Easymon::ActiveRecordCheck.new(ActiveRecord::Base), :critical)
       ActiveRecord::Base.connection.stubs(:select_value).raises("boom")
-      get :index, use_route: :easymon
+      get :index, :use_route => :easymon
       assert_response :service_unavailable
       assert response.body.include?("database: Down"), "Should include failure text, got #{response.body}"
     end
     
     test "index when a non-critical check fails" do
-      Easymon::Repository.add("database", Easymon::ActiveRecordCheck.new(ActiveRecord::Base), true)
+      Easymon::Repository.add("database", Easymon::ActiveRecordCheck.new(ActiveRecord::Base), :critical)
       Easymon::Repository.add("redis", Easymon::RedisCheck.new(YAML.load_file(Rails.root.join("config/redis.yml"))[Rails.env].symbolize_keys))
       Redis.any_instance.stubs(:ping).raises("boom")
       get :index, use_route: :easymon
@@ -34,18 +34,39 @@ module Easymon
       assert response.body.include?("OK"), "Should include 'OK' in response body"
     end
     
+    test "index returns valid json" do
+      Easymon::Repository.add("database", Easymon::ActiveRecordCheck.new(ActiveRecord::Base))
+      get :index, :use_route => :easymon, :format => :json
+      
+      json = JSON.parse(response.body)
+
+      assert json.has_key?("database")
+      assert_equal "Up", json["database"]["message"]
+      assert_equal 1, json.keys.count
+    end
+    
     test "show when the check passes" do
       Easymon::Repository.add("database", Easymon::ActiveRecordCheck.new(ActiveRecord::Base))
-      get :show, use_route: :easymon, check: "database"
+      get :show, :use_route => :easymon, check: "database"
       assert_response :success
       assert response.body.include?("Up"), "Response should include message text, got #{response.body}"
     end
     
+    test "show json when the check passes" do
+      Easymon::Repository.add("database", Easymon::ActiveRecordCheck.new(ActiveRecord::Base))
+      get :show, :use_route => :easymon, :check => "database", :format => :json
+      
+      json = JSON.parse(response.body)
+      
+      assert json.has_key?("message")
+      assert_equal "Up", json["message"]
+    end
+    
     test "show when the check fails" do
       Easymon::Repository.add("database", Easymon::ActiveRecordCheck.new(ActiveRecord::Base))
       ActiveRecord::Base.connection.stubs(:select_value).raises("boom")
       
-      get :show, use_route: :easymon, check: "database"
+      get :show, :use_route => :easymon, :check => "database"
       
       assert_response :service_unavailable
       assert response.body.include?("Down"), "Response should include failure text, got #{response.body}"
@@ -54,7 +75,7 @@ module Easymon
     test "show if the check is not found" do
       Easymon::Repository.names.each {|name| Easymon::Repository.remove(name)}
       
-      get :show, use_route: :easymon, check: "database"
+      get :show, :use_route => :easymon, :check => "database"
       assert_response :not_found
     end
   end

data/test/dummy/config/environments/development.rb

@@ -27,7 +27,7 @@ Dummy::Application.configure do
 
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
+  #config.active_record.auto_explain_threshold_in_seconds = 0.5
 
   # Do not compress assets
   config.assets.compress = false