tinder 0.1.9 → 1.1.7

data/CHANGELOG.txt

@@ -1,12 +1,3 @@
-0.1.9
-* Repackaging to include multipart file
-
-0.1.8
-* Get the list of available files [Christopher MacGown]
-* Upload files [Joshua Want]
-* Find rooms even when full [Josh Owens]
-* Join rooms as a guest [Ian Lesperance]
-
 0.1.7 - 2008-07-24
 * Don't join the room when only speaking [Brian Donovan]
 * Added support for HTTP proxies

data/Manifest.txt

@@ -5,6 +5,5 @@ Rakefile
 init.rb
 lib/tinder.rb
 lib/tinder/campfire.rb
-lib/tinder/multipart.rb
 lib/tinder/room.rb
 lib/tinder/version.rb

data/README.txt

@@ -6,15 +6,11 @@ Tinder is a library for interfacing with Campfire, the chat application from 37S
 
   campfire = Campfire.new 'mysubdomain'
   campfire.login 'myemail@example.com', 'mypassword'
-
   room = campfire.create_room 'New Room', 'My new campfire room to test tinder'
   room.rename 'New Room Name'
   room.speak 'Hello world!'
   room.paste "my pasted\ncode"
   room.destroy
-
-  room = campfire.find_room_by_guest_hash 'abc123', 'John Doe'
-  room.speak 'Hello world!'
   
   See the RDoc for more details.
 
@@ -40,4 +36,5 @@ The source for Tinder is available at http://source.collectiveidea.com/public/ti
 == ToDo
 
 * Tests! (unit and remote)
+* Log in via guest url
 * Marshmallow-style integration scripts for exception notification and continuous integration

data/Rakefile

@@ -1,12 +1,5 @@
 require 'rubygems'
 require 'hoe'
-begin
-  require 'spec/rake/spectask'
-rescue LoadError
-  puts 'To use rspec for testing you must install rspec gem:'
-  puts '$ sudo gem install rspec'
-  exit
-end
 require File.join(File.dirname(__FILE__), 'lib', 'tinder', 'version')
 
 # RDOC_OPTS = ['--quiet', '--title', "Tinder",
@@ -28,14 +21,4 @@ hoe = Hoe.new('tinder', ENV['VERSION'] || Tinder::VERSION::STRING) do |p|
   p.changes = p.paragraphs_of('CHANGELOG.txt', 0..1).join("\n\n")
   p.extra_deps << ['activesupport']
   p.extra_deps << ['hpricot']
-  p.extra_deps << ['mime-types']
-end
-
-desc "Run the specs under spec"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
 end
-
-desc "Default task is to run specs"
-task :default => :spec

data/lib/tinder/campfire.rb

@@ -4,13 +4,9 @@ module Tinder
   #
   #   campfire = Tinder::Campfire.new 'mysubdomain'
   #   campfire.login 'myemail@example.com', 'mypassword'
-  #
   #   room = campfire.create_room 'New Room', 'My new campfire room to test tinder'
   #   room.speak 'Hello world!'
   #   room.destroy
-  #
-  #   room = campfire.find_room_by_guest_hash 'abc123', 'John Doe'
-  #   room.speak 'Hello world!'
   class Campfire
     attr_reader :subdomain, :uri
 
@@ -60,10 +56,8 @@ module Tinder
     # 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)
+      Hpricot(get.body).search("//h2/a").collect do |a|
+        Room.new(self, room_id_from_url(a.attributes['href']), a.inner_html)
       end
     end
   
@@ -71,13 +65,6 @@ module Tinder
     def find_room_by_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)
-    end
     
     # Creates and returns a new Room with the given +name+ and optionally a +topic+
     def create_room(name, topic = nil)
@@ -124,10 +111,6 @@ module Tinder
     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 : {})
@@ -138,11 +121,8 @@ module Tinder
     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
+          request.add_field 'Content-Type', 'application/x-www-form-urlencoded'
+          request.set_form_data flatten(data)
         end
       end
     end
@@ -159,11 +139,6 @@ module Tinder
           request.add_field 'X-Requested-With', 'XMLHttpRequest'
           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
     

data/lib/tinder/room.rb

@@ -95,17 +95,8 @@ module Tinder
 
     # 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
+      message if verify_response(post("room/#{id}/speak", {:message => message,
+        :t => Time.now.to_i}.merge(options), :ajax => true), :success)
     end
 
     def paste(message)
@@ -116,7 +107,7 @@ module Tinder
     def users
       @campfire.users name
     end
-
+    
     # 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
@@ -172,22 +163,7 @@ module Tinder
         }
       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
-      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
-    end
-    
+
   protected
     
     def messages

data/lib/tinder/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tinder
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 1.1.7
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-28 00:00:00 -05:00
+date: 2008-07-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,16 +32,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: mime-types
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -50,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 1.7.0
     version: 
 description: An API for interfacing with Campfire, the 37Signals chat application.
 email: brandon@opensoul.org
@@ -70,7 +60,6 @@ files:
 - init.rb
 - lib/tinder.rb
 - lib/tinder/campfire.rb
-- lib/tinder/multipart.rb
 - lib/tinder/room.rb
 - lib/tinder/version.rb
 has_rdoc: true
@@ -96,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tinder
-rubygems_version: 1.3.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: An (unofficial) Campfire API

data/lib/tinder/multipart.rb

@@ -1,64 +0,0 @@
-require 'rubygems'
-require 'mime/types'
-require 'net/http'
-require 'cgi'
-
-module Multipart #:nodoc:
-  # From: http://deftcode.com/code/flickr_upload/multipartpost.rb
-  ## Helper class to prepare an HTTP POST request with a file upload
-  ## Mostly taken from
-  #http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/113774
-  ### WAS:
-  ## Anything that's broken and wrong probably the fault of Bill Stilwell
-  ##(bill@marginalia.org)
-  ### NOW:
-  ## Everything wrong is due to keith@oreilly.com
-
-  class Param #:nodoc:
-    attr_accessor :k, :v
-    def initialize(k, v)
-      @k = k
-      @v = v
-    end
-
-    def to_multipart
-      "Content-Disposition: form-data; name=\"#{k}\"\r\n\r\n#{v}\r\n"
-    end
-  end
-
-  class FileParam #:nodoc:
-    attr_accessor :k, :filename, :content
-    def initialize(k, filename, content)
-      @k = k
-      @filename = filename
-      @content = content
-    end
-
-    def to_multipart
-      "Content-Disposition: form-data; name=\"#{k}\"; filename=\"#{filename}\"\r\n" +
-        "Content-Transfer-Encoding: binary\r\n" +
-        "Content-Type: #{MIME::Types.type_for(@filename)}\r\n\r\n" +
-        @content + "\r\n"
-    end
-  end
-  
-  class MultipartPost #:nodoc:
-    BOUNDARY = 'campfire-is-awesome'
-    HEADER = {"Content-type" => "multipart/form-data, boundary=" + BOUNDARY + " "}
-    TIMEOUT_SECONDS = 30
-
-    attr_accessor :params, :query, :headers
-    def initialize(params)
-      @params = params
-      @query = {}
-      self.prepare_query
-    end
-
-    def prepare_query()
-      @query = @params.map do |k,v|
-        param = v.respond_to?(:read) ? FileParam.new(k, v.path, v.read) : Param.new(k, v)
-        "--#{BOUNDARY}\r\n#{param.to_multipart}"
-      end.join("") + "--#{BOUNDARY}--"
-    end
-  end
-end