hipchat 1.0.1 → 1.1.0

data/spec/spec_helper.rb

@@ -3,9 +3,12 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'hipchat'
 require 'rspec'
 require 'rspec/autorun'
+require 'json'
 require 'webmock/rspec'
 require 'coveralls'
 
+Dir["./spec/support/**/*.rb"].each {|f| require f}
+
 Coveralls.wear!
 
 RSpec.configure do |config|

data/spec/{shared_hipchat.rb → support/shared_contexts_for_hipchat.rb}

@@ -1,3 +1,5 @@
+HISTORY_JSON_PATH = File.expand_path(File.dirname(__FILE__) + '/../example/history.json')
+
 shared_context "HipChatV1" do
   before { @api_version = 'v1'}
   # Helper for mocking room message post requests
@@ -29,15 +31,25 @@ shared_context "HipChatV1" do
 
   def mock_successful_history(options={})
     options = { :date => 'recent', :timezone => 'UTC', :format => 'JSON' }.merge(options)
-    canned_response = File.new File.expand_path(File.dirname(__FILE__) + '/example/history.json')
+    canned_response = File.new(HISTORY_JSON_PATH)
     stub_request(:get, "https://api.hipchat.com/v1/rooms/history").with(:query => {:auth_token => "blah",
                                    :room_id    => "Hipchat",
                                    :date       => options[:date],
                                    :timezone   => options[:timezone],
                                    :format     => options[:format]}).to_return(canned_response)
   end
-  subject { HipChat::Client.new("blah", :api_version => @api_version) }
-  let(:room) { subject["Hipchat"] }
+
+  def mock_successful_room_creation(name, options={})
+    options = {:name => "A Room"}.merge(options)
+    stub_request(:post, "https://api.hipchat.com/v1/rooms/create").with(
+                             :query => {:auth_token => "blah"},
+                             :body  => { :name => name }.merge(options),
+                             :headers => {'Accept' => 'application/json',
+                                          'Content-Type' => 'application/x-www-form-urlencoded'}).to_return(
+                                          :status => 200,
+                                          :body => '{"room": {"room_id": "1234", "name" : "A Room"}}',
+                                          :headers => {})
+  end
 end
 
 shared_context "HipChatV2" do
@@ -54,7 +66,7 @@ shared_context "HipChatV2" do
                                         :color   => options[:color],
                                         :notify  => options[:notify]}.to_json,
                                         :headers => {'Accept' => 'application/json',
-                                                    'Content-Type' => 'application/json'}).to_return(:status => 200, :body => "", :headers => {}) 
+                                                    'Content-Type' => 'application/json'}).to_return(:status => 200, :body => "", :headers => {})
   end
 
   def mock_successful_topic_change(topic, options={})
@@ -70,13 +82,52 @@ shared_context "HipChatV2" do
 
   def mock_successful_history(options={})
     options = { :date => 'recent', :timezone => 'UTC', :format => 'JSON' }.merge(options)
-    canned_response = File.new File.expand_path(File.dirname(__FILE__) + '/example/history.json')
+    canned_response = File.new(HISTORY_JSON_PATH)
     stub_request(:get, "https://api.hipchat.com/v2/room/Hipchat/history").with(:query => {:auth_token => "blah",
                                    :room_id    => "Hipchat",
                                    :date       => options[:date],
                                    :timezone   => options[:timezone],
                                    :format     => options[:format]}).to_return(canned_response)
   end
-  subject { HipChat::Client.new("blah", :api_version => @api_version) }
-  let(:room) { subject["Hipchat"] }
+
+  def mock_successful_room_creation(name, options={})
+    stub_request(:post, "https://api.hipchat.com/v2/room").with(
+                             :query => {:auth_token => "blah"},
+                             :body  => { :name => name }.merge(options).to_json,
+                             :headers => {'Accept' => 'application/json',
+                                          'Content-Type' => 'application/json'}).to_return(
+                                          :status => 201,
+                                          :body => '{"id": "12345", "links": {"self": "https://api.hipchat.com/v2/room/12345"}}',
+                                          :headers => {})
+  end
+
+  def mock_successful_get_room(room_id="1234")
+    stub_request(:get, "https://api.hipchat.com/v2/room/#{room_id}").with(
+      :query => {:auth_token => "blah"},
+      :body => "",
+      :headers => {'Accept' => 'application/json',
+                   'Content-Type' => 'application/json'}).to_return(:status => 200, :body => "{\"id\":\"#{room_id}\"}", :headers => {})
+  end
+
+  def mock_successful_invite(options={})
+    options = {:user_id => "1234"}.merge(options)
+    stub_request(:post, "https://api.hipchat.com/v2/room/Hipchat/invite/#{options[:user_id]}").with(
+      :query => {:auth_token => "blah"},
+      :body  => {
+        :reason => options[:reason]||""
+      }.to_json,
+      :headers => {'Accept' => 'application/json',
+                   'Content-Type' => 'application/json'}).to_return(
+                   :status => 204,
+                   :body => "",
+                   :headers => {})
+  end
+
+  def mock_successful_user_send(message)
+    stub_request(:post, "https://api.hipchat.com/v2/user/12345678/message").with(
+                                   :query   => {:auth_token => "blah"},
+                                   :body    => {:message => "Equal bytes for everyone"},
+                                   :headers => {'Accept' => 'application/json',
+                                                'Content-Type' => 'application/json'}).to_return(:status => 200, :body => "", :headers => {})
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hipchat
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - HipChat/Atlassian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -131,6 +131,8 @@ extra_rdoc_files: []
 files:
 - ".document"
 - ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -143,14 +145,20 @@ files:
 - lib/hipchat/capistrano/tasks/hipchat.rake
 - lib/hipchat/capistrano2.rb
 - lib/hipchat/chef.rb
+- lib/hipchat/client.rb
+- lib/hipchat/errors.rb
 - lib/hipchat/rails3_tasks.rb
 - lib/hipchat/railtie.rb
+- lib/hipchat/room.rb
+- lib/hipchat/user.rb
 - lib/hipchat/version.rb
 - spec/example/history.json
+- spec/hipchat_api_v1_spec.rb
+- spec/hipchat_api_v2_spec.rb
 - spec/hipchat_spec.rb
-- spec/shared_hipchat.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/support/shared_contexts_for_hipchat.rb
 homepage: https://github.com/hipchat/hipchat-rb
 licenses:
 - MIT
@@ -171,14 +179,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Ruby library to interact with HipChat
 test_files:
 - spec/example/history.json
+- spec/hipchat_api_v1_spec.rb
+- spec/hipchat_api_v2_spec.rb
 - spec/hipchat_spec.rb
-- spec/shared_hipchat.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: 
+- spec/support/shared_contexts_for_hipchat.rb