kindling 1.0.0 → 1.0.1

data/README.rdoc

@@ -21,7 +21,7 @@ If using SSL pass true to the third parameter of the Kindling::Campfire construc
 	campfire = Kindling::Campfire.new(API_TOKEN, SUBDOMAIN, true)
 
 === Sending messages
-	capfire.speak(ROOM_ID, 'my message')
+	campfire.speak(ROOM_ID, 'my message')
 	
 ==== Message Types
 The speak method can take an optional third parameter MessageType

data/kindling.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kindling}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wal McConnell"]

data/lib/kindling/request.rb

@@ -1,4 +1,4 @@
-require 'rubygems'
+  require 'rubygems'
 require 'httparty'
 require 'json'
 
@@ -17,6 +17,10 @@ class Kindling::Request
       raise Kindling::InvalidSubdomain.new(campfire.subdomain)
     when 401
       raise Kindling::InvalidAPIToken.new(campfire.api_token)
+    when 405
+      # retry with SSL
+      campfire.ssl = true
+      rooms(campfire)
     when 200
       return response["rooms"]
     end
@@ -29,6 +33,10 @@ class Kindling::Request
       raise Kindling::InvalidRoomID.new(room_id)
     when 401
       raise Kindling::InvalidAPIToken.new(campfire.api_token)      
+    when 405
+      # retry with SSL
+      campfire.ssl = true
+      speak(message, campfire, room_id, type)
     when 200..201
       response
     else

data/test/kindling/request_test.rb

@@ -25,6 +25,12 @@ class RequestTest < Test::Unit::TestCase
         end
       end
 
+      should "retry with SSL if 405" do
+        stub_rooms_request({:code => 405})        
+        stub_rooms_request({:code => 200, :[] =>  JSON.parse(fixture_file("rooms.json"))["rooms"]}, true)       
+        assert_equal [{"name"=>"Room 1", "id"=>201712}, {"name"=>"Room 2", "id"=>298625}, {"name"=>"Room 3", "id"=>206877}], Kindling::Request.rooms(@campfire)
+      end
+
       should "should return rooms list" do
         stub_rooms_request({:code => 200, :[] =>  JSON.parse(fixture_file("rooms.json"))["rooms"]})       
         assert_equal [{"name"=>"Room 1", "id"=>201712}, {"name"=>"Room 2", "id"=>298625}, {"name"=>"Room 3", "id"=>206877}], Kindling::Request.rooms(@campfire)
@@ -54,6 +60,12 @@ class RequestTest < Test::Unit::TestCase
             Kindling::Request.speak("test message", @campfire, TEST_ROOM_ID)
           end
         end
+        
+        should "retry with SSL if 405" do
+          stub_send_message_request('test message', {:code => 405})
+          stub_send_message_request('test message', {:code => 200}, true)
+          Kindling::Request.speak("test message", @campfire, TEST_ROOM_ID)
+        end        
       end
     end
   end  

data/test/test_helper.rb

@@ -15,9 +15,9 @@ TEST_API_TOKEN = '787654567654323456789098765432345678765432'
 TEST_ROOM_ID = 206877
 TEST_ROOM_NAME = 'Room 3'
 
-def stub_rooms_request(resp)
+def stub_rooms_request(resp, ssl = false)
   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)
+  Kindling::Request.expects(:get).with("#{ssl ? 'https' : '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, ssl = false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kindling
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Wal McConnell