lita-kegbot 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbe0e8c14e5b7b7a03a5c41d347e047a90c4addb
-  data.tar.gz: 6fc87df5733ba261d0ac1f5cd4f00d71d8d193c5
+  metadata.gz: f377744672faacfb1dd8eb24044eeb4051a7f033
+  data.tar.gz: d6b41a95f2e133eee66e5767987e550fe6d8dc81
 SHA512:
-  metadata.gz: cc63abe6ef50aa448ceb159cf86076c05ead14f010dc717486e73194c874b6d5653c4c6f85364d16f2ccf9e35a159d7d42ccfebc18960dc2fe5eba3237790a00
-  data.tar.gz: 05b18f5f48934e07824988d76abc2e4a32fef542fdbd905d9fdc8c29e89cc0f3b3564eabe2374c9620300ed5a6952a144f748a3dc25076fd07daa983755d90a6
+  metadata.gz: bc8141444f4cbbb04de03fc93990a1c08824d24dcf25c2b737552ba0da0f7dcbfda6f30c29c3f93100b3378665e9e9f709b3f00b591c22d48e31095f8412347b
+  data.tar.gz: e784489a0972fb0f3eebd5e7d33ddc01ed11895051349a886e615cbaf0b837186c67a12dbb3fce73b95420bf0e43afbcb51c4de5ddda0410fe4b118227578bf1

data/lib/lita/handlers/kegbot.rb

@@ -2,25 +2,16 @@ module Lita
   module Handlers
     class Kegbot < Handler
       route(
-        /^(?:kegbot|kb)\sdrink\slist$/,
-        :drink_list_all,
-        command: true,
-        help: {
-          t('help.drink_list.syntax') => t('help.drink_list.desc')
-        }
-      )
-
-      route(
-        /^(?:kegbot|kb)\sdrink\slist\s(\d+)$/,
+        /^(?:kegbot|kb)\s(?:drink|drinks)\slist(\s\d+)*$/,
         :drink_list,
         command: true,
         help: {
-          t('help.drink_list_N.syntax') => t('help.drink_list_N.desc')
+          t('help.drink_list.syntax') => t('help.drink_list.desc')
         }
       )
 
       route(
-        /^(?:kegbot|kb)\stap\sstatus$/,
+        /^(?:kegbot|kb)\s(?:tap|taps)\sstatus$/,
         :tap_status_all,
         command: true,
         help: {
@@ -29,7 +20,7 @@ module Lita
       )
 
       route(
-        /^(?:kegbot|kb)\stap\sstatus\s(\d+)$/,
+        /^(?:kegbot|kb)\s(?:tap|taps)\sstatus\s(\d+)$/,
         :tap_status_id,
         command: true,
         help: {
@@ -38,7 +29,7 @@ module Lita
       )
 
       route(
-        /^(?:kegbot|kb)\skeg\sstatus$/,
+        /^(?:kegbot|kb)\s(?:keg|kegs)\sstatus$/,
         :keg_status_all,
         command: true,
         help: {
@@ -47,7 +38,7 @@ module Lita
       )
 
       route(
-        /^(?:kegbot|kb)\skeg\sstatus\s(\d+)$/,
+        /^(?:kegbot|kb)\s(?:keg|kegs)\sstatus\s(\d+)$/,
         :keg_status_id,
         command: true,
         help: {
@@ -60,32 +51,20 @@ module Lita
         config.api_url = nil
       end
 
-      def drink_list_all(response)
-        result = api_request('get', 'drinks/')
-        if result && result['objects']
-          drinks = result['objects']
-          response.reply(t('drinks.none')) unless drinks.count > 0
-          drinks.each do |drink|
-            session = drink['session']
-            response.reply(t('drinks.info', user: drink['user_id'],
-                                            date: session['start_time']))
-          end
-        else
-          response.reply(t('error.request'))
-        end
-      end
-
       def drink_list(response)
-        count = response.matches[0][0].to_i
+        count_match = response.matches[0][0]
+        count_match ? count = count_match.to_i : count = 5
         current = 0
-        result = api_request('get', 'drinks')
-        if result && result['result'] && result['result']['drinks']
-          drinks = result['result']['drinks']
+        drinks = fetch_drinks
+        if drinks
           response.reply(t('drinks.none')) unless drinks.count > 0
           drinks.each do |drink|
             if current < count
+              formatted_date = drink['session']['start_time']
+              beer = drink['keg']['beverage']['name']
               response.reply(t('drinks.info', user: drink['user_id'],
-                                              date: drink['pour_time']))
+                                              beer: beer,
+                                              date: formatted_date))
               current += 1
             end
           end
@@ -95,9 +74,8 @@ module Lita
       end
 
       def tap_status_all(response)
-        result = api_request('get', 'taps/')
-        if result && result['objects']
-          taps = result['objects']
+        taps = fetch_taps
+        if taps
           response.reply(t('taps.none')) unless taps.count > 0
           taps.each do |tap|
             response.reply(t('taps.info', id: tap['id'], name: tap['name']))
@@ -108,10 +86,8 @@ module Lita
       end
 
       def tap_status_id(response)
-        id = response.matches[0][0].to_i
-        result = api_request('get', "taps/#{id}")
-        if result && result['object']
-          tap = result['object']
+        tap = fetch_tap(response.matches[0][0].to_i)
+        if tap
           response.reply(t('taps.info', id: tap['id'], name: tap['name']))
         else
           response.reply(t('error.request'))
@@ -119,16 +95,18 @@ module Lita
       end
 
       def keg_status_all(response)
-        result = api_request('get', 'kegs/')
-        if result && result['objects']
-          kegs = result['objects']
+        kegs = fetch_kegs
+        if kegs
           response.reply(t('kegs.none')) unless kegs.count > 0
           kegs.each do |keg|
-            keg['status'] ? status = 'offline' : status = 'online'
-            response.reply(t('kegs.info', id: keg['id'],
-                                          beer: keg['beverage']['name'],
-                                          status: status,
-                                          pct: keg['percent_full']))
+            if keg['online']
+              keg['online'] ? status = 'online' : status = 'offline'
+              pct = format('%3.2f', keg['percent_full'])
+              response.reply(t('kegs.info', id: keg['id'],
+                                            beer: keg['beverage']['name'],
+                                            status: status,
+                                            pct: pct))
+            end
           end
         else
           response.reply(t('error.request'))
@@ -136,15 +114,14 @@ module Lita
       end
 
       def keg_status_id(response)
-        id = response.matches[0][0].to_i
-        result = api_request('get', "kegs/#{id}")
-        if result && result['object']
-          keg = result['object']
-          keg['status'] ? status = 'offline' : status = 'online'
+        keg = fetch_keg(response.matches[0][0].to_i)
+        if keg
+          keg['online'] ? status = 'online' : status = 'offline'
+          pct = format('%3.2f', keg['percent_full'])
           response.reply(t('kegs.info', id: keg['id'],
                                         beer: keg['beverage']['name'],
                                         status: status,
-                                        pct: keg['percent_full']))
+                                        pct: pct))
         else
           response.reply(t('error.request'))
         end
@@ -152,6 +129,31 @@ module Lita
 
       private
 
+      def fetch_drinks
+        result = api_request('get', 'drinks/')
+        result['objects'] if result && result['objects']
+      end
+
+      def fetch_tap(id)
+        result = api_request('get', "taps/#{id}")
+        result['object'] if result && result['object']
+      end
+
+      def fetch_taps
+        result = api_request('get', 'taps/')
+        result['objects'] if result && result['objects']
+      end
+
+      def fetch_keg(id)
+        result = api_request('get', "kegs/#{id}")
+        result['object'] if result && result['object']
+      end
+
+      def fetch_kegs
+        result = api_request('get', 'kegs/')
+        result['objects'] if result && result['objects']
+      end
+
       def api_request(method, path, args = {})
         if Lita.config.handlers.kegbot.api_key.nil? ||
            Lita.config.handlers.kegbot.api_url.nil?

data/lita-kegbot.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-kegbot'
-  spec.version       = '0.2.0'
+  spec.version       = '0.3.0'
   spec.authors       = ['Eric Sigler']
   spec.email         = ['me@esigler.com']
   spec.description   = %q{A Kegbot handler for Lita.io}

data/locales/en.yml

@@ -3,18 +3,15 @@ en:
     handlers:
       kegbot:
         drinks:
-          info: "%{user} poured a glass at %{date}"
+          info: "%{user} poured a refreshing glass of %{beer} at %{date}"
           none: No drinks have been poured
         error:
           not_implemented: Not implemented yet.
           request: There was a problem with the Kegbot request
         help:
           drink_list:
-            syntax: (kegbot|kb) drink list
-            desc: List last 5 drinks poured
-          drink_list_N:
-            syntax: (kegbot|kb) drink list <N>
-            desc: List last <N> drinks poured
+            syntax: (kegbot|kb) drink list [N]
+            desc: List last [N] drinks poured, defaults to 5
           tap_list:
             syntax: (kegbot|kb) tap list
             desc: Lists taps

data/spec/lita/handlers/kegbot_spec.rb

@@ -33,14 +33,14 @@ describe Lita::Handlers::Kegbot, lita_handler: true do
     File.read('spec/files/keg.json')
   end
 
-  it { routes_command('kegbot drink list').to(:drink_list_all) }
+  it { routes_command('kegbot drink list').to(:drink_list) }
   it { routes_command('kegbot drink list 10').to(:drink_list) }
   it { routes_command('kegbot tap status').to(:tap_status_all) }
   it { routes_command('kegbot tap status 1').to(:tap_status_id) }
   it { routes_command('kegbot keg status').to(:keg_status_all) }
   it { routes_command('kegbot keg status 1').to(:keg_status_id) }
 
-  it { routes_command('kb drink list').to(:drink_list_all) }
+  it { routes_command('kb drink list').to(:drink_list) }
   it { routes_command('kb drink list 10').to(:drink_list) }
   it { routes_command('kb tap status').to(:tap_status_all) }
   it { routes_command('kb tap status 1').to(:tap_status_id) }
@@ -79,34 +79,26 @@ describe Lita::Handlers::Kegbot, lita_handler: true do
     Lita.config.handlers.kegbot.api_url = 'https://example.com'
   end
 
-  describe '#drink_list_all' do
+  describe '#drink_list' do
     it 'shows a list of drinks if there are any' do
       grab_request('get', 200, drinks)
       send_command('kegbot drink list')
-      expect(replies.last).to eq('esigler poured a glass at ' \
-                                 '2014-04-14T07:39:01+00:00')
+      expect(replies.last).to eq('esigler poured a refreshing glass of ' \
+                                 'Racer 5 at 2014-04-14T07:39:01+00:00')
     end
 
-    it 'shows an empty list if there arent any' do
-      grab_request('get', 200, drinks_empty)
-      send_command('kegbot drink list')
-      expect(replies.last).to eq('No drinks have been poured')
-    end
-
-    it 'shows an error if there was a problem with the request' do
-      grab_request('get', 500, nil)
-      send_command('kegbot drink list')
-      expect(replies.last).to eq('There was a problem with the Kegbot request')
-    end
-  end
-
-  describe '#drink_list' do
     it 'shows the correct number of drinks if there are that many' do
       grab_request('get', 200, drinks)
       send_command('kegbot drink list 1')
       expect(replies.count).to eq(1)
     end
 
+    it 'shows an empty list if there arent any' do
+      grab_request('get', 200, drinks_empty)
+      send_command('kegbot drink list')
+      expect(replies.last).to eq('No drinks have been poured')
+    end
+
     it 'shows an error if there was a problem with the request' do
       grab_request('get', 500, nil)
       send_command('kegbot drink list 2')
@@ -158,7 +150,7 @@ describe Lita::Handlers::Kegbot, lita_handler: true do
     it 'shows the status of all of the kegs if there are any' do
       grab_request('get', 200, kegs)
       send_command('kegbot keg status')
-      expect(replies.last).to eq('Keg #1: Racer 5, status: online, 100.0% ' \
+      expect(replies.last).to eq('Keg #1: Racer 5, status: online, 100.00% ' \
                                  'remaining')
     end
 
@@ -179,7 +171,7 @@ describe Lita::Handlers::Kegbot, lita_handler: true do
     it 'shows the status of a specific keg' do
       grab_request('get', 200, keg)
       send_command('kegbot keg status 1')
-      expect(replies.last).to eq('Keg #1: Racer 5, status: online, 100.0% ' \
+      expect(replies.last).to eq('Keg #1: Racer 5, status: online, 100.00% ' \
                                  'remaining')
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-kegbot
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Eric Sigler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita