kindling 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/kindling.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kindling}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wal McConnell"]
-  s.date = %q{2009-12-21}
+  s.date = %q{2009-12-24}
   s.description = %q{Ruby wrapper for the 37 Signals Campfire API}
   s.email = %q{wal@contrast.ie}
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "lib/kindling/campfire.rb",
      "lib/kindling/request.rb",
      "test/fixtures/rooms.json",
+     "test/kindling/campfire_test.rb",
      "test/kindling/request_test.rb",
      "test/test_helper.rb"
   ]
@@ -35,7 +36,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Ruby wrapper for the 37 Signals Campfire API}
   s.test_files = [
-    "test/kindling/request_test.rb",
+    "test/kindling/campfire_test.rb",
+     "test/kindling/request_test.rb",
      "test/test_helper.rb"
   ]
 

data/lib/kindling/campfire.rb

@@ -2,26 +2,43 @@ module Kindling
   
   class Campfire
     
-    attr_accessor :api_token, :subdomain, :room_id, :ssl
+    attr_accessor :api_token, :subdomain, :ssl
 
-    def initialize(api_token, subdomain, room_id, ssl=false)
+    def initialize(api_token, subdomain, ssl=false)
       @api_token = api_token
-      @subdomain = subdomain
-      @room_id = room_id
+      @subdomain = subdomain            
       @ssl = ssl
-      rooms
     end
 
     def rooms
       Kindling::Request.rooms(self)
     end
     
-    def speak(message)
-      Kindling::Request.speak(message, self)
+    def speak(room, message)
+      if is_campfire_id?(room)
+        Kindling::Request.speak(message, self, room)
+      else
+        Kindling::Request.speak(message, self, map_room_name(room))
+      end
     end
     
     def credentials
       {:username => @api_token, :password => 'x'}
     end
+  
+    private  
+  
+    def is_campfire_id?(s)
+      s.to_s.match(/\A[+-]?\d+?(\.\d+)?\Z/) == nil ? false : true
+    end  
+  
+    def map_room_name(name)
+      rms = rooms.select{|r| r["name"] == name}
+      unless rms.empty?
+        rms[0]["id"]
+      else
+        raise InvalidRoomName.new(name)
+      end
+    end
   end
 end

data/lib/kindling/request.rb

@@ -16,17 +16,17 @@ class Kindling::Request
     when 404
       raise Kindling::InvalidSubdomain.new(campfire.subdomain)
     when 401
-      raise Kindling::InvalidAPIToken.new(campfire.api_token)      
+      raise Kindling::InvalidAPIToken.new(campfire.api_token)
     when 200
       return response["rooms"]
     end
   end  
   
-  def self.speak(message, campfire)
-    response = post room_url(campfire), :body => {:message => {:body => message, :type => "Textmessage"}}.to_json, :basic_auth => campfire.credentials
+  def self.speak(message, campfire, room_id)
+    response = post(room_url(campfire, room_id), :body => {:message => {:body => message, :type => "Textmessage"}}.to_json, :basic_auth => campfire.credentials)
     case response.code
     when 404
-      raise Kindling::InvalidRoomID.new(campfire.room_id)
+      raise Kindling::InvalidRoomID.new(room_id)
     when 401
       raise Kindling::InvalidAPIToken.new(campfire.api_token)      
     when 200..201
@@ -38,8 +38,8 @@ class Kindling::Request
   
   private 
     
-  def self.room_url(campfire)
-    "#{subdomain(campfire)}/room/#{campfire.room_id}/speak.json"
+  def self.room_url(campfire, room_id)
+    "#{subdomain(campfire)}/room/#{room_id}/speak.json"
   end
   
   def self.rooms_url(campfire)

data/lib/kindling.rb

@@ -3,6 +3,7 @@ module Kindling
   class InvalidSubdomain < StandardError; end
   class InvalidAPIToken < StandardError; end
   class InvalidRoomID < StandardError; end  
+  class InvalidRoomName < StandardError; end    
 end
 
 ['campfire', 'request'].each do |file|

data/test/kindling/campfire_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class CampfireTest < Test::Unit::TestCase
+  context "campfire" do
+    context "with room name" do      
+      setup do
+        @campfire = Kindling::Campfire.new(TEST_API_TOKEN, TEST_SUBDOMAIN)
+      end
+      
+      should "send message if correct name" do
+        Kindling::Request.expects(:rooms).returns(JSON.parse(fixture_file("rooms.json"))["rooms"])
+        Kindling::Request.expects(:speak).with("test message", @campfire, TEST_ROOM_ID)
+        @campfire.speak(TEST_ROOM_NAME, "test message")
+      end        
+    end
+  end
+end

data/test/kindling/request_test.rb

@@ -1,12 +1,12 @@
 require 'test_helper'
 require 'json'
 
+
 class RequestTest < Test::Unit::TestCase
 
-  context "Request" do
+  context "Request no SSL" do
     setup do 
-      stub_rooms_request({:code => 200, :[] =>  JSON.parse(fixture_file("rooms.json"))["rooms"]})         
-      @campfire = Kindling::Campfire.new(TEST_API_TOKEN, TEST_SUBDOMAIN, TEST_ROOM_ID)
+      @campfire = Kindling::Campfire.new(TEST_API_TOKEN, TEST_SUBDOMAIN, false)
     end
 
     context "rooms" do  
@@ -32,29 +32,44 @@ class RequestTest < Test::Unit::TestCase
     end  
 
     context "send message" do  
-      should "send message successfully if 200" do
-        stub_send_message_request('test message', {:code => 200})
-        Kindling::Request.speak("test message", @campfire)
-      end
-      
-      should "send message successfully if 201" do
-        stub_send_message_request('test message', {:code => 201})
-        Kindling::Request.speak("test message", @campfire)
-      end
+
+      context "with room id" do
+        should "send message successfully if 20x" do
+          [200, 201].each do |code|
+            stub_send_message_request('test message', {:code => code})
+            Kindling::Request.speak("test message", @campfire, TEST_ROOM_ID)
+          end
+        end
       
-      should "raise error if invalid room id" do
-        stub_send_message_request('test message', {:code => 404})
-        assert_raises Kindling::InvalidRoomID do
-          Kindling::Request.speak("test message", @campfire)
+        should "raise error if invalid room id" do
+          stub_send_message_request('test message', {:code => 404})
+          assert_raises Kindling::InvalidRoomID do
+            Kindling::Request.speak("test message", @campfire, TEST_ROOM_ID)
+          end
         end
-      end
 
-      should "raise error if invalid API token" do
-        stub_send_message_request('test message', {:code => 401})
-        assert_raises Kindling::InvalidAPIToken do
-          Kindling::Request.speak("test message", @campfire)
+        should "raise error if invalid API token" do
+          stub_send_message_request('test message', {:code => 401})
+          assert_raises Kindling::InvalidAPIToken do
+            Kindling::Request.speak("test message", @campfire, TEST_ROOM_ID)
+          end
         end
       end
     end
+  end  
+  
+  context "Request SSL" do
+    setup do 
+      @campfire = Kindling::Campfire.new(TEST_API_TOKEN, TEST_SUBDOMAIN, true)
+    end
+
+    context "with room id" do
+      should "send message successfully if 20x" do
+        [200, 201].each do |code|
+          stub_send_message_request('test message', {:code => code}, true)
+          Kindling::Request.speak("test message", @campfire, TEST_ROOM_ID)
+        end
+      end
+    end    
   end
-end
+end

data/test/test_helper.rb

@@ -12,17 +12,21 @@ end
 
 TEST_SUBDOMAIN = 'testsubdomain'
 TEST_API_TOKEN = '787654567654323456789098765432345678765432'
-TEST_ROOM_ID = '201712'
+TEST_ROOM_ID = 206877
+TEST_ROOM_NAME = 'Room 3'
 
 def stub_rooms_request(resp)
   response = mock('Net::HTTPResponse', resp)
   Kindling::Request.expects(:get).with("http://#{TEST_SUBDOMAIN}.campfirenow.com/rooms.json", {:basic_auth => {:password => 'x', :username => "#{TEST_API_TOKEN}"}}).returns(response)
 end
 
-def stub_send_message_request(message, resp)
+def stub_send_message_request(message, resp, ssl = false)
   response = mock('Net::HTTPResponse', resp)  
   Kindling::Request.expects(:post).with(
-    "http://#{TEST_SUBDOMAIN}.campfirenow.com/room/#{TEST_ROOM_ID}/speak.json", 
+    "#{ssl ? 'https' : 'http'}://#{TEST_SUBDOMAIN}.campfirenow.com/room/#{TEST_ROOM_ID}/speak.json", 
     :body => {:message => {:body => message, :type => "Textmessage"}}.to_json, 
     :basic_auth => {:password => 'x', :username => "#{TEST_API_TOKEN}"}).returns(response)
 end
+
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kindling
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Wal McConnell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 +00:00
+date: 2009-12-24 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - lib/kindling/campfire.rb
 - lib/kindling/request.rb
 - test/fixtures/rooms.json
+- test/kindling/campfire_test.rb
 - test/kindling/request_test.rb
 - test/test_helper.rb
 has_rdoc: true
@@ -63,5 +64,6 @@ signing_key:
 specification_version: 3
 summary: Ruby wrapper for the 37 Signals Campfire API
 test_files: 
+- test/kindling/campfire_test.rb
 - test/kindling/request_test.rb
 - test/test_helper.rb