hipchat 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b14a3d503b8dd0e2328c0428d84ce558d8610997
-  data.tar.gz: 149915edf47032db069730107a43b85e00a57dfe
+  metadata.gz: be4faa179685cdd34630559010e1f4f8433d12d2
+  data.tar.gz: ceb3933c95e331a8735199c0cf3f284bfdad078c
 SHA512:
-  metadata.gz: 2bc937a5155d8c7c7b5f666fec0bec676b26517a8c3b5834faafffa0097b8faab3d742fd66f521ebca98325aadd94c6d8acc7483c69393fb5fc45446ebb57051
-  data.tar.gz: 3f03b59bb670761e06120cfc91e84e497b20418e7e9c7aa9b29d60ed1a14cfe73fbe0de0fd453f7be17b07d2beebb5d046e8639eb69fb3771671f5a664fbf848
+  metadata.gz: 6a0d5ce3f382e4ac4a4b04890361e92d7a886570752c21567c6e74c163e67b8873e15be661fc321f4c5267fd203d36dcb29a4815e22feabda17c22308862a871
+  data.tar.gz: 0b75dfbccbff349ca3eab259b458da322a7cc9875d0cba17fcf69183d37549231d175a9302d173083138503d6f4933e4be24ebc2027cc55c2cf1457ba8d61c69

data/.gitignore

@@ -22,7 +22,7 @@ pkg
 .bundle
 .config
 .yardoc
-Gemfile.lock
+/Gemfile.lock
 InstalledFiles
 _yardoc
 doc/

data/.travis.yml

@@ -5,5 +5,3 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-
-script: bundle exec rspec spec

data/README.textile

@@ -9,6 +9,7 @@ h2. Build Status
 h2. Usage
 
 bc.. client = HipChat::Client.new(api_token)
+# 'username' is the name for which the message will be presented as from
 client['my room'].send('username', 'I talk')
 
 # Send notifications to users (default false)

data/Rakefile

@@ -1,4 +1,10 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = 'spec/**/*_spec.rb'
+  t.rspec_opts = '-c -fd'
+end
 
 task :default => :spec
 

data/hipchat.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "webmock"
+  spec.add_development_dependency 'rdoc', '> 2.4.2'
 end

data/lib/hipchat.rb

@@ -16,8 +16,11 @@ module HipChat
     base_uri 'https://api.hipchat.com/v1/rooms'
     format :json
 
-    def initialize(token)
+    def initialize(token, options={})
       @token = token
+
+      http_proxy = options[:http_proxy] || ENV['http_proxy']
+      setup_proxy(http_proxy) if http_proxy
     end
 
     def rooms
@@ -28,6 +31,16 @@ module HipChat
     def [](name)
       Room.new(@token, :room_id => name)
     end
+
+    private
+    def setup_proxy(proxy_url)
+      proxy_url = URI.parse(proxy_url)
+
+      self.class.http_proxy(proxy_url.host, proxy_url.port,
+                            proxy_url.user, proxy_url.password)
+      HipChat::Room.http_proxy(proxy_url.host, proxy_url.port,
+                               proxy_url.user, proxy_url.password)
+    end
   end
 
   class Room < OpenStruct

data/lib/hipchat/version.rb

@@ -1,3 +1,3 @@
 module HipChat
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/spec/hipchat_spec.rb

@@ -172,4 +172,38 @@ describe HipChat do
         should raise_error(HipChat::UnknownResponseCode)
     end
   end
+
+  describe 'http_proxy' do
+    let(:proxy_user) { 'proxy_user' }
+    let(:proxy_pass) { 'proxy_pass' }
+    let(:proxy_host) { 'proxy.example.com' }
+    let(:proxy_port) { 2649 }
+    let(:proxy_url) { "http://#{proxy_user}:#{proxy_pass}@#{proxy_host}:#{proxy_port}" }
+
+    context 'specified by option of constructor' do
+      before do
+        HipChat::Client.new("blah", :http_proxy => proxy_url)
+      end
+
+      subject { HipChat::Client.default_options }
+
+      specify "Client's proxy settings should be changed" do
+        expect(subject[:http_proxyaddr]).to eql(proxy_host)
+        expect(subject[:http_proxyport]).to eql(proxy_port)
+        expect(subject[:http_proxyuser]).to eql(proxy_user)
+        expect(subject[:http_proxypass]).to eql(proxy_pass)
+      end
+
+      describe "Room class's proxy" do
+        subject { HipChat::Room.default_options }
+
+        specify "proxy settings should be changed" do
+          expect(subject[:http_proxyaddr]).to eql(proxy_host)
+          expect(subject[:http_proxyport]).to eql(proxy_port)
+          expect(subject[:http_proxyuser]).to eql(proxy_user)
+          expect(subject[:http_proxypass]).to eql(proxy_pass)
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hipchat
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - HipChat/Atlassian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -94,6 +94,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  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
 description: Ruby library to interact with HipChat
 email:
 - support@hipchat.com
@@ -105,7 +119,6 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.textile
 - Rakefile
@@ -140,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Ruby library to interact with HipChat