pingdom-client 0.0.2.alpha → 0.0.3.alpha

data/Readme.md

@@ -3,24 +3,29 @@
 Pingdom now offers a RESTful API, which gives us no reason not to make a decent,
 non-SOAP API client for their services.
 
+NOTE: This is a 3rd party gem and not an official product from Pingdom.
+
 ## Usage
 
     client = Pingdom::Client.new :username => u, :password => p
     check = client.checks.first #=> #<Pingdom::Check>
-    check.lastresponsetime      #=> 200 (ms)
+    check.last_response_time    #=> 200 (ms)
     check.status                #=> :up
     check.up?                   #=> true
-
+    
     result = check.results.first(:probes => [1,2,3], :status => [:up, :down])
                                 #=> #<Pingdom::Result>
     result.status               #=> :up
     result.up?                  #=> true
-    result.responsetime         #=> 200 (ms)
+    result.response_time        #=> 20000 (microsecs)
     
     avg = check.average(:from   => 1.month.ago,
                         :probes => [1,2,3])
                                 #=> #<Pingdom::Summary::Average>
-    avg.responsetime.avgresponse
+    avg.response_time           #=> 200 (ms)
+    probe_avg = avg.averages.first
+    probe_avg.response_time     #=> 120 (ms)
+    probe_avg.probe.name        #=> "Atlanta, GA"
 
 ## License
 

data/lib/pingdom-client.rb

@@ -14,7 +14,6 @@ require 'active_support/core_ext/hash/slice'
 require 'pingdom'
 require 'pingdom/client'
 require 'pingdom/base'
-require 'pingdom/base'
 require 'pingdom/check'
 require 'pingdom/result'
 require 'pingdom/probe'

data/lib/pingdom.rb

@@ -1,6 +1,6 @@
 module Pingdom
   
-  VERSION = '0.0.2.alpha'
+  VERSION = '0.0.3.alpha'
   
   class Error < RuntimeError
   end

data/lib/pingdom/check.rb

@@ -3,7 +3,8 @@ module Pingdom
   # {"name"=>"Autocomplete", "id"=>259103, "type"=>"http", "lastresponsetime"=>203173, "status"=>"up", "lasttesttime"=>1298102416}
   class Check < Base
     def self.parse(client, response)
-      super[:checks].map do |check|
+      checks = super
+      Array.wrap(checks[:checks] || checks[:check]).map do |check|
         new(client, response, check)
       end
     end

data/lib/pingdom/client.rb

@@ -5,11 +5,12 @@ module Pingdom
     
     attr_accessor :limit
     
-    def initialize(credentials = {})
+    def initialize(options = {})
+      @options = options.with_indifferent_access
       @connection = Faraday::Connection.new(:url => "https://api/pingdom.com/api/2.0/") do |builder|
         builder.url_prefix = "https://api.pingdom.com/api/2.0"
         
-        builder.adapter :logger
+        builder.adapter :logger, @options[:logger]
         
         builder.adapter :excon
         
@@ -17,7 +18,7 @@ module Pingdom
         builder.response :yajl
         builder.use Tinder::FaradayResponse::WithIndifferentAccess
         
-        builder.basic_auth credentials[:username], credentials[:password]
+        builder.basic_auth @options[:username], @options[:password]
       end
     end
     
@@ -60,7 +61,7 @@ module Pingdom
       Check.parse(self, get("checks", options))
     end
     def check(id)
-      Check.parse(self, get("checks/#{id}"))
+      Check.parse(self, get("checks/#{id}")).first
     end
     
     # Check ID

data/pingdom-client.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = %q{pingdom-client}
-  s.version = "0.0.2.alpha"
+  s.version = "0.0.3.alpha"
   
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Todd"]
-  s.date = %q{2011-02-24}
+  s.date = %q{2011-03-01}
   s.description = %q{Pingdom Ruby Client}
   s.email = %q{chiology@gmail.com}
   s.files = [

data/spec/pingdom-client_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Pingdom::Client do
-  let(:client){ Pingdom::Client.new(CREDENTIALS) }
+  let(:client){ Pingdom::Client.new(CREDENTIALS.merge(:logger => LOGGER)) }
   
   describe "#test!" do
     it "should test a single endpoint" do

data/spec/spec_helper.rb

@@ -3,6 +3,8 @@ require 'rubygems'
 require 'bundler/setup'
 require 'pingdom-client'
 
+require 'logger'
 require 'rspec'
 
-CREDENTIALS = YAML.load_file(File.join(File.dirname(__FILE__), '..', 'credentials.yml')).inject({}){ |h,(k,v)| h[k.to_sym] = v; h }
+LOGGER      = Logger.new(File.join(File.dirname(__FILE__), 'test.log'))
+CREDENTIALS = YAML.load_file(File.join(File.dirname(__FILE__), '..', 'credentials.yml')).with_indifferent_access

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: pingdom-client
 version: !ruby/object:Gem::Version 
-  hash: -1851332170
+  hash: -1851332174
   prerelease: 6
   segments: 
   - 0
   - 0
-  - 2
+  - 3
   - alpha
-  version: 0.0.2.alpha
+  version: 0.0.3.alpha
 platform: ruby
 authors: 
 - Matt Todd
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 -05:00
+date: 2011-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Pingdom Ruby Client