camper_van 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    camper_van (0.0.5)
+    camper_van (0.0.6)
       eventmachine (~> 0.12.10)
       firering (~> 1.2.0)
       logging (~> 1.5.1)

data/lib/camper_van/channel.rb

@@ -361,8 +361,9 @@ module CamperVan
           # client.numeric_reply :rpl_topic, channel, ':' + message.body
 
         when "Upload"
-          client.campfire_reply :privmsg, name, channel, ":\01ACTION uploaded " +
-            "https://#{client.subdomain}.campfirenow.com/room/#{room.id}/uploads/#{message.id}/#{message.body}"
+          room.connection.http(:get, "/room/#{message.room_id}/messages/#{message.id}/upload.json") do |data|
+            client.campfire_reply :privmsg, name, channel, ":\01ACTION uploaded " + data[:upload][:full_url]
+          end
 
         when "Tweet"
           # stringify keys since campfire API is inconsistent about it

data/lib/camper_van/version.rb

@@ -1,3 +1,3 @@
 module CamperVan
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/camper_van/channel_spec.rb

@@ -26,6 +26,8 @@ describe CamperVan::Channel do
     attr_writer :users, :topic, :locked, :full, :open_to_guests
     attr_writer :stream
 
+    attr_accessor :connection
+
     def initialize
       @users = []
       @sent = []
@@ -455,8 +457,16 @@ describe CamperVan::Channel do
     end
 
     it "sends a message containing the upload link when a user uploads a file" do
-      @channel.map_message_to_irc msg("Upload", :body => "filename")
-      @client.sent.last.must_match %r(:joe\S+ PRIVMSG #test .*uploads/1234/filename)
+      conn = Class.new do
+        def http(method, url)
+          raise "bad method #{method}" unless method == :get
+          raise "bad url #{url}" unless url == "/room/456/messages/1234/upload.json"
+          yield :upload => {:full_url => "filename"}
+        end
+      end.new
+      @room.connection = conn
+      @channel.map_message_to_irc msg("Upload", :body => "filename", :room_id => 456)
+      @client.sent.last.must_match %r(:joe\S+ PRIVMSG #test .* filename)
     end
 
     it "sends a message containing the tweet url when a user posts a tweet" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: camper_van
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4196066118135228285
+      hash: 3878281362238996625
 requirements: []
 rubyforge_project: camper_van
 rubygems_version: 1.8.24