tinder 0.1.4 → 0.1.5

data/CHANGELOG.txt

@@ -1,3 +1,7 @@
+0.1.5 - 2008-01-25
+* Fixed Room#listen, which was broken by latest Campfire deploy
+* Fixed timeout when listening but not speaking that will eventually log you out [Clinton R. Nixon]
+
 0.1.4 - 2007-07-23
 * Support for transcripts
 * Fixed Room#leave, which was broken by a Campfire deployment [Andy Smith]

data/lib/tinder.rb

@@ -6,7 +6,6 @@ require 'net/https'
 require 'open-uri'
 require 'hpricot'
 
-
 Dir[File.join(File.dirname(__FILE__), 'tinder/**/*.rb')].sort.each { |lib| require lib }
 
 module Tinder

data/lib/tinder/campfire.rb

@@ -19,6 +19,7 @@ module Tinder
       @cookie = nil
       @subdomain = subdomain
       @uri = URI.parse("#{options[:ssl] ? 'https' : 'http' }://#{subdomain}.campfirenow.com")
+      @logged_in = false
     end
     
     # Log in to campfire using your +email+ and +password+
@@ -129,7 +130,7 @@ module Tinder
         request.add_field 'Cookie', @cookie if @cookie
         if options[:ajax]
           request.add_field 'X-Requested-With', 'XMLHttpRequest'
-          request.add_field 'X-Prototype-Version', '1.5.0_rc1'
+          request.add_field 'X-Prototype-Version', '1.5.1.1'
         end
       end
     end
@@ -171,4 +172,4 @@ module Tinder
     end
     
   end
-end
+end

data/lib/tinder/room.rb

@@ -17,14 +17,16 @@ module Tinder
         @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
+        @idle_since = Time.now
       end if @room.nil? || force
+      ping
       true
     end
     
     # Leave a room
     def leave
       returning verify_response(post("room/#{id}/leave"), :redirect) do
-        @room, @membership_key, @user_id, @last_cache_id, @timestamp = nil
+        @room, @membership_key, @user_id, @last_cache_id, @timestamp, @idle_since = nil
       end
     end
 
@@ -42,11 +44,13 @@ module Tinder
     end
     
     def guest_access_enabled?
+      join
       !guest_url.nil?
     end
 
     # The invite code use for guest
     def guest_invite_code
+      join
       guest_url.scan(/\/(\w*)$/).to_s
     end
 
@@ -71,19 +75,26 @@ module Tinder
       verify_response(post("room/#{id}/unlock", {}, :ajax => true), :success)
     end
 
+    def ping(force = false)
+      returning verify_response(post("room/#{id}/tabs", { }, :ajax => true), :success) do
+        @idle_since = Time.now
+      end if @idle_since < 1.minute.ago || force
+    end
+
     def destroy
       verify_response(post("account/delete/room/#{id}"), :success)
     end
 
     # Post a new message to the chat room
-    def speak(message)
+    def speak(message, options = {})
       join
-      send message
+      message if verify_response(post("room/#{id}/speak", {:message => message,
+        :t => Time.now.to_i}.merge(options), :ajax => true), :success)
     end
-    
+
     def paste(message)
       join
-      send message, { :paste => true }
+      speak message, :paste => true
     end
     
     # Get the list of users currently chatting for this room
@@ -91,7 +102,7 @@ module Tinder
       @campfire.users name
     end
     
-    # Get and array of the messages that have been posted to the room since you joined. Each
+    # Get and array of the messages that have been posted to the room. Each
     # messages is a hash with:
     # * +:person+: the display name of the person that posted the message
     # * +:message+: the body of the message
@@ -101,46 +112,25 @@ module Tinder
     #   room.listen
     #   #=> [{:person=>"Brandon", :message=>"I'm getting very sleepy", :user_id=>"148583", :id=>"16434003"}]
     #
-    # listen also takes an optional block, which then polls for new messages every 5 seconds
-    # and calls the block for each message.
+    # Called without a block, listen will return an array of messages that have been
+    # posted since you joined. listen also takes an optional block, which then polls
+    # for new messages every 5 seconds and calls the block for each message.
     #
     #   room.listen do |m|
     #     room.speak "#{m[:person]}, Go away!" if m[:message] =~ /Java/i
     #   end
     #
-    def listen
-      # FIXME: this method needs refactored!
+    def listen(interval = 5)
       join
-      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
+      if block_given?
+        loop do
+          ping
+          self.messages.each {|msg| yield msg }
+          sleep interval
         end
+      else
+        self.messages
       end
-      messages
     end
     
     # Get the dates for the available transcripts for this room
@@ -165,8 +155,39 @@ module Tinder
       end
     end
 
-  private
+  protected
+
+    def messages
+      returning [] do |messages|
+        response = post("poll.fcgi", {:l => @last_cache_id, :m => @membership_key,
+          :s => @timestamp, :t => "#{Time.now.to_i}000"}, :ajax => true)
+        if response.body.length > 1
+          # deal with "chat.redirectTo('/');" - relogin
+          join(true) && self.messages if response.body.match('chat\.redirectTo')
 
+          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/)
+                # pull out only the chat.transcript.queueMessage part for now
+                msg = msg.scan(/(chat\.transcript\.queueMessage(?:.+?);)/).to_s
+                if msg.length > 0
+                  messages << {
+                    :id => msg.scan(/message_(\d+)/).to_s,
+                    :user_id => msg.scan(/user_(\d+)/).to_s,
+                    :person => msg.scan(/\\u003Ctd class=\\"person\\"\\u003E(?:\\u003Cspan\\u003E)?(.+?)(?:\\u003C\/span\\u003E)?\\u003C\/td\\u003E/).to_s,
+                    :message => msg.scan(/\\u003Ctd class=\\"body\\"\\u003E\\u003Cdiv\\u003E(.+?)\\u003C\/div\\u003E\\u003C\/td\\u003E/).to_s
+                  }
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  
     def post(*args)
       @campfire.send :post, *args
     end
@@ -179,9 +200,5 @@ module Tinder
       @campfire.send :verify_response, *args
     end
 
-    def send(message, options = {})
-      message if verify_response(post("room/#{id}/speak", { :message => message, :t => Time.now.to_i }.merge(options), :ajax => true), :success)
-    end
-
   end
-end
+end

data/lib/tinder/version.rb

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

data/test/remote/remote_campfire_test.rb

@@ -4,7 +4,7 @@ class RemoteCampfireTest < Test::Unit::TestCase
   
   def setup
     @campfire = Tinder::Campfire.new 'domain'
-    #@user, @pass = 'email@example.com', 'password'
+    # @user, @pass = 'email@example.com', 'password'
     raise "Set your campfire credentials before running the remote tests" unless @user && @pass
   end
   
@@ -29,7 +29,7 @@ class RemoteCampfireTest < Test::Unit::TestCase
   end
   
   def test_failed_login
-    assert !@campfire.login(@user, 'notmypassword')
+    assert_raises(Tinder::Error) { @campfire.login(@user, 'notmypassword') }
     assert !@campfire.logged_in?
   end
   

metadata

@@ -1,84 +1,90 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: tinder
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
-date: 2007-07-23 00:00:00 +03:00
-summary: An (unofficial) Campfire API
-require_paths: 
-- lib
-email: brandon@opensoul.org
-homepage: http://tinder.rubyforge.org
-rubyforge_project: tinder
-description: An API for interfacing with Campfire, the 37Signals chat application.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.1.5
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Brandon Keepers
-files: 
-- CHANGELOG.txt
-- Manifest.txt
-- README.txt
-- Rakefile
-- init.rb
-- lib/tinder.rb
-- lib/tinder/campfire.rb
-- lib/tinder/room.rb
-- lib/tinder/version.rb
-test_files: 
-- test/remote/remote_campfire_test.rb
-- test/unit/room_test.rb
-rdoc_options: 
-- --main
-- README.txt
-extra_rdoc_files: 
-- CHANGELOG.txt
-- Manifest.txt
-- README.txt
-executables: []
-
-extensions: []
-
-requirements: []
+autorequire: 
+bindir: bin
+cert_chain: []
 
+date: 2008-01-25 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.1
+        version: 1.4.0
     version: 
+description: An API for interfacing with Campfire, the 37Signals chat application.
+email: brandon@opensoul.org
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- CHANGELOG.txt
+- Manifest.txt
+- README.txt
+files: 
+- CHANGELOG.txt
+- Manifest.txt
+- README.txt
+- Rakefile
+- init.rb
+- lib/tinder.rb
+- lib/tinder/campfire.rb
+- lib/tinder/room.rb
+- lib/tinder/version.rb
+has_rdoc: true
+homepage: http://tinder.rubyforge.org
+post_install_message: 
+rdoc_options: 
+- --main
+- README.txt
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: tinder
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: An (unofficial) Campfire API
+test_files: 
+- test/remote/remote_campfire_test.rb

data/test/unit/room_test.rb

@@ -1,30 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
-class RoomTest < Test::Unit::TestCase
-  
-  def setup
-    @campfire = Tinder::Campfire.new("foobar")
-    @room = Tinder::Room.new(@campfire, 1, "Room 1")
-  end
-  
-  def test_toggle_guest_access_rejoins_room
-    @response = mock("response")
-    @response.expects(:code).returns("200")
-    @campfire.expects(:post).with('room/1/toggle_guest_access').returns(@response)
-    @campfire.expects(:get).with('room/1').returns(@response)
-    @room.toggle_guest_access
-  end
-  
-  def test_guest_access?
-    mock_response :guest_access_enabled
-    assert @room.guest_access_enabled?
-  end
-  
-private
-
-  def mock_response(response)
-    FakeWeb.register_uri('http://foobar.campfirenow.com/room/1',
-      :file => "#{FIXTURE_DIR}/pages/room/#{response}.html")
-  end
-  
-end