hipchat 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: cbeb4474e9bae99465b61d971e6d5ac53f4562f1
-  data.tar.gz: a9e7ec6445f91871676065bf26a0c19c817d511c
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDBiYjZkZDVmYzJiYTFlMGI0YWVjZTZkNGIxMzI2ZTkzOTc0Yzk5OA==
+  data.tar.gz: !binary |-
+    ZjE0YmMzM2MxNjEwZjUyZTg5MGU2MDUxYTlkMjQ0MjZmMGU0ZmM5YQ==
 SHA512:
-  metadata.gz: e50b678c47c408557c8443352086ab4fd2020b5d7eaad21741eddae2dfc3866ce06cb333afe0df329814d8f946ae18e0d2d14319f5a4d85b1bc331fed22aed3a
-  data.tar.gz: 87e12c6fcc6e94dd7b609eed2cb9f9f32626bedbe14fbe8f32f40c57c3e1abb746b88713973794e267e2beeda814da8441ed660f96ceef4e4fa32b728213078b
+  metadata.gz: !binary |-
+    NGJlOGFhMGQzOTBhYjliZDg5ZTI0OGRkNWVlYWU3ZDBmYmM2ZGI1ZDBiODYz
+    OGExMmFmNzE2ZGUwZGFhNWUxNDRkZGIxNGI3ODE4M2YxMjYxNDE4ZWEzYWMz
+    Zjk4NTcyZjE5YzI5M2QyM2JlNjM0MjU3OWZhM2I5YWJmNTA0ZTU=
+  data.tar.gz: !binary |-
+    MjIyMzRmNDMxZTA2NjE2NmI0NDllOTI5MGZkYTc5MTlmNTVhMzc4NzE5NGE1
+    NjkzNTMyMjAyNTJmMjE0YTFjNTU3OWZjYjY2MGE5NTk1MTA3ZGE4OWU1NDY2
+    N2JlZjhiNzY1MGUyODkxZjBkMDBlYzdlNDM3ZGYyNTA3OTQzYTU=

data/hipchat.gemspec

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

data/lib/hipchat/railtie.rb

@@ -1,5 +1,3 @@
-require 'hipchat'
-
 module HipChat
   class Railtie < Rails::Railtie
     rake_tasks do

data/lib/hipchat/user.rb

@@ -19,7 +19,10 @@ module HipChat
     #
     # Send a private message to user.
     #
-    def send(message, message_format='text', notify=false)
+    def send(message, options = {})
+      message_format = options[:message_format] ? options[:message_format] : 'text'
+      notify         = options[:notify]         ? options[:notify]         : false
+
       response = self.class.post(@api.send_config[:url],
                                  :query => { :auth_token => @token },
                                  :body => {

data/lib/hipchat/version.rb

@@ -1,3 +1,3 @@
 module HipChat
-  VERSION = '1.5.3'
+  VERSION = '1.5.4'
 end

data/spec/hipchat_api_v1_spec.rb

@@ -28,25 +28,18 @@ describe "HipChat (API V1)" do
     end
 
     it "fails when the room doen't exist" do
-      mock(HipChat::Room).get(anything, anything) {
-        OpenStruct.new(:code => 404)
-      }
-
+      allow(room.class).to receive(:get).with(anything, anything).and_return(OpenStruct.new(:code => 404))
       expect { room.history }.to raise_error(HipChat::UnknownRoom)
     end
 
     it "fails when we're not allowed to do so" do
-      mock(HipChat::Room).get(anything, anything) {
-        OpenStruct.new(:code => 401)
-      }
+      allow(room.class).to receive(:get).with(anything, anything).and_return(OpenStruct.new(:code => 401))
 
       expect { room.history }.to raise_error(HipChat::Unauthorized)
     end
 
     it "fails if we get an unknown response code" do
-      mock(HipChat::Room).get(anything, anything) {
-        OpenStruct.new(:code => 403)
-      }
+      allow(room.class).to receive(:get).with(anything, anything).and_return(OpenStruct.new(:code => 403))
 
       expect { room.history }.to raise_error(HipChat::Unauthorized)
     end
@@ -67,25 +60,19 @@ describe "HipChat (API V1)" do
     end
 
     it "fails when the room doesn't exist" do
-      mock(HipChat::Room).post(anything, anything) {
-        OpenStruct.new(:code => 404)
-      }
+      allow(room.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 404))
 
       expect { room.topic "" }.to raise_error(HipChat::UnknownRoom)
     end
 
     it "fails when we're not allowed to do so" do
-      mock(HipChat::Room).post(anything, anything) {
-        OpenStruct.new(:code => 401)
-      }
+      allow(room.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 401))
 
       expect { room.topic "" }.to raise_error(HipChat::Unauthorized)
     end
 
     it "fails if we get an unknown response code" do
-      mock(HipChat::Room).post(anything, anything) {
-        OpenStruct.new(:code => 403)
-      }
+      allow(room.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 403))
 
       expect { room.topic "" }.to raise_error(HipChat::Unauthorized)
     end
@@ -134,17 +121,13 @@ describe "HipChat (API V1)" do
     end
 
     it "but fails when the room doesn't exist" do
-      mock(HipChat::Room).post(anything, anything) {
-        OpenStruct.new(:code => 404)
-      }
+      allow(room.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 404))
 
       expect { room.send "", "" }.to raise_error(HipChat::UnknownRoom)
     end
 
     it "but fails when we're not allowed to do so" do
-      mock(HipChat::Room).post(anything, anything) {
-        OpenStruct.new(:code => 401)
-      }
+      allow(room.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 401))
 
       expect { room.send "", "" }.to raise_error(HipChat::Unauthorized)
     end
@@ -154,9 +137,7 @@ describe "HipChat (API V1)" do
     end
 
     it "but fails if we get an unknown response code" do
-      mock(HipChat::Room).post(anything, anything) {
-        OpenStruct.new(:code => 403)
-      }
+      allow(room.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 403))
 
       expect { room.send "", "" }.to raise_error(HipChat::Unauthorized)
     end

data/spec/hipchat_api_v2_spec.rb

@@ -29,25 +29,19 @@ describe "HipChat (API V2)" do
     end
 
     it "fails when the room doen't exist" do
-      mock(HipChat::Room).get(anything, anything) {
-        OpenStruct.new(:code => 404)
-      }
+      allow(room.class).to receive(:get).with(anything, anything).and_return(OpenStruct.new(:code => 404))
 
       expect { room.history }.to raise_error(HipChat::UnknownRoom)
     end
 
     it "fails when we're not allowed to do so" do
-      mock(HipChat::Room).get(anything, anything) {
-        OpenStruct.new(:code => 401)
-      }
+      allow(room.class).to receive(:get).with(anything, anything).and_return(OpenStruct.new(:code => 401))
 
       expect { room.history }.to raise_error(HipChat::Unauthorized)
     end
 
     it "fails if we get an unknown response code" do
-      mock(HipChat::Room).get(anything, anything) {
-        OpenStruct.new(:code => 403)
-      }
+      allow(room.class).to receive(:get).with(anything, anything).and_return(OpenStruct.new(:code => 403))
 
       expect { room.history }.to raise_error(HipChat::Unauthorized)
     end
@@ -70,25 +64,19 @@ describe "HipChat (API V2)" do
     end
 
     it "fails when the room doen't exist" do
-      mock(HipChat::Room).get(anything, anything) {
-        OpenStruct.new(:code => 404)
-      }
+      allow(room.class).to receive(:get).with(anything, anything).and_return(OpenStruct.new(:code => 404))
 
       expect { room.statistics }.to raise_error(HipChat::UnknownRoom)
     end
 
     it "fails when we're not allowed to do so" do
-      mock(HipChat::Room).get(anything, anything) {
-        OpenStruct.new(:code => 401)
-      }
+      allow(room.class).to receive(:get).with(anything, anything).and_return(OpenStruct.new(:code => 401))
 
       expect { room.statistics }.to raise_error(HipChat::Unauthorized)
     end
 
     it "fails if we get an unknown response code" do
-      mock(HipChat::Room).get(anything, anything) {
-        OpenStruct.new(:code => 403)
-      }
+      allow(room.class).to receive(:get).with(anything, anything).and_return(OpenStruct.new(:code => 403))
 
       expect { room.statistics }.to raise_error(HipChat::Unauthorized)
     end
@@ -109,25 +97,19 @@ describe "HipChat (API V2)" do
     end
 
     it "fails when the room doesn't exist" do
-      mock(HipChat::Room).put(anything, anything) {
-        OpenStruct.new(:code => 404)
-      }
+      allow(room.class).to receive(:put).with(anything, anything).and_return(OpenStruct.new(:code => 404))
 
       expect { room.topic "" }.to raise_error(HipChat::UnknownRoom)
     end
 
     it "fails when we're not allowed to do so" do
-        mock(HipChat::Room).put(anything, anything) {
-          OpenStruct.new(:code => 401)
-        }
+        allow(room.class).to receive(:put).with(anything, anything).and_return(OpenStruct.new(:code => 401))
 
       expect { room.topic "" }.to raise_error(HipChat::Unauthorized)
     end
 
     it "fails if we get an unknown response code" do
-        mock(HipChat::Room).put(anything, anything) {
-          OpenStruct.new(:code => 403)
-        }
+        allow(room.class).to receive(:put).with(anything, anything).and_return(OpenStruct.new(:code => 403))
 
       expect { room.topic "" }.to raise_error(HipChat::Unauthorized)
     end
@@ -142,25 +124,19 @@ describe "HipChat (API V2)" do
     end
 
     it "but fails when the room doesn't exist" do
-      mock(HipChat::Room).post(anything, anything) {
-        OpenStruct.new(:code => 404)
-      }
+      allow(room.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 404))
 
       expect { room.send_message "" }.to raise_error(HipChat::UnknownRoom)
     end
 
     it "but fails when we're not allowed to do so" do
-      mock(HipChat::Room).post(anything, anything) {
-        OpenStruct.new(:code => 401)
-      }
+      allow(room.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 401))
 
       expect { room.send_message "" }.to raise_error(HipChat::Unauthorized)
     end
 
     it "but fails if we get an unknown response code" do
-      mock(HipChat::Room).post(anything, anything) {
-        OpenStruct.new(:code => 403)
-      }
+      allow(room.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 403))
 
       expect { room.send_message "" }.to raise_error(HipChat::Unauthorized)
     end
@@ -204,17 +180,13 @@ describe "HipChat (API V2)" do
     end
 
     it "but fails when the room doesn't exist" do
-      mock(HipChat::Room).post(anything, anything) {
-        OpenStruct.new(:code => 404)
-      }
+      allow(room.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 404))
 
       expect { room.send "", "" }.to raise_error(HipChat::UnknownRoom)
     end
 
     it "but fails when we're not allowed to do so" do
-      mock(HipChat::Room).post(anything, anything) {
-        OpenStruct.new(:code => 401)
-      }
+      allow(room.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 401))
 
       expect { room.send "", "" }.to raise_error(HipChat::Unauthorized)
     end
@@ -224,9 +196,7 @@ describe "HipChat (API V2)" do
     end
 
     it "but fails if we get an unknown response code" do
-      mock(HipChat::Room).post(anything, anything) {
-        OpenStruct.new(:code => 403)
-      }
+      allow(room.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 403))
 
       expect { room.send "", "" }.to raise_error(HipChat::Unauthorized)
     end
@@ -238,36 +208,29 @@ describe "HipChat (API V2)" do
     it "successfully" do
       mock_successful_link_share 'Dude', 'Sloth love Chunk!', link
 
-      room.share_link("Dude", "Sloth love Chunk!", link).should be_truthy
+      expect(room.share_link("Dude", "Sloth love Chunk!", link)).to be_truthy
     end
 
     it "but fails when the room doesn't exist" do
-      mock(HipChat::Room).post(anything, anything) {
-        OpenStruct.new(:code => 404)
-      }
+      allow(room.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 404))
 
-      lambda { room.share_link "", "", link }.should raise_error(HipChat::UnknownRoom)
+      expect(lambda { room.share_link "", "", link }).to raise_error(HipChat::UnknownRoom)
     end
 
     it "but fails when we're not allowed to do so" do
-      mock(HipChat::Room).post(anything, anything) {
-        OpenStruct.new(:code => 401)
-      }
+      allow(room.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 401))
 
-      lambda { room.share_link "", "", link }.should raise_error(HipChat::Unauthorized)
+      expect(lambda { room.share_link "", "", link }).to raise_error(HipChat::Unauthorized)
     end
 
     it "but fails if the username is more than 15 chars" do
-      lambda { room.share_link "a very long username here", "a message", link }.should raise_error(HipChat::UsernameTooLong)
+      expect(lambda { room.share_link "a very long username here", "a message", link }).to raise_error(HipChat::UsernameTooLong)
     end
 
     it "but fails if we get an unknown response code" do
-      mock(HipChat::Room).post(anything, anything) {
-        OpenStruct.new(:code => 403)
-      }
+      allow(room.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 403))
 
-      lambda { room.share_link "", "", link }.
-        should raise_error(HipChat::Unauthorized)
+      expect(lambda { room.share_link "", "", link }).to raise_error(HipChat::Unauthorized)
     end
   end
 
@@ -286,36 +249,29 @@ describe "HipChat (API V2)" do
     it "successfully" do
       mock_successful_file_send 'Dude', 'Hello world', file
 
-      room.send_file("Dude", "Hello world", file).should be_truthy
+      expect(room.send_file("Dude", "Hello world", file)).to be_truthy
     end
 
     it "but fails when the room doesn't exist" do
-      mock(HipChat::Room).post(anything, anything) {
-        OpenStruct.new(:code => 404)
-      }
+      allow(room.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 404))
 
-      lambda { room.send_file "", "", file }.should raise_error(HipChat::UnknownRoom)
+      expect(lambda { room.send_file "", "", file }).to raise_error(HipChat::UnknownRoom)
     end
 
     it "but fails when we're not allowed to do so" do
-      mock(HipChat::Room).post(anything, anything) {
-        OpenStruct.new(:code => 401)
-      }
+      allow(room.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 401))
 
-      lambda { room.send_file "", "", file }.should raise_error(HipChat::Unauthorized)
+      expect(lambda { room.send_file "", "", file }).to raise_error(HipChat::Unauthorized)
     end
 
     it "but fails if the username is more than 15 chars" do
-      lambda { room.send_file "a very long username here", "a message", file }.should raise_error(HipChat::UsernameTooLong)
+      expect(lambda { room.send_file "a very long username here", "a message", file }).to raise_error(HipChat::UsernameTooLong)
     end
 
     it "but fails if we get an unknown response code" do
-      mock(HipChat::Room).post(anything, anything) {
-        OpenStruct.new(:code => 403)
-      }
+      allow(room.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 403))
 
-      lambda { room.send_file "", "", file }.
-        should raise_error(HipChat::Unauthorized)
+      expect(lambda { room.send_file "", "", file }).to raise_error(HipChat::Unauthorized)
     end
   end
 
@@ -447,17 +403,13 @@ describe "HipChat (API V2)" do
     end
 
     it "but fails when the user doesn't exist" do
-      mock(HipChat::User).post(anything, anything) {
-        OpenStruct.new(:code => 404)
-      }
+      allow(user.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 404))
 
       expect { user.send "" }.to raise_error(HipChat::UnknownUser)
     end
 
     it "but fails when we're not allowed to do so" do
-      mock(HipChat::User).post(anything, anything) {
-        OpenStruct.new(:code => 401)
-      }
+      allow(user.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 401))
 
       expect { user.send "" }.to raise_error(HipChat::Unauthorized)
     end
@@ -468,7 +420,7 @@ describe "HipChat (API V2)" do
 
     it 'successfully returns history' do
       mock_successful_user_history
-      user.history.should be_truthy
+      expect(user.history).to be_truthy
     end
 
     it 'has allowed params' do
@@ -489,23 +441,19 @@ describe "HipChat (API V2)" do
     it "successfully with a standard file" do
       mock_successful_user_send_file 'Equal bytes for everyone', file
 
-      user.send_file('Equal bytes for everyone', file).should be_truthy
+      expect(user.send_file('Equal bytes for everyone', file)).to be_truthy
     end
 
     it "but fails when the user doesn't exist" do
-      mock(HipChat::User).post(anything, anything) {
-        OpenStruct.new(:code => 404)
-      }
+      allow(user.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 404))
 
-      lambda { user.send_file "", file }.should raise_error(HipChat::UnknownUser)
+      expect(lambda { user.send_file "", file }).to raise_error(HipChat::UnknownUser)
     end
 
     it "but fails when we're not allowed to do so" do
-      mock(HipChat::User).post(anything, anything) {
-        OpenStruct.new(:code => 401)
-      }
+      allow(user.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 401))
 
-      lambda { user.send_file "", file }.should raise_error(HipChat::Unauthorized)
+      expect(lambda { user.send_file "", file }).to raise_error(HipChat::Unauthorized)
     end
   end
 
@@ -519,36 +467,29 @@ describe "HipChat (API V2)" do
     end
 
     it "but fails when the room doesn't exist" do
-      mock(HipChat::Room).post(anything, anything) {
-        OpenStruct.new(:code => 404)
-      }
+      allow(room.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 404))
 
-      lambda { room.create_webhook('https://example.org/hooks/awesome', 'room_enter') }.should raise_error(HipChat::UnknownRoom)
+      expect(lambda { room.create_webhook('https://example.org/hooks/awesome', 'room_enter') }).to raise_error(HipChat::UnknownRoom)
     end
 
     it "but fails when we're not allowed to do so" do
-      mock(HipChat::Room).post(anything, anything) {
-        OpenStruct.new(:code => 401)
-      }
+      allow(room.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 401))
 
-      lambda { room.create_webhook('https://example.org/hooks/awesome', 'room_enter') }.should raise_error(HipChat::Unauthorized)
+      expect(lambda { room.create_webhook('https://example.org/hooks/awesome', 'room_enter') }).to raise_error(HipChat::Unauthorized)
     end
 
     it "but fails if the url is invalid" do
-      lambda { room.create_webhook('foo://bar.baz/', 'room_enter') }.should raise_error(HipChat::InvalidUrl)
+      expect(lambda { room.create_webhook('foo://bar.baz/', 'room_enter') }).to raise_error(HipChat::InvalidUrl)
     end
 
     it "but fails if the event is invalid" do
-      lambda { room.create_webhook('https://example.org/hooks/awesome', 'room_vandalize') }.should raise_error(HipChat::InvalidEvent)
+      expect(lambda { room.create_webhook('https://example.org/hooks/awesome', 'room_vandalize') }).to raise_error(HipChat::InvalidEvent)
     end
 
     it "but fails if we get an unknown response code" do
-      mock(HipChat::Room).post(anything, anything) {
-        OpenStruct.new(:code => 403)
-      }
+      allow(room.class).to receive(:post).with(anything, anything).and_return(OpenStruct.new(:code => 403))
 
-      lambda { room.create_webhook('https://example.org/hooks/awesome', 'room_enter') }.
-        should raise_error(HipChat::Unauthorized)
+      expect(lambda { room.create_webhook('https://example.org/hooks/awesome', 'room_enter') }).to raise_error(HipChat::Unauthorized)
     end
   end
 
@@ -562,28 +503,21 @@ describe "HipChat (API V2)" do
     end
 
     it "but fails when the webhook doesn't exist" do
-      mock(HipChat::Room).delete(anything, anything) {
-        OpenStruct.new(:code => 404)
-      }
+      allow(room.class).to receive(:delete).with(anything, anything).and_return(OpenStruct.new(:code => 404))
 
-      lambda { room.delete_webhook('my_awesome_webhook') }.should raise_error(HipChat::UnknownWebhook)
+      expect(lambda { room.delete_webhook('my_awesome_webhook') }).to raise_error(HipChat::UnknownWebhook)
     end
 
     it "but fails when we're not allowed to do so" do
-      mock(HipChat::Room).delete(anything, anything) {
-        OpenStruct.new(:code => 401)
-      }
+      allow(room.class).to receive(:delete).with(anything, anything).and_return(OpenStruct.new(:code => 401))
 
-      lambda { room.delete_webhook('my_awesome_webhook') }.should raise_error(HipChat::Unauthorized)
+      expect(lambda { room.delete_webhook('my_awesome_webhook') }).to raise_error(HipChat::Unauthorized)
     end
 
     it "but fails if we get an unknown response code" do
-      mock(HipChat::Room).delete(anything, anything) {
-        OpenStruct.new(:code => 403)
-      }
+      allow(room.class).to receive(:delete).with(anything, anything).and_return(OpenStruct.new(:code => 403))
 
-      lambda { room.delete_webhook('my_awesome_webhook') }.
-        should raise_error(HipChat::Unauthorized)
+      expect(lambda { room.delete_webhook('my_awesome_webhook') }).to raise_error(HipChat::Unauthorized)
     end
   end
 
@@ -597,28 +531,21 @@ describe "HipChat (API V2)" do
     end
 
     it "but fails when the room doesn't exist" do
-      mock(HipChat::Room).get(anything, anything) {
-        OpenStruct.new(:code => 404)
-      }
+      allow(room.class).to receive(:get).with(anything, anything).and_return(OpenStruct.new(:code => 404))
 
-      lambda { room.get_all_webhooks }.should raise_error(HipChat::UnknownRoom)
+      expect(lambda { room.get_all_webhooks }).to raise_error(HipChat::UnknownRoom)
     end
 
     it "but fails when we're not allowed to do so" do
-      mock(HipChat::Room).get(anything, anything) {
-        OpenStruct.new(:code => 401)
-      }
+      allow(room.class).to receive(:get).with(anything, anything).and_return(OpenStruct.new(:code => 401))
 
-      lambda { room.get_all_webhooks }.should raise_error(HipChat::Unauthorized)
+      expect(lambda { room.get_all_webhooks }).to raise_error(HipChat::Unauthorized)
     end
 
     it "but fails if we get an unknown response code" do
-      mock(HipChat::Room).get(anything, anything) {
-        OpenStruct.new(:code => 403)
-      }
+      allow(room.class).to receive(:get).with(anything, anything).and_return(OpenStruct.new(:code => 403))
 
-      lambda { room.get_all_webhooks }.
-        should raise_error(HipChat::Unauthorized)
+      expect(lambda { room.get_all_webhooks }).to raise_error(HipChat::Unauthorized)
     end
   end
 
@@ -632,28 +559,21 @@ describe "HipChat (API V2)" do
     end
 
     it "but fails when the webhook doesn't exist" do
-      mock(HipChat::Room).get(anything, anything) {
-        OpenStruct.new(:code => 404)
-      }
+      allow(room.class).to receive(:get).with(anything, anything).and_return(OpenStruct.new(:code => 404))
 
-      lambda { room.get_webhook('5678') }.should raise_error(HipChat::UnknownWebhook)
+      expect(lambda { room.get_webhook('5678') }).to raise_error(HipChat::UnknownWebhook)
     end
 
     it "but fails when we're not allowed to do so" do
-      mock(HipChat::Room).get(anything, anything) {
-        OpenStruct.new(:code => 401)
-      }
+      allow(room.class).to receive(:get).with(anything, anything).and_return(OpenStruct.new(:code => 401))
 
-      lambda { room.get_webhook('5678') }.should raise_error(HipChat::Unauthorized)
+      expect(lambda { room.get_webhook('5678') }).to raise_error(HipChat::Unauthorized)
     end
 
     it "but fails if we get an unknown response code" do
-      mock(HipChat::Room).get(anything, anything) {
-        OpenStruct.new(:code => 403)
-      }
+      allow(room.class).to receive(:get).with(anything, anything).and_return(OpenStruct.new(:code => 403))
 
-      lambda { room.get_webhook('5678') }.
-        should raise_error(HipChat::Unauthorized)
+      expect(lambda { room.get_webhook('5678') }).to raise_error(HipChat::Unauthorized)
     end
   end
 end

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'hipchat'
 require 'rspec'
-require 'rspec/autorun'
 require 'json'
 require 'webmock/rspec'
 
@@ -13,8 +12,4 @@ rescue LoadError
   warn 'warning: coveralls gem not found; skipping coverage'
 end
 
-Dir["./spec/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-  config.mock_with :rr
-end
+Dir["./spec/support/**/*.rb"].each {|f| require f}

data/tests.py

@@ -0,0 +1,2 @@
+import os
+print os.path.dirname(os.path.realpath(__file__))

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: hipchat
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - HipChat/Atlassian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-28 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mimemagic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.11.1
+        version: 1.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.11.1
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -112,28 +112,42 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 2.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 2.4.2
+- !ruby/object:Gem::Dependency
+  name: tins
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby library to interact with HipChat
@@ -143,12 +157,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".document"
-- ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
-- ".travis.yml"
+- .coveralls.yml
+- .document
+- .gitignore
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.textile
@@ -175,6 +189,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/shared_contexts_for_hipchat.rb
+- tests.py
 homepage: https://github.com/hipchat/hipchat-rb
 licenses:
 - MIT
@@ -185,17 +200,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby library to interact with HipChat