flapjack-diner 0.15 → 1.0.0.rc1

data/lib/flapjack-diner/argument_validator.rb

@@ -35,6 +35,24 @@ module Flapjack
       end
     end
 
+    def boolean(*elements)
+      elements.each do |element|
+        if target = @query[element]
+          next if [TrueClass, FalseClass].include?(target.class)
+          @errors << "'#{target}' should be 'true' or 'false'."
+        end
+      end
+    end
+
+    def array_of_strings(*elements)
+      elements.each do |element|
+        if target = @query[element]
+          next if target.is_a?(Array) && target.all? {|t| t.is_a?(String)}
+          @errors << "'#{target}' should be an Array of Strings."
+        end
+      end
+    end
+
     def required(*elements)
       elements.each do |element|
         @errors << "'#{element}' is required." if @query[element].nil?
@@ -49,7 +67,7 @@ module Flapjack
       return super unless klass = classify_name(name)
       elements = args
       elements.each do |element|
-        @errors << "'#{element}' is expected to be a #{klass}" unless @query[element].is_a?(klass)
+        @errors << "'#{element}' is expected to be a #{klass}" unless @query[element].nil? || @query[element].is_a?(klass)
       end
     end
 

data/lib/flapjack-diner/version.rb

@@ -1,5 +1,5 @@
 module Flapjack
   module Diner
-    VERSION = "0.15"
+    VERSION = "1.0.0.rc1"
   end
 end

data/spec/flapjack-diner_spec.rb

@@ -4,23 +4,12 @@ require 'flapjack-diner'
 describe Flapjack::Diner do
 
   let(:server) { 'flapjack.com' }
-  let(:entity) { 'ex-abcd-data-17.example.com' }
-  let(:check)  { 'ping'}
-
-  let(:rule_data) {
-    {"contact_id"         => "21",
-     "entity_tags"        => ["database","physical"],
-     "entities"           => ["foo-app-01.example.com"],
-     "time_restrictions"  => nil,
-     "warning_media"      => ["email"],
-     "critical_media"     => ["sms", "email"],
-     "warning_blackhole"  => false,
-     "critical_blackhole" => false
-    }
-  }
-
-  let(:response)      { '{"key":"value"}' }
-  let(:response_body) { {'key' => 'value'} }
+
+  let(:time) { Time.now }
+
+  def response_with_data(name, data = [])
+    "{\"#{name}\":#{data.to_json}}"
+  end
 
   before(:each) do
     Flapjack::Diner.base_uri(server)
@@ -31,704 +20,1177 @@ describe Flapjack::Diner do
     WebMock.reset!
   end
 
-  it "returns a json list of entities" do
-    req = stub_request(:get, "http://#{server}/entities").to_return(
-      :body => response)
-
-    result = Flapjack::Diner.entities
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
-
-  it "returns a json list of entities from a non-standard port" do
-    Flapjack::Diner.base_uri('flapjack.com:54321')
-
-    req = stub_request(:get, "http://#{server}:54321/entities").to_return(
-      :body => response)
-
-    result = Flapjack::Diner.entities
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
-
-  it "returns a json list of checks for an entity" do
-    req = stub_request(:get, "http://#{server}/checks/#{entity}").to_return(
-      :body => response)
-
-    result = Flapjack::Diner.checks(entity)
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
-
-  it "returns a json list of check statuses for an entity" do
-    req = stub_request(:get, "http://#{server}/status").
-            with(:query => {:entity => entity}).
-            to_return(:body => response)
-
-    result = Flapjack::Diner.bulk_status(:entity => entity)
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
-
-  it "returns a json list of check statuses for an entity, legacy" do
-    req = stub_request(:get, "http://#{server}/status/#{entity}").
-            to_return(:body => response)
-
-    result = Flapjack::Diner.status(entity)
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
-
-  it "returns a list of entity statuses for a bulk query" do
-    req = stub_request(:get, "http://#{server}/status").
-      with(:query => {:entity => ['abc.net', 'def.com'], :check => {'ghi.net' => 'ping', 'jkl.org' => ['ping', 'ssh']}}).
-      to_return(:body => response)
-
-    result = Flapjack::Diner.bulk_status(:entity => ['abc.net', 'def.com'], :check => {'ghi.net' => 'ping', 'jkl.org' => ['ping', 'ssh']})
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
-
-  it "returns a single check status for an entity" do
-    req = stub_request(:get, "http://#{server}/status").
-            with(:query => {:check => {entity => check}}).
-            to_return(:body => response)
-
-    result = Flapjack::Diner.bulk_status(:check => {entity => check})
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
-
-  it "returns a single check status for an entity, legacy" do
-    req = stub_request(:get, "http://#{server}/status/#{entity}/#{check}").
-            to_return(:body => response)
-
-    result = Flapjack::Diner.status(entity, :check => check)
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
-
-  it "returns a list of scheduled maintenance periods for all checks on an entity" do
-    req = stub_request(:get, "http://#{server}/scheduled_maintenances/#{entity}").
-            to_return(:body => response)
-
-    result = Flapjack::Diner.scheduled_maintenances(entity)
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
-
-  it "returns a list of scheduled maintenance periods for a check on an entity" do
-    req = stub_request(:get, "http://#{server}/scheduled_maintenances/#{entity}/#{check}").
-            to_return(:body => response)
-
-    result = Flapjack::Diner.scheduled_maintenances(entity, :check => check)
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
-
-  it "returns a list of scheduled maintenance periods for a bulk query" do
-    req = stub_request(:get, "http://#{server}/scheduled_maintenances").
-      with(:query => {:entity => 'abc.net', :check => {'def.org' => 'ping'}}).
-      to_return(:body => response)
-
-    result = Flapjack::Diner.bulk_scheduled_maintenances(:entity => 'abc.net', :check => {'def.org' => 'ping'})
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
-
-  it "returns a list of unscheduled maintenance periods for all checks on an entity" do
-    req = stub_request(:get, "http://#{server}/unscheduled_maintenances/#{entity}").
-            to_return(:body => response)
-
-    result = Flapjack::Diner.unscheduled_maintenances(entity)
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
-
-  it "returns a list of unscheduled maintenance periods for a check on an entity" do
-    req = stub_request(:get, "http://#{server}/unscheduled_maintenances/#{entity}/#{check}").
-            to_return(:body => response)
-
-    result = Flapjack::Diner.unscheduled_maintenances(entity, :check => check)
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
-
-  it "returns a list of unscheduled maintenance periods for a bulk query" do
-    req = stub_request(:get, "http://#{server}/unscheduled_maintenances").
-      with(:query => {:entity => 'abc.net', :check => {'def.org' => 'ping'}}).
-      to_return(:body => response)
-
-    result = Flapjack::Diner.bulk_unscheduled_maintenances(:entity => 'abc.net', :check => {'def.org' => 'ping'})
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
-
-  it "returns a list of outages for all checks on an entity" do
-    req = stub_request(:get, "http://#{server}/outages/#{entity}").
-            to_return(:body => response)
+  context 'contacts' do
+    context 'create' do
+
+      it "submits a POST request for a contact" do
+        data = [{:first_name => 'Jim',
+                 :last_name  => 'Smith',
+                 :email      => 'jims@example.com',
+                 :timezone   => 'UTC',
+                 :tags       => ['admin', 'night_shift']}]
+
+        req = stub_request(:post, "http://#{server}/contacts").
+          with(:body => {:contacts => data}.to_json,
+               :headers => {'Content-Type'=>'application/vnd.api+json'}).
+          to_return(:status => 201, :body => response_with_data('contacts', data))
+
+        result = Flapjack::Diner.create_contacts(data)
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
+
+      it "submits a POST request for several contacts" do
+        data = [{:first_name => 'Jim',
+                 :last_name  => 'Smith',
+                 :email      => 'jims@example.com',
+                 :timezone   => 'UTC',
+                 :tags       => ['admin', 'night_shift']},
+                {:first_name => 'Joan',
+                 :last_name  => 'Smith',
+                 :email      => 'joans@example.com'}]
+
+        req = stub_request(:post, "http://#{server}/contacts").
+          with(:body => {:contacts => data}.to_json,
+               :headers => {'Content-Type'=>'application/vnd.api+json'}).
+          to_return(:status => 201, :body => response_with_data('contacts', data))
+
+        result = Flapjack::Diner.create_contacts(data)
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
 
-    result = Flapjack::Diner.outages(entity)
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
+    end
 
-  it "returns a list of outages for a check on an entity" do
-    req = stub_request(:get, "http://#{server}/outages/#{entity}/#{check}").
-            to_return(:body => response)
+    context 'read' do
+      it "submits a GET request for all contacts" do
+        req = stub_request(:get, "http://#{server}/contacts").to_return(
+          :status => 200, :body => response_with_data('contacts'))
+
+        result = Flapjack::Diner.contacts
+        req.should have_been_requested
+        result.should_not be_nil
+      end
+
+      it "submits a GET request for one contact" do
+        req = stub_request(:get, "http://#{server}/contacts/72").to_return(
+          :body => response_with_data('contacts'))
+
+        result = Flapjack::Diner.contacts('72')
+        req.should have_been_requested
+        result.should_not be_nil
+      end
+
+      it "submits a GET request for several contacts" do
+        req = stub_request(:get, "http://#{server}/contacts/72,150").to_return(
+          :body => response_with_data('contacts'))
+
+        result = Flapjack::Diner.contacts('72', '150')
+        req.should have_been_requested
+        result.should_not be_nil
+      end
+    end
 
-    result = Flapjack::Diner.outages(entity, :check => check)
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
+    context 'update' do
+
+      it "submits a PATCH request for one contact" do
+        req = stub_request(:patch, "http://#{server}/contacts/23").
+          with(:body => [{:op => 'replace', :path => '/contacts/0/timezone', :value => 'UTC'}].to_json,
+               :headers => {'Content-Type'=>'application/json-patch+json'}).
+          to_return(:status => 204)
+
+        result = Flapjack::Diner.update_contacts(23, :timezone => 'UTC')
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
+
+      it "submits a PATCH request for several contacts" do
+        req = stub_request(:patch, "http://#{server}/contacts/23,87").
+          with(:body => [{:op => 'replace', :path => '/contacts/0/timezone', :value => 'UTC'}].to_json,
+               :headers => {'Content-Type'=>'application/json-patch+json'}).
+          to_return(:status => 204)
+
+        result = Flapjack::Diner.update_contacts(23, 87, :timezone => 'UTC')
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
+
+      it "submits a PATCH request to change a link for one contact" do
+        req = stub_request(:patch, "http://#{server}/contacts/23").
+          with(:body => [{:op => 'add', :path => '/contacts/0/links/entities/-', :value => '57'}].to_json,
+               :headers => {'Content-Type'=>'application/json-patch+json'}).
+          to_return(:status => 204)
+
+        result = Flapjack::Diner.update_contacts(23, :add_entity => '57')
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
+
+      it "submits a PATCH request to change links for several contacts" do
+        req = stub_request(:patch, "http://#{server}/contacts/23,87").
+          with(:body => [{:op => 'add', :path => '/contacts/0/links/entities/-', :value => '57'}].to_json,
+               :headers => {'Content-Type'=>'application/json-patch+json'}).
+          to_return(:status => 204)
+
+        result = Flapjack::Diner.update_contacts(23, 87, :add_entity => '57')
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
 
-  it "returns a list of outages for a bulk query" do
-    req = stub_request(:get, "http://#{server}/outages").
-      with(:query => {:entity => 'abc.net', :check => {'def.org' => 'ping'}}).
-      to_return(:body => response)
+    end
 
-    result = Flapjack::Diner.bulk_outages(:entity => 'abc.net', :check => {'def.org' => 'ping'})
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
+    context 'delete' do
+      it "submits a DELETE request for one contact" do
+        req = stub_request(:delete, "http://#{server}/contacts/72").
+          to_return(:status => 204)
+
+        result = Flapjack::Diner.delete_contacts('72')
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
+
+      it "submits a DELETE request for several contacts" do
+        req = stub_request(:delete, "http://#{server}/contacts/72,150").
+          to_return(:status => 204)
+
+        result = Flapjack::Diner.delete_contacts('72', '150')
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
+    end
   end
 
-  it "returns a list of downtimes for all checks on an entity" do
-    req = stub_request(:get, "http://#{server}/downtime/#{entity}").
-            to_return(:body => response)
+  context 'media' do
+    context 'create' do
+
+      it "submits a POST request for a medium" do
+        data = [{
+          :type             => 'sms',
+          :address          => '0123456789',
+          :interval         => 300,
+          :rollup_threshold => 5
+        }]
+
+        req = stub_request(:post, "http://#{server}/contacts/1/media").
+          with(:body => {:media => data}.to_json,
+               :headers => {'Content-Type'=>'application/vnd.api+json'}).
+          to_return(:status => 201, :body => response_with_data('media', data))
+
+        result = Flapjack::Diner.create_contact_media(1, data)
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
+
+      it "submits a POST request for several media" do
+        data = [{
+          :type             => 'sms',
+          :address          => '0123456789',
+          :interval         => 300,
+          :rollup_threshold => 5
+        }, {
+          :type             => 'email',
+          :address          => 'ablated@example.org',
+          :interval         => 180,
+          :rollup_threshold => 3
+        }]
+
+        req = stub_request(:post, "http://#{server}/contacts/1/media").
+          with(:body => {:media => data}.to_json,
+               :headers => {'Content-Type'=>'application/vnd.api+json'}).
+          to_return(:status => 201, :body => response_with_data('media', data))
+
+        result = Flapjack::Diner.create_contact_media(1, data)
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
 
-    result = Flapjack::Diner.downtime(entity)
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
-
-  it "returns a list of downtimes for all checks on an entity between two times" do
-    start  = Time.iso8601('2011-08-01T00:00:00+10:00')
-    finish = Time.iso8601('2011-08-31T00:00:00+10:00')
+    end
 
-    req = stub_request(:get, "http://#{server}/downtime/#{entity}").
-            with(:query => {:start_time => start.iso8601, :end_time => finish.iso8601}).
-            to_return(:body => response)
+    context 'read' do
+     it "submits a GET request for all media" do
+        req = stub_request(:get, "http://#{server}/media").
+          to_return(:body => response_with_data('media'))
+
+        result = Flapjack::Diner.media
+        req.should have_been_requested
+        result.should_not be_nil
+      end
+
+      it "submits a GET request for one medium" do
+        req = stub_request(:get, "http://#{server}/media/72_sms").
+          to_return(:body => response_with_data('media'))
+
+        result = Flapjack::Diner.media('72_sms')
+        req.should have_been_requested
+        result.should_not be_nil
+      end
+
+      it "submits a GET request for several media" do
+        req = stub_request(:get, "http://#{server}/media/72_sms,150_email").
+          to_return(:body => response_with_data('media'))
+
+        result = Flapjack::Diner.media('72_sms', '150_email')
+        req.should have_been_requested
+        result.should_not be_nil
+      end
+    end
 
-    result = Flapjack::Diner.downtime(entity, :start_time => start, :end_time => finish)
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
+    context 'update' do
+
+      it "submits a PATCH request for one medium" do
+        req = stub_request(:patch, "http://#{server}/media/23_email").
+          with(:body => [{:op => 'replace', :path => '/media/0/interval', :value => 50},
+                         {:op => 'replace', :path => '/media/0/rollup_threshold', :value => 3}].to_json,
+               :headers => {'Content-Type'=>'application/json-patch+json'}).
+          to_return(:status => 204)
+
+        result = Flapjack::Diner.update_media('23_email', :interval => 50, :rollup_threshold => 3)
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
+
+      it "submits a PATCH request for several media" do
+        req = stub_request(:patch, "http://#{server}/media/23_email,87_sms").
+          with(:body => [{:op => 'replace', :path => '/media/0/interval', :value => 50},
+                         {:op => 'replace', :path => '/media/0/rollup_threshold', :value => 3}].to_json,
+               :headers => {'Content-Type'=>'application/json-patch+json'}).
+          to_return(:status => 204)
+
+        result = Flapjack::Diner.update_media('23_email', '87_sms', :interval => 50, :rollup_threshold => 3)
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
 
-  it "returns a list of downtimes for a check on an entity" do
-    req = stub_request(:get, "http://#{server}/downtime/#{entity}/#{check}").
-            to_return(:body => response)
+    end
 
-    result = Flapjack::Diner.downtime(entity, :check => check)
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
+    context 'delete' do
+      it "submits a DELETE request for one medium" do
+        req = stub_request(:delete, "http://#{server}/media/72_sms").
+          to_return(:status => 204)
+
+        result = Flapjack::Diner.delete_media('72_sms')
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
+
+      it "submits a DELETE request for several media" do
+        req = stub_request(:delete, "http://#{server}/media/72_sms,150_email").
+          to_return(:status => 204)
+
+        result = Flapjack::Diner.delete_media('72_sms', '150_email')
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
+    end
   end
 
-  it "returns a list of downtimes for a bulk query between two times" do
-    start  = Time.iso8601('2011-08-01T00:00:00+10:00')
-    finish = Time.iso8601('2011-08-31T00:00:00+10:00')
+  context 'pagerduty credentials' do
+    context 'create' do
 
-    req = stub_request(:get, "http://#{server}/downtime").
-      with(:query => {:entity => 'abc.net', :check => {'def.org' => 'ping'},
-                      :start_time => start.iso8601, :end_time => finish.iso8601}).
-      to_return(:body => response)
+      it "submits a POST request for pagerduty credentials" do
+        data = [{:service_key => 'abc',
+                 :subdomain   => 'def',
+                 :username    => 'ghi',
+                 :password    => 'jkl',
+                }]
 
-    result = Flapjack::Diner.bulk_downtime(:entity => 'abc.net', :check => {'def.org' => 'ping'},
-                                           :start_time => start, :end_time => finish)
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
+        req = stub_request(:post, "http://#{server}/contacts/1/pagerduty_credentials").
+          with(:body => {:pagerduty_credentials => data}.to_json,
+               :headers => {'Content-Type'=>'application/vnd.api+json'}).
+          to_return(:status => 201, :body => response_with_data('pagerduty_credentials', data))
 
-  it "acknowledges a check's state for an entity" do
-    req = stub_request(:post, "http://#{server}/acknowledgements").with(
-      :body => {:check => {entity => check}, :summary => 'dealing with it'}).to_return(
-      :status => 204)
+        result = Flapjack::Diner.create_contact_pagerduty_credentials(1, data)
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
 
-    result = Flapjack::Diner.acknowledge!(entity, check, :summary => 'dealing with it')
-    req.should have_been_requested
-    result.should be_true
-  end
+    end
 
-  it "acknowledges all checks on an entity" do
-    req = stub_request(:post, "http://#{server}/acknowledgements").with(
-      :body => {:entity => entity, :summary => 'dealing with it'},
-                :headers => {'Content-Type' => 'application/json'}).to_return(
-      :status => 204)
+    context 'read' do
+     it "submits a GET request for all pagerduty credentials" do
+        req = stub_request(:get, "http://#{server}/pagerduty_credentials").
+          to_return(:body => response_with_data('pagerduty_credentials'))
+
+        result = Flapjack::Diner.pagerduty_credentials
+        req.should have_been_requested
+        result.should_not be_nil
+      end
+
+      it "submits a GET request for one set of pagerduty credentials" do
+        req = stub_request(:get, "http://#{server}/pagerduty_credentials/72").
+          to_return(:body => response_with_data('pagerduty_credentials'))
+
+        result = Flapjack::Diner.pagerduty_credentials('72')
+        req.should have_been_requested
+        result.should_not be_nil
+      end
+
+      it "submits a GET request for several sets of pagerduty credentials" do
+        req = stub_request(:get, "http://#{server}/pagerduty_credentials/72,150").
+          to_return(:body => response_with_data('pagerduty_credentials'))
+
+        result = Flapjack::Diner.pagerduty_credentials('72', '150')
+        req.should have_been_requested
+        result.should_not be_nil
+      end
+    end
 
-    result = Flapjack::Diner.bulk_acknowledge!(:entity => entity, :summary => 'dealing with it')
-    req.should have_been_requested
-    result.should be_true
-  end
+    context 'update' do
+
+      it "submits a PATCH request for one set of pagerduty credentials" do
+        req = stub_request(:patch, "http://#{server}/pagerduty_credentials/23").
+          with(:body => [{:op => 'replace', :path => '/pagerduty_credentials/0/password', :value => 'lmno'}].to_json,
+               :headers => {'Content-Type'=>'application/json-patch+json'}).
+          to_return(:status => 204)
+
+        result = Flapjack::Diner.update_pagerduty_credentials('23', :password => 'lmno')
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
+
+      it "submits a PATCH request for several sets of pagerduty credentials" do
+        req = stub_request(:patch, "http://#{server}/pagerduty_credentials/23,87").
+          with(:body => [{:op => 'replace', :path => '/pagerduty_credentials/0/username', :value => 'hijk'},
+                         {:op => 'replace', :path => '/pagerduty_credentials/0/password', :value => 'lmno'}].to_json,
+               :headers => {'Content-Type'=>'application/json-patch+json'}).
+          to_return(:status => 204)
+
+        result = Flapjack::Diner.update_pagerduty_credentials('23', '87', :username => 'hijk', :password => 'lmno')
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
 
-  it "acknowledges checks from multiple entities" do
-    req = stub_request(:post, "http://#{server}/acknowledgements").with(
-      :body => {:entity => [entity, 'lmn.net'], :summary => 'dealing with it'}).to_return(
-      :status => 204)
+    end
 
-    result = Flapjack::Diner.bulk_acknowledge!(:entity => [entity, 'lmn.net'], :summary => 'dealing with it')
-    req.should have_been_requested
-    result.should be_true
+    context 'delete' do
+      it "submits a DELETE request for one set of pagerduty credentials" do
+        req = stub_request(:delete, "http://#{server}/pagerduty_credentials/72").
+          to_return(:status => 204)
+
+        result = Flapjack::Diner.delete_pagerduty_credentials('72')
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
+
+      it "submits a DELETE request for several media" do
+        req = stub_request(:delete, "http://#{server}/pagerduty_credentials/72,150").
+          to_return(:status => 204)
+
+        result = Flapjack::Diner.delete_pagerduty_credentials('72', '150')
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
+    end
   end
 
-  it "generates test notifications for a check on an entity" do
-    req = stub_request(:post, "http://#{server}/test_notifications").with(
-      :body => {:check => {entity => check}, :summary => 'testing notifications'}).to_return(
-      :status => 204)
+  context 'notification rules' do
+
+    context 'create' do
+
+      it "submits a POST request for a notification rule" do
+        data = [{
+          "entity_tags"        => ["database","physical"],
+          "entities"           => ["foo-app-01.example.com"],
+          "time_restrictions"  => nil,
+          "warning_media"      => ["email"],
+          "critical_media"     => ["sms", "email"],
+          "warning_blackhole"  => false,
+          "critical_blackhole" => false
+        }]
+
+        req = stub_request(:post, "http://#{server}/contacts/1/notification_rules").
+          with(:body => {:notification_rules => data}.to_json,
+               :headers => {'Content-Type'=>'application/vnd.api+json'}).
+          to_return(:status => 201, :body => response_with_data('notification_rules', data))
+
+
+        result = Flapjack::Diner.create_contact_notification_rules(1, data)
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
+
+      it "submits a POST request for several notification rules" do
+        data = [{
+          "entity_tags"        => ["database","physical"],
+          "entities"           => ["foo-app-01.example.com"],
+          "time_restrictions"  => nil,
+          "warning_media"      => ["email"],
+          "critical_media"     => ["sms", "email"],
+          "warning_blackhole"  => false,
+          "critical_blackhole" => false
+        }, {
+          "entity_tags"        => nil,
+          "entities"           => ["foo-app-02.example.com"],
+          "time_restrictions"  => nil,
+          "warning_media"      => ["email"],
+          "critical_media"     => ["sms", "email"],
+          "warning_blackhole"  => true,
+          "critical_blackhole" => false
+        }]
+
+        req = stub_request(:post, "http://#{server}/contacts/1/notification_rules").
+          with(:body => {:notification_rules => data}.to_json,
+               :headers => {'Content-Type'=>'application/vnd.api+json'}).
+          to_return(:status => 201, :body => response_with_data('notification_rules', data))
+
+        result = Flapjack::Diner.create_contact_notification_rules(1, data)
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
 
-    result = Flapjack::Diner.test_notifications!(entity, check, :summary => 'testing notifications')
-    req.should have_been_requested
-    result.should be_true
-  end
+    end
 
-  it "generates test notifications for all checks on an entity" do
-    req = stub_request(:post, "http://#{server}/test_notifications").with(
-      :body => {:entity => entity, :summary => 'testing notifications'}).to_return(
-      :status => 204)
+    context 'read' do
+     it "submits a GET request for all notification rules" do
+        req = stub_request(:get, "http://#{server}/notification_rules").
+          to_return(:body => response_with_data('notification_rules'))
+
+        result = Flapjack::Diner.notification_rules
+        req.should have_been_requested
+        result.should_not be_nil
+      end
+
+      it "submits a GET request for one notification rule" do
+        req = stub_request(:get, "http://#{server}/notification_rules/30fd36ae-3922-4957-ae3e-c8f6dd27e543").
+          to_return(:body => response_with_data('notification_rules'))
+
+        result = Flapjack::Diner.notification_rules('30fd36ae-3922-4957-ae3e-c8f6dd27e543')
+        req.should have_been_requested
+        result.should_not be_nil
+      end
+
+      it "submits a GET request for several media" do
+        req = stub_request(:get, "http://#{server}/notification_rules/30fd36ae-3922-4957-ae3e-c8f6dd27e543,bfd8be61-3d80-4b95-94df-6e77183ce4e3").
+          to_return(:body => response_with_data('notification_rules'))
+
+        result = Flapjack::Diner.notification_rules('30fd36ae-3922-4957-ae3e-c8f6dd27e543', 'bfd8be61-3d80-4b95-94df-6e77183ce4e3')
+        req.should have_been_requested
+        result.should_not be_nil
+      end
+    end
 
-    result = Flapjack::Diner.bulk_test_notifications!(:entity => entity, :summary => 'testing notifications')
-    req.should have_been_requested
-    result.should be_true
-  end
+    context 'update' do
+
+      it "submits a PATCH request for one notification rule" do
+        req = stub_request(:patch, "http://#{server}/notification_rules/30fd36ae-3922-4957-ae3e-c8f6dd27e543").
+          with(:body => [{:op => 'replace', :path => '/notification_rules/0/warning_blackhole', :value => false}].to_json,
+               :headers => {'Content-Type'=>'application/json-patch+json'}).
+          to_return(:status => 204)
+
+        result = Flapjack::Diner.update_notification_rules('30fd36ae-3922-4957-ae3e-c8f6dd27e543', :warning_blackhole => false)
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
+
+      it "submits a PATCH request for several notification rules" do
+        req = stub_request(:patch, "http://#{server}/notification_rules/30fd36ae-3922-4957-ae3e-c8f6dd27e543,bfd8be61-3d80-4b95-94df-6e77183ce4e3").
+          with(:body => [{:op => 'replace', :path => '/notification_rules/0/warning_blackhole', :value => false}].to_json,
+               :headers => {'Content-Type'=>'application/json-patch+json'}).
+          to_return(:status => 204)
+
+        result = Flapjack::Diner.update_notification_rules('30fd36ae-3922-4957-ae3e-c8f6dd27e543',
+          'bfd8be61-3d80-4b95-94df-6e77183ce4e3', :warning_blackhole => false)
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
 
-  it "generates test notifications for checks from multiple entities" do
-    req = stub_request(:post, "http://#{server}/test_notifications").with(
-      :body => {:entity => [entity, 'lmn.net'], :summary => 'testing notifications'}).to_return(
-      :status => 204)
+    end
 
-    result = Flapjack::Diner.bulk_test_notifications!(:entity => [entity, 'lmn.net'], :summary => 'testing notifications')
-    req.should have_been_requested
-    result.should be_true
+    context 'delete' do
+      it "submits a DELETE request for a notification rule" do
+        req = stub_request(:delete, "http://#{server}/notification_rules/30fd36ae-3922-4957-ae3e-c8f6dd27e543").
+          to_return(:status => 204)
+
+        result = Flapjack::Diner.delete_notification_rules('30fd36ae-3922-4957-ae3e-c8f6dd27e543')
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
+
+      it "submits a DELETE request for several notification rules" do
+        req = stub_request(:delete, "http://#{server}/notification_rules/30fd36ae-3922-4957-ae3e-c8f6dd27e543,bfd8be61-3d80-4b95-94df-6e77183ce4e3").
+          to_return(:status => 204)
+
+        result = Flapjack::Diner.delete_notification_rules('30fd36ae-3922-4957-ae3e-c8f6dd27e543', 'bfd8be61-3d80-4b95-94df-6e77183ce4e3')
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
+    end
   end
 
-  it "creates a scheduled maintenance period for an entity" do
-    start_time = Time.now
-    duration = 60 * 30 # in seconds, so 30 minutes
-    summary = "fixing everything"
-
-    req = stub_request(:post, "http://#{server}/scheduled_maintenances").
-            with(:body => {:check => {entity => check}, :start_time => start_time.iso8601,
-                           :duration => duration, :summary => summary},
-                 :headers => {'Content-Type'=>'application/json'}).
+  context 'entities' do
+
+    context 'create' do
+
+     it "submits a POST request for an entity" do
+        data = [{
+          :name => 'example.org',
+          :id   => '57_example'
+        }]
+
+        req = stub_request(:post, "http://#{server}/entities").
+          with(:body => {:entities => data}.to_json,
+               :headers => {'Content-Type'=>'application/vnd.api+json'}).
+          to_return(:status => 201, :body => response_with_data('entities', data))
+
+        result = Flapjack::Diner.create_entities(data)
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
+
+      it "submits a POST request for several entities" do
+        data = [{
+          :name => 'example.org',
+          :id   => '57_example'
+        }, {
+          :name => 'example2.org',
+          :id   => '58'
+        }]
+
+        req = stub_request(:post, "http://#{server}/entities").
+          with(:body => {:entities => data}.to_json,
+               :headers => {'Content-Type'=>'application/vnd.api+json'}).
+          to_return(:status => 201, :body => response_with_data('entities', data))
+
+        result = Flapjack::Diner.create_entities(data)
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
+
+      context 'scheduled maintenance periods' do
+
+        it "submits a POST request on an entity" do
+          data = [{:start_time => time.iso8601, :duration => 3600, :summary => 'working'}]
+          req = stub_request(:post, "http://#{server}/scheduled_maintenances/entities/72").
+            with(:body => {:scheduled_maintenances => data}.to_json,
+                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
             to_return(:status => 204)
 
-    result = Flapjack::Diner.create_scheduled_maintenance!(entity, check,
-      :start_time => start_time, :duration => duration, :summary => summary)
-    req.should have_been_requested
-    result.should be_true
-  end
-
-  it "creates scheduled maintenance periods for all checks on an entity" do
-    start_time = Time.now
-    duration = 60 * 30 # in seconds, so 30 minutes
-    summary = "fixing everything"
-
-    req = stub_request(:post, "http://#{server}/scheduled_maintenances").
-            with(:body => {:entity => entity, :start_time => start_time.iso8601,
-                           :duration => duration, :summary => summary},
-                 :headers => {'Content-Type'=>'application/json'}).
+          result = Flapjack::Diner.create_scheduled_maintenances_entities(72, data)
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
+
+        it "submits a POST request on several entities" do
+          data = [{:start_time => time.iso8601, :duration => 3600, :summary => 'working'}]
+          req = stub_request(:post, "http://#{server}/scheduled_maintenances/entities/72,150").
+            with(:body => {:scheduled_maintenances => data}.to_json,
+                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
             to_return(:status => 204)
 
-    result = Flapjack::Diner.bulk_create_scheduled_maintenance!(:entity => entity,
-      :start_time => start_time, :duration => duration, :summary => summary)
-    req.should have_been_requested
-    result.should be_true
-  end
-
-  it "creates scheduled maintenance periods for checks from multiple entities" do
-    start_time = Time.now
-    duration = 60 * 30 # in seconds, so 30 minutes
-    summary = "fixing everything"
-
-    req = stub_request(:post, "http://#{server}/scheduled_maintenances").
-            with(:body => {:check => {entity => 'ping', 'pqr.org' => 'ssh'}, :start_time => start_time.iso8601,
-                           :duration => duration, :summary => summary},
-                 :headers => {'Content-Type'=>'application/json'}).
+          result = Flapjack::Diner.create_scheduled_maintenances_entities(72, 150, data)
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
+
+        it "submits a POST request for multiple periods on an entity" do
+          data = [{:start_time => time.iso8601, :duration => 3600, :summary => 'working'},
+                  {:start_time => (time + 7200).iso8601, :duration => 3600, :summary => 'more work'}]
+          req = stub_request(:post, "http://#{server}/scheduled_maintenances/entities/72").
+            with(:body => {:scheduled_maintenances => data}.to_json,
+                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
             to_return(:status => 204)
 
-    result = Flapjack::Diner.bulk_create_scheduled_maintenance!(:check => {entity => 'ping', 'pqr.org' => 'ssh'},
-      :start_time => start_time, :duration => duration, :summary => summary)
-    req.should have_been_requested
-    result.should be_true
-  end
-
-  it "deletes a scheduled maintenance period for a check on an entity" do
-    start_time = Time.now
-
-    req = stub_request(:delete, "http://#{server}/scheduled_maintenances").
-            with(:body => {:check => {entity => check}, :start_time => start_time.iso8601},
-                 :headers => {'Content-Type'=>'application/json'}).
+          result = Flapjack::Diner.create_scheduled_maintenances_entities(72, data)
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
+
+        it "submits a POST request for multiple periods on several entities" do
+          data = [{:start_time => time.iso8601, :duration => 3600, :summary => 'working'},
+                  {:start_time => (time + 7200).iso8601, :duration => 3600, :summary => 'more work'}]
+          req = stub_request(:post, "http://#{server}/scheduled_maintenances/entities/72,150").
+            with(:body => {:scheduled_maintenances => data}.to_json,
+                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
             to_return(:status => 204)
 
-    result = Flapjack::Diner.delete_scheduled_maintenance!(entity, check,
-      :start_time => start_time)
-    req.should have_been_requested
-    result.should be_true
-  end
+          result = Flapjack::Diner.create_scheduled_maintenances_entities(72, 150, data)
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
 
-  it "deletes scheduled maintenance periods for all checks on an entity" do
-    start_time = Time.now
+      end
 
-    req = stub_request(:delete, "http://#{server}/scheduled_maintenances").
-            with(:body => {:entity => entity, :start_time => start_time.iso8601},
-                 :headers => {'Content-Type'=>'application/json'}).
-            to_return(:status => 204)
+      context 'unscheduled maintenance periods' do
 
-    result = Flapjack::Diner.bulk_delete_scheduled_maintenance!(:entity => entity,
-      :start_time => start_time)
-    req.should have_been_requested
-    result.should be_true
-  end
+        it "submits a POST request on an entity" do
+          data = [{:duration => 3600, :summary => 'working'}]
+          req = stub_request(:post, "http://#{server}/unscheduled_maintenances/entities/72").
+            with(:body => {:unscheduled_maintenances => data}.to_json,
+                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
+            to_return(:status => 204)
 
-  it "deletes scheduled maintenance periods for checks from multiple entities" do
-    start_time = Time.now
+          result = Flapjack::Diner.create_unscheduled_maintenances_entities(72, data)
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
+
+        it "submits a POST request on several entities" do
+          data = [{:duration => 3600, :summary => 'working'}]
+          req = stub_request(:post, "http://#{server}/unscheduled_maintenances/entities/72,150").
+            with(:body => {:unscheduled_maintenances => data}.to_json,
+                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
+            to_return(:status => 204)
 
-    req = stub_request(:delete, "http://#{server}/scheduled_maintenances").
-            with(:body => {:check => {entity => 'ping', 'pqr.org' => 'ssh'},
-                           :start_time => start_time.iso8601},
-                 :headers => {'Content-Type'=>'application/json'}).
+          result = Flapjack::Diner.create_unscheduled_maintenances_entities(72, 150, data)
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
+
+        it "submits a POST request for multiple periods on several entities" do
+          data = [{:duration => 3600, :summary => 'working'},
+                  {:duration => 3600, :summary => 'more work'}]
+          req = stub_request(:post, "http://#{server}/unscheduled_maintenances/entities/72,150").
+            with(:body => {:unscheduled_maintenances => data}.to_json,
+                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
             to_return(:status => 204)
 
-    result = Flapjack::Diner.bulk_delete_scheduled_maintenance!(:check => {entity => 'ping', 'pqr.org' => 'ssh'},
-      :start_time => start_time)
-    req.should have_been_requested
-    result.should be_true
-  end
+          result = Flapjack::Diner.create_unscheduled_maintenances_entities(72, 150, data)
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
 
-  it "deletes an unscheduled maintenance period for a check on an entity" do
-    end_time = Time.now
+      end
 
-    req = stub_request(:delete, "http://#{server}/unscheduled_maintenances").
-            with(:body => {:check => {entity => check}, :end_time => end_time.iso8601},
-                 :headers => {'Content-Type'=>'application/json'}).
-            to_return(:status => 204)
+      context 'test notifications' do
 
-    result = Flapjack::Diner.delete_unscheduled_maintenance!(entity, check,
-      :end_time => end_time)
-    req.should have_been_requested
-    result.should be_true
-  end
+        it "submits a POST request for an entity" do
+          req = stub_request(:post, "http://#{server}/test_notifications/entities/72").
+            with(:body => {:test_notifications => [{:summary => 'testing'}]}.to_json,
+                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
+            to_return(:status => 204)
 
-  it "deletes scheduled maintenance periods for all checks on an entity" do
-    end_time = Time.now
+          result = Flapjack::Diner.create_test_notifications_entities(72, [:summary => 'testing'])
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
 
-    req = stub_request(:delete, "http://#{server}/unscheduled_maintenances").
-            with(:body => {:entity => entity, :end_time => end_time.iso8601},
-                 :headers => {'Content-Type'=>'application/json'}).
+        it "submits a POST request for several entities" do
+          req = stub_request(:post, "http://#{server}/test_notifications/entities/72,150").
+            with(:body => {:test_notifications => [{:summary => 'testing'}]}.to_json,
+                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
             to_return(:status => 204)
 
-    result = Flapjack::Diner.bulk_delete_unscheduled_maintenance!(:entity => entity,
-      :end_time => end_time)
-    req.should have_been_requested
-    result.should be_true
-  end
-
-  it "deletes scheduled maintenance periods for checks from multiple entities" do
-    end_time = Time.now
+          result = Flapjack::Diner.create_test_notifications_entities(72, 150, [:summary => 'testing'])
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
+
+        it "submits a POST request for multiple notifications on an entity" do
+          data = [{:summary => 'testing'}, {:summary => 'another test'}]
+          req = stub_request(:post, "http://#{server}/test_notifications/entities/72").
+            with(:body => {:test_notifications => data}.to_json,
+                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
+            to_return(:status => 204)
 
-    req = stub_request(:delete, "http://#{server}/unscheduled_maintenances").
-            with(:body => {:check => {entity => 'ping', 'pqr.org' => 'ssh'},
-                           :end_time => end_time.iso8601},
-                 :headers => {'Content-Type'=>'application/json'}).
+          result = Flapjack::Diner.create_test_notifications_entities(72, data)
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
+
+        it "submits a POST request for multiple notifications on several entities" do
+          data = [{:summary => 'testing'}, {:summary => 'another test'}]
+          req = stub_request(:post, "http://#{server}/test_notifications/entities/72,150").
+            with(:body => {:test_notifications => data}.to_json,
+                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
             to_return(:status => 204)
 
-    result = Flapjack::Diner.bulk_delete_unscheduled_maintenance!(:check => {entity => 'ping', 'pqr.org' => 'ssh'},
-      :end_time => end_time)
-    req.should have_been_requested
-    result.should be_true
-  end
+          result = Flapjack::Diner.create_test_notifications_entities(72, 150, data)
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
 
+      end
 
-  it "returns a list of contacts" do
-    req = stub_request(:get, "http://#{server}/contacts").to_return(
-      :body => response)
+    end
 
-    result = Flapjack::Diner.contacts
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
+    context 'read' do
+      it "submits a GET request for all entities" do
+        req = stub_request(:get, "http://#{server}/entities").
+          to_return(:body => response_with_data('entities'))
+
+        result = Flapjack::Diner.entities
+        req.should have_been_requested
+        result.should_not be_nil
+      end
+
+      it "submits a GET request for one entity" do
+        req = stub_request(:get, "http://#{server}/entities/72").
+          to_return(:body => response_with_data('entities'))
+
+        result = Flapjack::Diner.entities('72')
+        req.should have_been_requested
+        result.should_not be_nil
+      end
+
+      it "submits a GET request for several entities" do
+        req = stub_request(:get, "http://#{server}/entities/72,150").
+          to_return(:body => response_with_data('entities'))
+
+        result = Flapjack::Diner.entities('72', '150')
+        req.should have_been_requested
+        result.should_not be_nil
+      end
+    end
 
-  it "returns a single contact" do
-    contact_id = '21'
-    req = stub_request(:get, "http://#{server}/contacts/#{contact_id}").to_return(
-      :body => response)
+    context 'update' do
+
+      it "submits a PATCH request for an entity" do
+        req = stub_request(:patch, "http://#{server}/entities/57").
+          with(:body => [{:op => 'replace', :path => '/entities/0/name', :value => 'example3.com'}].to_json,
+               :headers => {'Content-Type'=>'application/json-patch+json'}).
+          to_return(:status => 204)
+
+        result = Flapjack::Diner.update_entities('57', :name => 'example3.com')
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
+
+      it "submits a PATCH request for unscheduled maintenances on an entity" do
+        req = stub_request(:patch, "http://#{server}/unscheduled_maintenances/entities/72").
+          with(:body => [{:op => 'replace', :path => '/unscheduled_maintenances/0/end_time', :value => time.iso8601}].to_json,
+               :headers => {'Content-Type'=>'application/json-patch+json'}).
+          to_return(:status => 204)
+
+        result = Flapjack::Diner.update_unscheduled_maintenances_entities('72', :end_time => time)
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
+
+      it "submits a PATCH request for unscheduled maintenances on several entities" do
+        req = stub_request(:patch, "http://#{server}/unscheduled_maintenances/entities/72,150").
+          with(:body => [{:op => 'replace', :path => '/unscheduled_maintenances/0/end_time', :value => time.iso8601}].to_json,
+               :headers => {'Content-Type'=>'application/json-patch+json'}).
+          to_return(:status => 204)
+
+        result = Flapjack::Diner.update_unscheduled_maintenances_entities('72', '150', :end_time => time)
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
 
-    result = Flapjack::Diner.contact(contact_id)
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
+    end
 
-  it "returns notification rules for a contact" do
-    contact_id = '21'
-    req = stub_request(:get, "http://#{server}/contacts/#{contact_id}/notification_rules").to_return(
-      :body => response)
+    context 'delete' do
 
-    result = Flapjack::Diner.notification_rules(contact_id)
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
+      it "submits a DELETE request for scheduled maintenances on an entity" do
+        req = stub_request(:delete, "http://#{server}/scheduled_maintenances/entities/72").
+          with(:query => {:start_time => time.iso8601}).
+          to_return(:status => 204)
 
-  it "returns a single notification rule" do
-    rule_id = '00001'
-    req = stub_request(:get, "http://#{server}/notification_rules/#{rule_id}").
-            to_return(:body => response)
+        result = Flapjack::Diner.delete_scheduled_maintenances_entities('72', :start_time => time.iso8601)
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
 
-    result = Flapjack::Diner.notification_rule(rule_id)
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
+      it "submits a DELETE request for scheduled maintenances on several entities" do
+        req = stub_request(:delete, "http://#{server}/scheduled_maintenances/entities/72,150").
+          with(:query => {:start_time => time.iso8601}).
+          to_return(:status => 204)
 
-  it "creates a notification rule" do
-    rule_result = rule_data.merge('id' => '00001')
+        result = Flapjack::Diner.delete_scheduled_maintenances_entities('72', '150', :start_time => time.iso8601)
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
 
-    req = stub_request(:post, "http://#{server}/notification_rules").
-            with(:body => rule_data,
-                 :headers => {'Content-Type'=>'application/json'}).
-            to_return(:body => rule_result.to_json)
+    end
 
-    result = Flapjack::Diner.create_notification_rule!(rule_data)
-    req.should have_been_requested
-    result.should == rule_result
   end
 
-  it "updates a notification rule" do
-    rule_id = '00001'
-
-    rule_data_with_id = rule_data.merge('id' => rule_id)
+  context 'checks' do
+    context 'create' do
 
-    req = stub_request(:put, "http://#{server}/notification_rules/#{rule_id}").
-            with(:body => rule_data_with_id,
-                 :headers => {'Content-Type'=>'application/json'}).
-            to_return(:body => rule_data_with_id.to_json)
+      context 'scheduled maintenance periods' do
 
-    result = Flapjack::Diner.update_notification_rule!(rule_id, rule_data_with_id)
-    req.should have_been_requested
-    result.should == rule_data_with_id
-  end
+        it "submits a POST request on a check" do
+          data = [{:start_time => time.iso8601, :duration => 3600, :summary => 'working'}]
+          req = stub_request(:post, "http://#{server}/scheduled_maintenances/checks/example.com:SSH").
+            with(:body => {:scheduled_maintenances => data}.to_json,
+                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
+            to_return(:status => 204)
 
-  it "deletes a notification rule" do
-    rule_id = '00001'
-    req = stub_request(:delete, "http://#{server}/notification_rules/#{rule_id}").to_return(
-      :status => 204)
+          result = Flapjack::Diner.create_scheduled_maintenances_checks('example.com:SSH', data)
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
+
+        it "submits a POST request on several checks" do
+          data = [{:start_time => time.iso8601, :duration => 3600, :summary => 'working'}]
+          req = stub_request(:post, "http://#{server}/scheduled_maintenances/checks/example.com:SSH,example2.com:PING").
+            with(:body => {:scheduled_maintenances => data}.to_json,
+                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
+            to_return(:status => 204)
 
-    result = Flapjack::Diner.delete_notification_rule!(rule_id)
-    req.should have_been_requested
-    result.should be_true
-  end
+          result = Flapjack::Diner.create_scheduled_maintenances_checks('example.com:SSH', 'example2.com:PING', data)
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
+
+        it "submits a POST request for multiple periods on a check" do
+          data = [{:start_time => time.iso8601, :duration => 3600, :summary => 'working'},
+                  {:start_time => (time + 7200).iso8601, :duration => 3600, :summary => 'more work'}]
+          req = stub_request(:post, "http://#{server}/scheduled_maintenances/checks/example.com:SSH").
+            with(:body => {:scheduled_maintenances => data}.to_json,
+                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
+            to_return(:status => 204)
 
-  it "gets a list of entity tags" do
-    req = stub_request(:get, "http://#{server}/entities/#{entity}/tags").to_return(
-      :body => ['web', 'app'].to_json)
+          result = Flapjack::Diner.create_scheduled_maintenances_checks('example.com:SSH', data)
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
+
+        it "submits a POST request for multiple periods on several checks" do
+          data = [{:start_time => time.iso8601, :duration => 3600, :summary => 'working'},
+                  {:start_time => (time + 7200).iso8601, :duration => 3600, :summary => 'more work'}]
+          req = stub_request(:post, "http://#{server}/scheduled_maintenances/checks/example.com:SSH,example2.com:PING").
+            with(:body => {:scheduled_maintenances => data}.to_json,
+                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
+            to_return(:status => 204)
 
-    result = Flapjack::Diner.entity_tags(entity)
-    req.should have_been_requested
-    result.should == ['web', 'app']
-  end
+          result = Flapjack::Diner.create_scheduled_maintenances_checks('example.com:SSH', 'example2.com:PING', data)
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
 
-  it "adds tags to an entity" do
-    req = stub_request(:post, "http://#{server}/entities/#{entity}/tags").
-            with(:body => {:tag => ['web', 'app']},
-                 :headers => {'Content-Type'=>'application/json'}).
-            to_return(:body => ['web', 'app'].to_json)
+      end
 
-    result = Flapjack::Diner.add_entity_tags!(entity, 'web', 'app')
-    req.should have_been_requested
-    result.should == ['web', 'app']
-  end
+      context 'unscheduled maintenance periods' do
 
-  it "deletes tags from an entity" do
-    req = stub_request(:delete, "http://#{server}/entities/#{entity}/tags").
-            with(:body => {:tag => ['web']},
-                 :headers => {'Content-Type'=>'application/json'}).
+        it "submits a POST request on a check" do
+          data = [{:duration => 3600, :summary => 'working'}]
+          req = stub_request(:post, "http://#{server}/unscheduled_maintenances/checks/example.com:SSH").
+            with(:body => {:unscheduled_maintenances => data}.to_json,
+                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
             to_return(:status => 204)
 
-    result = Flapjack::Diner.delete_entity_tags!(entity, 'web')
-    req.should have_been_requested
-    result.should be_true
-  end
-
-  it "gets a list of contact tags" do
-    contact_id = 21
-    req = stub_request(:get, "http://#{server}/contacts/#{contact_id}/tags").to_return(
-      :body => ['user', 'admin'].to_json)
-
-    result = Flapjack::Diner.contact_tags(contact_id)
-    req.should have_been_requested
-    result.should == ['user', 'admin']
-  end
+          result = Flapjack::Diner.create_unscheduled_maintenances_checks('example.com:SSH', data)
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
+
+        it "submits a POST request on several checks" do
+          data = [{:duration => 3600, :summary => 'working'}]
+          req = stub_request(:post, "http://#{server}/unscheduled_maintenances/checks/example.com:SSH,example2.com:PING").
+            with(:body => {:unscheduled_maintenances => data}.to_json,
+                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
+            to_return(:status => 204)
 
-  it "gets tags for a contact's linked entities" do
-    contact_id = 21
-    req = stub_request(:get, "http://#{server}/contacts/#{contact_id}/entity_tags").to_return(
-      :body => {'entity_1' => ['web', 'app']}.to_json)
+          result = Flapjack::Diner.create_unscheduled_maintenances_checks('example.com:SSH', 'example2.com:PING', data)
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
+
+        it "submits a POST request for multiple periods on several checks" do
+          data = [{:duration => 3600, :summary => 'working'},
+                  {:duration => 3600, :summary => 'more work'}]
+          req = stub_request(:post, "http://#{server}/unscheduled_maintenances/checks/example.com:SSH,example2.com:PING").
+            with(:body => {:unscheduled_maintenances => data}.to_json,
+                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
+            to_return(:status => 204)
 
-    result = Flapjack::Diner.contact_entitytags(contact_id)
-    req.should have_been_requested
-    result.should == {'entity_1' => ['web', 'app']}
-  end
+          result = Flapjack::Diner.create_unscheduled_maintenances_checks('example.com:SSH', 'example2.com:PING', data)
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
 
-  it "adds tags to a contact's linked entities" do
-    contact_id = 21
-    req = stub_request(:post, "http://#{server}/contacts/#{contact_id}/entity_tags").
-            with(:body => {:entity => {'entity_1' => ['web', 'app']}},
-                 :headers => {'Content-Type'=>'application/json'}).
-            to_return(:body => {'entity_1' => ['web', 'app']}.to_json)
+      end
 
-    result = Flapjack::Diner.add_contact_entitytags!(contact_id, {'entity_1' => ['web', 'app']})
-    req.should have_been_requested
-    result.should == {'entity_1' => ['web', 'app']}
-  end
+      context 'test notifications' do
 
-  it "deletes tags from a contact's linked entities" do
-    contact_id = 21
-    req = stub_request(:delete, "http://#{server}/contacts/#{contact_id}/entity_tags").
-            with(:body => {:entity => {'entity_1' => ['web', 'app']}},
-                 :headers => {'Content-Type'=>'application/json'}).
+        it "submits a POST request for a check" do
+          req = stub_request(:post, "http://#{server}/test_notifications/checks/example.com:SSH").
+            with(:body => {:test_notifications => [{:summary => 'testing'}]}.to_json,
+                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
             to_return(:status => 204)
 
-    result = Flapjack::Diner.delete_contact_entitytags!(contact_id, {'entity_1' => ['web', 'app']})
-    req.should have_been_requested
-    result.should be_true
-  end
-
-  it "adds tags to a contact" do
-    contact_id = 21
-    req = stub_request(:post, "http://#{server}/contacts/#{contact_id}/tags").
-            with(:body => {:tag => ['admin', 'user']},
-                 :headers => {'Content-Type'=>'application/json'}).
-            to_return(:body => ['admin', 'user'].to_json)
+          result = Flapjack::Diner.create_test_notifications_checks('example.com:SSH', [{:summary => 'testing'}])
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
 
-    result = Flapjack::Diner.add_contact_tags!(contact_id, 'admin', 'user')
-    req.should have_been_requested
-    result.should == ['admin', 'user']
-  end
+        it "submits a POST request for several checks" do
+          req = stub_request(:post, "http://#{server}/test_notifications/checks/example.com:SSH,example2.com:PING").
+            with(:test_notifications => [{:summary => 'testing'}]).
+            to_return(:status => 204)
 
-  it "deletes tags from a contact" do
-    contact_id = 21
-    req = stub_request(:delete, "http://#{server}/contacts/#{contact_id}/tags").
-            with(:body => {:tag => ['admin']},
-                 :headers => {'Content-Type'=>'application/json'}).
+          result = Flapjack::Diner.create_test_notifications_checks('example.com:SSH', 'example2.com:PING', [{:summary => 'testing'}])
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
+
+        it "submits a POST request for multiple notifications on a check" do
+          data = [{:summary => 'testing'}, {:summary => 'more testing'}]
+          req = stub_request(:post, "http://#{server}/test_notifications/checks/example.com:SSH").
+            with(:body => {:test_notifications => data}.to_json,
+                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
             to_return(:status => 204)
 
-    result = Flapjack::Diner.delete_contact_tags!(contact_id, 'admin')
-    req.should have_been_requested
-    result.should be_true
-  end
+          result = Flapjack::Diner.create_test_notifications_checks('example.com:SSH', data)
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
+
+        it "submits a POST request for multiple notifications on several checks" do
+          data = [{:summary => 'testing'}, {:summary => 'more testing'}]
+          req = stub_request(:post, "http://#{server}/test_notifications/checks/example.com:SSH,example2.com:PING").
+            with(:body => {:test_notifications => data}.to_json,
+                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
+            to_return(:status => 204)
 
-  it "returns a list of a contact's notification media values" do
-    contact_id = '21'
-    req = stub_request(:get, "http://#{server}/contacts/#{contact_id}/media").to_return(
-      :body => response)
+          result = Flapjack::Diner.create_test_notifications_checks('example.com:SSH', 'example2.com:PING', data)
+          req.should have_been_requested
+          result.should_not be_nil
+          result.should be_true
+        end
 
-    result = Flapjack::Diner.contact_media(contact_id)
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
+      end
 
-  it "returns the values for a contact's notification medium" do
-    contact_id = '21'
-    media = 'sms'
-    req = stub_request(:get, "http://#{server}/contacts/#{contact_id}/media/#{media}").to_return(
-      :body => response)
+    end
 
-    result = Flapjack::Diner.contact_medium(contact_id, media)
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
+    context 'update' do
 
-  it "updates a contact's notification medium" do
-    contact_id = '21'
-    media_type = 'sms'
-    media_data = {"address" => "dmitri@example.com",
-                  "interval" => 900}
+      it "submits a PATCH request for unscheduled maintenances on a check" do
+        req = stub_request(:patch, "http://#{server}/unscheduled_maintenances/checks/example.com:SSH").
+          with(:body => [{:op => 'replace', :path => '/unscheduled_maintenances/0/end_time', :value => time.iso8601}].to_json,
+               :headers => {'Content-Type'=>'application/json-patch+json'}).
+          to_return(:status => 204)
 
-    req = stub_request(:put, "http://#{server}/contacts/#{contact_id}/media/#{media_type}").with(
-      :body => media_data).to_return(:body => media_data.to_json)
+        result = Flapjack::Diner.update_unscheduled_maintenances_checks('example.com:SSH', :end_time => time)
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
 
-    result = Flapjack::Diner.update_contact_medium!(contact_id, media_type, media_data)
-    req.should have_been_requested
-    result.should == media_data
-  end
+      it "submits a PATCH request for unscheduled maintenances on several checks" do
+        req = stub_request(:patch, "http://#{server}/unscheduled_maintenances/checks/example.com:SSH,example2.com:PING").
+          with(:body => [{:op => 'replace', :path => '/unscheduled_maintenances/0/end_time', :value => time.iso8601}].to_json,
+               :headers => {'Content-Type'=>'application/json-patch+json'}).
+          to_return(:status => 204)
 
-  it "deletes a contact's notification medium" do
-    contact_id = '21'
-    media = 'sms'
-    req = stub_request(:delete, "http://#{server}/contacts/#{contact_id}/media/#{media}").to_return(
-      :status => 204)
-
-    result = Flapjack::Diner.delete_contact_medium!(contact_id, media)
-    req.should have_been_requested
-    result.should be_true
-  end
+        result = Flapjack::Diner.update_unscheduled_maintenances_checks('example.com:SSH', 'example2.com:PING', :end_time => time)
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
 
-  it "returns a contact's timezone" do
-    contact_id = '21'
-    req = stub_request(:get, "http://#{server}/contacts/#{contact_id}/timezone").to_return(
-      :body => response)
+    end
 
-    result = Flapjack::Diner.contact_timezone(contact_id)
-    req.should have_been_requested
-    result.should_not be_nil
-    result.should == response_body
-  end
+    context 'delete' do
 
-  it "updates a contact's timezone" do
-    contact_id = '21'
-    timezone_data = {'timezone' => "Australia/Perth"}
+      it "submits a DELETE request for scheduled maintenances on a check" do
+        req = stub_request(:delete, "http://#{server}/scheduled_maintenances/checks/example.com:SSH").
+          with(:query => {:start_time => time.iso8601}).
+          to_return(:status => 204)
 
-    req = stub_request(:put, "http://#{server}/contacts/#{contact_id}/timezone").with(
-      :body => timezone_data).to_return(:body => timezone_data.to_json)
+        result = Flapjack::Diner.delete_scheduled_maintenances_checks('example.com:SSH', :start_time => time.iso8601)
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
 
-    result = Flapjack::Diner.update_contact_timezone!(contact_id, timezone_data['timezone'])
-    req.should have_been_requested
-    result.should == timezone_data
-  end
+      it "submits a DELETE request for scheduled maintenances on several checks" do
+        req = stub_request(:delete, "http://#{server}/scheduled_maintenances/checks/example.com:SSH,example2.com:PING").
+          with(:query => {:start_time => time.iso8601}).
+          to_return(:status => 204)
 
-  it "deletes a contact's timezone" do
-    contact_id = '21'
-    req = stub_request(:delete, "http://#{server}/contacts/#{contact_id}/timezone").to_return(
-      :status => 204)
+        result = Flapjack::Diner.delete_scheduled_maintenances_checks('example.com:SSH', 'example2.com:PING', :start_time => time.iso8601)
+        req.should have_been_requested
+        result.should_not be_nil
+        result.should be_true
+      end
 
-    result = Flapjack::Diner.delete_contact_timezone!(contact_id)
-    req.should have_been_requested
-    result.should be_true
+    end
   end
 
-  it "returns nil with last_error available when requesting the timezone for a non existant contact" do
-    contact_id = 'jkfldsj'
-    req = stub_request(:get, "http://#{server}/contacts/#{contact_id}/timezone").to_return(
-      :body => '{"errors": ["Not found"]}', :status => 404)
+  context 'reports' do
+    context 'read' do
+
+      ['status', 'scheduled_maintenance', 'unscheduled_maintenance', 'downtime', 'outage'].each do |report_type|
+
+        it "submits a GET request for a #{report_type} report on all entities" do
+          req = stub_request(:get, "http://#{server}/#{report_type}_report/entities").
+            to_return(:body => response_with_data("#{report_type}_reports"))
+
+          result = Flapjack::Diner.send("#{report_type}_report_entities".to_sym)
+          req.should have_been_requested
+          result.should_not be_nil
+        end
+
+        it "submits a GET request for a #{report_type} report on one entity" do
+          req = stub_request(:get, "http://#{server}/#{report_type}_report/entities/72").
+            to_return(:body => response_with_data("#{report_type}_reports"))
+
+          result = Flapjack::Diner.send("#{report_type}_report_entities".to_sym, '72')
+          req.should have_been_requested
+          result.should_not be_nil
+        end
+
+        it "submits a GET request for a #{report_type} report on several entities" do
+          req = stub_request(:get, "http://#{server}/#{report_type}_report/entities/72,150").
+            to_return(:body => response_with_data("#{report_type}_reports"))
+
+          result = Flapjack::Diner.send("#{report_type}_report_entities".to_sym, '72', '150')
+          req.should have_been_requested
+          result.should_not be_nil
+        end
+
+        it "submits a GET request for a #{report_type} report on all checks" do
+          req = stub_request(:get, "http://#{server}/#{report_type}_report/checks").
+            to_return(:body => response_with_data("#{report_type}_reports"))
+
+          result = Flapjack::Diner.send("#{report_type}_report_checks".to_sym)
+          req.should have_been_requested
+          result.should_not be_nil
+        end
+
+        it "submits a GET request for a #{report_type} report on one check" do
+          req = stub_request(:get, "http://#{server}/#{report_type}_report/checks/example.com:SSH").
+            to_return(:body => response_with_data("#{report_type}_reports"))
+
+          result = Flapjack::Diner.send("#{report_type}_report_checks".to_sym,
+            'example.com:SSH')
+          req.should have_been_requested
+          result.should_not be_nil
+        end
+
+        it "submits a GET request for a #{report_type} report on several checks" do
+          req = stub_request(:get, "http://#{server}/#{report_type}_report/checks/example.com:SSH,example2.com:PING").
+            to_return(:body => response_with_data("#{report_type}_reports"))
+
+          result = Flapjack::Diner.send("#{report_type}_report_checks".to_sym,
+            'example.com:SSH', 'example2.com:PING')
+          req.should have_been_requested
+          result.should_not be_nil
+        end
+
+      end
+
+      ['scheduled_maintenance', 'unscheduled_maintenance', 'downtime', 'outage'].each do |report_type|
+
+        let(:start_time) { Time.now }
+        let(:end_time)   { start_time + (60 * 60 * 12) }
+
+        it "submits a time-limited GET request for a #{report_type} report on all entities" do
+          req = stub_request(:get, "http://#{server}/#{report_type}_report/entities").
+            with(:query => {:start_time => start_time.iso8601, :end_time => end_time.iso8601}).
+            to_return(:body => response_with_data("#{report_type}_reports"))
+
+          result = Flapjack::Diner.send("#{report_type}_report_entities".to_sym,
+            :start_time => start_time, :end_time => end_time)
+          req.should have_been_requested
+          result.should_not be_nil
+        end
+
+        it "submits a time-limited GET request for a #{report_type} report on one entity" do
+          req = stub_request(:get, "http://#{server}/#{report_type}_report/entities/72").
+            with(:query => {:start_time => start_time.iso8601, :end_time => end_time.iso8601}).
+            to_return(:body => response_with_data("#{report_type}_reports"))
+
+          result = Flapjack::Diner.send("#{report_type}_report_entities".to_sym,
+            '72', :start_time => start_time, :end_time => end_time)
+          req.should have_been_requested
+          result.should_not be_nil
+        end
+
+        it "submits a time-limited GET request for a #{report_type} report on several entities" do
+          req = stub_request(:get, "http://#{server}/#{report_type}_report/entities/72,150").
+            with(:query => {:start_time => start_time.iso8601, :end_time => end_time.iso8601}).
+            to_return(:body => response_with_data("#{report_type}_reports"))
+
+          result = Flapjack::Diner.send("#{report_type}_report_entities".to_sym,
+            '72', '150', :start_time => start_time, :end_time => end_time)
+          req.should have_been_requested
+          result.should_not be_nil
+        end
+
+        it "submits a time-limited GET request for a #{report_type} report on all checks" do
+          req = stub_request(:get, "http://#{server}/#{report_type}_report/checks").
+            with(:query => {:start_time => start_time.iso8601, :end_time => end_time.iso8601}).
+            to_return(:body => response_with_data("#{report_type}_reports"))
+
+          result = Flapjack::Diner.send("#{report_type}_report_checks".to_sym,
+            :start_time => start_time, :end_time => end_time)
+          req.should have_been_requested
+          result.should_not be_nil
+        end
+
+        it "submits a time-limited GET request for a #{report_type} report on one check" do
+          req = stub_request(:get, "http://#{server}/#{report_type}_report/checks/example.com:SSH").
+            with(:query => {:start_time => start_time.iso8601, :end_time => end_time.iso8601}).
+            to_return(:body => response_with_data("#{report_type}_reports"))
+
+          result = Flapjack::Diner.send("#{report_type}_report_checks".to_sym,
+            'example.com:SSH', :start_time => start_time, :end_time => end_time)
+          req.should have_been_requested
+          result.should_not be_nil
+        end
+
+        it "submits a time-limited GET request for a #{report_type} report on several checks" do
+          req = stub_request(:get, "http://#{server}/#{report_type}_report/checks/example.com:SSH,example2.com:PING").
+            with(:query => {:start_time => start_time.iso8601, :end_time => end_time.iso8601}).
+            to_return(:body => response_with_data("#{report_type}_reports"))
+
+          result = Flapjack::Diner.send("#{report_type}_report_checks".to_sym,
+            'example.com:SSH', 'example2.com:PING',
+            :start_time => start_time, :end_time => end_time)
+          req.should have_been_requested
+          result.should_not be_nil
+        end
+
+      end
 
-    result = Flapjack::Diner.contact_timezone(contact_id)
-    last_error = Flapjack::Diner.last_error
-    req.should have_been_requested
-    result.should be_nil
-    last_error.should_not be_nil
+    end
   end
 
   context "logging" do
@@ -740,8 +1202,9 @@ describe Flapjack::Diner do
     end
 
     it "logs a GET request without a path" do
-      req = stub_request(:get, "http://#{server}/entities").to_return(
-        :body => response)
+      response = response_with_data('entities')
+      req = stub_request(:get, "http://#{server}/entities").
+        to_return(:body => response)
 
       logger.should_receive(:info).with("GET http://#{server}/entities")
       logger.should_receive(:info).with("  Response Code: 200")
@@ -750,63 +1213,29 @@ describe Flapjack::Diner do
       result = Flapjack::Diner.entities
       req.should have_been_requested
       result.should_not be_nil
-      result.should == response_body
-    end
-
-    it "logs a GET request with a path" do
-      req = stub_request(:get, "http://#{server}/checks/#{entity}").to_return(
-        :body => response)
-
-      logger.should_receive(:info).with("GET http://#{server}/checks/#{entity}")
-      logger.should_receive(:info).with("  Response Code: 200")
-      logger.should_receive(:info).with("  Response Body: #{response}")
-
-      result = Flapjack::Diner.checks(entity)
-      req.should have_been_requested
-      result.should_not be_nil
-      result.should == response_body
     end
 
     it "logs a POST request" do
-      req = stub_request(:post, "http://#{server}/acknowledgements").
-              with(:body => {:check => {entity => check}, :summary => 'dealing with it'},
-                   :headers => {'Content-Type'=>'application/json'}).
-              to_return(:status => 204)
-      logger.should_receive(:info).with("POST http://#{server}/acknowledgements\n" +
-        "  Params: {:summary=>\"dealing with it\", :check=>{\"ex-abcd-data-17.example.com\"=>\"ping\"}}")
-      logger.should_receive(:info).with("  Response Code: 204")
+      req = stub_request(:post, "http://#{server}/test_notifications/entities/27").
+              to_return(:status => 200)
+      logger.should_receive(:info).with("POST http://#{server}/test_notifications/entities/27\n" +
+        "  Params: {:test_notifications=>[{:summary=>\"dealing with it\"}]}")
+      logger.should_receive(:info).with("  Response Code: 200")
 
-      result = Flapjack::Diner.acknowledge!(entity, check, :summary => 'dealing with it')
+      result = Flapjack::Diner.create_test_notifications_entities(27, [{:summary => 'dealing with it'}])
       req.should have_been_requested
       result.should be_true
     end
 
-    it "logs a JSON put request" do
-      contact_id = '21'
-      timezone_data = {:timezone => "Australia/Perth"}
-
-      req = stub_request(:put, "http://#{server}/contacts/#{contact_id}/timezone").with(
-        :body => timezone_data).to_return(:body => timezone_data.to_json, :status => [200, 'OK'])
-
-      logger.should_receive(:info).
-        with("PUT http://#{server}/contacts/#{contact_id}/timezone\n  Params: #{timezone_data.inspect}")
-      logger.should_receive(:info).with("  Response Code: 200 OK")
-      logger.should_receive(:info).with("  Response Body: #{timezone_data.to_json}")
-
-      result = Flapjack::Diner.update_contact_timezone!(contact_id, timezone_data[:timezone])
-      req.should have_been_requested
-      result.should == {'timezone' => "Australia/Perth"}
-    end
-
     it "logs a DELETE request" do
-      contact_id = '21'
-      req = stub_request(:delete, "http://#{server}/contacts/#{contact_id}/timezone").to_return(
-        :status => 204)
+      req = stub_request(:delete, "http://#{server}/scheduled_maintenances/checks/example.com:SSH").
+        with(:query => {:start_time => time.iso8601}).
+        to_return(:status => 204)
 
-      logger.should_receive(:info).with("DELETE http://#{server}/contacts/#{contact_id}/timezone")
+      logger.should_receive(:info).with("DELETE http://#{server}/scheduled_maintenances/checks/#{CGI.escape('example.com:SSH')}?start_time=#{CGI.escape(time.iso8601)}")
       logger.should_receive(:info).with("  Response Code: 204")
 
-      result = Flapjack::Diner.delete_contact_timezone!(contact_id)
+      result = Flapjack::Diner.delete_scheduled_maintenances_checks('example.com:SSH', :start_time => time)
       req.should have_been_requested
       result.should be_true
     end
@@ -838,34 +1267,7 @@ describe Flapjack::Diner do
       req = stub_request(:get, /http:\/\/#{server}\/*/)
 
       expect {
-        Flapjack::Diner.check_status(entity, nil)
-      }.to raise_error
-      req.should_not have_been_requested
-    end
-
-    it "raises an exception if bulk queries don't have entity or check arguments" do
-      req = stub_request(:get, /http:\/\/#{server}\/*/)
-
-      expect {
-        Flapjack::Diner.bulk_downtime({})
-      }.to raise_error
-      req.should_not have_been_requested
-    end
-
-    it "raises an exception if bulk queries have invalid entity arguments" do
-      req = stub_request(:get, /http:\/\/#{server}\/*/)
-
-      expect {
-        Flapjack::Diner.bulk_scheduled_maintenances(:entity => 23)
-      }.to raise_error
-      req.should_not have_been_requested
-    end
-
-    it "raises an exception if bulk queries have invalid check arguments" do
-      req = stub_request(:get, /http:\/\/#{server}\/*/)
-
-      expect {
-        Flapjack::Diner.bulk_outages(:check => {'abc.com' => ['ping', 5]})
+        Flapjack::Diner.delete_scheduled_maintenances_checks('example.com:SSH', :start_time => nil)
       }.to raise_error
       req.should_not have_been_requested
     end
@@ -879,7 +1281,8 @@ describe Flapjack::Diner do
       req = stub_request(:get, /http:\/\/#{server}\/*/)
 
       expect {
-        Flapjack::Diner.downtime(entity, :start_time => start, :end_time => finish_str)
+        Flapjack::Diner.downtime_report_checks('example.com:SSH',
+          :start_time => start_time, :end_time => end_time)
       }.to raise_error
       req.should_not have_been_requested
     end