easymon 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37ad20e40a9eb00cac3ff063616b106d614a72ba
-  data.tar.gz: b90df46d842ff9cb52e9f6bb34fdcd166e4c11a0
+  metadata.gz: 9e3c6dbe76e00da8ea581456f3629db07caf8feb
+  data.tar.gz: 3ebe3496b6880dc63b076c92c1e319a406a3865b
 SHA512:
-  metadata.gz: 132bbbd21819511b28bea2e5ce627259ef37286cddf3a2c6ca17b3eea2ccf6b92af28c32ce800f7524a77af645cfebccbdc7211d4ef446b9b194242506a80b04
-  data.tar.gz: 071967341f3c6a779c8748209223541fa9ca8ce62b1b6df872bf0b93c7af28d7078fdb0843f56c72b61ef13a8d767753650a71e12341c758a1a6df45edec75cf
+  metadata.gz: 42a4731f64e2201753c66dccf6132d12073505f583425e2a20f505fb403561704600d33b702870614ecf247029224b5211ea39163af38a32e02accc3a1304483
+  data.tar.gz: e8a181963593e0367d5563c62bc06504af6cacb27ae4f5e557155947f8cb378c9c4112208c7990aa39f7099aaa55c6b6c3dddbdce85d575b9eaed8b43233cebb

data/lib/easymon/checklist.rb

@@ -24,7 +24,7 @@ module Easymon
     end
     
     def timing
-      results.values.map{|r| r.timing}.reduce(:+)
+      results.values.map{|r| r.timing}.inject(0, :+)
     end
     
     def to_text
@@ -32,13 +32,13 @@ module Easymon
     end
     
     def to_s
-      self.results.map{|name, result| "#{name}: #{result.to_s}"}.join("\n") + 
-      "\n - Total Time - " + self.timing.to_s + "s"
+      results.map{|name, result| "#{name}: #{result.to_s}"}.join("\n") + 
+      "\n - Total Time - " + Easymon.timing_to_ms(self.timing) + "ms"
     end
     
     def to_json(*args)
       combined = []
-      self.results.each do |name, result|
+      results.each do |name, result|
         combined << result.to_hash.merge({"name" => name})
       end
       combined.to_json

data/lib/easymon/result.rb

@@ -19,7 +19,7 @@ module Easymon
     end
     
     def to_s
-        "#{message} - #{timing.to_s}s"
+        "#{message} - #{Easymon.timing_to_ms(timing)}ms"
     end
     
     def to_json(options = {})
@@ -27,8 +27,7 @@ module Easymon
     end
     
     def to_hash
-      {:success => success, :message => message, :timing => timing}
+      {:success => success, :message => message, :timing => timing_to_ms(timing)}
     end
-    
   end
 end

data/lib/easymon/version.rb

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

data/lib/easymon.rb

@@ -61,4 +61,8 @@ module Easymon
       end
     end
   end
+  
+  def self.timing_to_ms(timing = 0)
+    sprintf("%.3f", (timing * 1000))
+  end
 end

data/test/dummy/log/development.log

@@ -731,3 +731,23 @@ Started GET "/up/index.json" for 127.0.0.1 at 2014-05-27 18:56:07 -0400
 Processing by Easymon::ChecksController#show as JSON
   Parameters: {"check"=>"index"}
 Completed 404 Not Found in 0ms (Views: 0.1ms | ActiveRecord: 0.0ms)
+   (0.2ms)  SELECT 1=1
+   (0.2ms)  SELECT 1=1
+   (0.2ms)  SELECT 1=1
+   (0.3ms)  SELECT 1=1
+   (0.2ms)  SELECT 1=1
+   (0.2ms)  SELECT 1=1
+0.002186
+0.011523
+0.000727
+0.001202
+   (0.2ms)  SELECT 1=1
+0.0024
+0.011956
+0.000711
+0.001118
+{}
+true
+{}
+{}
+{}