camper_van 0.0.7 → 0.0.8

data/Gemfile.lock

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

data/README.md

@@ -53,6 +53,9 @@ Connect, and `/LIST` will show you the irc channels / campfire rooms you
 have access to. To connect to more than one subdomain, make a separate
 connection for each.
 
+Your campfire subdomain should be just the subdomain part. If your campfire url
+is `mycompany.campfirenow.com`, your subdomain would be `mycompany`.
+
 ## Development
 
 CamperVan uses:
@@ -66,7 +69,7 @@ CamperVan uses:
 
 ## License
 
-See LICENSE for details.
+MIT, See LICENSE for details.
 
 ## Contributing
 

data/lib/camper_van/channel.rb

@@ -309,7 +309,7 @@ module CamperVan
           users.delete user.id
 
         when "Paste"
-          lines = message.body.split("\n")
+          lines = message.body.split(/\n|\r\n|\r/)
 
           lines[0..2].each do |line|
             client.campfire_reply :privmsg, name, channel, ":> " + line
@@ -352,7 +352,9 @@ module CamperVan
             else
               body = message.body
             end
-            client.campfire_reply :privmsg, name, channel, ":" + body
+            body.split(/[\r\n]+/).each do |line|
+              client.campfire_reply :privmsg, name, channel, ":" + line
+            end
           end
 
         when "TopicChange"
@@ -366,7 +368,9 @@ module CamperVan
           end
 
         when "Tweet"
-          client.campfire_reply :privmsg, name, channel, message.body
+          message.body.split(/\n|\r\n|\r/).each do |line|
+            client.campfire_reply :privmsg, name, channel, line
+          end
 
         else
           logger.warn "unknown message #{message.type}: #{message.body}"

data/lib/camper_van/ircd.rb

@@ -95,6 +95,8 @@ module CamperVan
         shutdown
       else
         @subdomain, @api_key = *args.first.split(":")
+        # ignore full "mycompany.campfirenow.com" being set as the subdomain
+        @subdomain = subdomain.split(".").first
       end
     end
 

data/lib/camper_van/version.rb

@@ -1,3 +1,3 @@
 module CamperVan
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/camper_van/channel_spec.rb

@@ -332,6 +332,18 @@ describe CamperVan::Channel do
       @client.sent.last.must_match ":joe!joe@campfire PRIVMSG #test :hello there"
     end
 
+    it "splits text messages on newline and carriage returns" do
+      @channel.map_message_to_irc msg("Text", :body => "hello\n\r\r\nthere")
+      @client.sent[-2].must_match ":joe!joe@campfire PRIVMSG #test :hello"
+      @client.sent[-1].must_match ":joe!joe@campfire PRIVMSG #test :there"
+    end
+
+    it "sends the first few lines, split by newline or carriage return, for a paste" do
+      @channel.map_message_to_irc msg("Paste", :body => "foo\r\nbar\nbaz\nbleh")
+      @client.sent[-4].must_match %r(:joe\S+ PRIVMSG #test :> foo)
+      @client.sent.last.must_match %r(:joe\S+ PRIVMSG #test .*room/10/paste/1234)
+    end
+
     it "sends a privmsg with the pasted url and the first line when a user pastes something" do
       @channel.map_message_to_irc msg("Paste", :body => "foo\nbar\nbaz\nbleh")
       @client.sent.last.must_match %r(:joe\S+ PRIVMSG #test .*room/10/paste/1234)
@@ -481,6 +493,13 @@ describe CamperVan::Channel do
       @client.sent.last.must_match %r(:joe\S+ PRIVMSG #test .*twitter.com/aniero/status/12345.*)
     end
 
+    it "splits on newline or carriage returns in tweets" do
+      body = "hello world\nsays me -- @author, twitter.com/aniero/status/12345.*"
+      @channel.map_message_to_irc msg("Tweet", :body => body)
+      @client.sent[-2].must_match %r(:joe\S+ PRIVMSG #test :hello world)
+      @client.sent.last.must_match %r(:joe\S+ PRIVMSG #test :says.*twitter.com/aniero/status/12345.*)
+    end
+
     # it "sends a notice with the message when the system sends a message"
 
     it "marks the user as away when a user goes idle" do

data/spec/camper_van/ircd_spec.rb

@@ -42,6 +42,12 @@ describe CamperVan::IRCD do
       @server.api_key.must_equal "asdf1234"
     end
 
+    it "only uses the subdomain if a full domain is specified" do
+      @server.handle :pass => ["test.campfirenow.com:asdf1234"]
+      @server.subdomain.must_equal "test"
+      @server.api_key.must_equal "asdf1234"
+    end
+
     it "saves the nickname from the NICK command" do
       @server.handle :nick => ["nathan"]
       @server.nick.must_equal "nathan"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: camper_van
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-17 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -150,10 +150,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -442402109143344785
+      hash: -3050987797857657263
 requirements: []
 rubyforge_project: camper_van
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: An IRC to Campfire bridge