lita-onewheel-baileys 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7704f88f1316c98b6781f5ecf31cfc1eb8e29525
-  data.tar.gz: d2acc68ec67dc78bce800c7127930282f0a8528a
+  metadata.gz: c567adea9608809dd87a888de332df23256ac610
+  data.tar.gz: 4f4f5cdfa7ac0a0d5e6dabf62e0c1f7cf79a6678
 SHA512:
-  metadata.gz: 5e85d5077ad6b1ae6a6f12b0b51354aca03c839d02a4a29e374555273d7460ff84e4262e537ce8591268aa95207464b51ca0da9fbf26636d25db6a5b4ef5cb63
-  data.tar.gz: 3e723e6aeb8531a6765cba66f956e874f70ede278b9af0e80a77b223b8be4e8ad083b4a39a163af12827540b3a2c42d3569d8f987431b0f076c825c7e2ee86a4
+  metadata.gz: c6a5dfd46627e8dd456c8276823bf38fc80494752613df3b9b30999a39a02e56201d4ed98d37d48b63e5713e7713c21545f698d942c4aa090f727296b0ba79fb
+  data.tar.gz: d06627fbdd5ff720530ebaf8dc50c79bcc82cf26bfc83b96f751952696cd6552d05f755199d1e3ef8a57bef9b66e8b039b5f8b6c7e74d1a574932ed541126f36

data/lib/lita/handlers/onewheel_baileys.rb

@@ -31,10 +31,11 @@ module Lita
             help: {'taps roulette' => 'Can\'t decide?  Let me do it for you!'}
 
       def taps_list(response)
-        beers = get_baileys
+        beers = get_source
         reply = "Bailey's taps: "
         beers.each do |tap, datum|
           reply += "#{tap}) "
+          reply += get_tap_type_text(datum[:type])
           reply += datum[:brewery] + ' '
           reply += datum[:name] + '  '
         end
@@ -45,24 +46,25 @@ module Lita
       end
 
       def taps_deets(response)
-        beers = get_baileys
+        beers = get_source
         beers.each do |tap, datum|
           query = response.matches[0][0].strip
           # Search directly by tap number OR full text match.
-          if (query.match(/^\d+$/) and tap == query) or (datum[:search].match(/#{query}/i))
+          # Let's make cask and nitro taps specific.
+          if (query.match(/^\d+$/) and tap == query) or (datum[:search].match(/#{query}/i)) or (datum[:type].downcase.match(/#{query}/i))  # Cask and Nitro
             send_response(tap, datum, response)
           end
         end
       end
 
       def taps_by_abv(response)
-        beers = get_baileys
+        beers = get_source
         beers.each do |tap, datum|
           if datum[:abv].to_f == 0.0
             next
           end
           query = response.matches[0][0].strip
-          # Search directly by tap number OR full text match.
+          # Search directly by abv matcher.
           if (abv_matches = query.match(/([><])(\d+\.*\d*)/))
             direction = abv_matches.to_s.match(/[<>]/).to_s
             abv_requested = abv_matches.to_s.match(/\d+.*\d*/).to_s
@@ -77,7 +79,7 @@ module Lita
       end
 
       def taps_by_price(response)
-        beers = get_baileys
+        beers = get_source
         beers.each do |tap, datum|
           # if datum[:prices][1][:cost].to_f == 0.0
           #   next
@@ -99,13 +101,13 @@ module Lita
       end
 
       def taps_by_random(response)
-        beers = get_baileys
+        beers = get_source
         beer = beers.to_a.sample
         send_response(beer[0], beer[1], response)
       end
 
       def send_response(tap, datum, response)
-        reply = "Bailey's tap #{tap}) "
+        reply = "Bailey's tap #{tap}) #{get_tap_type_text(datum[:type])}"
         reply += "#{datum[:brewery]} "
         reply += "#{datum[:name]} "
         reply += "- #{datum[:desc]}, "
@@ -115,6 +117,10 @@ module Lita
         response.reply reply
       end
 
+      def get_tap_type_text(type)
+        (type.empty?) ? '' : "(#{type}) "
+      end
+
       def get_display_prices(prices)
         price_array = []
         prices.each do |p|
@@ -123,7 +129,7 @@ module Lita
         price_array.join ' | '
       end
 
-      def get_baileys
+      def get_source
         unless (response = redis.get('page_response'))
           Lita.logger.info 'No cached result found.'
           response = RestClient.get('http://www.baileystaproom.com/draft-list/')
@@ -133,12 +139,18 @@ module Lita
         parse_response response
       end
 
+      # This is the worker bee- decoding the html into our "standard" document.
+      # Future implementations could simply override this implementation-specific
+      # code to help this grow more widely.
       def parse_response(response)
         gimme_what_you_got = {}
         noko = Nokogiri.HTML response
         noko.css('div#boxfielddata').each do |beer_node|
           # gimme_what_you_got
-          tap = get_tap_name(beer_node)
+          tap_name = get_tap_name(beer_node)
+          tap = tap_name.match(/\d+/).to_s
+          tap_type = tap_name.match(/(cask|nitro)/i).to_s
+
           remaining = beer_node.attributes['title']
 
           brewery = get_brewery(beer_node)
@@ -149,6 +161,7 @@ module Lita
           prices = get_prices(beer_node)
 
           gimme_what_you_got[tap] = {
+              type: tap_type,
               remaining: remaining,
               brewery: brewery.to_s,
               name: beer_name.to_s,

data/lita-onewheel-baileys.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-onewheel-baileys'
-  spec.version       = '3.2.0'
+  spec.version       = '3.3.0'
   spec.authors       = ['Andrew Kreps']
   spec.email         = ['andrew.kreps@gmail.com']
   spec.description   = %q{Lita interface to Bailey's Taproom listings.}

data/spec/lita/handlers/onewheel_baileys_spec.rb

@@ -11,7 +11,7 @@ describe Lita::Handlers::OnewheelBaileys, lita_handler: true do
 
   it 'shows the taps' do
     send_command 'taps'
-    expect(replies.last).to eq("Bailey's taps: 1) Cider Riot! Plastic Paddy  2) Fox Tail Rosenberry  Cask 3) Machine House Crystal Maze  4) Wild Ride Solidarity  5) Mazama Gillian’s Red  Nitro 6) Backwoods Winchester Brown  7) Fort George Vortex  8) Fat Head’s Zeus Juice  9) Hopworks Noggin’ Floggin’  10) Anderson Valley Briney Melon Gose  11) Lagunitas Copper Fusion Ale  12) Double Mountain Fast Lane  13) Burnside Couch Lager  14) Bell’s Oatmeal Stout  15) Baerlic Wildcat  16) New Belgium La Folie  17) Culmination Urizen  18) Knee Deep Hop Surplus  19) Cascade Lakes Ziggy Stardust  20) Knee Deep Dark Horse  21) Coronado Orange Avenue Wit  22) GoodLife 29er  23) Amnesia Slow Train Porter  24) Oakshire Perfect Storm  25) Green Flash Passion Fruit Kicker")
+    expect(replies.last).to eq("Bailey's taps: 1) Cider Riot! Plastic Paddy  2) Fox Tail Rosenberry  3) (Cask) Machine House Crystal Maze  4) Wild Ride Solidarity  5) Mazama Gillian’s Red  6) (Nitro) Backwoods Winchester Brown  7) Fort George Vortex  8) Fat Head’s Zeus Juice  9) Hopworks Noggin’ Floggin’  10) Anderson Valley Briney Melon Gose  11) Lagunitas Copper Fusion Ale  12) Double Mountain Fast Lane  13) Burnside Couch Lager  14) Bell’s Oatmeal Stout  15) Baerlic Wildcat  16) New Belgium La Folie  17) Culmination Urizen  18) Knee Deep Hop Surplus  19) Cascade Lakes Ziggy Stardust  20) Knee Deep Dark Horse  21) Coronado Orange Avenue Wit  22) GoodLife 29er  23) Amnesia Slow Train Porter  24) Oakshire Perfect Storm  25) Green Flash Passion Fruit Kicker")
   end
 
   it 'displays details for tap 4' do
@@ -27,12 +27,12 @@ describe Lita::Handlers::OnewheelBaileys, lita_handler: true do
 
   it 'gets nitro' do
     send_command 'taps nitro'
-    expect(replies.last).to eq('Bailey\'s tap Nitro 6) Backwoods Winchester Brown - Brown Ale 6.2%, 10oz - $3 | 20oz - $5, 98% remaining')
+    expect(replies.last).to eq('Bailey\'s tap 6) (Nitro) Backwoods Winchester Brown - Brown Ale 6.2%, 10oz - $3 | 20oz - $5, 98% remaining')
   end
 
   it 'gets cask' do
     send_command 'taps cask'
-    expect(replies.last).to eq("Bailey's tap Cask 3) Machine House Crystal Maze - ESB 4.0%, 10oz - $3 | 20oz - $5, 57% remaining")
+    expect(replies.last).to eq("Bailey's tap 3) (Cask) Machine House Crystal Maze - ESB 4.0%, 10oz - $3 | 20oz - $5, 57% remaining")
   end
 
   it 'searches for ipa' do
@@ -58,7 +58,7 @@ describe Lita::Handlers::OnewheelBaileys, lita_handler: true do
   it 'searches for abv < 4%' do
     send_command 'taps <4%'
     expect(replies.count).to eq(2)
-    expect(replies[0]).to eq("Bailey's tap Cask 3) Machine House Crystal Maze - ESB 4.0%, 10oz - $3 | 20oz - $5, 57% remaining")
+    expect(replies[0]).to eq("Bailey's tap 3) (Cask) Machine House Crystal Maze - ESB 4.0%, 10oz - $3 | 20oz - $5, 57% remaining")
     expect(replies.last).to eq("Bailey's tap 11) Lagunitas Copper Fusion Ale - Copper Ale 4.0%, 10oz - $3 | 20oz - $5 | 32oz Crowler - $8, 19% remaining")
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-onewheel-baileys
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Andrew Kreps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita