campy 0.1.2 → 0.1.3

data/.gitignore

@@ -15,5 +15,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.rbenv-version
 .rvmrc
 .rbx/

data/.travis.yml

@@ -7,5 +7,4 @@ rvm:
   - ree
   - rbx-18mode
   - jruby-18mode
-  - ruby-head
   - jruby-head

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-## 0.1.3.dev (unreleased)
+## 0.1.4.dev (unreleased)
+
+
+## 0.1.3 (July 10, 2012)
+
+### New features
+
+* Pull request [#1](https://github.com/fnichol/campy/pull/1): Add option to
+  use Campfire room id rather than room name. ([@mvandenbeuken][])
 
 
 ## 0.1.2 (April 5, 2012)
@@ -21,3 +29,4 @@
 The initial release.
 
 [@fnichol]: https://github.com/fnichol
+[@mvandenbeuken]: https://github.com/mvandenbeuken

data/README.md

@@ -68,6 +68,18 @@ campy.paste "Long pastes are long"
 campy.play "ohmy"
 ```
 
+If you know the room ID and would prefer to use that instead of the name:
+
+```ruby
+require 'campy'
+
+campy = Campy::Room.new(:account => "mysubdomain",
+  :token => "mytoken123", :room_id => "12345")
+campy.speak "Campy says yello"
+campy.paste "Long pastes are long"
+campy.play "ohmy"
+```
+
 Why not use the `campfire.yml` config? Let's do that:
 
 ```ruby

data/campy.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "minitest", "~> 2.12.0"
   gem.add_development_dependency "webmock", "~> 1.8.5"
+  gem.add_development_dependency "simplecov", "~> 0.6.1"
 end

data/lib/campy/room.rb

@@ -31,7 +31,7 @@ module Campy
     def initialize(options = {})
       options = { :ssl => true }.merge(options)
 
-      [:account, :room, :token, :ssl].each do |option|
+      [:account, :room_id, :room, :token, :ssl].each do |option|
         instance_variable_set "@#{option}", options[option]
       end
     end

data/lib/campy/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module Campy
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/campy/room_spec.rb

@@ -1,4 +1,20 @@
 # -*- encoding: utf-8 -*-
+
+# Currently there no support for SimpleCov in Rubinus, see:
+# http://donttreadonme.co.uk/rubinius/2012/02/22.html#message_243
+unless defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
+  require 'simplecov'
+  SimpleCov.adapters.define 'gem' do
+    command_name 'Specs'
+
+    add_filter '/spec/'
+
+    add_group 'Binaries', '/bin/'
+    add_group 'Libraries', '/lib/'
+  end
+  SimpleCov.start 'gem'
+end
+
 require 'minitest/autorun'
 require 'webmock/minitest'
 require 'campy/room'
@@ -46,6 +62,13 @@ describe Campy::Room do
                 :body => fixture("speak").sub(/@@MESSAGE@@/, msg))
   end
 
+  def stub_speak_not_found!(msg, type = 'TextMessage')
+    stub_request(:post, "https://yepyep:X@zubzub.campfirenow.com/room/123456/speak.json").
+      with(:headers => {'Content-Type' => 'application/json'},
+           :body => {:message => {:body => msg, :type => type}}).
+      to_return(:status => 404, :headers => {}, :body => "Not Found")
+  end
+
   def stub_speak_error!(error)
     stub_request(:post, "https://yepyep:X@zubzub.campfirenow.com/room/123456/speak.json").
       with(:headers => {'Content-Type' => 'application/json'}).
@@ -75,6 +98,12 @@ describe Campy::Room do
   describe "#room_id" do
     let(:subject) { Campy::Room.new(opts) }
 
+    it "returns the room_id set in the initializer if it is provided" do
+      room_with_id = Campy::Room.new(opts.merge(:room_id => 654321))
+
+      room_with_id.room_id.must_equal 654321
+    end
+
     it "fetches the room id from the API" do
       stub_rooms!
 
@@ -123,6 +152,12 @@ describe Campy::Room do
       subject.speak("talking about talking").must_equal true
     end
 
+    it "raises a ConnectionError when API does not return HTTP 201" do
+      stub_speak_not_found!("nope")
+
+      proc { subject.speak "nope" }.must_raise(Campy::Room::ConnectionError)
+    end
+
     WRAPPED_ERRORS.each do |error|
       it "wraps #{error} and raises a ConnectionError" do
         stub_speak_error!(error)
@@ -153,6 +188,12 @@ describe Campy::Room do
       subject.paste("big ol long paste\nwith newlines").must_equal true
     end
 
+    it "raises a ConnectionError when API does not return HTTP 201" do
+      stub_speak_not_found!("nope", "PasteMessage")
+
+      proc { subject.paste "nope" }.must_raise(Campy::Room::ConnectionError)
+    end
+
     WRAPPED_ERRORS.each do |error|
       it "wraps #{error} and raises a ConnectionError" do
         stub_speak_error!(error)
@@ -183,6 +224,12 @@ describe Campy::Room do
       subject.play("tada").must_equal true
     end
 
+    it "raises a ConnectionError when API does not return HTTP 201" do
+      stub_speak_not_found!("nope", "SoundMessage")
+
+      proc { subject.play "nope" }.must_raise(Campy::Room::ConnectionError)
+    end
+
     WRAPPED_ERRORS.each do |error|
       it "wraps #{error} and raises a ConnectionError" do
         stub_speak_error!(error)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: campy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70146366979960 !ruby/object:Gem::Requirement
+  requirement: &2155891020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70146366979960
+  version_requirements: *2155891020
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70146366979020 !ruby/object:Gem::Requirement
+  requirement: &2155890340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.12.0
   type: :development
   prerelease: false
-  version_requirements: *70146366979020
+  version_requirements: *2155890340
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70146366978320 !ruby/object:Gem::Requirement
+  requirement: &2155889700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,18 @@ dependencies:
         version: 1.8.5
   type: :development
   prerelease: false
-  version_requirements: *70146366978320
+  version_requirements: *2155889700
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &2155888960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+  type: :development
+  prerelease: false
+  version_requirements: *2155888960
 description: Tiny Campfire Ruby client so you can get on with it.
 email:
 - fnichol@nichol.ca
@@ -81,18 +92,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3617043583867255143
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3617043583867255143
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17