tinder 1.2.2 → 1.3.0

data/README.txt

@@ -1,10 +1,16 @@
 = Tinder - get the Campfire started
 
+
+This branch is a rewrite of Tinder to use the official Campfire API. The API is intended to be backwards compatible so consumers can easily migrate off the HTML API.
+
+-- Joshua Peek (Programmer, 37signals)
+
+
 Tinder is a library for interfacing with Campfire, the chat application from 37Signals. Unlike Marshmallow, it is designed to be a full-featured API (since 37Signals doesn't provide a real one), allowing you to programatically manage and speak/listen in chat rooms.
 
 == Usage
 
-  campfire = Campfire.new 'mysubdomain'
+  campfire = Tinder::Campfire.new 'mysubdomain'
   campfire.login 'myemail@example.com', 'mypassword'
 
   room = campfire.create_room 'New Room', 'My new campfire room to test tinder'

data/Rakefile

@@ -9,14 +9,10 @@ begin
     gem.homepage = 'http://github.com/collectiveidea/tinder'
     gem.rubyforge_project = "tinder"
     gem.add_dependency "activesupport"
-    gem.add_dependency "hpricot"
     gem.add_dependency "mime-types"
     gem.add_development_dependency "rspec"
   end
   Jeweler::GemcutterTasks.new
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "rdoc"
-  end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.3.0

data/lib/tinder.rb

@@ -4,8 +4,8 @@ require 'uri'
 require 'net/http'
 require 'net/https'
 require 'open-uri'
-require 'hpricot'
 
+require 'tinder/connection'
 require 'tinder/multipart'
 require 'tinder/campfire'
 require 'tinder/room'
@@ -13,4 +13,4 @@ require 'tinder/room'
 module Tinder
   class Error < StandardError; end
   class SSLRequiredError < Error; end
-end
+end

data/lib/tinder/campfire.rb

@@ -1,5 +1,5 @@
 module Tinder
-  
+
   # == Usage
   #
   #   campfire = Tinder::Campfire.new 'mysubdomain'
@@ -12,7 +12,9 @@ module Tinder
   #   room = campfire.find_room_by_guest_hash 'abc123', 'John Doe'
   #   room.speak 'Hello world!'
   class Campfire
-    attr_reader :subdomain, :uri
+    HOST = "campfirenow.com"
+
+    attr_reader :connection, :subdomain, :uri
 
     # Create a new connection to the campfire account with the given +subdomain+.
     #
@@ -24,9 +26,11 @@ module Tinder
     #   c = Tinder::Campfire.new("mysubdomain", :ssl => true)
     def initialize(subdomain, options = {})
       options = { :ssl => false }.merge(options)
+      @connection = Connection.new
       @cookie = nil
       @subdomain = subdomain
-      @uri = URI.parse("#{options[:ssl] ? 'https' : 'http' }://#{subdomain}.campfirenow.com")
+      @uri = URI.parse("#{options[:ssl] ? 'https' : 'http' }://#{subdomain}.#{HOST}")
+      connection.base_uri @uri.to_s
       if options[:proxy]
         uri = URI.parse(options[:proxy])
         @http = Net::HTTP::Proxy(uri.host, uri.port, uri.user, uri.password)
@@ -35,173 +39,68 @@ module Tinder
       end
       @logged_in = false
     end
-    
+
     # Log in to campfire using your +email+ and +password+
-    def login(email, password)
-      unless verify_response(post("login", :email_address => email, :password => password), :redirect_to => url_for(:only_path => false))
-        raise Error, "Campfire login failed"
-      end
-      # ensure that SSL is set if required on this account
-      raise SSLRequiredError, "Your account requires SSL" unless verify_response(get, :success)
+    def login(username, password)
+      connection.basic_auth(username, password)
       @logged_in = true
     end
-    
+
     # Returns true when successfully logged in
     def logged_in?
       @logged_in == true
     end
-  
+
     def logout
-      returning verify_response(get("logout"), :redirect) do |result|
-        @logged_in = !result
-      end
+      connection.default_options.delete(:basic_auth)
+      @logged_in = false
     end
-    
+
     # Get an array of all the available rooms
     # TODO: detect rooms that are full (no link)
     def rooms
-      Hpricot(get.body).search("//div.room").collect do |a|
-        name = a.search("//h2/a").inner_html.strip
-        name = a.search("//h2").inner_html.strip if name.empty?
-        Room.new(self, room_id_from_element(a.attributes['id']), name)
+      connection.get('/rooms.json')['rooms'].map do |room|
+        Room.new(self, room)
       end
     end
-  
+
     # Find a campfire room by name
     def find_room_by_name(name)
-      rooms.detect {|room| room.name == name }
+      rooms.detect { |room| room.name == name }
     end
 
     # Find a campfire room by its guest hash
     def find_room_by_guest_hash(hash, name)
-      res = post(hash, :name => name)
-
-      Room.new(self, room_id_from_url(res['location'])) if verify_response(res, :redirect)
+      rooms.detect { |room| room.guest_invite_code == hash }
     end
-    
+
     # Creates and returns a new Room with the given +name+ and optionally a +topic+
     def create_room(name, topic = nil)
-      find_room_by_name(name) if verify_response(post("account/create/room?from=lobby", {:room => {:name => name, :topic => topic}}, :ajax => true), :success)
+      connection.post('/rooms.json', :body => { :room => { :name => name, :topic => topic } }.to_json)
+      find_room_by_name(name)
     end
-    
+
     def find_or_create_room_by_name(name)
       find_room_by_name(name) || create_room(name)
     end
-    
+
     # List the users that are currently chatting in any room
     def users(*room_names)
-      users = Hpricot(get.body).search("div.room").collect do |room|
-        if room_names.empty? || room_names.include?((room/"h2/a").inner_html)
-          room.search("//li.user").collect { |user| user.inner_html }
-        end
-      end
-      users.flatten.compact.uniq.sort
+      rooms.map(&:users).flatten.compact.uniq.sort
     end
-    
+
     # Get the dates of the available transcripts by room
     #
     #   campfire.available_transcripts
     #   #=> {"15840" => [#<Date: 4908311/2,0,2299161>, #<Date: 4908285/2,0,2299161>]}
     #
     def available_transcripts(room = nil)
-      url = "files%2Btranscripts"
-      url += "?room_id#{room}" if room
-      transcripts = (Hpricot(get(url).body) / ".transcript").inject({}) do |result,transcript|
-        link = (transcript / "a").first.attributes['href']
-        (result[room_id_from_url(link)] ||= []) << Date.parse(link.scan(/\/transcript\/(\d{4}\/\d{2}\/\d{2})/).to_s)
-        result
-      end
-      room ? transcripts[room.to_s] : transcripts
+      raise NotImplementedError
     end
-    
+
     # Is the connection to campfire using ssl?
     def ssl?
       uri.scheme == 'https'
     end
-  
-  private
-  
-    def room_id_from_url(url)
-      url.scan(/room\/(\d*)/).to_s
-    end
-    
-    def room_id_from_element(element)
-      element.split("_").last
-    end
-
-    def url_for(*args)
-      options = {:only_path => true}.merge(args.last.is_a?(Hash) ? args.pop : {})
-      path = args.shift
-      "#{options[:only_path] ? '' : uri}/#{path}"
-    end
-
-    def post(path, data = {}, options = {})
-      perform_request(options) do
-        returning Net::HTTP::Post.new(url_for(path)) do |request|
-          if options[:multipart]
-            request.body = data
-          else
-            request.set_form_data(flatten(data))
-          end
-        end
-      end
-    end
-  
-    def get(path = nil, options = {})
-      perform_request(options) { Net::HTTP::Get.new(url_for(path)) }
-    end
-  
-    def prepare_request(request, options = {})
-      returning request do
-        request.add_field 'User-Agent', "Tinder (http://tinder.rubyforge.org)"
-        request.add_field 'Cookie', @cookie if @cookie
-        request.add_field 'X-Requested-With', 'XMLHttpRequest'
-        if options[:ajax]
-          request.add_field 'X-Prototype-Version', '1.5.1.1'
-        end
-        if options[:multipart]
-          request.add_field 'Content-Type', 'multipart/form-data, boundary=' + Multipart::MultipartPost::BOUNDARY + " "
-        else
-          request.add_field 'Content-Type', 'application/x-www-form-urlencoded'
-        end
-      end
-    end
-    
-    def perform_request(options = {}, &block)
-      @request = prepare_request(yield, options)
-      http = @http.new(uri.host, uri.port)
-      http.use_ssl = ssl?
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE if ssl?
-      @response = returning http.request(@request) do |response|
-        @cookie = response['set-cookie'] if response['set-cookie']
-      end
-    end
-  
-    # flatten a nested hash (:room => {:name => 'foobar'} to 'user[name]' => 'foobar')
-    def flatten(params)
-      params = params.dup
-      params.stringify_keys!.each do |k,v| 
-        if v.is_a? Hash
-          params.delete(k)
-          v.each {|subk,v| params["#{k}[#{subk}]"] = v }
-        end
-      end
-    end
-
-    def verify_response(response, options = {})
-      if options.is_a?(Symbol)
-        codes = case options
-        when :success; [200]
-        when :redirect; 300..399
-        else raise(ArgumentError, "Unknown response #{options}")
-        end
-        codes.include?(response.code.to_i)
-      elsif options[:redirect_to]
-        verify_response(response, :redirect) && response['location'] == options[:redirect_to]
-      else
-        false
-      end
-    end
-    
   end
 end

data/lib/tinder/connection.rb

@@ -0,0 +1,21 @@
+require 'httparty'
+
+module Tinder
+  class Connection
+    def initialize
+      class << self
+        include HTTParty
+
+        headers 'Content-Type' => 'application/json'
+      end
+    end
+
+    def metaclass
+      class << self; self; end
+    end
+
+    def method_missing(*args, &block)
+      metaclass.send(*args, &block)
+    end
+  end
+end

data/lib/tinder/multipart.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'mime/types'
 require 'net/http'
 require 'cgi'
@@ -41,7 +40,7 @@ module Multipart #:nodoc:
         @content + "\r\n"
     end
   end
-  
+
   class MultipartPost #:nodoc:
     BOUNDARY = 'campfire-is-awesome'
     HEADER = {"Content-type" => "multipart/form-data, boundary=" + BOUNDARY + " "}

data/lib/tinder/room.rb

@@ -3,118 +3,96 @@ module Tinder
   class Room
     attr_reader :id, :name
 
-    def initialize(campfire, id, name = nil)
+    def initialize(campfire, attributes = {})
       @campfire = campfire
-      @id = id
-      @name = name
+      @id = attributes['id']
+      @name = attributes['name']
+      @loaded = false
     end
-    
+
     # Join the room. Pass +true+ to join even if you've already joined.
     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\":\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
-      true
-    end
-    
+      post 'join'
+    end
+
     # Leave a room
     def leave
-      returning verify_response(post("room/#{id}/leave"), :redirect) do
-        @room, @membership_key, @user_id, @last_cache_id, @timestamp, @idle_since = nil
-      end
+      post 'leave'
     end
 
     # Toggle guest access on or off
     def toggle_guest_access
-      # re-join the room to get the guest url
-      verify_response(post("room/#{id}/toggle_guest_access"), :success) && join(true)
+      raise NotImplementedError
     end
 
     # Get the url for guest access
     def guest_url
-      join
-      link = (Hpricot(@room.body)/"#guest_access h4").first
-      link.inner_html if link
+      if guest_access_enabled?
+        "http://#{@campfire.subdomain}.campfirenow.com/#{guest_invite_code}"
+      else
+        nil
+      end
     end
-    
+
     def guest_access_enabled?
-      !guest_url.nil?
+      load
+      @open_to_guests ? true : false
     end
 
     # The invite code use for guest
     def guest_invite_code
-      guest_url.scan(/\/(\w*)$/).to_s
+      load
+      @active_token_value
     end
 
     # Change the name of the room
     def name=(name)
-      @name = name if verify_response(post("account/edit/room/#{id}", { :room => { :name => name }}, :ajax => true), :success)
+      connection.post("/room/#{@id}.json", :body => { :room => { :name => name } })
     end
     alias_method :rename, :name=
 
     # Change the topic
     def topic=(topic)
-      topic if verify_response(post("room/#{id}/change_topic", { 'room' => { 'topic' => topic }}, :ajax => true), :success)
+      connection.post("/room/#{@id}.json", :body => { :room => { :topic => name } })
     end
-    
+
     # Get the current topic
     def topic
-      join
-      h = (Hpricot(@room.body)/"#topic")
-      if h
-        (h/:span).remove
-        h.inner_text.strip
-      end
+      load
+      @topic
     end
-    
+
     # Lock the room to prevent new users from entering and to disable logging
     def lock
-      verify_response(post("room/#{id}/lock", {}, :ajax => true), :success)
+      post :lock
     end
 
     # Unlock the room
     def unlock
-      verify_response(post("room/#{id}/unlock", {}, :ajax => true), :success)
+      post :unlock
     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
+      raise NotImplementedError
     end
 
     def destroy
-      verify_response(post("account/delete/room/#{id}"), :success)
+      raise NotImplementedError
     end
 
     # Post a new message to the chat room
     def speak(message, options = {})
-      post_options = {
-        :message => message,
-        :t => Time.now.to_i
-      }.merge(options)
-      
-      post_options.delete(:paste) unless post_options[:paste]
-      response = post("room/#{id}/speak", post_options, :ajax => true)
-        
-      if verify_response(response, :success)
-        message 
-      end
+      send_message(message)
     end
 
     def paste(message)
-      speak message, :paste => true
+      send_message(message, 'PasteMassage')
     end
-    
+
     # Get the list of users currently chatting for this room
     def users
-      @campfire.users name
+      reload!
+      @users
     end
 
     # Get and array of the messages that have been posted to the room. Each
@@ -136,26 +114,22 @@ module Tinder
     #   end
     #
     def listen(interval = 5)
-      join
-      if block_given?
-        catch(:stop_listening) do
-          trap('INT') { throw :stop_listening }
-          loop do
-            ping
-            self.messages.each {|msg| yield msg }
-            sleep interval
-          end
-        end
-      else
-        self.messages
+      require 'yajl/http_stream'
+
+      auth = connection.default_options[:basic_auth]
+      url = URI.parse("http://#{auth[:username]}:#{auth[:password]}@streaming.#{Campfire::HOST}/room/#{@id}/live.json")
+      Yajl::HttpStream.get(url) do |message|
+        { :id => message['id'],
+          :user_id => message['user_id'],
+          :message => message['body'] }
       end
     end
-    
+
     # Get the dates for the available transcripts for this room
     def available_transcripts
-      @campfire.available_transcripts(id)
+      raise NotImplementedError
     end
-    
+
     # Get the transcript for the given date (Returns a hash in the same format as #listen)
     #
     #   room.transcript(room.available_transcripts.first)
@@ -168,79 +142,64 @@ module Tinder
     # 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,
-          # Use the transcript_date to fill in the correct year
-          :timestamp => Time.parse("#{date} #{time}", transcript_date)
-        }
+      url = "/room/#{@id}/transcript/#{transcript_date.to_date.strftime('%Y/%m/%d')}.json"
+      connection.get(url)['messages'].map do |room|
+        { :id => room['id'],
+          :user_id => room['user_id'],
+          :message => room['body'],
+          :timestamp => Time.parse(room['created_at']) }
       end
     end
-    
+
     def upload(filename)
       File.open(filename, "rb") do |file|
-        params = Multipart::MultipartPost.new({'upload' => file, 'submit' => "Upload"})
-        verify_response post("upload.cgi/room/#{@id}/uploads/new", params.query, :multipart => true), :success
+        params = Multipart::MultipartPost.new('upload' => file)
+        connection.post("/room/#{@id}/uploads.json", :body => params.query)
       end
     end
-    
+
     # Get the list of latest files for this room
     def files(count = 5)
-      join
-      (Hpricot(@room.body)/"#file_list li a").to_a[0,count].map do |link|
-        @campfire.send :url_for, link.attributes['href'][1..-1], :only_path => false
-      end
+      connection.get(room_url_for(:uploads))['uploads'].map { |u| u['full_url'] }
     end
-    
-  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
-          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/)
-                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
+
+    protected
+      def load
+        reload! unless @loaded
       end
-    end
-  
-    [:post, :get, :verify_response].each do |method|
-      define_method method do |*args|
-        @campfire.send method, *args
+
+      def reload!
+        attributes = connection.get("/room/#{@id}.json")['room']
+
+        @id = attributes['id']
+        @name = attributes['name']
+        @topic = attributes['topic']
+        @full = attributes['full']
+        @open_to_guests = attributes['open-to-guests']
+        @active_token_value = attributes['active-token-value']
+        @users = attributes['users'].map { |u| u['name'] }
+
+        @loaded = true
       end
-    end
 
+      def send_message(message, type = 'Textmessage')
+        post 'speak', :body => {:message => {:body => message, :type => type}}.to_json
+      end
+
+      def get(action, options = {})
+        connection.get(room_url_for(action), options)
+      end
+
+      def post(action, options = {})
+        connection.post(room_url_for(action), options)
+      end
+
+      def room_url_for(action)
+        "/room/#{@id}/#{action}.json"
+      end
+
+      def connection
+        @campfire.connection
+      end
   end
 end

data/spec/campfire_spec.rb

@@ -1,15 +1,15 @@
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'spec_helper'
 
 describe "Preparing a campfire request" do
   before do
     @campfire = Tinder::Campfire.new("foobar")
     @request = Net::HTTP::Get.new("does_not_matter")
   end
-  
+
   def prepare_request
     @campfire.send(:prepare_request, @request)
   end
-  
+
   it "should return the request" do
     prepare_request.should equal(@request)
   end
@@ -18,14 +18,14 @@ describe "Preparing a campfire request" do
     @campfire.instance_variable_set("@cookie", "foobar")
     prepare_request['Cookie'].should == 'foobar'
   end
-  
+
   it "should set the user agent" do
     prepare_request['User-Agent'].should =~ /^Tinder/
   end
 end
 
 # describe "Performing a campfire request" do
-#   
+#
 #   before do
 #     @response = mock("response")
 #     Net::HTTP.any_instance.stubs(:request).returns(response)
@@ -33,56 +33,56 @@ end
 #     response.expects(:[]).with('set-cookie').and_return('foobar')
 #     @campfire.send(:perform_request) { request }
 #   end
-#   
+#
 #   it "should set cookie" do
 #     @campfire.instance_variable_get("@cookie").should == 'foobar'
 #   end
-#   
+#
 # end
 
 describe "Verifying a 200 response" do
-  
+
   before do
     @campfire = Tinder::Campfire.new("foobar")
     @response = mock("response")
     @response.should_receive(:code).and_return(200)
   end
-  
+
   it "should return true when expecting success" do
     @campfire.send(:verify_response, @response, :success).should equal(true)
   end
-  
+
   it "should return false when expecting a redirect" do
     @campfire.send(:verify_response, @response, :redirect).should equal(false)
   end
-  
+
   it "should return false when expecting a redirect to a specific path" do
     @campfire.send(:verify_response, @response, :redirect_to => '/foobar').should equal(false)
   end
-  
+
 end
 
 describe "Verifying a 302 response" do
-  
+
   before do
     @campfire = Tinder::Campfire.new("foobar")
     @response = mock("response")
     @response.should_receive(:code).and_return(302)
   end
-  
+
   it "should return true when expecting redirect" do
     @campfire.send(:verify_response, @response, :redirect).should equal(true)
   end
-  
+
   it "should return false when expecting success" do
     @campfire.send(:verify_response, @response, :success).should equal(false)
   end
-  
+
   it "should return true when expecting a redirect to a specific path" do
     @response.should_receive(:[]).with('location').and_return("/foobar")
     @campfire.send(:verify_response, @response, :redirect_to => '/foobar').should equal(true)
   end
-  
+
   it "should return false when redirecting to a different path than expected" do
     @response.should_receive(:[]).with('location').and_return("/baz")
     @campfire.send(:verify_response, @response, :redirect_to => '/foobar').should equal(false)
@@ -91,7 +91,7 @@ describe "Verifying a 302 response" do
 end
 
 describe "A failed login" do
-  
+
   before do
     @campfire = Tinder::Campfire.new 'foobar'
     @response = mock("response")
@@ -99,18 +99,18 @@ describe "A failed login" do
     @response.should_receive(:code).and_return("302")
     @response.should_receive(:[]).with("location").and_return("/login")
   end
-  
+
   it "should raise an error" do
     lambda do
       @campfire.login "doesn't", "matter"
     end.should raise_error(Tinder::Error)
   end
-  
+
   it "should not set logged in status" do
     @campfire.login 'foo', 'bar' rescue
     @campfire.logged_in?.should equal(false)
   end
-  
+
 end
 
 describe "Accessing a room with guest access" do
@@ -151,40 +151,40 @@ describe "Accessing a room" do
   end
 
   describe "when the room is full" do
-  
+
     before do
       @html = File.read(File.dirname(__FILE__) + '/html/full_lobby.html')
       @response.stub!(:body).and_return(@html)
       @campfire = Tinder::Campfire.new 'foobar'
     end
-  
+
     it "should return a room" do
       @campfire.rooms.should_not be_empty
     end
-    
+
     it "should find a room by name" do
       @campfire.find_room_by_name("Just Fishin").class.should == Tinder::Room
     end
-  
+
   end
 
   describe "when the room is not full" do
-  
+
     before do
       @html = File.read(File.dirname(__FILE__) + '/html/normal_lobby.html')
       @response.stub!(:body).and_return(@html)
       @campfire = Tinder::Campfire.new 'foobar'
     end
-  
+
     it "should return a room" do
       @campfire.rooms.should_not be_empty
     end
-  
+
     it "should find a room by name" do
        @campfire.find_room_by_name("Just Fishin").class.should == Tinder::Room
      end
   end
-  
+
 end
 
 describe "Accessing a room's transcript" do
@@ -216,7 +216,7 @@ describe "Accessing a room's transcript" do
         @transcript.second[:timestamp].should == Time.parse("2009-05-05 09:35")
       end
   end
- 
+
   describe "when entering the room" do
       it "a transcript message should include the person who entered" do
         @transcript.second[:person].should == "Marcel"

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'rubygems'
 require 'spec'
 require 'tinder'

data/test/remote/remote_campfire_test.rb

@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/credentials'
+require 'test_helper'
+require 'remote/credentials'
 
 class RemoteCampfireTest < Test::Unit::TestCase
-  
+
   def setup
     @subdomain = SUBDOMAIN
     @user, @pass = USER, PASS
@@ -10,7 +10,7 @@ class RemoteCampfireTest < Test::Unit::TestCase
     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
-  
+
   def test_ssl_required
     if @ssl
       campfire = Tinder::Campfire.new @subdomain
@@ -19,32 +19,32 @@ class RemoteCampfireTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_create_and_delete_room
     assert login
     assert @campfire.logged_in?
-    
+
     room = @campfire.create_room("Testing#{Time.now.to_i}")
-    
+
     assert_instance_of Tinder::Room, room
     assert_not_nil room.id
-    
+
     room.name = "new name"
     assert_equal "new name", room.name
-    
+
     room.destroy
     assert_nil @campfire.find_room_by_name(room.name)
-    
+
     assert @campfire.logout
   ensure
     room.destroy rescue nil
   end
-  
+
   def test_failed_login
     assert_raises(Tinder::Error) { @campfire.login(@user, 'notmypassword') }
     assert !@campfire.logged_in?
   end
-  
+
   def test_find_nonexistent_room
     login
     assert_nil @campfire.find_room_by_name('No Room Should Have This Name')
@@ -55,5 +55,5 @@ private
   def login(user = @user, pass = @pass)
     @campfire.login(user, pass)
   end
-  
-end
+
+end

data/test/test_helper.rb

@@ -1,3 +1,2 @@
 require 'test/unit'
-require 'rubygems'
-require File.dirname(__FILE__) + '/../lib/tinder.rb'
+require 'tinder'

data/tinder.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{tinder}
-  s.version = "1.2.2"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brandon Keepers"]
-  s.date = %q{2009-09-12}
+  s.date = %q{2009-12-17}
   s.description = %q{An API for interfacing with Campfire, the 37Signals chat application.}
   s.email = %q{brandon@opensoul.org}
   s.extra_rdoc_files = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "init.rb",
      "lib/tinder.rb",
      "lib/tinder/campfire.rb",
+     "lib/tinder/connection.rb",
      "lib/tinder/multipart.rb",
      "lib/tinder/room.rb",
      "site/index.html",
@@ -44,7 +45,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{tinder}
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{An (unofficial) Campfire API}
   s.test_files = [
     "spec/campfire_spec.rb",
@@ -59,19 +60,17 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<hpricot>, [">= 0"])
       s.add_runtime_dependency(%q<mime-types>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<hpricot>, [">= 0"])
       s.add_dependency(%q<mime-types>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<hpricot>, [">= 0"])
     s.add_dependency(%q<mime-types>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tinder
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-12 00:00:00 -04:00
+date: 2009-12-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,16 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: hpricot
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
   type: :runtime
@@ -70,6 +60,7 @@ files:
 - init.rb
 - lib/tinder.rb
 - lib/tinder/campfire.rb
+- lib/tinder/connection.rb
 - lib/tinder/multipart.rb
 - lib/tinder/room.rb
 - site/index.html
@@ -108,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tinder
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: An (unofficial) Campfire API