lita-hipchat 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3afeeed54c6b3093fd68a764bdda47a6d925ce4e
-  data.tar.gz: 4bc84ba99ea9bf19751559e8532e8d2d2816da21
+  metadata.gz: 80be126d9118aac2e700c31b23559fbed60ae90e
+  data.tar.gz: 115d3081432b9077665381f9b02e2141f5935dec
 SHA512:
-  metadata.gz: af847c34127057fe05a209e1f3131887f18b7b04da82472f15af56dbb4c893106fc77abc10650fd72530a8cb0cf680795de6a9b3dfd8dfea07458488e31389dd
-  data.tar.gz: 80c197bae7c7b5d1740b82b16e45bacd9115481892dd498acff094a3214e25a14468331f533b131da0a8b8554c1105c7a7dc42fae3e52dfb31ba333193630af8
+  metadata.gz: 5d375ca0fac539d04a6aae0863ec92b3253af71be27fdf91bf8ecd789095d77a875b6b4b4ebed4b9728eaa0af1763d844df70c451bf42659c080d47fd71941cb
+  data.tar.gz: 8e68828a8465e119e0a8d342f15b3361461bc604f147d11e4c1814de2dc50f0322cbe7d8b2d24fbc8c78fee09251d79fd9a707014b1a3346346240880b194049

data/README.md

@@ -50,7 +50,10 @@ end
 
 ## Events
 
-The HipChat adapter will trigger the `:connected` and `:disconnected` events when the robot has connected and disconnected from HipChat, respectively. There is no payload data for either event.
+`:connected` - When the robot has connected to HipChat. No payload.
+`:disconnected` - When the robot has disconnected from HipChat. No payload.
+`:joined` - When the robot joins a room. Payload: `:room`: The String room ID that was joined.
+`:parted` - When the robot parts from a room. Payload: `:room`: The String room ID that was parted from.
 
 ## License
 

data/lib/lita/adapters/hipchat.rb

@@ -10,12 +10,12 @@ module Lita
 
       def initialize(robot)
         super
-
         @connector = Connector.new(robot, config.jid, config.password, debug: debug)
       end
 
       def join(room_id)
         connector.join(muc_domain, room_id)
+        robot.trigger(:joined, room: room_id)
       end
 
       def mention_format(name)
@@ -23,13 +23,14 @@ module Lita
       end
 
       def part(room_id)
+        robot.trigger(:parted, room: room_id)
         connector.part(muc_domain, room_id)
       end
 
       def run
         connector.connect
         robot.trigger(:connected)
-        connector.join_rooms(muc_domain, rooms)
+        rooms.each { |r| join(r) }
         sleep
       rescue Interrupt
         shut_down
@@ -48,12 +49,21 @@ module Lita
       end
 
       def shut_down
+        rooms.each { |r| part(r) }
         connector.shut_down
         robot.trigger(:disconnected)
       end
 
       private
 
+      def rooms
+        if config.rooms == :all
+          connector.list_rooms(muc_domain)
+        else
+          Array(config.rooms)
+        end
+      end
+
       def config
         Lita.config.adapter
       end
@@ -66,13 +76,6 @@ module Lita
         config.muc_domain.nil? ? "conf.hipchat.com" : config.muc_domain.dup
       end
 
-      def rooms
-        if config.rooms == :all
-          connector.list_rooms(muc_domain)
-        else
-          Array(config.rooms)
-        end
-      end
     end
 
     Lita.register_adapter(:hipchat, HipChat)

data/lita-hipchat.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-hipchat"
-  spec.version       = "1.5.0"
+  spec.version       = "1.6.0"
   spec.authors       = ["Jimmy Cuadra"]
   spec.email         = ["jimmy@jimmycuadra.com"]
   spec.description   = %q{A HipChat adapter for Lita.}

data/spec/lita/adapters/hipchat/connector_spec.rb

@@ -5,6 +5,7 @@ describe Lita::Adapters::HipChat::Connector, lita: true do
 
   let(:client) do
     client = instance_double("Jabber::Client")
+    allow(robot).to  receive(:trigger)
     allow(client).to receive(:auth)
     allow(client).to receive(:connect)
     allow(client).to receive(:send)

data/spec/lita/adapters/hipchat_spec.rb

@@ -16,6 +16,7 @@ describe Lita::Adapters::HipChat do
 
   let(:robot) { instance_double("Lita::Robot") }
   let(:connector) { instance_double("Lita::Adapters::HipChat::Connector") }
+  let(:domain) { "conf.hipchat.com" }
 
   it "registers with Lita" do
     expect(Lita.adapters[:hipchat]).to eql(described_class)
@@ -28,9 +29,13 @@ describe Lita::Adapters::HipChat do
   end
 
   describe "#join" do
+    let(:room) { "#foo" }
+    before do
+      allow(robot).to receive(:trigger).with(:joined, room: room)
+    end
     it "joins a room" do
-      expect(subject.connector).to receive(:join).with("conf.hipchat.com", "#foo")
-      subject.join("#foo")
+      expect(subject.connector).to receive(:join).with(domain, room)
+      subject.join(room)
     end
   end
 
@@ -41,17 +46,23 @@ describe Lita::Adapters::HipChat do
   end
 
   describe "#part" do
+    let(:room) { "#foo" }
+    before do
+      allow(robot).to receive(:trigger).with(:parted, room: room)
+    end
     it "parts from a room" do
-      expect(subject.connector).to receive(:part).with("conf.hipchat.com", "#foo")
-      subject.part("#foo")
+      expect(subject.connector).to receive(:part).with(domain, room)
+      subject.part(room)
     end
   end
 
   describe "#run" do
+    let(:rooms) { ["room_1_id", "room_2_id"] }
+
     before do
       allow(subject.connector).to receive(:connect)
       allow(robot).to receive(:trigger)
-      allow(subject.connector).to receive(:join_rooms)
+      allow(subject.connector).to receive(:join)
       allow(subject).to receive(:sleep)
     end
 
@@ -61,24 +72,31 @@ describe Lita::Adapters::HipChat do
       subject.run
     end
 
-    it "joins rooms with a custom muc_domain" do
-      Lita.config.adapter.muc_domain = "foo.bar.com"
-      expect(subject.connector).to receive(:join_rooms).with("foo.bar.com", anything)
-      subject.run
+    context "with a custom domain" do
+      let(:domain) { "foo.bar.com" }
+      it "joins rooms with a custom muc_domain" do
+        Lita.config.adapter.muc_domain = domain
+        allow(subject).to receive(:rooms).and_return(rooms)
+        expect(subject.connector).to receive(:join).with(domain, anything)
+        subject.run
+      end
     end
 
     it "joins all rooms when config.rooms is :all" do
-      rooms = ["room_1_id", "room_2_id"]
       Lita.config.adapter.rooms = :all
-      allow(subject.connector).to receive(:list_rooms).with("conf.hipchat.com").and_return(rooms)
-      expect(subject.connector).to receive(:join_rooms).with("conf.hipchat.com", rooms)
+      allow(subject.connector).to receive(:list_rooms).with(domain).and_return(rooms)
+      rooms.each do |room|
+        expect(subject).to receive(:join).with(room)
+      end
       subject.run
     end
 
     it "joins rooms specified by config.rooms" do
-      custom_rooms = ["my_room_1_id", "my_room_2_id"]
+      custom_rooms = rooms
       Lita.config.adapter.rooms = custom_rooms
-      expect(subject.connector).to receive(:join_rooms).with("conf.hipchat.com",custom_rooms)
+      rooms.each do |room|
+        expect(subject).to receive(:join).with(room)
+      end
       subject.run
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-hipchat
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Jimmy Cuadra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-26 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita