flapjack-diner 1.0.0 → 1.2.0

data/lib/flapjack-diner/version.rb

@@ -1,5 +1,5 @@
 module Flapjack
   module Diner
-    VERSION = "1.0.0"
+    VERSION = '1.2.0'
   end
 end

data/spec/argument_validator_spec.rb

@@ -12,21 +12,21 @@ describe Flapjack::ArgumentValidator do
     subject { Flapjack::ArgumentValidator.new(query) }
 
     it 'does not raise an exception when query entity is valid' do
-      lambda { subject.validate(:query => :entity, :as => :required) }.should_not raise_exception
+      expect { subject.validate(:query => :entity, :as => :required) }.not_to raise_exception
     end
 
     it 'raises ArgumentError when query entity is invalid' do
       query[:entity] = nil
-      lambda { subject.validate(:query => :entity, :as => :required) }.should raise_exception
+      expect { subject.validate(:query => :entity, :as => :required) }.to raise_exception
     end
 
     it 'handles arrays as query values valid' do
-      lambda { subject.validate(:query => [:entity, :check], :as => :required) }.should_not raise_exception
+      expect { subject.validate(:query => [:entity, :check], :as => :required) }.not_to raise_exception
     end
 
     it 'handles arrays as query values invalid' do
       query[:check] = nil
-      lambda { subject.validate(:query => [:entity, :check], :as => :required) }.should raise_exception
+      expect { subject.validate(:query => [:entity, :check], :as => :required) }.to raise_exception
     end
   end
 
@@ -39,37 +39,37 @@ describe Flapjack::ArgumentValidator do
     subject { Flapjack::ArgumentValidator.new(query) }
 
     it 'does not raise an exception when query start_time is valid' do
-      lambda { subject.validate(:query => :start_time, :as => :time) }.should_not raise_exception
+      expect { subject.validate(:query => :start_time, :as => :time) }.not_to raise_exception
     end
 
     it 'raises an exception when query start_time is invalid' do
       query[:start_time] = 1234
-      lambda { subject.validate(:query => :start_time, :as => :time) }.should raise_exception
+      expect { subject.validate(:query => :start_time, :as => :time) }.to raise_exception
     end
 
     it 'handles arrays as query values valid' do
       query[:end_time] = Time.now
-      lambda { subject.validate(:query => [:start_time, :end_time], :as => :time) }.should_not raise_exception
+      expect { subject.validate(:query => [:start_time, :end_time], :as => :time) }.not_to raise_exception
     end
 
     it 'handles arrays as query values invalid' do
       query[:end_time] = 3904
-      lambda { subject.validate(:query => [:start_time, :end_time], :as => :time) }.should raise_exception
+      expect { subject.validate(:query => [:start_time, :end_time], :as => :time) }.to raise_exception
     end
 
     it 'handles dates as query values' do
       query[:end_time] = Date.today
-      lambda { subject.validate(:query => :end_time, :as => :time) }.should_not raise_exception
+      expect { subject.validate(:query => :end_time, :as => :time) }.not_to raise_exception
     end
 
     it 'handles ISO 8601 strings as query values' do
       query[:end_time] = Time.now.iso8601
-      lambda { subject.validate(:query => :end_time, :as => :time) }.should_not raise_exception
+      expect { subject.validate(:query => :end_time, :as => :time) }.not_to raise_exception
     end
 
     it 'raises an exception when invalid time strings are provided' do
       query[:end_time] = '2011-08-01T00:00'
-      lambda { subject.validate(:query => :end_time, :as => :time) }.should raise_exception
+      expect { subject.validate(:query => :end_time, :as => :time) }.to raise_exception
     end
   end
 
@@ -82,12 +82,12 @@ describe Flapjack::ArgumentValidator do
     subject { Flapjack::ArgumentValidator.new(query) }
 
     it 'does not raise an exception when query duration is valid' do
-      lambda { subject.validate(:query => :duration, :as => :integer) }.should_not raise_exception
+      expect { subject.validate(:query => :duration, :as => :integer) }.not_to raise_exception
     end
 
     it 'raises an exception when query duration is invalid' do
       query[:duration] = '23'
-      lambda { subject.validate(:query => :duration, :as => :integer) }.should raise_exception
+      expect { subject.validate(:query => :duration, :as => :integer) }.to raise_exception
     end
   end
 
@@ -100,12 +100,12 @@ describe Flapjack::ArgumentValidator do
     subject { Flapjack::ArgumentValidator.new(query) }
 
     it 'does not raise an exception when query start_time is valid' do
-      lambda { subject.validate(:query => :start_time, :as => [:time, :required]) }.should_not raise_exception
+      expect { subject.validate(:query => :start_time, :as => [:time, :required]) }.not_to raise_exception
     end
 
     it 'raises an exception when query start_time is invalid' do
       query[:start_time] = nil
-      lambda { subject.validate(:query => :start_time, :as => [:time, :required]) }.should raise_exception
+      expect { subject.validate(:query => :start_time, :as => [:time, :required]) }.to raise_exception
     end
   end
 end

data/spec/flapjack-diner_spec.rb

@@ -14,1275 +14,58 @@ describe Flapjack::Diner do
   before(:each) do
     Flapjack::Diner.base_uri(server)
     Flapjack::Diner.logger = nil
-    Flapjack::Diner.return_keys_as_strings = true
   end
 
   after(:each) do
     WebMock.reset!
   end
 
-  context 'contacts' do
-    context 'create' do
+  context 'argument parsing' 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
-
-    end
-
-    context 'read' do
-      it "submits a GET request for all contacts" do
-        data = [{:id => "21"}]
-
-        req = stub_request(:get, "http://#{server}/contacts").to_return(
-          :status => 200, :body => response_with_data('contacts', data))
-
-        result = Flapjack::Diner.contacts
-        req.should have_been_requested
-        result.should_not be_nil
-        result.should be_an_instance_of(Array)
-        result.length.should be(1)
-        result[0].should be_an_instance_of(Hash)
-        result[0].should have_key('id')
-      end
-
-      it "can return keys as symbols" do
-        Flapjack::Diner.return_keys_as_strings = false
-        data = [{
-          :id         => "21",
-          :first_name => "Ada",
-          :last_name  => "Lovelace",
-          :email      => "ada@example.com",
-          :timezone   => "Europe/London",
-          :tags       => [ "legend", "first computer programmer" ],
-          :links      => {
-            :entities           => ["7", "12", "83"],
-            :media              => ["21_email", "21_sms"],
-            :notification_rules => ["30fd36ae-3922-4957-ae3e-c8f6dd27e543"]
-          }
-        }]
-
-        req = stub_request(:get, "http://#{server}/contacts").to_return(
-          :status => 200, :body => response_with_data('contacts', data))
-
-        result = Flapjack::Diner.contacts
-        req.should have_been_requested
-        result.should_not be_nil
-        result.should be_an_instance_of(Array)
-        result.length.should be(1)
-        result[0].should be_an_instance_of(Hash)
-        result[0].should have_key(:id)
-        result[0].should have_key(:links)
-        result[0][:links].should have_key(:entities)
-      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
-
-    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
-
-    end
-
-    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
 
-  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
-
-    end
-
-    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
-
-    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
-
-    end
-
-    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
-
-  context 'pagerduty credentials' do
-    context 'create' do
-
-      it "submits a POST request for pagerduty credentials" do
-        data = [{:service_key => 'abc',
-                 :subdomain   => 'def',
-                 :username    => 'ghi',
-                 :password    => 'jkl',
-                }]
-
-        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))
-
-        result = Flapjack::Diner.create_contact_pagerduty_credentials(1, data)
-        req.should have_been_requested
-        result.should_not be_nil
-        result.should be_true
-      end
-
-    end
-
-    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
-
-    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
-
-    end
-
-    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
-
-  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
-
-    end
-
-    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
-
-    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
-
-    end
-
-    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
-
-  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_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.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.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.create_scheduled_maintenances_entities(72, 150, data)
-          req.should have_been_requested
-          result.should_not be_nil
-          result.should be_true
-        end
-
-      end
-
-      context 'unscheduled maintenance periods' do
-
-        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)
-
-          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)
-
-          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.create_unscheduled_maintenances_entities(72, 150, data)
-          req.should have_been_requested
-          result.should_not be_nil
-          result.should be_true
-        end
-
-      end
-
-      context 'test notifications' do
-
-        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)
-
-          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
-
-        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.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)
-
-          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.create_test_notifications_entities(72, 150, data)
-          req.should have_been_requested
-          result.should_not be_nil
-          result.should be_true
-        end
-
-      end
-
-    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
-
-    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
-
-    end
-
-    context 'delete' do
-
-      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)
-
-        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
-
-      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)
-
-        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
-
-    end
-
-  end
-
-  context 'checks' do
-    context 'create' do
-
-      context 'scheduled maintenance periods' do
-
-        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%3ASSH").
-            with(:body => {:scheduled_maintenances => data}.to_json,
-                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
-            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%3ASSH,example2.com%3APING").
-            with(:body => {:scheduled_maintenances => data}.to_json,
-                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
-            to_return(:status => 204)
-
-          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%3ASSH").
-            with(:body => {:scheduled_maintenances => data}.to_json,
-                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
-            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 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%3ASSH,example2.com%3APING").
-            with(:body => {:scheduled_maintenances => data}.to_json,
-                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
-            to_return(:status => 204)
-
-          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
-
-      end
-
-      context 'unscheduled maintenance periods' do
-
-        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%3ASSH").
-            with(:body => {:unscheduled_maintenances => data}.to_json,
-                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
-            to_return(:status => 204)
-
-          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%3ASSH,example2.com%3APING").
-            with(:body => {:unscheduled_maintenances => data}.to_json,
-                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
-            to_return(:status => 204)
-
-          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%3ASSH,example2.com%3APING").
-            with(:body => {:unscheduled_maintenances => data}.to_json,
-                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
-            to_return(:status => 204)
-
-          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
-
-      end
-
-      context 'test notifications' do
-
-        it "submits a POST request for a check" do
-          req = stub_request(:post, "http://#{server}/test_notifications/checks/example.com%3ASSH").
-            with(:body => {:test_notifications => [{:summary => 'testing'}]}.to_json,
-                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
-            to_return(:status => 204)
-
-          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
-
-        it "submits a POST request for several checks" do
-          req = stub_request(:post, "http://#{server}/test_notifications/checks/example.com%3ASSH,example2.com%3APING").
-            with(:test_notifications => [{:summary => 'testing'}]).
-            to_return(:status => 204)
-
-          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%3ASSH").
-            with(:body => {:test_notifications => data}.to_json,
-                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
-            to_return(:status => 204)
-
-          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%3ASSH,example2.com%3APING").
-            with(:body => {:test_notifications => data}.to_json,
-                 :headers => {'Content-Type'=>'application/vnd.api+json'}).
-            to_return(:status => 204)
-
-          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
-
-      end
-
-    end
-
-    context 'read' do
-      it "submits a GET request for all checks" do
-        req = stub_request(:get, "http://#{server}/checks").
-          to_return(:body => response_with_data('checks'))
-
-        result = Flapjack::Diner.checks
-        req.should have_been_requested
-        result.should_not be_nil
-      end
-
-      it "submits a GET request for one check" do
-        req = stub_request(:get, "http://#{server}/checks/example.com%3ASSH").
-          to_return(:body => response_with_data('checks'))
-
-        result = Flapjack::Diner.checks('example.com:SSH')
-        req.should have_been_requested
-        result.should_not be_nil
-      end
-
-      it "submits a GET request for several checks" do
-        req = stub_request(:get, "http://#{server}/checks/example.com%3ASSH,example2.com%3APING").
-          to_return(:body => response_with_data('checks'))
-
-        result = Flapjack::Diner.checks('example.com:SSH', 'example2.com:PING')
-        req.should have_been_requested
-        result.should_not be_nil
-      end
-    end
-
-    context 'update' do
-
-      it "submits a PATCH request for a check" do
-        req = stub_request(:patch, "http://#{server}/checks/www.example.com%3APING").
-          with(:body => [{:op => 'replace', :path => '/checks/0/enabled', :value => false}].to_json,
-               :headers => {'Content-Type'=>'application/json-patch+json'}).
-          to_return(:status => 204)
-
-        result = Flapjack::Diner.update_checks('www.example.com:PING', :enabled => false)
-        req.should have_been_requested
-        result.should_not be_nil
-        result.should be_true
-      end
-
-      it "submits a PATCH request for unscheduled maintenances on a check" do
-        req = stub_request(:patch, "http://#{server}/unscheduled_maintenances/checks/example.com%3ASSH").
-          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_checks('example.com:SSH', :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 checks" do
-        req = stub_request(:patch, "http://#{server}/unscheduled_maintenances/checks/example.com%3ASSH,example2.com%3APING").
-          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_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
-
-    end
-
-    context 'delete' do
-
-      it "submits a DELETE request for scheduled maintenances on a check" do
-        req = stub_request(:delete, "http://#{server}/scheduled_maintenances/checks/example.com%3ASSH").
-          with(:query => {:start_time => time.iso8601}).
-          to_return(:status => 204)
-
-        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
-
-      it "submits a DELETE request for scheduled maintenances on a check with spaces in the name, percent-encoded" do
-        req = stub_request(:delete, "http://#{server}/scheduled_maintenances/checks/example.com%3ADisk%20C%3A%20Utilisation").
-          with(:query => {:start_time => time.iso8601}).
-          to_return(:status => 204)
-
-        result = Flapjack::Diner.delete_scheduled_maintenances_checks('example.com:Disk C: Utilisation', :start_time => time.iso8601)
-        req.should have_been_requested
-        result.should_not be_nil
-        result.should be_true
-      end
-
-      it "submits a DELETE request for scheduled maintenances on several checks" do
-        req = stub_request(:delete, "http://#{server}/scheduled_maintenances/checks/example.com%3ASSH,example2.com%3APING").
-          with(:query => {:start_time => time.iso8601}).
-          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
+  context 'keys as strings' do
 
+    before do
+      Flapjack::Diner.return_keys_as_strings = true
+    end
+
+    after do
+      Flapjack::Diner.return_keys_as_strings = false
+    end
+
+    it 'can return keys as strings' do
+      data = [{
+        :id         => '21',
+        :first_name => 'Ada',
+        :last_name  => 'Lovelace',
+        :email      => 'ada@example.com',
+        :timezone   => 'Europe/London',
+        :tags       => [ 'legend', 'first computer programmer' ],
+        :links      => {
+          :entities           => ['7', '12', '83'],
+          :media              => ['21_email', '21_sms'],
+          :notification_rules => ['30fd36ae-3922-4957-ae3e-c8f6dd27e543']
+        }
+      }]
+
+      req = stub_request(:get, "http://#{server}/contacts").to_return(
+        :status => 200, :body => response_with_data('contacts', data))
+
+      result = Flapjack::Diner.contacts
+      expect(req).to have_been_requested
+      expect(result).not_to be_nil
+      expect(result).to be_an_instance_of(Array)
+      expect(result.length).to be(1)
+      expect(result[0]).to be_an_instance_of(Hash)
+      expect(result[0]).to have_key('id')
+      expect(result[0]).to have_key('links')
+      expect(result[0]['links']).to have_key('entities')
     end
-  end
-
-  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%3ASSH").
-            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%3ASSH,example2.com%3APING").
-            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%3ASSH").
-            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%3ASSH,example2.com%3APING").
-            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
-
-    end
   end
 
-  context "logging" do
+  context 'logging' do
 
     let(:logger) { double('logger') }
 
@@ -1290,30 +73,30 @@ describe Flapjack::Diner do
       Flapjack::Diner.logger = logger
     end
 
-    it "logs a GET request without a path" do
+    it 'logs a GET request without a path' do
       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")
-      logger.should_receive(:info).with("  Response Body: #{response}")
+      expect(logger).to receive(:info).with("GET http://#{server}/entities")
+      expect(logger).to receive(:info).with('  Response Code: 200')
+      expect(logger).to receive(:info).with("  Response Body: #{response}")
 
       result = Flapjack::Diner.entities
-      req.should have_been_requested
-      result.should_not be_nil
+      expect(req).to have_been_requested
+      expect(result).not_to be_nil
     end
 
     it "logs a POST request" do
       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")
+              to_return(:status => 204)
+      expect(logger).to receive(:info).with("POST http://#{server}/test_notifications/entities/27\n" +
+        "  Body: {:test_notifications=>[{:summary=>\"dealing with it\"}]}")
+      expect(logger).to receive(:info).with('  Response Code: 204')
 
       result = Flapjack::Diner.create_test_notifications_entities(27, [{:summary => 'dealing with it'}])
-      req.should have_been_requested
-      result.should be_true
+      expect(req).to have_been_requested
+      expect(result).to be_truthy
     end
 
     it "logs a DELETE request" do
@@ -1321,12 +104,12 @@ describe Flapjack::Diner do
         with(:query => {:start_time => time.iso8601}).
         to_return(:status => 204)
 
-      logger.should_receive(:info).with("DELETE http://#{server}/scheduled_maintenances/checks/example.com:SSH?start_time=#{URI.encode_www_form_component(time.iso8601)}")
-      logger.should_receive(:info).with("  Response Code: 204")
+      expect(logger).to receive(:info).with("DELETE http://#{server}/scheduled_maintenances/checks/example.com:SSH?start_time=#{URI.encode_www_form_component(time.iso8601)}")
+      expect(logger).to receive(:info).with("  Response Code: 204")
 
       result = Flapjack::Diner.delete_scheduled_maintenances_checks('example.com:SSH', :start_time => time)
-      req.should have_been_requested
-      result.should be_true
+      expect(req).to have_been_requested
+      expect(result).to be_truthy
     end
 
   end
@@ -1339,7 +122,7 @@ describe Flapjack::Diner do
       expect {
         Flapjack::Diner.entities
       }.to raise_error
-      req.should have_been_requested
+      expect(req).to have_been_requested
     end
 
     it "raises an exception on invalid JSON data" do
@@ -1349,7 +132,7 @@ describe Flapjack::Diner do
       expect {
         Flapjack::Diner.entities
       }.to raise_error
-      req.should have_been_requested
+      expect(req).to have_been_requested
     end
 
     it "raises an exception if a required argument is not provided" do
@@ -1358,7 +141,7 @@ describe Flapjack::Diner do
       expect {
         Flapjack::Diner.delete_scheduled_maintenances_checks('example.com:SSH', :start_time => nil)
       }.to raise_error
-      req.should_not have_been_requested
+      expect(req).not_to have_been_requested
     end
 
     it "raises an exception if a time argument is provided with the wrong data type" do
@@ -1373,7 +156,7 @@ describe Flapjack::Diner do
         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
+      expect(req).not_to have_been_requested
     end
 
   end