sappy 0.1.4 → 0.1.5

data/Rakefile

@@ -1,5 +1,7 @@
+require 'bundler'
+require 'jeweler'
+
 begin
-  require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "sappy"
     gemspec.summary = "Wrapping that shit!"
@@ -7,22 +9,33 @@ begin
     gemspec.email = ["dylanegan@gmail.com", "tim@spork.in"]
     gemspec.homepage = "http://github.com/abcde/sappy"
     gemspec.authors = ["Dylan Egan", "Tim Carey-Smith"]
-    gemspec.files = %w(README.markdown Rakefile VERSION) + Dir.glob("{lib,bacon}/**/*")
+    # reject people's local copies of credentials
+    project_files = Dir.glob("{lib,spec}/**/*").reject { |file| file =~ %r!spec/credentials.rb! }
+    gemspec.files = %w(README.markdown Rakefile VERSION) + project_files
     gemspec.rubyforge_project = 'abcde'
-    gemspec.add_dependency "rack", "1.0.0"
-    gemspec.add_dependency "rest-client", "1.0.3"
-    gemspec.add_dependency "xml-simple", "1.0.12"
+    manifest = Bundler::Environment.load(File.dirname(__FILE__) + '/Gemfile')
+    manifest.dependencies.each do |d|
+      next unless d.only && d.only.include?('release')
+      gemspec.add_dependency(d.name, d.version)
+    end
   end
 
   Jeweler::RubyforgeTasks.new
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end
 
-desc 'Run bacon'
-task :bacon do
-  puts `bacon #{Dir["spec/**/*_bacon.rb"].join(" ")}`
+require 'spec/rake/spectask'
+desc "Run specs"
+Spec::Rake::SpecTask.new do |t|
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_opts = %w(-fs --color)
+
+  t.rcov = ENV['RCOV'] == "true"
+  t.rcov_opts << '--exclude' << 'spec'
+  t.rcov_opts << '--text-summary'
+  t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
 end
 
-desc 'Default: Runs spec'
-task :default => :bacon
+desc 'Default: Runs rspec'
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/sappy.rb

@@ -1,6 +1,5 @@
-require 'xmlsimple'
-
 require File.dirname(__FILE__) + '/core_ext'
+require 'nokogiri'
 
 $:.unshift File.dirname(__FILE__)
 

data/lib/sappy/account.rb

@@ -49,24 +49,25 @@ module Sappy
       Request.perform(self, action, parameters)
     end
 
-    private
-      def authenticate
-        response = request('auth', "Email" => @username, "Password" => @password)
-        @authkey = response.key
-      end
+  private
+    
+    def authenticate
+      response = request('auth', "Email" => @username, "Password" => @password)
+      @authkey = response.key
+    end
 
-      def refresh_account_info
-        response = request('accountinfo')
-        @available_monitors = response.available_monitors
-        @setup_monitors = response.setup_monitors
-        @sms_alerts = response.sms_alerts
-      end
+    def refresh_account_info
+      response = request('accountinfo')
+      @available_monitors = response.available_monitors
+      @setup_monitors = response.setup_monitors
+      @sms_alerts = response.sms_alerts
+    end
 
-      def refresh_summary_statistics
-        response = request('summarystatistics')
-        @up_monitors = response.up
-        @down_monitors = response.down
-        @inactive_monitors = response.inactive
-      end
+    def refresh_summary_statistics
+      response = request('summarystatistics')
+      @up_monitors = response.up
+      @down_monitors = response.down
+      @inactive_monitors = response.inactive
+    end
   end
 end

data/lib/sappy/monitor.rb

@@ -107,11 +107,19 @@ module Sappy
       @active = 0
     end
 
+    def disabled?
+      @active != 1
+    end
+
     def enable!
       @account.request('enablemonitor', "MonitorId" => id)
       @active = 1
     end
 
+    def enabled?
+      @active == 1
+    end
+
     def new_record?
       id.nil?
     end
@@ -121,7 +129,7 @@ module Sappy
     end
 
     def create
-      @id = @account.request("addmonitor", attributes).id
+      self.id = @account.request("addmonitor", attributes).id
     end
 
     def update

data/lib/sappy/response.rb

@@ -9,16 +9,33 @@ module Sappy
       r
     end
 
-    def initialize(xml)
-      @xml = xml
+    attr_reader :data, :xml
+
+    def initialize(data)
+      @data = data.to_s
+      @xml  = Nokogiri::XML.parse(data)
+    end
+
+    def error_response?
+      resp = xml.xpath('//rsp')
+      resp && resp.first['stat'] == 'fail'
+    end
+
+    def error_response
+      resp = xml.xpath('//err')
+      resp && resp.first
+    end
+
+    def first_xpath(path)
+      node = xml.xpath(path)
+      node && node.first
     end
 
     def parse
-      hash = XmlSimple.xml_in(@xml.to_s, 'KeepRoot' => false)
-      if hash["stat"] == "fail"
-        error = hash["err"]
-        message = error.first["msg"]
-        case code = error.first["code"]
+      if error_response?
+        error = error_response
+        message = error["msg"]
+        case code = error["code"]
         when "AUTH_EXPIRED"
           raise SessionExpired, "The auth session expired, reconnect to continue using the API"
         else
@@ -26,16 +43,21 @@ module Sappy
           raise UnhandledError, "Unhandled error: #{code}, #{message}"
         end
       else
-        success(hash)
+        success
       end
     end
 
-    def success(hash)
+    def success
       raise NotImplementedError, "Overwrite #success in a Response subclass"
     end
 
     def failure(code, message)
-      raise NotImplementedError, "Overwrite #failure in a Response subclass"
+      case code
+      when "WRONG_DATA"
+        raise ArgumentError, "You didn't provide a correct monitor id: #{message}"
+      else
+        raise NotImplementedError, "Overwrite #failure in a Response subclass"
+      end
     end
   end
 end

data/lib/sappy/responses/account_info.rb

@@ -3,11 +3,11 @@ module Sappy
     class AccountInfo < Response
       attr_reader :available_monitors, :setup_monitors, :sms_alerts
 
-      def success(hash)
-        accountinfo = hash["accountinfo"].first
+      def success
+        accountinfo         = first_xpath('//accountinfo')
+        @sms_alerts         = accountinfo["smsalerts"].to_i
+        @setup_monitors     = accountinfo["setupmonitors"].to_i
         @available_monitors = accountinfo["availablemonitors"].to_i
-        @setup_monitors = accountinfo["setupmonitors"].to_i
-        @sms_alerts = accountinfo["smsalerts"].to_i
       end
     end
   end

data/lib/sappy/responses/add_monitor.rb

@@ -2,15 +2,10 @@ module Sappy
   module Responses
     class AddMonitor < Response
       attr_reader :id
-      def success(hash)
-        @id = hash["monitor"].first["id"]
-      end
 
-      def failure(code, message)
-        case code
-        when "WRONG_DATA"
-          raise ArgumentError, "You didn't provide the correct data: #{message}"
-        end
+      def success
+        node = first_xpath('//monitor')
+        @id = node && node['id']
       end
     end
   end

data/lib/sappy/responses/annual_statistics.rb

@@ -3,8 +3,8 @@ module Sappy
     class AnnualStatistics < Response
       attr_reader :statistics
 
-      def success(hash)
-        @statistics = hash["monthlystats"].first
+      def success
+        @statistics = first_xpath('//monthlystats')
       end
     end
   end

data/lib/sappy/responses/auth.rb

@@ -2,10 +2,11 @@ module Sappy
   module Responses
     class Auth < Response
       class LoginFailed < Error; end
-
       attr_reader :key
-      def success(hash)
-        @key = hash["session"].first["key"]
+
+      def success
+        node = first_xpath('//session')
+        @key = node && node["key"]
       end
 
       def failure(code, message)

data/lib/sappy/responses/daily_statistics.rb

@@ -3,8 +3,8 @@ module Sappy
     class DailyStatistics < Response
       attr_reader :statistics
 
-      def success(hash)
-        @statistics = hash["checks"].first
+      def success
+        @statistics = first_xpath('//checks')
       end
     end
   end

data/lib/sappy/responses/disable_monitor.rb

@@ -1,14 +1,7 @@
 module Sappy
   module Responses
     class DisableMonitor < Response
-      def success(hash)
-      end
-
-      def failure(code, message)
-        case code
-        when "WRONG_DATA"
-          raise ArgumentError, "You didn't provide a correct monitor id: #{message}"
-        end
+      def success
       end
     end
   end

data/lib/sappy/responses/edit_monitor.rb

@@ -1,14 +1,7 @@
 module Sappy
   module Responses
     class EditMonitor < Response
-      def success(hash)
-      end
-
-      def failure(code, message)
-        case code
-        when "WRONG_DATA"
-          raise ArgumentError, "You didn't provide the correct data: #{message}"
-        end
+      def success
       end
     end
   end

data/lib/sappy/responses/enable_monitor.rb

@@ -1,14 +1,7 @@
 module Sappy
   module Responses
     class EnableMonitor < Response
-      def success(hash)
-      end
-
-      def failure(code, message)
-        case code
-        when "WRONG_DATA"
-          raise ArgumentError, "You didn't provide a correct monitor id: #{message}"
-        end
+      def success
       end
     end
   end

data/lib/sappy/responses/monitors.rb

@@ -3,8 +3,8 @@ module Sappy
     class Monitors < Response
       attr_reader :monitors
 
-      def success(hash)
-        @monitors = hash["monitors"].first["monitor"] || []
+      def success
+        @monitors = xml.xpath('//monitors/monitor')
       end
     end
   end

data/lib/sappy/responses/monthly_statistics.rb

@@ -3,8 +3,8 @@ module Sappy
     class MonthlyStatistics < Response
       attr_reader :statistics
 
-      def success(hash)
-        @statistics = hash["dailystats"].first
+      def success
+        @statistics = first_xpath('//dailystats')
       end
     end
   end

data/lib/sappy/responses/remove_monitor.rb

@@ -1,14 +1,7 @@
 module Sappy
   module Responses
     class RemoveMonitor < Response
-      def success(hash)
-      end
-
-      def failure(code, message)
-        case code
-        when "WRONG_DATA"
-          raise ArgumentError, "You didn't provide a correct monitor id: #{message}"
-        end
+      def success
       end
     end
   end

data/lib/sappy/responses/summary_statistics.rb

@@ -3,10 +3,11 @@ module Sappy
     class SummaryStatistics < Response
       attr_reader :up, :down, :inactive
 
-      def success(hash)
-        hash["summarystatistics"].first.each do |stat,value|
-          instance_variable_set("@#{stat}", value.to_i)
-        end
+      def success
+        node      = first_xpath('//summarystatistics')
+        @up       = node['up'].to_i
+        @down     = node['down'].to_i
+        @inactive = node['inactive'].to_i
       end
     end
   end

data/spec/credentials.integrity.rb

@@ -1,2 +1,3 @@
 USERNAME = "sappy@siteuptime.com"
 PASSWORD = "password"
+MONITOR_LIMIT = (ENV['SITEUPTIME_MONITOR_LIMIT'] || 1).to_i

data/spec/sappy/{account_bacon.rb → account_spec.rb}

@@ -1,21 +1,18 @@
-require File.dirname(__FILE__) + '/../helper'
+require File.dirname(__FILE__) + '/../spec_helper'
 
 module Sappy
   describe Account do
     describe "with incorrect credentials" do
       it "raises an error" do
         lambda { Account.login("invalid@email.com", "password") }.
-          should.raise(Responses::Auth::LoginFailed).
-          message.should.match(/Wrong email or password/)
+          should raise_error(Responses::Auth::LoginFailed, 'Wrong email or password')
       end
     end
 
     describe "with correct credentials" do
       before do
         @account = Account.login(USERNAME, PASSWORD)
-      end
-      
-      before do
+
         @account.monitors.each do |m|
           m.destroy
         end
@@ -23,7 +20,7 @@ module Sappy
 
       it "should obtain an auth key" do
         if ENV['LIVE_SPECS']
-          @account.authkey.should.be.kind_of(String)
+          @account.authkey.should be_a_kind_of(String)
         else
           @account.authkey.should == "b7kks5mh1l300v5segaksm8gh3"
         end
@@ -44,11 +41,11 @@ module Sappy
 
         it "can create a new monitor" do
           monitor = @account.add_monitor({:name => "New Monitor", :service => "http", :location => "sf", :host => "engineyard.com", :period => "60"})
-          monitor.id.should.not.be.nil
-          if ENV['LIVE_SPECS']
-            @account.available_monitors.should == 2
+          monitor.id.should_not be_nil
+          unless mocked?
+            @account.available_monitors.should == MONITOR_LIMIT
           else
-            FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.monitors", :response => cached_page('monitors_1'))
+            FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.monitors", :response => cached_page("monitors_#{MONITOR_LIMIT}"))
           end
           monitors = @account.monitors
           monitors.size.should == 1

data/spec/sappy/monitor_spec.rb

@@ -0,0 +1,73 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+module Sappy
+  describe Monitor do
+    before do
+      @account = Account.login(USERNAME, PASSWORD)
+    end
+
+    before do
+      @account.monitors.each { |m| m.destroy }
+      @monitor = @account.add_monitor(:name => "New Monitor", :service => "http", :location => "sf", :host => "engineyard.com", :period => "60")
+    end
+
+    describe "an active monitor" do
+      before do
+        @monitor.enable!
+      end
+
+      it "can be disabled" do
+        @monitor.disable!
+        @monitor.should be_disabled
+      end
+    end
+
+    describe "an inactive monitor" do
+      before do
+        @monitor.disable!
+      end
+
+      it "can be enabled" do
+        @monitor.enable!
+        @monitor.should be_enabled
+      end
+    end
+
+    describe "a monitor" do
+      it "can be destroyed" do
+        if mocked?
+          FakeWeb.register_uri(:get, "#{api_url}?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.monitors", :response => cached_page('monitors_1'))
+        end
+        @account.monitors.size.should == 1
+        lambda { @monitor.destroy }.should_not raise_error #TODO
+        if mocked?
+          FakeWeb.register_uri(:get, "#{api_url}?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.monitors", :response => cached_page('monitors'))
+        end
+        @account.monitors.size.should == 0
+      end
+
+      describe "statistics" do
+        before do
+          if mocked?
+            FakeWeb.register_uri(:get, "#{api_url}?AuthKey=b7kks5mh1l300v5segaksm8gh3&Month=11&method=siteuptime.dailystatistics&Day=28&Year=2006&MonitorId=84043", :response => cached_page('dailystatistics'))
+            FakeWeb.register_uri(:get, "#{api_url}?AuthKey=b7kks5mh1l300v5segaksm8gh3&Month=6&method=siteuptime.monthlystatistics&Year=2007&MonitorId=84043", :response => cached_page('monthlystatistics'))
+            FakeWeb.register_uri(:get, "#{api_url}?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.annualstatistics&Year=&MonitorId=84043", :response => cached_page('annualstatistics'))
+          end
+          @monitor = @account.add_monitor({:name => "New Monitor", :service => "http", :location => "sf", :host => "engineyard.com", :period => "60"})
+        end
+
+        it "should provide daily" do
+          @monitor.daily_statistics(2006, 11, 28).should be_an_instance_of(Statistics::Daily)
+        end
+
+        it "should provide monthly" do
+          @monitor.monthly_statistics(2007, 6).should be_an_instance_of(Statistics::Monthly)
+        end
+
+        it "should provide annual" do
+          @monitor.annual_statistics.should be_an_instance_of(Statistics::Annual)
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,45 @@
+Bundler.require_env(:test)
+require 'cgi'
+
+ENV['LIVE_SPECS'] ||= 'false'
+
+require File.dirname(__FILE__) + '/../lib/sappy'
+
+begin
+  require File.dirname(__FILE__) + '/credentials.rb'
+rescue LoadError
+  raise "add a spec/credentials.rb that defines USERNAME and PASSWORD constants"
+end
+
+Spec::Runner.configure do |config|
+  def cached_page(name)
+    file = File.dirname(__FILE__) + "/xml/#{name}.xml"
+    File.exist?(file) ? file : fail("Unable to find #{file}")
+  end
+
+  def api_url
+    'https://siteuptime.com/api/rest/'
+  end
+
+  def mocked?
+    ENV['LIVE_SPECS'] == 'false'
+  end
+  config.before(:each) do
+    if mocked?
+      FakeWeb.allow_net_connect = false
+      FakeWeb.clean_registry
+      FakeWeb.register_uri(:get, "#{api_url}?method=siteuptime.auth&Password=#{PASSWORD}&Email=#{CGI.escape USERNAME}", :response => cached_page('valid_account'))
+      FakeWeb.register_uri(:get, "#{api_url}?method=siteuptime.auth&Password=password&Email=invalid%40email.com", :response => cached_page('invalid_account'))
+      FakeWeb.register_uri(:get, "#{api_url}?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.accountinfo", :response => cached_page('accountinfo'))
+      FakeWeb.register_uri(:get, "#{api_url}?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.summarystatistics", :response => cached_page('summarystatistics'))
+      FakeWeb.register_uri(:get, "#{api_url}?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.monitors", :response => cached_page('monitors'))
+      FakeWeb.register_uri(:get, "#{api_url}?AddToStatusPage=&AltEmailAlerts=&AuthKey=b7kks5mh1l300v5segaksm8gh3&CheckPeriod=60&Content=&Domain=&DontSendUpAlert=&DownSubject=&EnablePublicStatistics=&Enabled=&HostName=engineyard.com&IP=&Location=sf&Login=&Name=New+Monitor&Password=&PortNumber=&SendAlertAfter=&SendAllDownAlerts=&SendJabberAlert=&SendSms=&SendUrlAlert=&Service=http&Timeout=&UpSubject=&method=siteuptime.addmonitor", :response => cached_page('addmonitor'))
+      FakeWeb.register_uri(:get, "#{api_url}?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.enablemonitor&MonitorId=84043", :response => cached_page('enablemonitor'))
+      FakeWeb.register_uri(:get, "#{api_url}?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.disablemonitor&MonitorId=84043", :response => cached_page('disablemonitor'))
+      FakeWeb.register_uri(:get, "#{api_url}?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.removemonitor&MonitorId=84043", :response => cached_page('removemonitor'))
+    end
+    Sappy::Account.login(USERNAME, PASSWORD).monitors.each do |m|
+      m.destroy
+    end
+  end
+end

data/spec/xml/accountinfo.xml

@@ -0,0 +1,15 @@
+HTTP/1.1 200 OK
+Date: Mon, 24 Aug 2009 05:09:43 GMT
+Server: Apache/2.2.3 (Red Hat)
+X-Powered-By: PHP/5.1.6
+Expires: Thu, 19 Nov 1981 08:52:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+Pragma: no-cache
+Content-Length: 135
+Connection: close
+Content-Type: text/xml
+
+<?xml version="1.0" encoding="utf-8"?>
+<rsp stat="ok">
+    <accountinfo setupmonitors="" availablemonitors="3" smsalerts="0"/>
+</rsp>

data/spec/xml/accountinfo_1.xml

@@ -0,0 +1,15 @@
+HTTP/1.1 200 OK
+Date: Mon, 24 Aug 2009 05:34:36 GMT
+Server: Apache/2.2.3 (Red Hat)
+X-Powered-By: PHP/5.1.6
+Expires: Thu, 19 Nov 1981 08:52:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+Pragma: no-cache
+Content-Length: 136
+Connection: close
+Content-Type: text/xml
+
+<?xml version="1.0" encoding="utf-8"?>
+<rsp stat="ok">
+    <accountinfo setupmonitors="1" availablemonitors="2" smsalerts="0"/>
+</rsp>

data/spec/xml/addmonitor.xml

@@ -0,0 +1,15 @@
+HTTP/1.1 200 OK
+Date: Mon, 24 Aug 2009 05:19:02 GMT
+Server: Apache/2.2.3 (Red Hat)
+X-Powered-By: PHP/5.1.6
+Expires: Thu, 19 Nov 1981 08:52:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+Pragma: no-cache
+Content-Length: 89
+Connection: close
+Content-Type: text/xml
+
+<?xml version="1.0" encoding="utf-8"?>
+<rsp stat="ok">
+    <monitor id="84043"/>
+</rsp>

data/spec/xml/annualstatistics.xml

@@ -0,0 +1,16 @@
+HTTP/1.1 200 OK
+Date: Tue, 06 Oct 2009 22:36:07 GMT
+Server: Apache/2.2.3 (Red Hat)
+X-Powered-By: PHP/5.1.6
+Expires: Thu, 19 Nov 1981 08:52:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+Pragma: no-cache
+Content-Length: 176
+Connection: close
+Content-Type: text/xml
+
+<?xml version="1.0" encoding="utf-8"?>
+<rsp stat="ok">
+    <monthlystats total="0" timezone="PST+10.0" numchecks="0" numfailures="0" uptime="n/a">
+    </monthlystats>
+</rsp>

data/spec/xml/dailystatistics.xml

@@ -0,0 +1,16 @@
+HTTP/1.1 200 OK
+Date: Tue, 06 Oct 2009 22:35:48 GMT
+Server: Apache/2.2.3 (Red Hat)
+X-Powered-By: PHP/5.1.6
+Expires: Thu, 19 Nov 1981 08:52:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+Pragma: no-cache
+Content-Length: 165
+Connection: close
+Content-Type: text/xml
+
+<?xml version="1.0" encoding="utf-8"?>
+<rsp stat="ok">
+    <checks total="0" timezone="PST+10.0" numchecks="0" numfailures="0" uptime="n/a">
+    </checks>
+</rsp>

data/spec/xml/disablemonitor.xml

@@ -0,0 +1,13 @@
+HTTP/1.1 200 OK
+Date: Mon, 24 Aug 2009 05:23:19 GMT
+Server: Apache/2.2.3 (Red Hat)
+X-Powered-By: PHP/5.1.6
+Expires: Thu, 19 Nov 1981 08:52:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+Pragma: no-cache
+Content-Length: 55
+Connection: close
+Content-Type: text/xml
+
+<?xml version="1.0" encoding="utf-8"?>
+<rsp stat="ok"/>

data/spec/xml/enablemonitor.xml

@@ -0,0 +1,13 @@
+HTTP/1.1 200 OK
+Date: Mon, 24 Aug 2009 05:24:51 GMT
+Server: Apache/2.2.3 (Red Hat)
+X-Powered-By: PHP/5.1.6
+Expires: Thu, 19 Nov 1981 08:52:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+Pragma: no-cache
+Content-Length: 55
+Connection: close
+Content-Type: text/xml
+
+<?xml version="1.0" encoding="utf-8"?>
+<rsp stat="ok"/>

data/spec/xml/invalid_account.xml

@@ -0,0 +1,12 @@
+HTTP/1.1 200 OK
+Date: Mon, 24 Aug 2009 05:00:31 GMT
+Server: Apache/2.2.3 (Red Hat)
+X-Powered-By: PHP/5.1.6
+Content-Length: 126
+Connection: close
+Content-Type: text/xml
+
+<?xml version="1.0" encoding="utf-8"?>
+<rsp stat="fail">
+   <err code="WRONG_DATA" msg="Wrong email or password" />
+</rsp>

data/spec/xml/monitors.xml

@@ -0,0 +1,16 @@
+HTTP/1.1 200 OK
+Date: Mon, 24 Aug 2009 05:16:46 GMT
+Server: Apache/2.2.3 (Red Hat)
+X-Powered-By: PHP/5.1.6
+Expires: Thu, 19 Nov 1981 08:52:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+Pragma: no-cache
+Content-Length: 101
+Connection: close
+Content-Type: text/xml
+
+<?xml version="1.0" encoding="utf-8"?>
+<rsp stat="ok">
+  <monitors total="0">
+  </monitors>
+</rsp>

data/spec/xml/monitors_1.xml

@@ -0,0 +1,17 @@
+HTTP/1.1 200 OK
+Date: Mon, 24 Aug 2009 05:29:31 GMT
+Server: Apache/2.2.3 (Red Hat)
+X-Powered-By: PHP/5.1.6
+Expires: Thu, 19 Nov 1981 08:52:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+Pragma: no-cache
+Content-Length: 465
+Connection: close
+Content-Type: text/xml
+
+<?xml version="1.0" encoding="utf-8"?>
+<rsp stat="ok">
+  <monitors total="1">
+    <monitor id="84043" active="no" name="New Monitor" host="new-sf-monitor.com" service="http" port="0" period="60" location="sf" timeout="25" downsubject="" upsubject="" altemailalerts="" sendalertafter="1" dontsendupalert="no" sendurlalert="no" sendjabberalert="no" sendalldownalerts="no" enablepublicstatistics="no" addtostatuspage="no" current_status="n/a"/>
+  </monitors>
+</rsp>

data/spec/xml/monitors_12.xml

@@ -0,0 +1,17 @@
+HTTP/1.1 200 OK
+Date: Mon, 24 Aug 2009 05:29:31 GMT
+Server: Apache/2.2.3 (Red Hat)
+X-Powered-By: PHP/5.1.6
+Expires: Thu, 19 Nov 1981 08:52:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+Pragma: no-cache
+Content-Length: 465
+Connection: close
+Content-Type: text/xml
+
+<?xml version="1.0" encoding="utf-8"?>
+<rsp stat="ok">
+  <monitors total="1">
+    <monitor id="84043" active="no" name="New Monitor" host="new-sf-monitor.com" service="http" port="0" period="60" location="sf" timeout="25" downsubject="" upsubject="" altemailalerts="" sendalertafter="1" dontsendupalert="no" sendurlalert="no" sendjabberalert="no" sendalldownalerts="no" enablepublicstatistics="no" addtostatuspage="no" current_status="n/a"/>
+  </monitors>
+</rsp>

data/spec/xml/monthlystatistics.xml

@@ -0,0 +1,16 @@
+HTTP/1.1 200 OK
+Date: Tue, 06 Oct 2009 22:35:16 GMT
+Server: Apache/2.2.3 (Red Hat)
+X-Powered-By: PHP/5.1.6
+Expires: Thu, 19 Nov 1981 08:52:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+Pragma: no-cache
+Content-Length: 195
+Connection: close
+Content-Type: text/xml
+
+<?xml version="1.0" encoding="utf-8"?>
+<rsp stat="ok">
+    <dailystats year="2009" month="10" total="0" timezone="PST+10.0" numchecks="0" numfailures="0" uptime="n/a">
+    </dailystats>
+</rsp>

data/spec/xml/removemonitor.xml

@@ -0,0 +1,13 @@
+HTTP/1.1 200 OK
+Date: Mon, 24 Aug 2009 05:26:12 GMT
+Server: Apache/2.2.3 (Red Hat)
+X-Powered-By: PHP/5.1.6
+Expires: Thu, 19 Nov 1981 08:52:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+Pragma: no-cache
+Content-Length: 55
+Connection: close
+Content-Type: text/xml
+
+<?xml version="1.0" encoding="utf-8"?>
+<rsp stat="ok"/>

data/spec/xml/summarystatistics.xml

@@ -0,0 +1,15 @@
+HTTP/1.1 200 OK
+Date: Mon, 24 Aug 2009 05:15:44 GMT
+Server: Apache/2.2.3 (Red Hat)
+X-Powered-By: PHP/5.1.6
+Expires: Thu, 19 Nov 1981 08:52:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+Pragma: no-cache
+Content-Length: 116
+Connection: close
+Content-Type: text/xml
+
+<?xml version="1.0" encoding="utf-8"?>
+<rsp stat="ok">
+    <summarystatistics up="0" down="0" inactive="0"/>
+</rsp>

data/spec/xml/valid_account.xml

@@ -0,0 +1,15 @@
+HTTP/1.1 200 OK
+Date: Mon, 24 Aug 2009 05:00:02 GMT
+Server: Apache/2.2.3 (Red Hat)
+X-Powered-By: PHP/5.1.6
+Expires: Thu, 19 Nov 1981 08:52:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0
+Pragma: no-cache
+Content-Length: 110
+Connection: close
+Content-Type: text/xml
+
+<?xml version="1.0" encoding="utf-8"?>
+<rsp stat="ok">
+   <session key="b7kks5mh1l300v5segaksm8gh3"/>
+</rsp>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sappy
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Dylan Egan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-11 00:00:00 +11:00
+date: 2009-12-07 00:00:00 -08:00
 default_executable: shell
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,19 +29,19 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 1.0.3
     version: 
 - !ruby/object:Gem::Dependency 
-  name: xml-simple
+  name: nokogiri
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.12
+        version: "0"
     version: 
 description: A wrapper for the SiteUptime API
 email: 
@@ -72,7 +72,6 @@ files:
 - lib/sappy/responses/disable_monitor.rb
 - lib/sappy/responses/edit_monitor.rb
 - lib/sappy/responses/enable_monitor.rb
-- lib/sappy/responses/error.rb
 - lib/sappy/responses/monitors.rb
 - lib/sappy/responses/monthly_statistics.rb
 - lib/sappy/responses/remove_monitor.rb
@@ -81,6 +80,25 @@ files:
 - lib/sappy/statistics/annual.rb
 - lib/sappy/statistics/daily.rb
 - lib/sappy/statistics/monthly.rb
+- spec/credentials.integrity.rb
+- spec/sappy/account_spec.rb
+- spec/sappy/monitor_spec.rb
+- spec/spec_helper.rb
+- spec/xml/accountinfo.xml
+- spec/xml/accountinfo_1.xml
+- spec/xml/addmonitor.xml
+- spec/xml/annualstatistics.xml
+- spec/xml/dailystatistics.xml
+- spec/xml/disablemonitor.xml
+- spec/xml/enablemonitor.xml
+- spec/xml/invalid_account.xml
+- spec/xml/monitors.xml
+- spec/xml/monitors_1.xml
+- spec/xml/monitors_12.xml
+- spec/xml/monthlystatistics.xml
+- spec/xml/removemonitor.xml
+- spec/xml/summarystatistics.xml
+- spec/xml/valid_account.xml
 - README.md
 has_rdoc: true
 homepage: http://github.com/abcde/sappy
@@ -112,6 +130,6 @@ specification_version: 3
 summary: Wrapping that shit!
 test_files: 
 - spec/credentials.integrity.rb
-- spec/helper.rb
-- spec/sappy/account_bacon.rb
-- spec/sappy/monitor_bacon.rb
+- spec/sappy/account_spec.rb
+- spec/sappy/monitor_spec.rb
+- spec/spec_helper.rb

data/lib/sappy/responses/error.rb

@@ -1,22 +0,0 @@
-module Sappy
-  module Responses
-    class ErrorResponse
-      class Error < StandardError; end
-      class AuthenticationError < Error; end
-
-      def initialize(xml)
-        err = xml["err"]
-        message = err.first["msg"]
-
-        case code = err.first["code"]
-        when "AUTH_EXPIRED"
-          raise AuthenticationExpired, message
-        when "AUTH_ERR"
-          raise AuthenticationError, message
-        else
-          raise Error, "Unknown error[#{code}]: #{message}"
-        end
-      end
-    end
-  end
-end

data/spec/helper.rb

@@ -1,38 +0,0 @@
-require File.dirname(__FILE__) + '/../tmp/vendor/environment'
-Bundler.require_env(:test)
-require 'cgi'
-
-require File.dirname(__FILE__) + '/../lib/sappy'
-begin
-  require File.dirname(__FILE__) + '/credentials.rb'
-rescue LoadError
-  raise "add a spec/credentials.rb that defines USERNAME and PASSWORD constants"
-end
-
-SPEC_DIR = File.dirname(__FILE__) unless defined? SPEC_DIR
-$:<< SPEC_DIR
-
-def cached_page(name)
-  SPEC_DIR + "/xml/#{name}.xml"
-end
-
-unless ENV['LIVE_SPECS']
-  # Don't allow real web requests
-  FakeWeb.allow_net_connect = false
-
-  FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?method=siteuptime.auth&Password=#{PASSWORD}&Email=#{CGI.escape USERNAME}", :response => cached_page('valid_account'))
-  FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?method=siteuptime.auth&Password=password&Email=invalid%40email.com", :response => cached_page('invalid_account'))
-  FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.accountinfo", :response => cached_page('accountinfo'))
-  FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.summarystatistics", :response => cached_page('summarystatistics'))
-  FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.monitors", :response => cached_page('monitors'))
-  FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AddToStatusPage=&AltEmailAlerts=&AuthKey=b7kks5mh1l300v5segaksm8gh3&CheckPeriod=60&Content=&Domain=&DontSendUpAlert=&DownSubject=&EnablePublicStatistics=&Enabled=&HostName=engineyard.com&IP=&Location=sf&Login=&Name=New+Monitor&Password=&PortNumber=&SendAlertAfter=&SendAllDownAlerts=&SendJabberAlert=&SendSms=&SendUrlAlert=&Service=http&Timeout=&UpSubject=&method=siteuptime.addmonitor", :response => cached_page('addmonitor'))
-  FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.enablemonitor&MonitorId=84043", :response => cached_page('enablemonitor'))
-  FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.disablemonitor&MonitorId=84043", :response => cached_page('disablemonitor'))
-  FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.removemonitor&MonitorId=84043", :response => cached_page('removemonitor'))
-end
-
-at_exit do
-  Sappy::Account.login(USERNAME, PASSWORD).monitors.each do |m|
-    m.destroy
-  end
-end

data/spec/sappy/monitor_bacon.rb

@@ -1,73 +0,0 @@
-require File.dirname(__FILE__) + '/../helper'
-
-module Sappy
-  describe Monitor do
-    before do
-      @account = Account.login(USERNAME, PASSWORD)
-    end
-    
-    before do
-      @account.monitors.each { |m| m.destroy }
-      @monitor = @account.add_monitor({:name => "New Monitor", :service => "http", :location => "sf", :host => "engineyard.com", :period => "60"})
-    end
-
-    describe "an active monitor" do
-      before do
-        @monitor.enable!
-      end
-
-      it "can be disabled" do
-        @monitor.disable!
-        @monitor.should.not.be.active
-      end
-    end
-
-    describe "an inactive monitor" do
-      before do
-        @monitor.disable!
-      end
-
-      it "can be enabled" do
-        @monitor.enable!
-        @monitor.should.be.active
-      end
-    end
-
-    describe "a monitor" do
-      it "can be destroyed" do
-        unless ENV['LIVE_SPECS']
-          FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.monitors", :response => cached_page('monitors_1'))
-        end
-        @account.monitors.size.should == 1
-        lambda { @monitor.destroy }.should.not.raise
-        unless ENV['LIVE_SPECS']
-          FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.monitors", :response => cached_page('monitors'))
-        end
-        @account.monitors.size.should == 0
-      end
-
-      describe "statistics" do
-        before do
-          unless ENV['LIVE_SPECS']
-            FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&Month=11&method=siteuptime.dailystatistics&Day=28&Year=2006&MonitorId=84043", :response => cached_page('dailystatistics'))
-            FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&Month=6&method=siteuptime.monthlystatistics&Year=2007&MonitorId=84043", :response => cached_page('monthlystatistics'))
-            FakeWeb.register_uri(:get, "https://siteuptime.com/api/rest/?AuthKey=b7kks5mh1l300v5segaksm8gh3&method=siteuptime.annualstatistics&Year=&MonitorId=84043", :response => cached_page('annualstatistics'))
-          end
-          @monitor = @account.add_monitor({:name => "New Monitor", :service => "http", :location => "sf", :host => "engineyard.com", :period => "60"})
-        end
-
-        it "should provide daily" do
-          @monitor.daily_statistics(2006, 11, 28).should.be.instance_of Statistics::Daily
-        end
-
-        it "should provide monthly" do
-          @monitor.monthly_statistics(2007, 6).should.be.instance_of Statistics::Monthly
-        end
-
-        it "should provide annual" do
-          @monitor.annual_statistics.should.be.instance_of Statistics::Annual
-        end
-      end
-    end
-  end
-end