hipchat 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46a4547a9f0d2cd12a211d78560fe3dfe7305b7b
-  data.tar.gz: 9c32aee4cd61577dff4f2d7ada82de5fc7151b95
+  metadata.gz: cbeb4474e9bae99465b61d971e6d5ac53f4562f1
+  data.tar.gz: a9e7ec6445f91871676065bf26a0c19c817d511c
 SHA512:
-  metadata.gz: a600e14c058610d0884bdc56a35838a5146a4603451b9f98eff32086af5452fb72193ed7d338ae56cbe3540d4817803223c7ae5db9988c5c801eaee74be5b84b
-  data.tar.gz: d4360c4bbf9958d8385c1e24d5fff0b22c13a36043b3943c05710a172a09b38c95b7a74e1da777ad5ef055b0f0c1cf0269f90149f210da8c4650a102ecb6fc68
+  metadata.gz: e50b678c47c408557c8443352086ab4fd2020b5d7eaad21741eddae2dfc3866ce06cb333afe0df329814d8f946ae18e0d2d14319f5a4d85b1bc331fed22aed3a
+  data.tar.gz: 87e12c6fcc6e94dd7b609eed2cb9f9f32626bedbe14fbe8f32f40c57c3e1abb746b88713973794e267e2beeda814da8441ed660f96ceef4e4fa32b728213078b

data/.travis.yml

@@ -1,5 +1,10 @@
 language: ruby
 
+before_install:
+  # Travis bundler versions are quite out of date and can cause install errors
+  # see: https://github.com/rubygems/rubygems/issues/1419
+  - gem update bundler
+
 rvm:
   - 1.9.3
   - 2.0.0

data/README.textile

@@ -4,8 +4,8 @@ A very basic wrapper for the HipChat HTTP API.
 
 h2. CI Status
 
-"!https://travis-ci.org/hipchat/hipchat-rb.png!":https://travis-ci.org/hipchat/hipchat-rb
-!https://coveralls.io/repos/hipchat/hipchat-rb/badge.png(Coverage Status)!:https://coveralls.io/r/hipchat/hipchat-rb
+"!https://travis-ci.org/hipchat/hipchat-rb.svg!":https://travis-ci.org/hipchat/hipchat-rb
+!https://coveralls.io/repos/hipchat/hipchat-rb/badge.svg(Coverage Status)!:https://coveralls.io/r/hipchat/hipchat-rb
 
 h2. Requirements
 * Ruby 1.9.3 or higher
@@ -26,6 +26,9 @@ h1. Usage
 h2. "API v1":https://www.hipchat.com/docs/api
 
 bc.. client = HipChat::Client.new(api_token)
+# Set http proxy
+client = HipChat::Client.new(api_token, :http_proxy => 'http://proxy_host:proxy_port')
+
 # 'username' is the name for which the message will be presented as from
 client['my room'].send('username', 'I talk')
 
@@ -56,6 +59,9 @@ client.create_room("Name", :owner_user_id => 'user_id')
 h2. "API v2":https://www.hipchat.com/docs/apiv2
 
 bc.. client = HipChat::Client.new(api_token, :api_version => 'v2')
+# Set http proxy
+client = HipChat::Client.new(api_token, :api_version => 'v2', :http_proxy => 'http://proxy_host:proxy_port')
+
 # 'username' is the name for which the message will be presented as from
 client['my room'].send('username', 'I talk')
 
@@ -93,6 +99,9 @@ client['my room'].get_room
 It's recommended to call client['my room'].get_room then pass in modified hash attributes to #update_room
 client['my room'].update_room(options = {})
 
+# Delete room (see https://www.hipchat.com/docs/apiv2/method/delete_room)
+client['my room'].delete_room
+
 # Invite user to room (see https://www.hipchat.com/docs/apiv2/method/invite_user)
 client['my room'].invite("USER_ID_OR_NAME", options = {})
 
@@ -224,7 +233,7 @@ h2. Chef Handler
 *APIv1 ONLY, use APIv1 Key*
 NOTE: APIv2 required for HipChatServer Beta
 
-Report on Chef runs. 
+Report on Chef runs.
 
 h3. Within a Recipe:
 
@@ -248,8 +257,8 @@ bc..    require 'hipchat/chef'
 h3. With HipChat Server Beta
 
 Add an "options" hash to set api v2 and your URL:
-* arguments ['API_KEY', 'HIPCHAT_ROOM', options={api_version: "v2", server_url: "https://hipchat.example.com"}]
-* hipchat_handler = HipChat::NotifyRoom.new("API_KEY", "HIPCHAT_ROOM", options={api_version: "v2", server_url: "https://hipchat.example.com"})
+* arguments ['API_KEY', 'HIPCHAT_ROOM', options={hipchat_options: {api_version: "v2", server_url: "https://hipchat.example.com"}}]
+* hipchat_handler = HipChat::NotifyRoom.new("API_KEY", "HIPCHAT_ROOM", options={hipchat_options: {api_version: "v2", server_url: "https://hipchat.example.com"}})
 
 h2. Copyright
 

data/hipchat.gemspec

@@ -25,9 +25,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rr"
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 1.11.1"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "webmock", "= 1.22.1"
   spec.add_development_dependency 'rdoc', '> 2.4.2'
   spec.add_development_dependency 'coveralls'
 end

data/lib/hipchat/api_version.rb

@@ -20,10 +20,12 @@ module HipChat
           @base_uri = "#{options[:server_url]}/v1"
           @headers = {'Accept' => 'application/json',
              'Content-Type' => 'application/x-www-form-urlencoded'}
-        else
+        elsif @version.eql?('v2')
           @base_uri = "#{options[:server_url]}/v2"
           @headers = {'Accept' => 'application/json',
              'Content-Type' => 'application/json'}
+        else
+          raise InvalidApiVersion, 'Couldn\'t recognize API version'
         end
       end
 
@@ -56,6 +58,19 @@ module HipChat
         }[version]
       end
 
+      def create_user_config
+        {
+          'v1' => {
+            :url => '/users/create',
+            :body_format => :to_hash
+          },
+          'v2' => {
+            :url => '/user',
+            :body_format => :to_json
+          }
+        }[version]
+      end
+
       def users_config
         {
           'v1' => {
@@ -116,6 +131,21 @@ module HipChat
         }[version]
       end
 
+      def delete_room_config
+        {
+          'v1' => {
+            :url => URI::escape("/delete"),
+            :method => :post,
+            :query_params => { :room_id => room_id }
+          },
+          'v2' => {
+            :url => URI::escape("/#{room_id}"),
+            :method => :delete,
+            :query_params => {}
+          }
+        }[version]
+      end
+
       def invite_config
         {
           'v2' => {
@@ -125,6 +155,24 @@ module HipChat
         }[version]
       end
 
+      def add_member_config
+        {
+          'v2' => {
+            :url => URI::escape("/#{room_id}/member"),
+            :body_format => :to_json
+          }
+        }[version]
+      end
+
+      def send_message_config
+        {
+          'v2' => {
+            :url => URI::escape("/#{room_id}/message"),
+            :body_format => :to_json
+          }
+        }[version]
+      end
+
       def send_config
         {
           'v1' => {
@@ -147,6 +195,15 @@ module HipChat
         }[version]
       end
 
+      def share_link_config
+        {
+          'v2' => {
+            :url => URI::escape("/#{room_id}/share/link"),
+            :body_format => :to_json
+          }
+        }[version]
+      end
+
       def topic_config
         {
           'v1' => {
@@ -180,6 +237,15 @@ module HipChat
           }
         }[version]
       end
+
+      def webhook_config
+        raise InvalidApiVersion, 'This functionality is not supported in API v1' unless version.eql?('v2')
+        {
+          'v2' => {
+            :url => URI::escape("/#{room_id}/webhook")
+          }
+        }[version]
+      end
     end
 
     class User
@@ -236,6 +302,22 @@ module HipChat
         }[version]
       end
 
+
+      def delete_config
+        {
+          'v1' => {
+            :url => URI::escape('/delete'),
+            :body_format => :to_json,
+            :query_params => { :user_id => user_id }
+          },
+          'v2' => {
+            :url => URI::escape("/#{user_id}"),
+            :body_format => :to_json,
+            :query_params => {}
+          }
+        }[version]
+      end
+
       def history_config
         raise InvalidApiVersion, 'This functionality is not supported in API v1' unless version.eql?('v2')
 

data/lib/hipchat/capistrano/tasks/hipchat.rake

@@ -65,18 +65,21 @@ namespace :hipchat do
 
   def deployment_name
     if fetch(:branch, nil)
-      application = fetch(:application)
       branch = fetch(:branch)
       real_revision = fetch(:real_revision)
 
-      name = "#{application}/#{branch}"
+      name = "#{application_name}/#{branch}"
       name += " (revision #{real_revision[0..7]})" if real_revision
       name
     else
-      application
+      application_name
     end
   end
 
+  def application_name
+    alt_application_name.nil? ? fetch(:application) : alt_application_name
+  end
+
   def message_color
     fetch(:hipchat_color, 'yellow')
   end
@@ -101,6 +104,10 @@ namespace :hipchat do
     fetch(:hipchat_deploy_user, 'Deploy')
   end
 
+  def alt_application_name
+    fetch(:hipchat_app_name, nil)
+  end
+
   def human
     user = ENV['HIPCHAT_USER'] || fetch(:hipchat_human)
     user = user || if (u = %x{git config user.name}.strip) != ''

data/lib/hipchat/client.rb

@@ -44,16 +44,26 @@ module HipChat
         :headers => @api.headers
       )
 
-      case response.code
-      when 201, 200 #CREATED
-        response.parsed_response
-      when 400
-        raise UnknownRoom,  "Error: #{response.message}"
-      when 401
-        raise Unauthorized, 'Access denied'
-      else
-        raise UnknownResponseCode, "Unexpected error #{response.code}"
+      ErrorHandler.response_code_to_exception_for :room, name, response
+      response.parsed_response
+    end
+
+    def create_user(name, email, options={})
+      if name.length > 50
+        raise UsernameTooLong, "User name #{name} is #{name.length} characters long. Limit is 50."
       end
+
+      response = self.class.post(@api.create_user_config[:url],
+        :query => { :auth_token => @token },
+        :body => {
+          :name => name,
+          :email => email
+          }.merge(options).send(@api.create_user_config[:body_format]),
+        :headers => @api.headers
+      )
+
+      ErrorHandler.response_code_to_exception_for :user, email, response
+      response.parsed_response
     end
 
     def user(name)
@@ -92,13 +102,10 @@ module HipChat
         },
         :headers => @api.headers
       )
-      case response.code
-      when 200
-        response[@api.rooms_config[:data_key]].map do |r|
-          HipChat::Room.new(@token, r.merge(:api_version => @api_version, :server_url => @options[:server_url]))
-        end
-      else
-        raise UnknownResponseCode, "Unexpected #{response.code} for room"
+
+      ErrorHandler.response_code_to_exception_for :room, nil, response
+      response[@api.rooms_config[:data_key]].map do |r|
+        HipChat::Room.new(@token, r.merge(:api_version => @api_version, :server_url => @options[:server_url]))
       end
     end
 
@@ -110,13 +117,10 @@ module HipChat
         },
         :headers => @api.headers
       )
-      case response.code
-      when 200
-        response[@api.users_config[:data_key]].map do |u|
-          HipChat::User.new(@token, u.merge(:api_version => @api_version, :server_url => @options[:server_url]))
-        end
-      else
-        raise UnknownResponseCode, "Unexpected #{response.code} for user"
+
+      ErrorHandler.response_code_to_exception_for :user, nil, response
+      response[@api.users_config[:data_key]].map do |u|
+        HipChat::User.new(@token, u.merge(:api_version => @api_version, :server_url => @options[:server_url]))
       end
     end
   end

data/lib/hipchat/errors.rb

@@ -1,10 +1,49 @@
 module HipChat
-  class UnknownRoom         < StandardError; end
-  class RoomNameTooLong     < StandardError; end
-  class RoomMissingOwnerUserId < StandardError; end
-  class Unauthorized        < StandardError; end
-  class UsernameTooLong     < StandardError; end
-  class UnknownResponseCode < StandardError; end
-  class UnknownUser         < StandardError; end
-  class InvalidApiVersion   < StandardError; end
+  class ServiceError            < StandardError;       end
+  class RoomNameTooLong         < ServiceError;        end
+  class RoomMissingOwnerUserId  < ServiceError;        end
+  class UnknownResponseCode     < ServiceError;        end
+  class Unauthorized            < UnknownResponseCode; end
+  class BadRequest              < ServiceError;        end
+  class MethodNotAllowed        < ServiceError;        end
+  class UsernameTooLong         < ServiceError;        end
+  class InvalidApiVersion       < ServiceError;        end
+  class InvalidUrl              < ServiceError;        end
+  class InvalidEvent            < ServiceError;        end
+  class ObjectNotFound          < UnknownResponseCode; end
+  class UnknownRoom             < ObjectNotFound;      end
+  class UnknownUser             < ObjectNotFound;      end
+  class UnknownWebhook          < ObjectNotFound;      end
+  class TooManyRequests         < UnknownResponseCode; end
+
+  class ErrorHandler
+
+    # Pass-through to catch error states and raise their appropriate exceptions
+    # @param klass {Symbol} The class of object we are handling the error for
+    # @param identifier {String} An identifying string for the object causing the error
+    # @param response {HTTParty::Response} The HTTParty response/request object
+    def self.response_code_to_exception_for(klass, identifier, response)
+      # Supports user, room and webhook objects.  If we get something other than that, bail.
+      raise ServiceError "Unknown class #{klass}" unless [:user, :room, :webhook].include? klass
+      # Grab the corresponding unknown object exception class and constantize it for the 404 case to call
+      not_found_exception = Module.const_get(HipChat.to_s.to_sym).const_get("Unknown#{klass.capitalize}".to_sym)
+      case response.code
+        when 200, 201, 202, 204;
+          return
+        when 400
+          raise BadRequest, "The request was invalid. You may be missing a required argument or provided bad data. path:#{response.request.path.to_s} method:#{response.request.http_method.to_s}"
+        when 401, 403
+          raise Unauthorized, "Access denied to #{klass} `#{identifier}'"
+        when 404
+          raise not_found_exception,  "Unknown #{klass}: `#{identifier}'"
+        when 405
+          raise MethodNotAllowed, "You requested an invalid method. path:#{response.request.path.to_s} method:#{response.request.http_method.to_s}"
+        when 429
+          raise TooManyRequests, 'You have exceeded the rate limit. `https://www.hipchat.com/docs/apiv2/rate_limiting`'
+        else
+          raise UnknownResponseCode, "Unexpected #{response.code} for #{klass} `#{identifier}'"
+      end
+    end
+  end
+
 end

data/lib/hipchat/room.rb

@@ -23,16 +23,8 @@ module HipChat
         :headers => @api.headers
       )
 
-      case response.code
-      when 200
-        response.parsed_response
-      when 404
-        raise UnknownRoom,  "Unknown room: `#{room_id}'"
-      when 401
-        raise Unauthorized, "Access denied to room `#{room_id}'"
-      else
-        raise UnknownResponseCode, "Unexpected #{response.code} for room `#{room_id}'"
-      end
+      ErrorHandler.response_code_to_exception_for :room, room_id, response
+      response.parsed_response
     end
 
     # Update a room
@@ -55,15 +47,17 @@ module HipChat
         }.to_json,
         :headers => @api.headers)
 
-      case response.code
-      when 200, 204; true
-      when 404
-        raise Unknown Room, "Unknown room: `#{room_id}'"
-      when 401
-        raise Unauthorized, "Access denied to room `#{room_id}'"
-      else
-        raise UnknownResponseCode, "Unexpected #{response.code} for room `#{room_id}'"
-      end
+      ErrorHandler.response_code_to_exception_for :room, room_id, response
+      true
+    end
+
+    # Delete a room
+    def delete_room
+      response = self.class.send(@api.delete_room_config[:method], @api.delete_room_config[:url],
+        :query => {:auth_token => @token }.merge(@api.get_room_config[:query_params]),
+        :headers => @api.headers)
+      ErrorHandler.response_code_to_exception_for :room, room_id, response
+      true
     end
 
     # Invite user to this room
@@ -75,15 +69,21 @@ module HipChat
         }.to_json,
         :headers => @api.headers)
 
-      case response.code
-      when 200, 204; true
-      when 404
-        raise UnknownRoom,  "Unknown room: `#{room_id}'"
-      when 401
-        raise Unauthorized, "Access denied to room `#{room_id}'"
-      else
-        raise UnknownResponseCode, "Unexpected #{response.code} for room `#{room_id}'"
-      end
+      ErrorHandler.response_code_to_exception_for :room, room_id, response
+      true
+    end
+
+    # Add member to this room
+    def add_member(user, room_roles=['room_member'])
+      response = self.class.put(@api.add_member_config[:url]+"/#{user}",
+        :query => { :auth_token => @token },
+        :body => {
+          :room_roles => room_roles
+        }.to_json,
+        :headers => @api.headers)
+
+      ErrorHandler.response_code_to_exception_for :room, room_id, response
+      true
     end
 
 
@@ -92,6 +92,28 @@ module HipChat
     # Usage:
     #
     #   # Default
+    #   send 'some message'
+    #
+    def send_message(message)
+      response = self.class.post(@api.send_message_config[:url],
+        :query => { :auth_token => @token },
+        :body  => {
+          :room_id => room_id,
+          :message => message,
+        }.send(@api.send_config[:body_format]),
+        :headers => @api.headers
+      )
+
+      ErrorHandler.response_code_to_exception_for :room, room_id, response
+      true
+    end
+
+
+    # Send a notification message to this room.
+    #
+    # Usage:
+    #
+    #   # Default
     #   send 'nickname', 'some message'
     #
     #   # Notify users and color the message red
@@ -107,8 +129,8 @@ module HipChat
     # +notify+:: true or false
     #            (default false)
     def send(from, message, options_or_notify = {})
-      if from.length > 15
-        raise UsernameTooLong, "Username #{from} is `#{from.length} characters long. Limit is 15'"
+      if from.length > 20
+        raise UsernameTooLong, "Username #{from} is `#{from.length} characters long. Limit is 20'"
       end
       options = if options_or_notify == true or options_or_notify == false
         warn 'DEPRECATED: Specify notify flag as an option (e.g., :notify => true)'
@@ -117,30 +139,46 @@ module HipChat
         options_or_notify || {}
       end
 
-      options = { :color => 'yellow', :notify => false }.merge options
+      options = { :color => 'yellow', :notify => false, :message_format => 'html' }.merge options
+
+      body = {
+        :room_id        => room_id,
+        :from           => from,
+        :message        => message,
+        :message_format => options[:message_format],
+        :color          => options[:color],
+        :card           => options[:card],
+        :notify         => @api.bool_val(options[:notify])
+      }.delete_if { |_k, v| v.nil? }
 
       response = self.class.post(@api.send_config[:url],
+        :query => { :auth_token => @token },
+        :body  => body.send(@api.send_config[:body_format]),
+        :headers => @api.headers
+      )
+
+      ErrorHandler.response_code_to_exception_for :room, room_id, response
+      true
+    end
+
+    def share_link(from, message, link)
+      if from.length > 20
+        raise UsernameTooLong, "Username #{from} is `#{from.length} characters long. Limit is 20'"
+      end
+
+      response = self.class.post(@api.share_link_config[:url],
         :query => { :auth_token => @token },
         :body  => {
           :room_id        => room_id,
           :from           => from,
           :message        => message,
-          :message_format => options[:message_format] || 'html',
-          :color          => options[:color],
-          :notify         => @api.bool_val(options[:notify])
+          :link           => link,
         }.send(@api.send_config[:body_format]),
         :headers => @api.headers
       )
 
-      case response.code
-      when 200, 204; true
-      when 404
-        raise UnknownRoom,  "Unknown room: `#{room_id}'"
-      when 401
-        raise Unauthorized, "Access denied to room `#{room_id}'"
-      else
-        raise UnknownResponseCode, "Unexpected #{response.code} for room `#{room_id}'"
-      end
+      ErrorHandler.response_code_to_exception_for :room, room_id, response
+      true
     end
 
     # Send a file to this room.
@@ -150,8 +188,8 @@ module HipChat
     #   # Default
     #   send_file 'nickname', 'some message', File.open("/path/to/file")
     def send_file(from, message, file)
-      if from.length > 15
-        raise UsernameTooLong, "Username #{from} is `#{from.length} characters long. Limit is 15'"
+      if from.length > 20
+        raise UsernameTooLong, "Username #{from} is `#{from.length} characters long. Limit is 20'"
       end
 
       response = self.class.post(@api.send_file_config[:url],
@@ -166,15 +204,8 @@ module HipChat
         :headers => file_body_headers(@api.headers)
       )
 
-      case response.code
-      when 200, 204; true
-      when 404
-        raise UnknownRoom,  "Unknown room: `#{room_id}'"
-      when 401
-        raise Unauthorized, "Access denied to room `#{room_id}'"
-      else
-        raise UnknownResponseCode, "Unexpected #{response.code} for room `#{room_id}'"
-      end
+      ErrorHandler.response_code_to_exception_for :room, room_id, response
+      true
     end
 
     # Change this room's topic
@@ -202,15 +233,8 @@ module HipChat
         :headers => @api.headers
       )
 
-      case response.code
-      when 204,200; true
-      when 404
-        raise UnknownRoom,  "Unknown room: `#{room_id}'"
-      when 401
-        raise Unauthorized, "Access denied to room `#{room_id}'"
-      else
-        raise UnknownResponseCode, "Unexpected #{response.code} for room `#{room_id}'"
-      end
+      ErrorHandler.response_code_to_exception_for :room, room_id, response
+      true
     end
 
     # Pull this room's history
@@ -235,7 +259,8 @@ module HipChat
         :timezone => 'UTC',
         :format => 'JSON',
         :'max-results' => 100,
-        :'start-index' => 0
+        :'start-index' => 0,
+        :'end-date' => nil
       }.merge options
 
       response = self.class.get(@api.history_config[:url],
@@ -246,21 +271,14 @@ module HipChat
           :format     => options[:format],
           :'max-results' => options[:'max-results'],
           :'start-index' => options[:'start-index'],
+          :'end-date' => options[:'end-date'],
           :auth_token => @token
         },
         :headers => @api.headers
       )
 
-      case response.code
-      when 200
-        response.body
-      when 404
-        raise UnknownRoom,  "Unknown room: `#{room_id}'"
-      when 401
-        raise Unauthorized, "Access denied to room `#{room_id}'"
-      else
-        raise UnknownResponseCode, "Unexpected #{response.code} for room `#{room_id}'"
-      end
+      ErrorHandler.response_code_to_exception_for :room, room_id, response
+      response.body
     end
 
     # Pull this room's statistics
@@ -277,16 +295,113 @@ module HipChat
         :headers => @api.headers
       )
 
-      case response.code
-      when 200
-        response.body
-      when 404
-        raise UnknownRoom,  "Unknown room: `#{room_id}'"
-      when 401
-        raise Unauthorized, "Access denied to room `#{room_id}'"
-      else
-        raise UnknownResponseCode, "Unexpected #{response.code} for room `#{room_id}'"
+      ErrorHandler.response_code_to_exception_for :room, room_id, response
+      response.body
+    end
+
+    # Create a webhook for this room
+    #
+    # Usage:
+    #
+    #   # Default
+    #   create_webhook 'http://example.org/path/to/my/webhook', 'room_event'
+    #
+    # Options:
+    #
+    # +pattern+::  The regular expression pattern to match against messages. Only applicable for message events.
+    #                (default "")
+    # +name+::     The label for this webhook
+    #                (default "")
+    def create_webhook(url, event, options = {})
+      raise InvalidEvent unless %w(room_message room_notification room_exit room_enter room_topic_change room_archived room_deleted room_unarchived).include? event
+
+      begin
+        u = URI::parse(url)
+        raise InvalidUrl unless %w(http https).include? u.scheme
+      rescue URI::InvalidURIError
+        raise InvalidUrl
       end
+
+      options = {
+        :pattern => '',
+        :name => ''
+      }.merge options
+
+      response = self.class.post(@api.webhook_config[:url],
+        :query => {
+          :auth_token => @token
+        },
+        :body => {:url => url, :pattern => options[:pattern], :event => event, :name => options[:name]}.send(@api.send_config[:body_format]),
+        :headers => @api.headers
+      )
+
+      ErrorHandler.response_code_to_exception_for :room, room_id, response
+      response.body
+    end
+
+    # Delete a webhook for this room
+    #
+    # Usage:
+    #
+    #   # Default
+    #   delete_webhook 'webhook_id'
+    def delete_webhook(webhook_id)
+      response = self.class.delete("#{@api.webhook_config[:url]}/#{URI::escape(webhook_id)}",
+                                 :query => {
+                                   :auth_token => @token
+                                 },
+                                 :headers => @api.headers
+      )
+
+      ErrorHandler.response_code_to_exception_for :webhook, webhook_id, response
+      true
+    end
+
+    # Gets all webhooks for this room
+    #
+    # Usage:
+    #
+    #   # Default
+    #   get_all_webhooks
+    #
+    # Options:
+    #
+    # +start-index+::  The regular expression pattern to match against messages. Only applicable for message events.
+    #                (default "")
+    # +max-results+::     The label for this webhook
+    #                (default "")
+    def get_all_webhooks(options = {})
+      options = {:'start-index' => 0, :'max-results' => 100}.merge(options)
+
+      response = self.class.get(@api.webhook_config[:url],
+                                   :query => {
+                                     :auth_token => @token,
+                                     :'start-index' => options[:'start-index'],
+                                     :'max-results' => options[:'max-results']
+                                   },
+                                   :headers => @api.headers
+      )
+
+      ErrorHandler.response_code_to_exception_for :room, room_id, response
+      response.body
+    end
+
+    # Get a webhook for this room
+    #
+    # Usage:
+    #
+    #   # Default
+    #   get_webhook 'webhook_id'
+    def get_webhook(webhook_id)
+      response = self.class.get("#{@api.webhook_config[:url]}/#{URI::escape(webhook_id)}",
+                                :query => {
+                                  :auth_token => @token
+                                },
+                                :headers => @api.headers
+      )
+
+      ErrorHandler.response_code_to_exception_for :webhook, webhook_id, response
+      response.body
     end
 
     private