lita-campfire 0.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6c09610adbd5cde7dbcba15ed189ae282565d42
-  data.tar.gz: 685c6bfafacd7ec73f258831629f2087deedabf0
+  metadata.gz: ccccb536763935bb73f1c26423541002e4b14a10
+  data.tar.gz: 3ca3c85a5cd7b55280d7ce03f258b3ae47ad8c5a
 SHA512:
-  metadata.gz: d00c551bcb948b8d0f8f2da32d63ea271ca06fe06277d46c20e60ba85c36f784dd0613cc19fd662f740e3e2a5ed0af4c3936d1c901398c4f82a4e6b42badb10f
-  data.tar.gz: baf6b041d1bb6033d29317b51bf7648d3eb753b61a4df6fb4e081e0625fc5d83b02d66d4e17a90c0910711cb9975529cedba13974d57175c3705f862ef560b88
+  metadata.gz: 9a64b263957531a45a4765407fc8d0bd41d07e0dcad8e500f87106373a841b67e02283db94f60ded94bd72ca52b80ac84a23be5a404af53d02a0791f0694d7e8
+  data.tar.gz: f77f87a68d2683511aae3349588118c2c840a512fa188b04f4cc87f3f7ae71837686ec2f1d89a7003fb61cdbda0b2e4c54d13dc2c2f3b88c05c32b59f3051d12

data/.gitignore

@@ -17,3 +17,5 @@ tmp
 .yardoc
 _yardoc
 doc/
+vendor/bundle
+tags

data/Gemfile.lock

@@ -1,19 +1,18 @@
 PATH
   remote: .
   specs:
-    lita-campfire (0.1)
-      lita (~> 2.0)
+    lita-campfire (0.1.2)
+      lita (~> 2.6.0)
       tinder (~> 1.9.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    colorize (0.5.8)
-    coveralls (0.6.7)
-      colorize
+    coveralls (0.6.9)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
+      term-ansicolor
       thor
     daemons (1.1.9)
     diff-lcs (1.2.4)
@@ -22,54 +21,57 @@ GEM
       multipart-post (~> 1.2.0)
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
-    hashie (1.2.0)
+    hashie (2.0.5)
     http_parser.rb (0.5.3)
-    json (1.7.7)
-    lita (2.2.0)
-      bundler (~> 1.3)
-      faraday (~> 0.8.7)
-      multi_json (~> 1.7.7)
-      rack (~> 1.5.2)
-      redis-namespace (~> 1.3.0)
-      thin (~> 1.5.1)
-      thor (~> 0.18.1)
-    mime-types (1.23)
-    multi_json (1.7.8)
+    json (1.8.1)
+    lita (2.6.0)
+      bundler (>= 1.3)
+      faraday (>= 0.8.7)
+      multi_json (>= 1.7.7)
+      rack (>= 1.5.2)
+      redis-namespace (>= 1.3.0)
+      thin (>= 1.5.1)
+      thor (>= 0.18.1)
+    mime-types (1.25)
+    multi_json (1.7.9)
     multipart-post (1.2.0)
     rack (1.5.2)
     rake (10.1.0)
-    redis (3.0.4)
-    redis-namespace (1.3.1)
-      redis (~> 3.0.0)
+    redis (3.0.6)
+    redis-namespace (1.4.1)
+      redis (~> 3.0.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.2)
+    rspec-mocks (2.14.3)
     simple_oauth (0.1.9)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    thin (1.5.1)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
+    thin (1.6.1)
       daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
+      eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
     thor (0.18.1)
-    tinder (1.9.2)
+    tinder (1.9.3)
       eventmachine (~> 1.0)
       faraday (~> 0.8)
       faraday_middleware (~> 0.9)
-      hashie (~> 1.0)
-      json (~> 1.7.5)
+      hashie (>= 1.0, < 3)
+      json (~> 1.8.0)
       mime-types (~> 1.19)
-      multi_json (~> 1.5)
+      multi_json (~> 1.7)
       twitter-stream (~> 0.1)
+    tins (0.9.0)
     twitter-stream (0.1.16)
       eventmachine (>= 0.12.8)
       http_parser.rb (~> 0.5.1)

data/README.md

@@ -4,6 +4,8 @@
 
 [![Build Status](https://secure.travis-ci.org/josacar/lita-campfire.png)](http://travis-ci.org/josacar/lita-campfire)
 [![Coverage Status](https://coveralls.io/repos/josacar/lita-campfire/badge.png)](https://coveralls.io/r/josacar/lita-campfire)
+[![Code Climate](https://codeclimate.com/github/josacar/lita-campfire.png)](https://codeclimate.com/github/josacar/lita-campfire)
+[![Dependency Status](https://gemnasium.com/josacar/lita-campfire.png)](https://gemnasium.com/josacar/lita-campfire)
 
 **lita-campfire** is an adapter for [Lita](https://github.com/jimmycuadra/lita) that allows you to use the robot with [Campfire](https://campfirenow.com).
 
@@ -11,6 +13,12 @@
 
 Add lita-campfire to your Lita instance's Gemfile:
 
+```ruby
+gem "lita-campfire"
+```
+
+or if you want to use the bleeding edge version:
+
 ```ruby
 gem "lita-campfire", :git => 'https://github.com/josacar/lita-campfire.git'
 ```

data/lib/lita/adapters/campfire.rb

@@ -12,14 +12,14 @@ module Lita
           robot,
           subdomain: config.subdomain,
           apikey: config.apikey,
-          rooms: config.rooms,
+          rooms: rooms,
           debug: config.debug
         )
       end
 
       def run
         connector.connect
-        connector.join_rooms rooms
+        connector.join_rooms
         sleep
       rescue Interrupt
         disconnect
@@ -54,4 +54,4 @@ module Lita
 
     Lita.register_adapter(:campfire, Campfire)
   end
-end
+end

data/lib/lita/adapters/campfire/callback.rb

@@ -3,28 +3,92 @@ module Lita
     class Campfire < Adapter
       class Callback
 
-        MESSAGE_TYPES = %w( TextMessage PasteMessage ).freeze
+        attr_reader :robot, :room
 
-        def initialize(robot)
+        def initialize(robot, room)
           @robot = robot
+          @room  = room
+
+          @receivers = [MessageReceiver, EnterReceiver].map do |receiver_type|
+            receiver_type.new(self)
+          end
         end
 
-        def room_message(room)
-          room.listen do |m|
-            if MESSAGE_TYPES.include?(m.type)
-              text    = m.body
-              user    = get_user(m.user)
-              source  = Source.new(user, room)
-              message = Message.new(@robot, text, source)
-              @robot.receive message
-            end
+        def listen
+          @room.listen do |event|
+            receive event
           end
         end
 
-        private
-        def get_user(user_data)
+        def register_users
+          @room.users.each do |user|
+            create_user user
+          end
+        end
+
+        def create_user(user_data)
+          user_data = user_data.dup
           user_id = user_data.delete(:id)
-          User.new(user_id, user_data)
+          User.create(user_id, user_data)
+        end
+
+        def receive(event)
+          Thread.new do
+            @receivers.each do |receiver|
+              receiver.receive event
+            end
+          end
+        end
+
+        class EventReceiver
+
+          class << self
+            attr_accessor :message_types
+
+            def receives(*types)
+              self.message_types = types
+            end
+          end
+
+          def initialize(callback)
+            @callback = callback
+            @robot    = callback.robot
+            @room     = callback.room
+          end
+
+          def receive(event)
+           _receive(event) if receives?(event)
+          end
+
+          private
+
+          def receives?(event)
+            self.class.message_types.include?(event.type)
+          end
+        end
+
+        class MessageReceiver < EventReceiver
+
+          receives 'TextMessage', 'PasteMessage'
+
+          def _receive(event)
+            text    = event.body
+            user    = @callback.create_user(event.user)
+            source  = Source.new(user, event.room_id.to_s)
+            message = Message.new(@robot, text, source)
+            @robot.receive message
+          end
+
+        end
+
+        class EnterReceiver < EventReceiver
+
+          receives 'EnterMessage'
+
+          def _receive(event)
+            @callback.create_user(event.user)
+          end
+
         end
 
       end

data/lib/lita/adapters/campfire/connector.rb

@@ -14,33 +14,49 @@ module Lita
           @campfire = Tinder::Campfire.new(@subdomain, token: @apikey)
         end
 
-        def join_rooms(rooms)
+        def join_rooms
           rooms.each do |room_id|
             room = fetch_room(room_id)
             room.join
-            Callback.new(@robot).room_message(room)
+            callback = Callback.new(@robot, room)
+            callback.register_users
+            callback.listen
           end
         end
 
-        def send_messages(room, messages)
-          @campfire.find_room_by_id(room.id).tap do |my_room|
+        def send_messages(room_id, messages)
+          fetch_room(room_id).tap do |my_room|
             messages.each do |message|
-              my_room.speak message
+              if message.include?("\n")
+                my_room.paste message
+              else
+                my_room.speak message
+              end
             end
           end
         end
 
+        def disconnect
+          Lita.logger.info("Disconnecting from Campfire.")
+          rooms.each do |room_id|
+            room = fetch_room(room_id)
+            room.leave
+          end
+        end
+
         private
 
+        attr_reader :rooms
+
         def fetch_room(room_id)
           @campfire.find_room_by_id(room_id).tap do |room|
             if room.nil?
               raise RoomNotAvailable,
-                "Make sure you have access to room #{ room_id }"
+                "Make sure you have access to room #{ room_id.inspect }"
             end
           end
         end
       end
     end
   end
-end
+end

data/lita-campfire.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-campfire"
-  spec.version       = "0.1"
-  spec.authors       = ["Jose Luis Salas"]
-  spec.email         = ["josacar@gmail.com"]
+  spec.version       = "0.1.2"
+  spec.authors       = ["Jose Luis Salas", "Zac Stewart"]
+  spec.email         = ["josacar@gmail.com", "zgstewart@gmail.com"]
   spec.description   = %q{A Campfire adapter for Lita.}
   spec.summary       = %q{A Campfire adapter for the Lita chat robot.}
   spec.homepage      = "https://github.com/josacar/lita-campfire"
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "lita", "~> 2.0"
+  spec.add_runtime_dependency "lita", "~> 2.6.0"
   spec.add_runtime_dependency "tinder", "~> 1.9.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
@@ -21,4 +21,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 2.14"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "coveralls"
-end
+end

data/spec/lita/adapters/campfire/callback_spec.rb

@@ -2,39 +2,68 @@ require 'spec_helper'
 
 describe Campfire::Callback do
 
-  class DummyRoom < Struct.new(:message)
+  class DummyRoom < Struct.new(:id, :message, :users)
     def listen
       yield message
     end
   end
 
+  let(:event)         { double('Event') }
   let(:campfire_user) { { id: 1, name: 'Bender Bending Rodriguez' } }
-  let(:message) { double('Message') }
-  let(:robot) { double('Robot', mention_name: 'Robot') }
-  let(:room) { DummyRoom.new(campfire_message) }
-  let(:source) { double('Source') }
-  let(:text) { "Yes it's the apocalypse alright. I always though is have a hand in it." }
-  let(:user) { double('User') }
+  let(:message)       { double('Message') }
+  let(:robot)         { double('Robot', mention_name: 'Robot') }
+  let(:room)          { DummyRoom.new(1, event, users) }
+  let(:source)        { double('Source') }
+  let(:text)          { "Yes it's the apocalypse alright. I always though is have a hand in it." }
+  let(:user)          { double('User') }
+  let(:users)         { [ {id: 2, name: 'Bender'}, {id: 3, name: 'Washbucket'} ] }
 
-  subject { described_class.new(robot) }
+  subject { described_class.new(robot, room) }
 
-  describe '#room_message' do
+  describe '#listen' do
+    before do
+      allow(Thread).to receive(:new).and_yield
+    end
     %w( TextMessage PasteMessage ).each do |message_type|
       describe "with a #{message_type}" do
-        let(:campfire_message) { double(
-          type: message_type,
-          body: text,
-          user: campfire_user) }
+        let(:event) do
+          double('Event',
+                 type:     message_type,
+                 body:     text,
+                 user:     campfire_user,
+                 room_id:  1)
+        end
 
         it 'passes the message to Robot#receive' do
-          expect(Lita::User).to receive(:new).with(1, name: 'Bender Bending Rodriguez').and_return(user)
-          expect(Lita::Source).to receive(:new).with(user, room).and_return(source)
+          expect(Lita::User).to receive(:create).with(1, name: 'Bender Bending Rodriguez').and_return(user)
+          expect(Lita::Source).to receive(:new).with(user, '1').and_return(source)
           expect(Lita::Message).to receive(:new).with(robot, text, source).and_return(message)
           expect(robot).to receive(:receive).with(message)
-          subject.room_message(room)
+          subject.listen
         end
       end
     end
+
+    describe 'EnterMessage' do
+      let(:event) { double('Event', type: 'EnterMessage', user: campfire_user) }
+
+      it 'creates a user' do
+        expect(Lita::User).to receive(:create).with(1, name: 'Bender Bending Rodriguez').and_return(user)
+        subject.listen
+      end
+    end
+
+  end
+
+  describe '#register_users' do
+    it 'creates a user for all the users in the room' do
+      users.each do |user|
+        user_id = user[:id]
+        name    = user[:name]
+        expect(Lita::User).to receive(:create).with(user_id, name: name)
+      end
+      subject.register_users
+    end
   end
 
 end

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

@@ -4,7 +4,7 @@ describe Campfire::Connector do
   let(:robot) { double }
   let(:subdomain) { 'mycampfire' }
   let(:apikey) { '2e9f45bb934c0fa13e9f19ee0901c316fda9fc1' }
-  let(:rooms) { %w( 12345 41234 ) }
+  let(:rooms) { %w( 12345 ) }
   let(:options) { { subdomain: subdomain, apikey: apikey, rooms: rooms } }
   let(:campfire) { double }
 
@@ -30,15 +30,16 @@ describe Campfire::Connector do
         subject.connect
       end
 
-      it 'joins each room' do
+      it 'joins each room, registers the users and listens for messages' do
         expect(Campfire::Callback).to receive(:new).
-          with(robot).
+          with(robot, room).
           and_return(callback = double('Callback'))
-        expect(callback).to receive(:room_message).with(room)
 
         expect(room).to receive(:join)
+        expect(callback).to receive(:listen)
+        expect(callback).to receive(:register_users)
 
-        subject.join_rooms [ double ]
+        subject.join_rooms
       end
     end
 
@@ -49,14 +50,12 @@ describe Campfire::Connector do
       end
 
       it 'raises an exception' do
-        expect { subject.join_rooms [ double ] }.to raise_error(Campfire::RoomNotAvailable)
+        expect { subject.join_rooms }.to raise_error(Campfire::RoomNotAvailable)
       end
     end
   end
 
   describe '#send_messages' do
-    let(:message) { "I'm gonna drink 'til I reboot." }
-
     let(:room) { double }
 
     before do
@@ -64,9 +63,36 @@ describe Campfire::Connector do
       subject.connect
     end
 
-    it 'speaks each message into room' do
-      expect(room).to receive(:speak).with(message)
-      subject.send_messages double(id: 1), [ message ]
+    context 'with a one line message' do
+      let(:message) { "I'm gonna drink 'til I reboot." }
+
+      it 'speaks each message into room' do
+        expect(room).to receive(:speak).with(message)
+        subject.send_messages double(id: 1), [ message ]
+      end
+    end
+
+    context 'with a multi line message' do
+      let(:message) { "I'm gonna drink 'til I reboot.\nNow I'm too drunk" }
+
+      it 'pastes each message into room' do
+        expect(room).to receive(:paste).with(message)
+        subject.send_messages double(id: 1), [ message ]
+      end
+    end
+  end
+
+  describe '#disconnect' do
+    let(:room) { double('Room', id: 666) }
+
+    before do
+      allow(campfire).to receive(:find_room_by_id).and_return(room)
+      subject.connect
+    end
+
+    it "leaves joined rooms" do
+      expect(room).to receive(:leave)
+      subject.disconnect
     end
   end
-end
+end

data/spec/lita/adapters/campfire_spec.rb

@@ -41,7 +41,7 @@ describe Lita::Adapters::Campfire do
     it 'join specified rooms' do
       rooms = ['room1', 'room2']
       Lita.config.adapter.rooms = rooms
-      expect(subject.connector).to receive(:join_rooms).with(rooms)
+      expect(subject.connector).to receive(:join_rooms)
       subject.run
     end
 
@@ -85,4 +85,4 @@ describe Lita::Adapters::Campfire do
       subject.shut_down
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -4,7 +4,10 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
 ]
-SimpleCov.start { add_filter "/spec/" }
+SimpleCov.start do
+  add_filter "/spec/"
+  add_filter 'vendor' # Don't include vendored stuff
+end
 
 require "lita-campfire"
 require "lita/rspec"

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: lita-campfire
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.2
 platform: ruby
 authors:
 - Jose Luis Salas
+- Zac Stewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2013-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -16,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: tinder
   requirement: !ruby/object:Gem::Requirement
@@ -111,6 +112,7 @@ dependencies:
 description: A Campfire adapter for Lita.
 email:
 - josacar@gmail.com
+- zgstewart@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -151,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A Campfire adapter for the Lita chat robot.