flapjack-diner 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3ddc9c0739401a0d4921a4ea116fa31f2da5076
-  data.tar.gz: 81598f05516e999be2dbb4b0617e04e72f6d77f2
+  metadata.gz: 39c4b55ae7da90b7fb53ee8cf79933c4498aa587
+  data.tar.gz: 8d2e64a0e3d18884c4d88f871400ff5b1dcca9f3
 SHA512:
-  metadata.gz: 6ff59adc22d994f71fb78b1b7e4632d5699801f9c65456de550b82bcf6e30066de614a122ac9c6847435a06017b3c85001419ae9d1ddbc2cbbcae9f8aad13538
-  data.tar.gz: 1edc4fe8320350c7ec36b82d5abb6d3686e85c23a2454c54943e5fd823fb219b689513d5bb792f4e3504fd90b2372bd1ab4f868c0cc4d8c77a1c1a14d094883f
+  metadata.gz: 904a7a6940342b64c01e61de9bbdc5798ab1931012ee0c5cc381c8382461850964312e0c13d951cd3ce2a6c8720d6a57657b0824521f64f8534f94bace1324bc
+  data.tar.gz: a6280e173fc280e609e8444480dcac2a2bbd772f3afdc30aa9577b0151b87390f8a0050a62dd589553ea57b05f5dd47c0813a15a59dee2df5019283d59bc2ffa

data/README.md

@@ -2,21 +2,26 @@
 
 [![Travis CI Status][id_travis_img]][id_travis_link]
 
-[id_travis_link]: https://secure.travis-ci.org/#!/flpjck/flapjack-diner
-[id_travis_img]: https://secure.travis-ci.org/flpjck/flapjack-diner.png
+[id_travis_link]: https://travis-ci.org/flapjack/flapjack-diner
+[id_travis_img]: https://travis-ci.org/flapjack/flapjack-diner.png
+
+Access the JSON API of a [Flapjack](http://flapjack.io/) system monitoring server.
+
+Note that flapjack-diner [releases](https://github.com/flapjack/flapjack-diner/releases) after [1.0.0.rc1](https://github.com/flapjack/flapjack-diner/releases/tag/v1.0.0.rc1) require the [JSONAPI](http://flapjack.io/docs/jsonapi) gateway of Flapjack to connect to. All previous releases (0.x) require the older [API](http://flapjack.io/docs/0.9/API) Flapjack gateway.
 
-Access the API of a [Flapjack](http://flapjack-project.com/) system monitoring server.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'flapjack-diner', :git => 'git://github.com/flpjck/flapjack-diner.git'
+    gem 'flapjack-diner', :github => 'flapjack/flapjack-diner'
 
 And then execute:
 
     $ bundle
 
+Note, you can also install from [RubyGems.org](https://rubygems.org/gems/flapjack-diner) as usual.
+
 ## Usage
 
 Set the URI of the Flapjack server:
@@ -31,6 +36,12 @@ Optionally, set a logger to log requests & responses:
 Flapjack::Diner.logger = Logger.new('logs/flapjack_diner.log')
 ```
 
+If you want the old behaviour wrt returning hashes with keys as strings (they're now symbols by default) then:
+
+```ruby
+Flapjack::Diner.return_keys_as_strings = true
+```
+
 ## Functions
 
 Parameters for all of **flapjack-diner**'s functions are organised into three categories:
@@ -87,6 +98,8 @@ If any operation fails, `Flapjack::Diner.last_error` will contain an error messa
 
 ### Checks
 
+* [checks](#checks)
+
 * [create_scheduled_maintenances_checks](#create_scheduled_maintenances_checks)
 * [delete_scheduled_maintenances_checks](#delete_scheduled_maintenances_checks)
 
@@ -539,6 +552,19 @@ Returns true if creation succeeded or false if creation failed.
 
 ---
 
+<a name="checks">&nbsp;</a>
+### checks
+
+Return basic identity data for one, some or all checks. (Check ids are composed by joining together the check's entity's name, the character ':' and the check's name.)
+
+```ruby
+check = Flapjack::Diner.check(ID)
+some_checks = Flapjack::Diner.checks(ID1, ID2, ...)
+all_checks = Flapjack::Diner.checks
+```
+
+---
+
 <a name="create_scheduled_maintenances_checks">&nbsp;</a>
 ### create_scheduled_maintenances_checks
 

data/flapjack-diner.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["ali.graham@bulletproof.net"]
   gem.summary       = %q{Access the API of a Flapjack system monitoring server}
   gem.description   = %q{Wraps raw API calls to a Flapjack server API with friendlier ruby methods.}
-  gem.homepage      = 'https://github.com/flpjck/flapjack-diner'
+  gem.homepage      = 'https://github.com/flapjack/flapjack-diner'
 
   gem.files         = `git ls-files`.split($\) - ['Gemfile.lock']
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency('bundler')
   gem.add_development_dependency('rake')
-  gem.add_development_dependency('rspec', '>= 2.0.0')
+  gem.add_development_dependency('rspec', '~> 2.0')
   gem.add_development_dependency('simplecov')
   gem.add_development_dependency('webmock')
 end

data/lib/flapjack-diner.rb

@@ -1,7 +1,6 @@
 require 'httparty'
 require 'json'
 require 'uri'
-require 'cgi'
 
 require 'flapjack-diner/version'
 require 'flapjack-diner/argument_validator'
@@ -16,7 +15,7 @@ module Flapjack
 
     class << self
 
-      attr_accessor :logger
+      attr_accessor :logger, :return_keys_as_strings
 
       # NB: clients will need to handle any exceptions caused by,
       # e.g., network failures or non-parseable JSON data.
@@ -237,6 +236,10 @@ module Flapjack
         extract_get('entities', perform_get('/entities', ids))
       end
 
+      def checks(*ids)
+        extract_get('checks', perform_get('/checks', ids))
+      end
+
       def update_entities(*args)
         ids, params, data = unwrap_ids_and_params(*args)
         raise "'update_entities' requires at least one entity id parameter" if ids.nil? || ids.empty?
@@ -264,6 +267,25 @@ module Flapjack
         perform_patch("/entities/#{escaped_ids(ids)}", nil, ops)
       end
 
+      def update_checks(*args)
+        ids, params, data = unwrap_ids_and_params(*args)
+        raise "'update_checks' requires at least one check id parameter" if ids.nil? || ids.empty?
+        validate_params(params) do
+          validate :query => :enabled, :as => :boolean
+        end
+        ops = params.inject([]) do |memo, (k,v)|
+          case k
+          when :enabled
+            memo << {:op    => 'replace',
+                     :path  => "/checks/0/#{k.to_s}",
+                     :value => v}
+          end
+          memo
+        end
+        raise "'update_checks' did not find any valid update fields" if ops.empty?
+        perform_patch("/checks/#{escaped_ids(ids)}", nil, ops)
+      end
+
       ['entities', 'checks'].each do |data_type|
 
         define_method("create_scheduled_maintenances_#{data_type}") do |*args|
@@ -360,8 +382,14 @@ module Flapjack
 
       private
 
-      def extract_get(name, result)
-        (result.nil? || result.is_a?(TrueClass)) ? result : result[name]
+      def extract_get(name, response)
+        result = (response.nil? || response.is_a?(TrueClass)) ? response : response[name]
+
+        if return_keys_as_strings.is_a?(TrueClass)
+          return result
+        else
+          return symbolize(result)
+        end
       end
 
       def perform_get(path, ids = [], data = [])
@@ -449,7 +477,7 @@ module Flapjack
       end
 
       def escaped_ids(ids = [])
-        ids.collect{|id| CGI.escape(id.to_s)}.join(',')
+        ids.collect{|id| URI.escape(id.to_s)}.join(',')
       end
 
       def escape(s)
@@ -526,6 +554,13 @@ module Flapjack
       def last_error=(error)
         @last_error = error
       end
+
+      def symbolize(obj)
+        return obj.inject({}){|memo,(k,v)| memo[k.to_sym] =  symbolize(v); memo} if obj.is_a? Hash
+        return obj.inject([]){|memo,v    | memo           << symbolize(v); memo} if obj.is_a? Array
+        return obj
+      end
+
     end
   end
 end

data/lib/flapjack-diner/version.rb

@@ -1,5 +1,5 @@
 module Flapjack
   module Diner
-    VERSION = "1.0.0.rc1"
+    VERSION = "1.0.0.rc2"
   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(ArgumentError)
+      lambda { subject.validate(:query => :entity, :as => :required) }.should_not 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(ArgumentError)
+      lambda { subject.validate(:query => :entity, :as => :required) }.should raise_exception
     end
 
     it 'handles arrays as query values valid' do
-      lambda { subject.validate(:query => [:entity, :check], :as => :required) }.should_not raise_exception(ArgumentError)
+      lambda { subject.validate(:query => [:entity, :check], :as => :required) }.should_not 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(ArgumentError)
+      lambda { subject.validate(:query => [:entity, :check], :as => :required) }.should 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(ArgumentError)
+      lambda { subject.validate(:query => :start_time, :as => :time) }.should_not 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(ArgumentError)
+      lambda { subject.validate(:query => :start_time, :as => :time) }.should 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(ArgumentError)
+      lambda { subject.validate(:query => [:start_time, :end_time], :as => :time) }.should_not 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(ArgumentError)
+      lambda { subject.validate(:query => [:start_time, :end_time], :as => :time) }.should 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(ArgumentError)
+      lambda { subject.validate(:query => :end_time, :as => :time) }.should_not 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(ArgumentError)
+      lambda { subject.validate(:query => :end_time, :as => :time) }.should_not 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(ArgumentError)
+      lambda { subject.validate(:query => :end_time, :as => :time) }.should 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(ArgumentError)
+      lambda { subject.validate(:query => :duration, :as => :integer) }.should_not 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(ArgumentError)
+      lambda { subject.validate(:query => :duration, :as => :integer) }.should 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(ArgumentError)
+      lambda { subject.validate(:query => :start_time, :as => [:time, :required]) }.should_not 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(ArgumentError)
+      lambda { subject.validate(:query => :start_time, :as => [:time, :required]) }.should raise_exception
     end
   end
 end

data/spec/flapjack-diner_spec.rb

@@ -14,6 +14,7 @@ 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
@@ -66,12 +67,48 @@ describe Flapjack::Diner do
 
     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'))
+          :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
@@ -845,7 +882,7 @@ describe Flapjack::Diner 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:SSH").
+          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)
@@ -858,7 +895,7 @@ describe Flapjack::Diner do
 
         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").
+          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)
@@ -872,7 +909,7 @@ describe Flapjack::Diner do
         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").
+          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)
@@ -886,7 +923,7 @@ describe Flapjack::Diner do
         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").
+          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)
@@ -903,7 +940,7 @@ describe Flapjack::Diner 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:SSH").
+          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)
@@ -916,7 +953,7 @@ describe Flapjack::Diner do
 
         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").
+          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)
@@ -930,7 +967,7 @@ describe Flapjack::Diner do
         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").
+          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)
@@ -946,7 +983,7 @@ describe Flapjack::Diner do
       context 'test notifications' do
 
         it "submits a POST request for a check" do
-          req = stub_request(:post, "http://#{server}/test_notifications/checks/example.com:SSH").
+          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)
@@ -958,7 +995,7 @@ describe Flapjack::Diner do
         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").
+          req = stub_request(:post, "http://#{server}/test_notifications/checks/example.com%3ASSH,example2.com%3APING").
             with(:test_notifications => [{:summary => 'testing'}]).
             to_return(:status => 204)
 
@@ -970,7 +1007,7 @@ describe Flapjack::Diner do
 
         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").
+          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)
@@ -983,7 +1020,7 @@ describe Flapjack::Diner do
 
         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").
+          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)
@@ -998,10 +1035,51 @@ describe Flapjack::Diner do
 
     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:SSH").
+        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)
@@ -1013,7 +1091,7 @@ describe Flapjack::Diner do
       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").
+        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)
@@ -1029,7 +1107,7 @@ describe Flapjack::Diner do
     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:SSH").
+        req = stub_request(:delete, "http://#{server}/scheduled_maintenances/checks/example.com%3ASSH").
           with(:query => {:start_time => time.iso8601}).
           to_return(:status => 204)
 
@@ -1039,8 +1117,19 @@ describe Flapjack::Diner do
         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:SSH,example2.com:PING").
+        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)
 
@@ -1095,7 +1184,7 @@ describe Flapjack::Diner do
         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").
+          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,
@@ -1105,7 +1194,7 @@ describe Flapjack::Diner do
         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").
+          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,
@@ -1166,7 +1255,7 @@ describe Flapjack::Diner do
         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").
+          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"))
 
@@ -1177,7 +1266,7 @@ describe Flapjack::Diner do
         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").
+          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"))
 
@@ -1195,7 +1284,7 @@ describe Flapjack::Diner do
 
   context "logging" do
 
-    let(:logger) { mock('logger') }
+    let(:logger) { double('logger') }
 
     before do
       Flapjack::Diner.logger = logger
@@ -1228,11 +1317,11 @@ describe Flapjack::Diner do
     end
 
     it "logs a DELETE request" do
-      req = stub_request(:delete, "http://#{server}/scheduled_maintenances/checks/example.com:SSH").
+      req = stub_request(:delete, "http://#{server}/scheduled_maintenances/checks/example.com%3ASSH").
         with(:query => {:start_time => time.iso8601}).
         to_return(:status => 204)
 
-      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("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")
 
       result = Flapjack::Diner.delete_scheduled_maintenances_checks('example.com:SSH', :start_time => time)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flapjack-diner
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Ali Graham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -70,16 +70,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +129,7 @@ files:
 - spec/argument_validator_spec.rb
 - spec/flapjack-diner_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/flpjck/flapjack-diner
+homepage: https://github.com/flapjack/flapjack-diner
 licenses: []
 metadata: {}
 post_install_message: