lita-locker 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 228a4b3898980e9de630cee8152cd4ea8104c830
-  data.tar.gz: fd299284bef188f5d7fee52c79c925c91b979187
+  metadata.gz: 538195ef609b8545191a650afd2264a722de29fe
+  data.tar.gz: 1dcc32d437547e690f6241beca18a5980ae20300
 SHA512:
-  metadata.gz: 078690a522779d50e1f8f5f83d3635bf401d26027cd68496a29b2f4472af7c444367df91e5c368d1def23b02946ff4f30cef6c67d1743b90f7442ccd13d526bf
-  data.tar.gz: 05fa9b743fa6a22e6c68e44d6f445cf143cb345c91c09fdad7fb959effc79299c36f3e91721e0b8123ab9af969197ee8595f011135bac98a6e0538dd8b9d485f
+  metadata.gz: d1e099f1a54bce4d2e24973fb05302bb00babc7a159ceb5fdef4686e0fbaae3d2539c860bd501b26607343e015e9557e40be03100a7301069eca22ad34b4aa34
+  data.tar.gz: e2e83c9855f15e83ecbbb82afc48daac9b95fa4ce0372049b5f96ce450d41871aa7fe467f7b05c278c7af954068d5a9123c7cbdca8fb87b15db69ffd213e0735

data/lib/lita/handlers/locker.rb

@@ -145,10 +145,11 @@ module Lita
             else
               l = label(name)
               if l['state'] == 'locked'
+                o = Lita::User.find_by_id(l['owner_id'])
                 response.reply('(failed) ' + t('label.owned',
                                                name: name,
-                                               owner_name: l['owner_name'],
-                                               owner_mention: l['owner_mention']))
+                                               owner_name: o.name,
+                                               owner_mention: o.mention_name))
               else
                 response.reply('(failed) ' + t('label.dependency'))
               end
@@ -173,10 +174,11 @@ module Lita
               unlock_label!(name)
               response.reply('(successful) ' + t('label.unlock', name: name))
             else
+              o = Lita::User.find_by_id(l['owner_id'])
               response.reply('(failed) ' + t('label.owned',
                                              name: name,
-                                             owner_name: l['owner_name'],
-                                             owner_mention: l['owner_mention']))
+                                             owner_name: o.name,
+                                             owner_mention: o.mention_name))
             end
           end
         else
@@ -381,8 +383,6 @@ module Lita
             # FIXME: Race condition!
             redis.hset(resource_key, 'state', 'locked')
             redis.hset(resource_key, 'owner_id', owner.id)
-            redis.hset(resource_key, 'owner_name', owner.name)
-            redis.hset(resource_key, 'owner_mention', owner.mention_name)
             redis.hset(resource_key, 'until', time_until)
             true
           else
@@ -402,8 +402,6 @@ module Lita
           end
           redis.hset(key, 'state', 'locked')
           redis.hset(key, 'owner_id', owner.id)
-          redis.hset(key, 'owner_name', owner.name)
-          redis.hset(key, 'owner_mention', owner.mention_name)
           redis.hset(key, 'until', time_until)
           true
         else
@@ -415,8 +413,6 @@ module Lita
         if resource_exists?(name)
           key = "resource_#{name}"
           redis.hset(key, 'state', 'unlocked')
-          redis.hset(key, 'owner_name', '')
-          redis.hset(key, 'owner_mention', '')
           redis.hset(key, 'owner_id', '')
         else
           false
@@ -431,8 +427,6 @@ module Lita
             unlock_resource!(m)
           end
           redis.hset(key, 'state', 'unlocked')
-          redis.hset(key, 'owner_name', '')
-          redis.hset(key, 'owner_mention', '')
           redis.hset(key, 'owner_id', '')
           true
         else

data/lita-locker.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-locker'
-  spec.version       = '0.5.0'
+  spec.version       = '0.5.1'
   spec.authors       = ['Eric Sigler']
   spec.email         = ['me@esigler.com']
   spec.description   = '"lock" and "unlock" arbitrary subjects'

data/spec/lita/handlers/locker_spec.rb

@@ -286,7 +286,9 @@ describe Lita::Handlers::Locker, lita_handler: true do
       send_command('locker label add foo to bar')
       send_command('locker label add baz to bar')
       send_command('locker label show bar')
-      expect(replies.last).to eq('Label bar has: foo, baz')
+      expect(replies.last).to match(/Label bar has:/)
+      expect(replies.last).to match(/foo/)
+      expect(replies.last).to match(/baz/)
     end
 
     it 'shows an error if the label does not exist' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-locker
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Eric Sigler