tinder 1.2.0 → 1.2.1

data/CHANGELOG.txt

@@ -1,6 +1,9 @@
+1.2.1 - 2009-08-27
+* Fixes for listening after campfire updates [Jordan Byron]
+
 1.2.0 - 2009-01-28
 * Get the list of available files [Christopher MacGown]
-* Upload files [Joshua Want]
+* Upload files [Joshua Wand]
 * Find rooms even when full [Josh Owens]
 * Join rooms as a guest [Ian Lesperance]
 

data/lib/tinder/room.rb

@@ -13,10 +13,10 @@ module Tinder
     def join(force = false)
       @room = returning(get("room/#{id}")) do |room|
         raise Error, "Could not join room" unless verify_response(room, :success)
-        @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
+        @membership_key = room.body.scan(/\"membershipKey\":\s?\"([a-z0-9]+)\"/).to_s
+        @user_id = room.body.scan(/\"userID\":\s?(\d+)/).to_s
+        @last_cache_id = room.body.scan(/\"lastCacheID\":\s?(\d+)/).to_s
+        @timestamp = room.body.scan(/\"timestamp\":\s?(\d+)/).to_s
         @idle_since = Time.now
       end if @room.nil? || force
       ping
@@ -159,16 +159,36 @@ module Tinder
     # Get the transcript for the given date (Returns a hash in the same format as #listen)
     #
     #   room.transcript(room.available_transcripts.first)
-    #   #=> [{:message=>"foobar!", :user_id=>"99999", :person=>"Brandon", :id=>"18659245"}]
+    #   #=> [{:message=>"foobar!",
+    #         :user_id=>"99999",
+    #         :person=>"Brandon",
+    #         :id=>"18659245",
+    #         :timestamp=>=>Tue May 05 07:15:00 -0700 2009}]
     #
-    def transcript(date)
-      (Hpricot(get("room/#{id}/transcript/#{date.to_date.strftime('%Y/%m/%d')}").body) / ".message").collect do |message|
+    # The timestamp slot will typically have a granularity of five minutes.
+    #
+    def transcript(transcript_date)
+      url = "room/#{id}/transcript/#{transcript_date.to_date.strftime('%Y/%m/%d')}"
+      date, time = nil, nil
+      (Hpricot(get(url).body) / ".message").collect do |message|
         person = (message / '.person span').first
+        if !person
+          # No span for enter/leave the room messages
+          person = (message / '.person').first
+        end
         body = (message / '.body div').first
+        if d = (message / '.date span').first
+            date = d.inner_html
+        end
+        if t = (message / '.time div').first
+            time = t.inner_html
+        end
         {:id => message.attributes['id'].scan(/message_(\d+)/).to_s,
           :person => person ? person.inner_html : nil,
           :user_id => message.attributes['class'].scan(/user_(\d+)/).to_s,
-          :message => body ? body.inner_html : nil
+          :message => body ? body.inner_html : nil,
+          # Use the transcript_date to fill in the correct year
+          :timestamp => Time.parse("#{date} #{time}", transcript_date)
         }
       end
     end

data/lib/tinder/version.rb

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

data/test/remote/remote_campfire_test.rb

@@ -1,12 +1,13 @@
 require File.dirname(__FILE__) + '/../test_helper'
+require File.dirname(__FILE__) + '/credentials'
 
 class RemoteCampfireTest < Test::Unit::TestCase
   
   def setup
-    # @subdomain = 'domain'
-    # @user, @pass = 'email@example.com', 'password'
-    @ssl = false
-    raise "Set your campfire credentials before running the remote tests" unless @user && @pass && @subdomain
+    @subdomain = SUBDOMAIN
+    @user, @pass = USER, PASS
+    @ssl = SSL
+    raise "Set your campfire credentials in /test/remote/credentials.rb before running the remote tests" unless @user && @pass && @subdomain
     @campfire = Tinder::Campfire.new @subdomain, :ssl => @ssl
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tinder
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-28 00:00:00 -05:00
+date: 2009-09-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 2.0.0
     version: 
 description: An API for interfacing with Campfire, the 37Signals chat application.
 email: brandon@opensoul.org
@@ -75,6 +75,8 @@ files:
 - lib/tinder/version.rb
 has_rdoc: true
 homepage: http://tinder.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -96,9 +98,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tinder
-rubygems_version: 1.3.1
+rubygems_version: 1.3.3
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: An (unofficial) Campfire API
 test_files: 
 - test/remote/remote_campfire_test.rb