lita-totems 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcebd655b6abfd2ae0fffb0e2477455a847b24fd
-  data.tar.gz: 078b012853bfc626e605eb8d7f20c128b99e9187
+  metadata.gz: 4c08d38dab66a89133a326195a7a3284c383e95e
+  data.tar.gz: 67e50f44222b2e993aec07811c178a868cf31a24
 SHA512:
-  metadata.gz: 53da90a7de19a6d7143b77dc7ab7716cb6749b8acc130210b4f86f3a3463b0541637b5c4d43a459b02539a890be51f2308825774bf8a004dd72f909404beba1f
-  data.tar.gz: 2d4c22bc113044b5e75d4a4df7f2b97681a44c737d032dd7f383cc0d5cc6c8a73e48ca5cc34a7c52cd129ece6d430afabfee9e04ef42360225745d72444cbabb
+  metadata.gz: 80179d6ebc67dd3ff465b7fb0636b9cab74665b0ca9d8ce564b6eb183c06cb5cefbca6d62039dd1baa4259366e7b21f883527543395bc5b5f91ee60af3c3179c
+  data.tar.gz: b6fcd10085bdc4fc04ceceb5faf7c2bd2ddd5a8cbab5b6c206d923e23629a11182fd583b446cd9b19627e0c801113092df467b33c019caa5fd377520a9ff52aa

data/lib/lita/handlers/totems.rb

@@ -10,13 +10,14 @@ module Lita
         %r{
         ^totems?\s+
         (#{action_capture_group})\s+
-        (?<totem>\w+)
+        (?<totem>\w+)\s*
+        (?<message>.*)?
         }x
       end
 
       route(route_regex("add|join|take|queue"), :add,
             help: {
-              'totems add TOTEM' => "Adds yourself to the TOTEM queue, or assigns yourself to the TOTEM if it's unassigned"
+              'totems add TOTEM <MESSAGE>' => "Adds yourself to the TOTEM queue, or assigns yourself to the TOTEM if it's unassigned. Includes optional MESSAGE."
             })
 
       route(
@@ -108,9 +109,12 @@ module Lita
           return
         end
 
+        message = response.match_data[:message]
+
         token_acquired = false
         queue_size     = nil
         Redis::Semaphore.new("totem/#{totem}", redis: redis).lock do
+          redis.hset("totem/#{totem}/message", user_id, message) if message && message != ""
           if redis.llen("totem/#{totem}/list") == 0 && redis.get("totem/#{totem}/owning_user_id").nil?
             # take it:
             token_acquired = true
@@ -176,6 +180,7 @@ module Lita
 
         redis.srem("user/#{past_owning_user_id}/totems", totem)
         redis.hdel("totem/#{totem}/waiting_since", past_owning_user_id)
+        redis.hdel("totem/#{totem}/message", past_owning_user_id)
         robot.send_messages(Lita::Source.new(user: Lita::User.find_by_id(past_owning_user_id)), %{You have been kicked from totem "#{totem}".})
         next_user_id = redis.lpop("totem/#{totem}/list")
         if next_user_id
@@ -215,10 +220,13 @@ module Lita
         first_id = redis.get("totem/#{totem}/owning_user_id")
         if first_id
           waiting_since_hash = redis.hgetall("totem/#{totem}/waiting_since")
+          message_hash = redis.hgetall("totem/#{totem}/message")
           str  += "#{prefix}1. #{users_cache[first_id].name} (held for #{waiting_duration(waiting_since_hash[first_id])})\n"
+          str += "\s\s\s\s#{message_hash[first_id]}\n" if message_hash[first_id]
           rest = redis.lrange("totem/#{totem}/list", 0, -1)
           rest.each_with_index do |user_id, index|
             str += "#{prefix}#{index+2}. #{users_cache[user_id].name} (waiting for #{waiting_duration(waiting_since_hash[user_id])})\n"
+            str += "\s\s\s\s#{message_hash[user_id]}\n" if message_hash[user_id]
           end
         end
         str
@@ -231,6 +239,7 @@ module Lita
       def yield_totem(totem, user_id, response)
         redis.srem("user/#{user_id}/totems", totem)
         redis.hdel("totem/#{totem}/waiting_since", user_id)
+        redis.hdel("totem/#{totem}/message", user_id)
         next_user_id = redis.lpop("totem/#{totem}/list")
         if next_user_id
           redis.set("totem/#{totem}/owning_user_id", next_user_id)

data/lita-totems.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-totems"
-  spec.version       = "0.2.0"
+  spec.version       = "0.3.0"
   spec.authors       = ["Charles Finkel", "Vijay Ramesh"]
   spec.email         = ["cf@dropbox.com", "vijay@change.org"]
   spec.description   = %q{Totems handler for Lita)}
@@ -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.4"
+  spec.add_runtime_dependency "lita", ">= 4.0"
   spec.add_runtime_dependency "chronic_duration"
   spec.add_runtime_dependency "redis-semaphore"
 

data/spec/lita/handlers/totems_spec.rb

@@ -1,16 +1,18 @@
 require "spec_helper"
 
 describe Lita::Handlers::Totems, lita_handler: true do
-  it { routes("totems add foo").to(:add) }
-  it { routes("totem add foo").to(:add) }
-  it { routes("totem join foo").to(:add) }
-  it { doesnt_route("totems add ").to(:add) }
-  it { doesnt_route("tote add foo").to(:add) }
-  it { routes("totems kick foo").to(:kick) }
-  it { routes("totems kick foo bob").to(:kick) }
-  it { routes("totems").to(:info) }
-  it { routes("totems info").to(:info) }
-  it { routes("totems info chicken").to(:info) }
+  it { is_expected.to route("totems add foo").to(:add) }
+  it { is_expected.to route("totem add foo").to(:add) }
+  it { is_expected.to route("totem join foo").to(:add) }
+  it { is_expected.to route("totems add foo message").to(:add) }
+  it { is_expected.not_to route("totems add ").to(:add) }
+  it { is_expected.not_to route("tote add foo").to(:add) }
+  it { is_expected.to route("totems kick foo").to(:kick) }
+  it { is_expected.to route("totems kick foo bob").to(:kick) }
+  it { is_expected.to route("totems").to(:info) }
+  it { is_expected.to route("totems info").to(:info) }
+  it { is_expected.to route("totems info chicken").to(:info) }
+
 
   let(:totem_creator) { Class.new do
     def initialize
@@ -121,6 +123,25 @@ describe Lita::Handlers::Totems, lita_handler: true do
         end
       end
 
+      context "with a message" do
+        before do
+          Timecop.freeze("2014-03-01 12:00:00") do
+            send_message("totems add chicken message", as: carl)
+            send_message("totems add chicken other message", as: another_user)
+          end
+        end
+        it "includes the message in the totems' info" do
+          Timecop.freeze("2014-03-01 13:00:00") do
+            send_message("totems info chicken")
+            expect(replies.last).to eq <<-END
+1. Carl (held for 1h)
+    message
+2. person_1 (waiting for 1h)
+    other message
+            END
+          end
+        end
+      end
     end
 
     context "when the totem doesn't exist" do
@@ -152,26 +173,28 @@ describe Lita::Handlers::Totems, lita_handler: true do
           end
         end
         it "yields that totem, gives to the next person in line" do
-          expect(robot).to receive(:send_messages) do |target, message|
-            expect(target.user.id).to eq(another_user.id)
-            expect(message).to eq(%{You are now in possession of totem "chicken."})
+          expect(robot).to receive(:send_messages).twice do |target, message|
+            expect([another_user.id, carl.id]).to include(target.user.id)
+            if target.user.id == another_user.id
+              expect(message).to eq(%{You are now in possession of totem "chicken."})
+            elsif target.user.id == carl.id
+              expect(message).to eq("You have yielded the totem to #{another_user.name}.")
+            end
           end
           send_message("totems yield", as: carl)
-          # todo: check for message to other user
-          expect(replies.last).to eq("You have yielded the totem to #{another_user.name}.")
         end
         it "updates the waiting since value for the new holder" do
           Timecop.freeze("2014-03-01 13:00:00") do
             send_message("totems info chicken")
             expect(replies.last).to eq <<-END
 1. Carl (held for 2h)
-2. Test User (waiting for 1h)
+2. person_1 (waiting for 1h)
 3. person_2 (waiting for 1h)
             END
             send_message("totems yield", as: carl)
             send_message("totems info chicken")
             expect(replies.last).to eq <<-END
-1. Test User (held for 0s)
+1. person_1 (held for 0s)
 2. person_2 (waiting for 1h)
             END
           end
@@ -240,7 +263,7 @@ describe Lita::Handlers::Totems, lita_handler: true do
               send_message("totems yield chicken", as: carl)
               expect(replies.last).to eq(%{You are no longer in line for the "chicken" totem.})
               send_message("totems info chicken")
-              expect(replies.last).to eq("1. Test User (held for 1h)\n")
+              expect(replies.last).to eq("1. person_1 (held for 1h)\n")
             end
           end
         end
@@ -251,7 +274,7 @@ describe Lita::Handlers::Totems, lita_handler: true do
             send_message("totems yield", as: carl)
             expect(replies.last).to eq(%{You are no longer in line for the "chicken" totem.})
             send_message("totems info chicken")
-            expect(replies.last).to eq("1. Test User (held for 1h)\n")
+            expect(replies.last).to eq("1. person_1 (held for 1h)\n")
           end
         end
       end
@@ -274,7 +297,7 @@ describe Lita::Handlers::Totems, lita_handler: true do
               send_message("totems yield chicken", as: carl)
               expect(replies.last).to eq(%{You are no longer in line for the "chicken" totem.})
               send_message("totems info chicken")
-              expect(replies.last).to eq("1. Test User (held for 1h)\n2. person_2 (waiting for 1h)\n")
+              expect(replies.last).to eq("1. person_1 (held for 1h)\n2. person_2 (waiting for 1h)\n")
             end
           end
         end
@@ -306,7 +329,7 @@ describe Lita::Handlers::Totems, lita_handler: true do
               send_message("totems yield chicken", as: carl)
               expect(replies.last).to eq(%{You are no longer in line for the "chicken" totem.})
               send_message("totems info chicken")
-              expect(replies.last).to eq("1. Test User (held for 1h)\n2. person_2 (waiting for 1h)\n")
+              expect(replies.last).to eq("1. person_1 (held for 1h)\n2. person_2 (waiting for 1h)\n")
             end
           end
         end
@@ -333,16 +356,16 @@ describe Lita::Handlers::Totems, lita_handler: true do
         send_message("totems add chicken", as: another_user)
         send_message("totems add chicken", as: carl)
       end
-      it "should notify that user that she has been kicked" do
-        expect(robot).to receive(:send_messages) do |target, message|
-          expect(target.user.id).to eq(another_user.id)
-          expect(message).to eq(%{You have been kicked from totem "chicken".})
-        end
-        send_message("totems kick chicken")
-      end
-      it "should notify next user in line that she now has the totem" do
-        send_message("totems kick chicken")
-        expect(replies.last).to eq(%{You are now in possession of totem "chicken".})
+      it "should notify that user that she has been kicked, and notify the next user she now has the totem" do
+        expect(robot).to receive(:send_messages).twice do |target, message|
+            expect([another_user.id, carl.id]).to include(target.user.id)
+            if target.user.id == carl.id
+              expect(message).to eq(%{You are now in possession of totem "chicken".})
+            elsif target.user.id == another_user.id
+              expect(message).to eq(%{You have been kicked from totem "chicken".})
+            end
+          end
+        send_message("totems kick chicken", as: carl)
       end
     end
 
@@ -351,13 +374,16 @@ describe Lita::Handlers::Totems, lita_handler: true do
         send_message("totems add chicken", as: carl)
       end
       it "should notify that user that she has been kicked and clear the owning_user_id" do
-        expect(robot).to receive(:send_messages) do |target, message|
-          expect(target.user.id).to eq(carl.id)
-          expect(message).to eq(%{You have been kicked from totem "chicken".})
+        expect(robot).to receive(:send_messages).twice do |target, message|
+          expect([another_user.id, carl.id]).to include(target.user.id)
+          if target.user.id == carl.id
+            expect(message).to eq(%{You have been kicked from totem "chicken".})
+          elsif target.user.id == another_user.id
+            expect(message).to eq("")
+          end
         end
         send_message("totems kick chicken")
         send_message("totems info chicken")
-        expect(replies.last).to eq ""
       end
     end
 
@@ -388,7 +414,7 @@ describe Lita::Handlers::Totems, lita_handler: true do
           send_message("totems info chicken")
           expect(replies.last).to eq <<-END
 1. Carl (held for 1h)
-2. Test User (waiting for 1h)
+2. person_1 (waiting for 1h)
 3. person_2 (waiting for 1h)
           END
         end
@@ -402,7 +428,7 @@ describe Lita::Handlers::Totems, lita_handler: true do
           expect(replies.last).to include <<-END
 - chicken
   1. Carl (held for 1d 1h)
-  2. Test User (waiting for 1d 1h)
+  2. person_1 (waiting for 1d 1h)
   3. person_2 (waiting for 1d 1h)
           END
           expect(replies.last).to include <<-END

data/spec/spec_helper.rb

@@ -9,3 +9,4 @@ SimpleCov.start { add_filter "/spec/" }
 
 require "lita-totems"
 require "lita/rspec"
+Lita.version_3_compatibility_mode = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-totems
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Charles Finkel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   requirement: !ruby/object:Gem::Requirement
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Adds support to Lita for Totems