monittr 0.0.5 → 0.0.6

data/lib/monittr/sinatra/template.erb

@@ -108,10 +108,12 @@ $(function() {
     $(this).removeClass('expanded').find('.content').hide('fast', function() { });
   });
 
-  $('#monittr .server h2').toggle(
-    function() { $(this).parent().trigger('expand') },
-    function() { $(this).parent().trigger('collapse') }
-  );
+  $('#monittr .server h2').click(
+    function(event) {
+      if ( event.target != this ) return true; // Enable clicking on links
+      $(this).parent().hasClass('expanded') ? $(this).parent().trigger('collapse') : $(this).parent().trigger('expand');
+  });
+
 
   $('#toggle').toggle(
     function() {

data/lib/monittr/version.rb

@@ -1,3 +1,3 @@
 module Monittr
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/monittr.rb

@@ -1,6 +1,7 @@
 require 'nokogiri'
 require 'rest-client'
 require 'ostruct'
+require 'timeout'
 
 module Monittr
 
@@ -45,10 +46,12 @@ module Monittr
     # Retrieve Monit status XML from the URL
     #
     def self.fetch(url='http://admin:monit@localhost:2812')
-      monit_url  = url
-      monit_url += '/' unless url =~ /\/$/
-      monit_url += '_status?format=xml' unless url =~ /_status\?format=xml$/
-      self.new url, RestClient.get(monit_url)
+      Timeout::timeout(1) do
+        monit_url  = url
+        monit_url += '/' unless url =~ /\/$/
+        monit_url += '_status?format=xml' unless url =~ /_status\?format=xml$/
+        self.new url, RestClient.get(monit_url)
+      end
     rescue Exception => e
       self.new url, %Q|<error status="3" name="#{e.class}" message="#{e.message}" />|
     end

data/test/monittr_test.rb

@@ -37,6 +37,15 @@ module Monittr
         assert_equal '500 Internal Server Error', cluster.servers.first.system.message
       end
 
+      should "timeout properly for non-responding URLs" do
+        RestClient.expects(:get).raises(Timeout::Error)
+        cluster = Monittr::Cluster.new %w[ http://admin:monit@localhost:2812 ]
+        assert_not_nil cluster.servers
+        assert_equal 1, cluster.servers.size
+        assert_equal 3, cluster.servers.first.system.status
+        assert_equal 'Timeout::Error', cluster.servers.first.system.name
+      end
+
     end
 
     context "Server" do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: monittr
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Karel Minarik
@@ -14,16 +15,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 +01:00
-default_executable: 
+date: 2011-06-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -35,9 +37,11 @@ dependencies:
   name: rest-client
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -47,9 +51,11 @@ dependencies:
   name: nokogiri
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -59,9 +65,11 @@ dependencies:
   name: sinatra
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -71,9 +79,11 @@ dependencies:
   name: shoulda
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -83,9 +93,11 @@ dependencies:
   name: turn
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -95,14 +107,30 @@ dependencies:
   name: fakeweb
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
 description: "    Monittr provides a Ruby interface for loading and displaying statistics\n    from multiple Monit instances and helpers for Sinatra web applications.\n"
 email: karmi@karmi.cz
 executables: []
@@ -128,7 +156,6 @@ files:
 - examples/application.rb
 - examples/monitrc
 - examples/template.erb
-has_rdoc: true
 homepage: http://github.com/karmi/monittr
 licenses: []
 
@@ -138,16 +165,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3
@@ -156,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: A Ruby and web interface for Monit statistics