lita-campfire 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 711b381aa5f58bc007ea46b6e7dca13f856fe4ad
-  data.tar.gz: 503b935c87bc152db95400c2c52aa2629d640334
+  metadata.gz: ab077da2c08ee6eb9ad0870696b8d6d4fecb1f28
+  data.tar.gz: 8ce64c6fab1e4cd8cab38668c40bf77de15b1700
 SHA512:
-  metadata.gz: a9c7cf1f3614b76e0487aeded9bfc31a5d89d624d28b2e8b5da90074a519e637d2c4886c933432b1edbb648a9f1246f43c55767030c10c3c4b6e7a7f6782d53b
-  data.tar.gz: 89750d635765c465bb5d871c27951e40e16852d629a3d325d4b6d343798fd66af5a2c1937fcbaa7e61635e04e46d8dece6b4f782da4b9e8c9b095977132fd7c1
+  metadata.gz: 746b4e1ec9e377b979a2c034cb1f1edf3756aa2b9da6e90aa294d333a76c180307bf623ccdef58ba4d22b576a86f2b20f364fb52840a7f8aa8003fa0afa2bcce
+  data.tar.gz: ced59da8e225161853bbdb6ca6fadc04947b84db00a27440c92bcd8aa9216d5b7fa1410116e1a74c2abc2f80d0bff70748e3a39150b779655ee5584ce99fc365

data/.travis.yml

@@ -1,6 +1,9 @@
 language: ruby
 rvm:
   - 2.0.0
+  - 2.1.0
 script: bundle exec rspec
+services:
+    - redis-server
 before_install:
-  - gem update --system
+  - gem update --system

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    lita-campfire (0.1.4)
-      lita (~> 2.7.0)
-      tinder (~> 1.9.0)
+    lita-campfire (0.2.0)
+      lita (>= 2.7.0, < 4.0.0)
+      tinder (~> 1.9.4)
 
 GEM
   remote: https://rubygems.org/
@@ -14,74 +14,81 @@ GEM
       simplecov (>= 0.7)
       term-ansicolor
       thor
-    daemons (1.1.9)
     diff-lcs (1.2.5)
-    docile (1.1.1)
+    docile (1.1.3)
     eventmachine (1.0.3)
-    faraday (0.8.8)
+    faraday (0.8.9)
       multipart-post (~> 1.2.0)
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
     hashie (2.0.5)
     http_parser.rb (0.5.3)
+    http_router (0.11.1)
+      rack (>= 1.0.0)
+      url_mount (~> 0.2.1)
+    i18n (0.6.9)
+    ice_nine (0.11.0)
     json (1.8.1)
-    lita (2.7.1)
+    lita (3.0.3)
       bundler (>= 1.3)
       faraday (>= 0.8.7)
+      http_router (>= 0.11.1)
+      i18n (>= 0.6.9)
+      ice_nine (>= 0.11.0)
       multi_json (>= 1.7.7)
+      puma (>= 2.7.1)
       rack (>= 1.5.2)
       redis-namespace (>= 1.3.0)
-      thin (>= 1.5.1)
       thor (>= 0.18.1)
     mime-types (1.25.1)
-    multi_json (1.8.2)
+    multi_json (1.8.4)
     multipart-post (1.2.0)
+    puma (2.8.0)
+      rack (>= 1.1, < 2.0)
     rack (1.5.2)
     rake (10.1.1)
-    redis (3.0.6)
+    redis (3.0.7)
     redis-namespace (1.4.1)
       redis (~> 3.0.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (3.0.0.beta1)
-      rspec-core (= 3.0.0.beta1)
-      rspec-expectations (= 3.0.0.beta1)
-      rspec-mocks (= 3.0.0.beta1)
-    rspec-core (3.0.0.beta1)
-      rspec-support (= 3.0.0.beta1)
-    rspec-expectations (3.0.0.beta1)
-      diff-lcs (>= 1.1.3, < 2.0)
-      rspec-support (= 3.0.0.beta1)
-    rspec-mocks (3.0.0.beta1)
-      rspec-support (= 3.0.0.beta1)
-    rspec-support (3.0.0.beta1)
+    rspec (3.0.0.beta2)
+      rspec-core (= 3.0.0.beta2)
+      rspec-expectations (= 3.0.0.beta2)
+      rspec-mocks (= 3.0.0.beta2)
+    rspec-core (3.0.0.beta2)
+      rspec-support (= 3.0.0.beta2)
+    rspec-expectations (3.0.0.beta2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (= 3.0.0.beta2)
+    rspec-mocks (3.0.0.beta2)
+      rspec-support (= 3.0.0.beta2)
+    rspec-support (3.0.0.beta2)
     simple_oauth (0.1.9)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    term-ansicolor (1.2.2)
-      tins (~> 0.8)
-    thin (1.6.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 1.0.0)
-      rack (>= 1.0.0)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
     thor (0.18.1)
-    tinder (1.9.3)
+    tinder (1.9.4)
       eventmachine (~> 1.0)
-      faraday (~> 0.8)
+      faraday (~> 0.8.9)
       faraday_middleware (~> 0.9)
       hashie (>= 1.0, < 3)
       json (~> 1.8.0)
       mime-types (~> 1.19)
       multi_json (~> 1.7)
       twitter-stream (~> 0.1)
-    tins (0.13.1)
+    tins (1.0.0)
     twitter-stream (0.1.16)
       eventmachine (>= 0.12.8)
       http_parser.rb (~> 0.5.1)
       simple_oauth (~> 0.1.4)
+    url_mount (0.2.1)
+      rack
 
 PLATFORMS
   ruby
@@ -91,5 +98,5 @@ DEPENDENCIES
   coveralls
   lita-campfire!
   rake
-  rspec (~> 3.0.0.beta1)
+  rspec (~> 3.0.0.beta2)
   simplecov

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

@@ -3,11 +3,12 @@ module Lita
     class Campfire < Adapter
       class Callback
 
-        attr_reader :robot, :room
+        attr_reader :robot, :room, :robot_id
 
-        def initialize(robot, room)
-          @robot = robot
-          @room  = room
+        def initialize(options)
+          @robot    = options.fetch(:robot)
+          @room     = options.fetch(:room)
+          @robot_id = options.fetch(:robot_id)
 
           @receivers = [MessageReceiver, EnterReceiver].map do |receiver_type|
             receiver_type.new(self)
@@ -15,8 +16,10 @@ module Lita
         end
 
         def listen(options={})
-          @room.listen(options) do |event|
-            receive event
+          Thread.new do
+            @room.listen(options) do |event|
+              receive event
+            end
           end
         end
 
@@ -54,6 +57,7 @@ module Lita
             @callback = callback
             @robot    = callback.robot
             @room     = callback.room
+            @robot_id = callback.robot_id
           end
 
           def receive(event)
@@ -62,8 +66,14 @@ module Lita
 
           private
 
+          attr_reader :robot_id
+
           def receives?(event)
-            self.class.message_types.include?(event.type)
+            self.class.message_types.include?(event.type) && !robot?(event.user)
+          end
+
+          def robot?(user)
+            robot_id == user.id
           end
         end
 
@@ -90,7 +100,6 @@ module Lita
           end
 
         end
-
       end
     end
   end

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

@@ -12,7 +12,7 @@ module Lita
         end
 
         def connect
-          @campfire = Tinder::Campfire.new(@subdomain, token: @apikey)
+          @campfire = Tinder::Campfire.new(subdomain, token: apikey)
         end
 
         def disconnect
@@ -27,9 +27,9 @@ module Lita
           rooms.each do |room_id|
             room = fetch_room(room_id)
             room.join
-            callback = Callback.new(@robot, room)
+            callback = Callback.new(robot: robot, room: room, robot_id: robot_id)
             callback.register_users
-            callback.listen(@tinder_options)
+            callback.listen(tinder_options)
           end
         end
 
@@ -51,16 +51,21 @@ module Lita
 
         private
 
-        attr_reader :rooms
+        attr_reader :rooms, :subdomain, :apikey, :tinder_options, :robot
+        attr_accessor :campfire
 
         def fetch_room(room_id)
-          @campfire.find_room_by_id(room_id).tap do |room|
+          campfire.find_room_by_id(room_id).tap do |room|
             if room.nil?
               raise RoomNotAvailable,
                 "Make sure you have access to room #{ room_id.inspect }"
             end
           end
         end
+
+        def robot_id
+          campfire.me.id
+        end
       end
     end
   end

data/lita-campfire.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-campfire"
-  spec.version       = "0.1.4"
+  spec.version       = "0.2.0"
   spec.authors       = ["Jose Luis Salas", "Zac Stewart"]
   spec.email         = ["josacar@gmail.com", "zgstewart@gmail.com"]
   spec.description   = %q{A Campfire adapter for Lita.}
@@ -14,12 +14,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.metadata      = { "lita_plugin_type" => "adapter" }
 
-  spec.add_runtime_dependency "lita", "~> 2.7.0"
-  spec.add_runtime_dependency "tinder", "~> 1.9.0"
+  spec.add_runtime_dependency "lita", ">= 2.7.0", '< 4.0.0'
+  spec.add_runtime_dependency "tinder", "~> 1.9.4"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 3.0.0.beta1"
+  spec.add_development_dependency "rspec", "~> 3.0.0.beta2"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "coveralls"
 end

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

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'hashie'
 
 describe Campfire::Callback do
 
@@ -9,7 +10,9 @@ describe Campfire::Callback do
   end
 
   let(:event)         { instance_double('Event') }
-  let(:campfire_user) { { id: 1, name: 'Bender Bending Rodriguez' } }
+  let(:campfire_user) { Hashie::Mash.new({ id: 1, name: 'Bender Bending Rodriguez' }) }
+  let(:robot_id)      { 2 }
+  let(:robot_user)    { Hashie::Mash.new({ id: robot_id, name: 'Hubot bot' }) }
   let(:message)       { instance_double(Lita::Message) }
   let(:robot)         { instance_double(Lita::Robot, mention_name: 'Robot') }
   let(:room)          { DummyRoom.new(1, event, users) }
@@ -18,7 +21,7 @@ describe Campfire::Callback do
   let(:user)          { instance_double(Lita::User) }
   let(:users)         { [ {id: 2, name: 'Bender'}, {id: 3, name: 'Washbucket'} ] }
 
-  subject { described_class.new(robot, room) }
+  subject { described_class.new(robot: robot, room: room, robot_id: robot_id) }
 
   describe '#listen' do
     before do
@@ -26,20 +29,37 @@ describe Campfire::Callback do
     end
     %w( TextMessage PasteMessage ).each do |message_type|
       describe "with a #{message_type}" do
-        let(:event) do
-          instance_double('Event',
-                 type:     message_type,
-                 body:     text,
-                 user:     campfire_user,
-                 room_id:  1)
+        context 'when message from user' do
+          let(:event) do
+            instance_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(:create).with(1, name: 'Bender Bending Rodriguez').and_return(user)
+            expect(Lita::Source).to receive(:new).with(user: user, room: '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.listen
+          end
         end
 
-        it 'passes the message to Robot#receive' do
-          expect(Lita::User).to receive(:create).with(1, name: 'Bender Bending Rodriguez').and_return(user)
-          expect(Lita::Source).to receive(:new).with(user: user, room: '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.listen
+        context 'when message from robot' do
+          let(:event) do
+            instance_double('Event',
+                            type:     message_type,
+                            body:     text,
+                            user:     robot_user,
+                            room_id:  1)
+          end
+
+          it 'does not pass the message to Robot#receive' do
+            expect(robot).not_to receive(:receive).with(message)
+            subject.listen
+          end
         end
       end
     end

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

@@ -1,7 +1,8 @@
 require 'spec_helper'
 
-describe Campfire::Connector do
+describe Campfire::Connector, lita: true do
   let(:robot) { instance_double(Lita::Robot) }
+  let(:robot_id) { 2 }
   let(:subdomain) { 'mycampfire' }
   let(:apikey) { '2e9f45bb934c0fa13e9f19ee0901c316fda9fc1' }
   let(:rooms) { %w( 12345 ) }
@@ -13,7 +14,6 @@ describe Campfire::Connector do
 
   before do
     allow(Tinder::Campfire).to receive(:new).and_return(campfire)
-    allow(campfire).to receive(:find_room_by_id).and_return(room)
   end
 
   describe '#connect' do
@@ -25,12 +25,12 @@ describe Campfire::Connector do
 
   context 'when connected to campfire' do
     before do
+      allow(campfire).to receive(:find_room_by_id).and_return(room)
       subject.connect
     end
     let(:callback) { instance_double(Campfire::Callback) }
 
     describe '#disconnect' do
-
       it "leaves joined rooms" do
         expect(room).to receive(:leave)
         subject.disconnect
@@ -51,6 +51,7 @@ describe Campfire::Connector do
       it 'passes options to underlying tinder lib' do
         allow(campfire).to receive(:find_room_by_id).and_return(room)
         subject.connect
+        allow(campfire).to receive_message_chain(:me,:id).and_return(robot_id)
         allow(Campfire::Callback).to receive(:new).and_return(callback)
 
         allow(room).to receive(:join)
@@ -63,8 +64,9 @@ describe Campfire::Connector do
     describe '#join_rooms' do
       describe 'when I have access to the room' do
         it 'joins each room, registers the users and listens for messages' do
+          allow(campfire).to receive_message_chain(:me,:id).and_return(robot_id)
           expect(Campfire::Callback).to receive(:new).
-            with(robot, room).
+            with(robot: robot, room: room, robot_id: robot_id).
             and_return(callback)
 
           expect(room).to receive(:join)
@@ -107,11 +109,6 @@ describe Campfire::Connector do
     end
 
     describe '#set_topic' do
-      before do
-        allow(Lita.logger).to receive(:info)
-        allow(campfire).to receive(:find_room_by_id).and_return(room)
-        subject.connect
-      end
       let(:topic) { 'Let it be wadus' }
 
       it 'sets toom topic' do

data/spec/lita/adapters/campfire_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Lita::Adapters::Campfire do
+describe Lita::Adapters::Campfire, lita: true do
   before do
     Lita.configure do |config|
       config.adapter.subdomain = 'foodomain'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-campfire
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Jose Luis Salas
@@ -9,36 +9,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.7.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.7.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: tinder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.9.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +79,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.0.0.beta2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.beta1
+        version: 3.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -163,3 +169,4 @@ test_files:
 - spec/lita/adapters/campfire/connector_spec.rb
 - spec/lita/adapters/campfire_spec.rb
 - spec/spec_helper.rb
+has_rdoc: