tinder 0.1.0 → 0.1.1

data/CHANGELOG.txt

@@ -1,3 +1,7 @@
+0.1.1 - 2007-01-27
+* fix bug preventing speak from working
+* incorporated "watching" from http://soylentfoo.jnewland.com/articles/2006/12/07/updates-to-marshmallow-the-campfire-bot
+
 0.1.0 - 2007-01-23
 * Initial release as gem
 * Get the users in a room [Tero Parviainen]

data/Manifest.txt

@@ -9,3 +9,4 @@ lib/tinder/room.rb
 lib/tinder/version.rb
 test/remote/remote_campfire_test.rb
 test/test_helper.rb
+test/unit/campfire_test.rb

data/lib/tinder/campfire.rb

@@ -92,12 +92,14 @@ module Tinder
     end
 
     def verify_response(response, options = {})
-      if options.is_a? Symbol
-        response.code == case options
-        when :success then "200"
-        end
+      if options.is_a?(Symbol)
+        case options
+        when :success then [200]
+        when :redirect then 300..399
+        else raise ArgumentError.new("Unknown response #{options}")
+        end.include?(response.code.to_i)
       elsif options[:redirect_to]
-        response.code == "302" && response['location'] == options[:redirect_to]
+        verify_response(response, :redirect) && response['location'] == options[:redirect_to]
       else
         false
       end

data/lib/tinder/room.rb

@@ -6,6 +6,15 @@ module Tinder
       @campfire = campfire
       self.id = id
       self.name = name
+      @room = get("room/#{self.id}")
+      @membership_key = @room.body.scan(/\"membershipKey\": \"([a-z0-9]+)\"/).to_s
+      @user_id = @room.body.scan(/\"userID\": (\d+)/).to_s
+      @last_cache_id = @room.body.scan(/\"lastCacheID\": (\d+)/).to_s
+      @timestamp = @room.body.scan(/\"timestamp\": (\d+)/).to_s
+    end
+    
+    def leave
+      verify_response get("/room/#{@room_id}/leave"), :redirect
     end
 
     def toggle_guest_access
@@ -13,7 +22,7 @@ module Tinder
     end
 
     def guest_url
-      (Hpricot(@campfire.send(:get, "room/#{self.id}").body)/"#guest_access h4").first.inner_html
+      (Hpricot(get("room/#{self.id}").body)/"#guest_access h4").first.inner_html
     end
 
     def guest_invite_code
@@ -51,6 +60,40 @@ module Tinder
     def users
        @campfire.users self.name
     end
+    
+    def listen
+      continue = true
+      while(continue)
+        messages = []
+        response = post("poll.fcgi", :l => @last_cache_id, :m => @membership_key, :s => @timestamp, :t => "#{Time.now.to_i}000")
+        if response.body.length > 1
+          lines = response.body.split("\r\n")
+          if lines.length > 0
+            @last_cache_id = lines.pop.scan(/chat.poller.lastCacheID = (\d+)/).to_s
+            lines.each do |msg|
+              unless msg.match(/timestamp_message/)
+                messages << {
+                  :id => msg.scan(/message_(\d+)/).to_s,
+                  :user_id => msg.scan(/user_(\d+)/).to_s,
+                  :person => msg.scan(/<span>(.+)<\/span>/).to_s,
+                  :message => msg.scan(/<div>(.+)<\/div>/).to_s
+                }
+              end
+            end
+          end
+        end
+        if block_given?
+          messages.each do |msg|
+            yield msg
+          end
+          sleep 5
+        else
+          continue = false
+          messages
+        end
+      end
+    end
+    
 
   private
 
@@ -67,7 +110,7 @@ module Tinder
     end
 
     def send(message, options = {})
-      message if verify_response(post("room/#{self.id}/speak", { :message => message, }.merge(options), :ajax => true), :success)
+      message if verify_response(post("room/#{self.id}/speak", { :message => message, :t => Time.now.to_i }.merge(options), :ajax => true), :success)
     end
 
   end

data/lib/tinder/version.rb

@@ -2,7 +2,7 @@ module Tinder #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_helper.rb

@@ -1,4 +1,6 @@
 require 'test/unit'
 require 'rubygems'
 require 'active_support'
-require File.dirname(__FILE__) + '/../lib/tinder.rb'
+require File.dirname(__FILE__) + '/../lib/tinder.rb'
+require 'mocha'
+require 'stubba'

data/test/unit/campfire_test.rb

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class CampfireTest < Test::Unit::TestCase
+  
+  def setup
+    @campfire = Tinder::Campfire.new("foobar")
+    @response = mock("response")
+  end
+  
+  def test_verify_response_redirect_true
+    @response.expects(:code).returns(302)
+    assert true === @campfire.send(:verify_response, @response, :redirect)
+  end
+  
+  def test_verify_response_redirect_false
+    @response.expects(:code).returns(200)
+    assert false === @campfire.send(:verify_response, @response, :redirect)
+  end
+    
+  def test_verify_response_success
+    @response.expects(:code).returns(200)
+    assert true === @campfire.send(:verify_response, @response, :success)
+  end
+
+  def test_verify_response_redirect_to
+    @response.expects(:code).returns(304)
+    @response.expects(:[]).with('location').returns("/foobar")
+    assert true === @campfire.send(:verify_response, @response, :redirect_to => '/foobar')
+  end
+  
+  def test_verify_response_redirect_to_without_redirect
+    @response.expects(:code).returns(200)
+    assert false === @campfire.send(:verify_response, @response, :redirect_to => '/foobar')
+  end
+  
+  def test_verify_response_redirect_to_wrong_path
+    @response.expects(:code).returns(302)
+    @response.expects(:[]).with('location').returns("/baz")
+    assert false === @campfire.send(:verify_response, @response, :redirect_to => '/foobar')
+  end
+  
+  
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: tinder
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-01-23 00:00:00 -05:00
+  version: 0.1.1
+date: 2007-01-27 00:00:00 -05:00
 summary: An (unofficial) Campfire API
 require_paths: 
 - lib
@@ -39,8 +39,10 @@ files:
 - lib/tinder/version.rb
 - test/remote/remote_campfire_test.rb
 - test/test_helper.rb
+- test/unit/campfire_test.rb
 test_files: 
 - test/remote/remote_campfire_test.rb
+- test/unit/campfire_test.rb
 rdoc_options: []
 
 extra_rdoc_files: []