lita-onewheel-baileys 3.4.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b4030c73a29f11bfc4d9ab88f1322556f72d044
-  data.tar.gz: 519cd61841d9cfc846d96437af7403a3b31a54f6
+  metadata.gz: 8d7f3a77e5632386242cad3dea416acec650cdce
+  data.tar.gz: c85e4caaaaf0c69b930e8b5487d16f9a3b064653
 SHA512:
-  metadata.gz: dba29a396e1443c206dc64da0e8a3d51de291b4bbdf0903b9c79983dccaa2ad627b1952bba182052c878cfd78bb5e434a48bfdf6561fc385d630b1729eb57995
-  data.tar.gz: b9a71b1ce256b06e99bad8576cdfb655599c0c198c8171172f7ff35faefc954211ad1f297d67ff2a01ef53bbdb5f0dae2be152b147cf092eb3fbb2e2a996fca6
+  metadata.gz: f3ef79346e8b6dc4944e3665e259973601f39fca103908bb33c716b3523507908aeda1a2bb7afe133cc16590220284997d3dfcc78fc858367b4a4f43a922a5bf
+  data.tar.gz: 7bdf4621e3aa5674adc478dd61941af4ff88dea8f4963f94e7b4e5233d3e0fde82f9f240e883fb7099e4a06ba7cc216c5058c2a814c4eedf33a2f950e87b0308

data/lib/lita/handlers/onewheel_baileys.rb

@@ -15,12 +15,12 @@ module Lita
             command: true,
             help: {'taps 4' => 'Display the tap 4 deets, including prices.'}
 
-      route /^taps ([<>\w.]+)%$/i,
+      route /^taps ([<>=\w.\s]+)%$/i,
             :taps_by_abv,
             command: true,
             help: {'taps >4%' => 'Display beers over 4% ABV.'}
 
-      route /^taps ([<>\$\w.]+)$/i,
+      route /^taps ([<>=\$\w.\s]+)$/i,
             :taps_by_price,
             command: true,
             help: {'taps <$5' => 'Display beers under $5.'}
@@ -65,13 +65,19 @@ module Lita
           end
           query = response.matches[0][0].strip
           # Search directly by abv matcher.
-          if (abv_matches = query.match(/([><])(\d+\.*\d*)/))
-            direction = abv_matches.to_s.match(/[<>]/).to_s
+          if (abv_matches = query.match(/([><=]+)\s*(\d+\.*\d*)/))
+            direction = abv_matches.to_s.match(/[<>=]+/).to_s
             abv_requested = abv_matches.to_s.match(/\d+.*\d*/).to_s
-            if direction == '>' and datum[:abv].to_f >= abv_requested.to_f
+            if direction == '>' and datum[:abv].to_f > abv_requested.to_f
               send_response(tap, datum, response)
             end
-            if direction == '<' and datum[:abv].to_f <= abv_requested.to_f
+            if direction == '<' and datum[:abv].to_f < abv_requested.to_f
+              send_response(tap, datum, response)
+            end
+            if direction == '>=' and datum[:abv].to_f >= abv_requested.to_f
+              send_response(tap, datum, response)
+            end
+            if direction == '<=' and datum[:abv].to_f <= abv_requested.to_f
               send_response(tap, datum, response)
             end
           end
@@ -87,13 +93,19 @@ module Lita
 
           query = response.matches[0][0].strip
           # Search directly by tap number OR full text match.
-          if (price_matches = query.match(/([><])\$(\d+\.*\d*)/))
-            direction = price_matches.to_s.match(/[<>]/).to_s
+          if (price_matches = query.match(/([><=]+)\s*\$(\d+\.*\d*)/))
+            direction = price_matches.to_s.match(/[<>=]+/).to_s
             price_requested = price_matches.to_s.match(/\d+.*\d*/).to_s
-            if direction == '>' and datum[:prices][1][:cost].to_f >= price_requested.to_f
+            if direction == '>' and datum[:prices][1][:cost].to_f > price_requested.to_f
+              send_response(tap, datum, response)
+            end
+            if direction == '<' and datum[:prices][1][:cost].to_f < price_requested.to_f
+              send_response(tap, datum, response)
+            end
+            if direction == '>=' and datum[:prices][1][:cost].to_f >= price_requested.to_f
               send_response(tap, datum, response)
             end
-            if direction == '<' and datum[:prices][1][:cost].to_f <= price_requested.to_f
+            if direction == '<=' and datum[:prices][1][:cost].to_f <= price_requested.to_f
               send_response(tap, datum, response)
             end
           end

data/lita-onewheel-baileys.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-onewheel-baileys'
-  spec.version       = '3.4.0'
+  spec.version       = '3.6.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

@@ -45,8 +45,26 @@ describe Lita::Handlers::OnewheelBaileys, lita_handler: true do
     expect(replies.last).to eq("Bailey's tap 22) GoodLife 29er - India Brown Ale 6.0%, 10oz - $3 | 20oz - $5 | 32oz Crowler - $8, 37% remaining")
   end
 
-  it 'searches for abv > 9%' do
+  it 'searches for abv >9%' do
     send_command 'taps >9%'
+    expect(replies.count).to eq(4)
+    expect(replies[0]).to eq("Bailey's tap 8) Fat Head’s Zeus Juice - Belgian Strong Blonde 10.0%, 4oz - $2 | 12oz - $4 | 32oz Crowler - $9, 44% remaining")
+    expect(replies[1]).to eq("Bailey's tap 9) Hopworks Noggin’ Floggin’ - Barleywine 11.0%, 4oz - $3 | 12oz - $6 | 32oz Crowler - $13, 34% remaining")
+    expect(replies[2]).to eq("Bailey's tap 18) Knee Deep Hop Surplus - Triple IPA 10.0%, 4oz - $2 | 12oz - $4 | 32oz Crowler - $10, 25% remaining")
+    expect(replies[3]).to eq("Bailey's tap 20) Knee Deep Dark Horse - Imperial Stout 12.0%, 4oz - $2 | 12oz - $4 | 32oz Crowler - $10, 39% remaining")
+  end
+
+  it 'searches for abv > 9%' do
+    send_command 'taps > 9%'
+    expect(replies.count).to eq(4)
+    expect(replies[0]).to eq("Bailey's tap 8) Fat Head’s Zeus Juice - Belgian Strong Blonde 10.0%, 4oz - $2 | 12oz - $4 | 32oz Crowler - $9, 44% remaining")
+    expect(replies[1]).to eq("Bailey's tap 9) Hopworks Noggin’ Floggin’ - Barleywine 11.0%, 4oz - $3 | 12oz - $6 | 32oz Crowler - $13, 34% remaining")
+    expect(replies[2]).to eq("Bailey's tap 18) Knee Deep Hop Surplus - Triple IPA 10.0%, 4oz - $2 | 12oz - $4 | 32oz Crowler - $10, 25% remaining")
+    expect(replies[3]).to eq("Bailey's tap 20) Knee Deep Dark Horse - Imperial Stout 12.0%, 4oz - $2 | 12oz - $4 | 32oz Crowler - $10, 39% remaining")
+  end
+
+  it 'searches for abv >= 9%' do
+    send_command 'taps >= 9%'
     expect(replies.count).to eq(5)
     expect(replies[0]).to eq("Bailey's tap 8) Fat Head’s Zeus Juice - Belgian Strong Blonde 10.0%, 4oz - $2 | 12oz - $4 | 32oz Crowler - $9, 44% remaining")
     expect(replies[1]).to eq("Bailey's tap 9) Hopworks Noggin’ Floggin’ - Barleywine 11.0%, 4oz - $3 | 12oz - $6 | 32oz Crowler - $13, 34% remaining")
@@ -55,15 +73,36 @@ describe Lita::Handlers::OnewheelBaileys, lita_handler: true do
     expect(replies.last).to eq("Bailey's tap 24) Oakshire Perfect Storm - Imperial IPA 9.0%, 10oz - $4 | 20oz - $6 | 32oz Crowler - $10, 61% remaining")
   end
 
-  it 'searches for abv < 4%' do
-    send_command 'taps <4%'
+  it 'searches for abv <4.1%' do
+    send_command 'taps <4.1%'
     expect(replies.count).to eq(2)
     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
 
-  it 'searches for prices > $6' do
+  it 'searches for abv < 4.1%' do
+    send_command 'taps < 4.1%'
+    expect(replies.count).to eq(2)
+    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
+
+  it 'searches for abv <= 4%' do
+    send_command 'taps <= 4%'
+    expect(replies.count).to eq(2)
+    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
+
+  it 'searches for prices >$6' do
     send_command 'taps >$6'
+    expect(replies.count).to eq(2)
+    expect(replies[0]).to eq("Bailey's tap 1) Cider Riot! Plastic Paddy - Apple Cider w/ Irish tea 6.0%, 10oz - $4 | 20oz - $7 | 32oz Crowler - $10, 48% remaining")
+    expect(replies[1]).to eq("Bailey's tap 4) Wild Ride Solidarity - Abbey Dubbel – Barrel Aged (Pinot Noir) 8.2%, 4oz - $4 | 12oz - $7, 26% remaining")
+  end
+
+  it 'searches for prices >=$6' do
+    send_command 'taps >=$6'
     expect(replies.count).to eq(4)
     expect(replies[0]).to eq("Bailey's tap 1) Cider Riot! Plastic Paddy - Apple Cider w/ Irish tea 6.0%, 10oz - $4 | 20oz - $7 | 32oz Crowler - $10, 48% remaining")
     expect(replies[1]).to eq("Bailey's tap 4) Wild Ride Solidarity - Abbey Dubbel – Barrel Aged (Pinot Noir) 8.2%, 4oz - $4 | 12oz - $7, 26% remaining")
@@ -71,8 +110,23 @@ describe Lita::Handlers::OnewheelBaileys, lita_handler: true do
     expect(replies[3]).to eq("Bailey's tap 24) Oakshire Perfect Storm - Imperial IPA 9.0%, 10oz - $4 | 20oz - $6 | 32oz Crowler - $10, 61% remaining")
   end
 
-  it 'searches for prices < $4' do
-    send_command 'taps <$4'
+  it 'searches for prices > $6' do
+    send_command 'taps > $6'
+    expect(replies.count).to eq(2)
+    expect(replies[0]).to eq("Bailey's tap 1) Cider Riot! Plastic Paddy - Apple Cider w/ Irish tea 6.0%, 10oz - $4 | 20oz - $7 | 32oz Crowler - $10, 48% remaining")
+    expect(replies[1]).to eq("Bailey's tap 4) Wild Ride Solidarity - Abbey Dubbel – Barrel Aged (Pinot Noir) 8.2%, 4oz - $4 | 12oz - $7, 26% remaining")
+  end
+
+  it 'searches for prices <$4.1' do
+    send_command 'taps <$4.1'
+    expect(replies.count).to eq(3)
+    expect(replies[0]).to eq("Bailey's tap 8) Fat Head’s Zeus Juice - Belgian Strong Blonde 10.0%, 4oz - $2 | 12oz - $4 | 32oz Crowler - $9, 44% remaining")
+    expect(replies[1]).to eq("Bailey's tap 18) Knee Deep Hop Surplus - Triple IPA 10.0%, 4oz - $2 | 12oz - $4 | 32oz Crowler - $10, 25% remaining")
+    expect(replies[2]).to eq("Bailey's tap 20) Knee Deep Dark Horse - Imperial Stout 12.0%, 4oz - $2 | 12oz - $4 | 32oz Crowler - $10, 39% remaining")
+  end
+
+  it 'searches for prices < $4.01' do
+    send_command 'taps < $4.01'
     expect(replies.count).to eq(3)
     expect(replies[0]).to eq("Bailey's tap 8) Fat Head’s Zeus Juice - Belgian Strong Blonde 10.0%, 4oz - $2 | 12oz - $4 | 32oz Crowler - $9, 44% remaining")
     expect(replies[1]).to eq("Bailey's tap 18) Knee Deep Hop Surplus - Triple IPA 10.0%, 4oz - $2 | 12oz - $4 | 32oz Crowler - $10, 25% remaining")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-onewheel-baileys
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Andrew Kreps
@@ -166,7 +166,6 @@ files:
 - lib/lita/handlers/onewheel_baileys.rb
 - lita-onewheel-baileys.gemspec
 - spec/fixtures/baileys.html
-- spec/fixtures/baileys.json
 - spec/fixtures/baileys_no_brewery_link.html
 - spec/lita/handlers/onewheel_baileys_spec.rb
 - spec/spec_helper.rb
@@ -197,7 +196,6 @@ specification_version: 4
 summary: See above.
 test_files:
 - spec/fixtures/baileys.html
-- spec/fixtures/baileys.json
 - spec/fixtures/baileys_no_brewery_link.html
 - spec/lita/handlers/onewheel_baileys_spec.rb
 - spec/spec_helper.rb

data/spec/fixtures/baileys.json

@@ -1,304 +0,0 @@
-{
-  "status": "ok",
-  "cache": "2016-02-18T02:38:12.175Z",
-  "data": {
-    "1": {
-      "glass": "Nonic",
-      "prices": [
-        "$6.00",
-        "$3.00"
-      ],
-      "fill": 0.1273266172312076,
-      "added": "2016-02-13T05:47:42.536Z",
-      "beer": "Tidebreak",
-      "style": "Apple Cider "
-    },
-    "2": {
-      "glass": "Snifter",
-      "prices": [
-        "$6.00",
-        "$3.00"
-      ],
-      "fill": 0.9498940998487141,
-      "added": "2016-02-18T01:10:15.807Z",
-      "beer": "The Sunny Cider",
-      "style": "Hard Cider w/ lemon juice & fresh ginger"
-    },
-    "4": {
-      "glass": "Nonic",
-      "prices": [
-        "$5.00",
-        "$3.00"
-      ],
-      "fill": 0.7365322580645163,
-      "added": "2016-02-13T23:26:22.57Z",
-      "beer": "Twisted Barre",
-      "style": "Dubbel ",
-      "brewery": "Knee Deep"
-    },
-    "5": {
-      "glass": "Snifter",
-      "prices": [
-        "$4.00",
-        "$2.00"
-      ],
-      "fill": 0.3379193548387105,
-      "added": "2016-02-09T02:03:10.376Z",
-      "beer": "Barrel-Aged Old Relic",
-      "style": "Scotch Ale  - Barrel Aged (Whisky)",
-      "brewery": "Golden Valley"
-    },
-    "7": {
-      "glass": "Nonic",
-      "prices": [
-        "$5.00",
-        "$3.00"
-      ],
-      "fill": 0.3727580645161292,
-      "added": "2016-02-16T03:59:31.027Z",
-      "beer": "Semper FiPA",
-      "style": "IPA - Hops (Chinook & Equinox)",
-      "brewery": "Fat Head's"
-    },
-    "8": {
-      "glass": "Snifter",
-      "prices": [
-        "$6.00",
-        "$3.00"
-      ],
-      "fill": 0.6952459720699161,
-      "added": "2016-02-16T01:28:08.066Z",
-      "beer": "Vertical Epic 11.11.11",
-      "style": "Belgian Ale ",
-      "brewery": "Stone"
-    },
-    "9": {
-      "glass": "Snifter",
-      "prices": [
-        "$4.00",
-        "$2.00"
-      ],
-      "fill": 0.22889113336023995,
-      "added": "2016-02-07T04:46:17.168Z",
-      "beer": "Olde Gnarleywine",
-      "style": "Barleywine ",
-      "brewery": "Lagunitas"
-    },
-    "10": {
-      "glass": "Nonic",
-      "prices": [
-        "$6.00",
-        "$4.00"
-      ],
-      "fill": 0.2611628319630925,
-      "added": "2016-02-14T20:16:20.238Z",
-      "beer": "Vanilla Bourbon Creme Ale",
-      "style": "Cream Ale  - Barrel Aged (Jim Beam)",
-      "brewery": "Sasquatch"
-    },
-    "11": {
-      "glass": "Nonic",
-      "prices": [
-        "$5.00",
-        "$3.00"
-      ],
-      "fill": 0.16575806451612995,
-      "added": "2016-02-09T23:14:41.903Z",
-      "beer": "Forbidden Rice",
-      "style": "Altbier w/ black rice",
-      "brewery": "Culmination"
-    },
-    "12": {
-      "glass": "Nonic",
-      "prices": [
-        "$6.00",
-        "$3.00"
-      ],
-      "fill": 0.7666292068374047,
-      "added": "2016-02-17T05:39:49.742Z",
-      "beer": "Test Pilot",
-      "style": "IPA - Hops (Citra, Mosaic, Cascade)",
-      "brewery": "Airways"
-    },
-    "13": {
-      "glass": "Nonic",
-      "prices": [
-        "$5.00",
-        "$3.00"
-      ],
-      "fill": 0.8766129032258064,
-      "added": "2016-02-17T02:53:46.493Z",
-      "beer": "Local Logger",
-      "style": "Lager ",
-      "brewery": "Everybody's"
-    },
-    "14": {
-      "glass": "Nonic",
-      "prices": [
-        "$6.00",
-        "$3.00"
-      ],
-      "fill": 0.6514627128329763,
-      "added": "2016-02-15T00:00:52.858Z",
-      "beer": "Charlie",
-      "style": "Strong Ale ",
-      "brewery": "Rogue"
-    },
-    "15": {
-      "glass": "Nonic",
-      "prices": [
-        "$5.00",
-        "$3.00"
-      ],
-      "fill": 0.007387096774195471,
-      "added": "2016-02-13T03:17:47.144Z",
-      "beer": "Hawaiian Sunburn",
-      "style": "Sour Ale w/Pineapple & Habanero- Hops (Magnum & Hull Melon)",
-      "brewery": "Elysian"
-    },
-    "16": {
-      "glass": "Snifter",
-      "prices": [
-        "$5.00",
-        "$3.00"
-      ],
-      "fill": 0.7430645161290323,
-      "added": "2016-02-16T01:03:58.069Z",
-      "beer": "Straight Up Saison",
-      "style": "Saison - Hops (Premiant, Tettnang & Sterling)",
-      "brewery": "Epic"
-    },
-    "17": {
-      "glass": "Nonic",
-      "prices": [
-        "$5.00",
-        "$3.00"
-      ],
-      "fill": 0.11692339142475526,
-      "added": "2016-02-14T18:12:46.97Z",
-      "beer": "Bulletproof Zest",
-      "style": "Session IPA w/ Orange & Lemon Peel",
-      "brewery": "Flat Tail"
-    },
-    "18": {
-      "glass": "Snifter",
-      "prices": [
-        "$5.00",
-        "$2.00"
-      ],
-      "fill": 0.4219677419354844,
-      "added": "2016-02-14T00:46:33.741Z",
-      "beer": "Watermelon Dorado",
-      "style": "Double IPA w/ Watermelon",
-      "brewery": "Ballast Point"
-    },
-    "19": {
-      "glass": "Nonic",
-      "prices": [
-        "$5.00",
-        "$3.00"
-      ],
-      "fill": 0.8562903225806452,
-      "added": "2016-02-17T01:10:42.54Z",
-      "beer": "Belgian Pale Ale",
-      "style": "Belgian Pale Ale ",
-      "brewery": "Three Magnets"
-    },
-    "20": {
-      "glass": "Snifter",
-      "prices": [
-        "$8.00",
-        "$4.00"
-      ],
-      "fill": 0.8602985074626865,
-      "added": "2016-02-17T06:30:41.468Z",
-      "beer": "Bourbon Stout",
-      "style": "Imperial Stout  - Barrel Aged (Bourbon)",
-      "brewery": "Backwoods"
-    },
-    "21": {
-      "glass": "Nonic",
-      "prices": [
-        "$5.00",
-        "$3.00"
-      ],
-      "fill": 0.19841935483871082,
-      "added": "2016-02-12T00:21:46.714Z",
-      "beer": "Coyote Peak Wheat",
-      "style": "Wheat ",
-      "brewery": "Barley Brown's"
-    },
-    "22": {
-      "glass": "Nonic",
-      "prices": [
-        "$5.00",
-        "$3.00"
-      ],
-      "fill": 0.8877435381794524,
-      "added": "2016-02-18T00:47:17.615Z",
-      "beer": "Cascadian Dark Ale",
-      "style": "Cascadian Dark Ale  ",
-      "brewery": "pFriem"
-    },
-    "23": {
-      "glass": "Nonic",
-      "prices": [
-        "$5.00",
-        "$3.00"
-      ],
-      "fill": 0.6965645161290323,
-      "added": "2016-02-16T03:49:12.981Z",
-      "beer": "6 A.M. Stout",
-      "style": "Oatmeal Stout w/ Lactose & Coldpress Coffee",
-      "brewery": "Flat Tail"
-    },
-    "24": {
-      "glass": "Snifter",
-      "prices": [
-        "$5.00",
-        "$2.00"
-      ],
-      "fill": 0.6152741935483872,
-      "added": "2016-02-16T00:50:39.295Z",
-      "beer": "Tank Slapper",
-      "style": "Imperial IPA - Hops (Simcoe, Chinook)",
-      "brewery": "Barley Brown's"
-    },
-    "25": {
-      "glass": "Nonic",
-      "prices": [
-        "$5.00",
-        "$3.00"
-      ],
-      "fill": 0.1399193548387117,
-      "added": "2016-02-04T03:31:58.237Z",
-      "beer": "Ready Set Gose",
-      "style": "Gose ",
-      "brewery": "Uinta"
-    },
-    "Cask 3": {
-      "glass": "Nonic",
-      "prices": [
-        "$5.00",
-        "$3.00"
-      ],
-      "fill": 0.1645967741935495,
-      "added": "2016-02-05T21:38:05.788Z",
-      "beer": "Winter Warmer",
-      "style": "English Strong Ale ",
-      "brewery": "Machine House"
-    },
-    "Nitro 6": {
-      "glass": "Nonic",
-      "prices": [
-        "$5.00",
-        "$3.00"
-      ],
-      "fill": 0.9279032258064517,
-      "added": "2016-02-17T04:57:56.017Z",
-      "beer": "Shake",
-      "style": "Chocolate Porter ",
-      "brewery": "Boulder"
-    }
-  }
-}