punky_brewster 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e187dcc2018f36ac897f7811ec2a7b7c0f050f6
-  data.tar.gz: c05be65d61dd21aa6429ad4dcb318c4b843fe41a
+  metadata.gz: e8a9177571a0dcd323267ab86c302822074fad2f
+  data.tar.gz: 47417879ff9929663329a0833e93a2b240b6c3b6
 SHA512:
-  metadata.gz: 85e4ba0f90358f7911a59a2243d075476288d2967a2d7b5a0d9efe4a7a90c0ed39c98902ebb6bb3ff70227f25e505b7b2e4ad460ae4a71599dc4bfcb2e5da2fc
-  data.tar.gz: dbbbe17d5cf17ec03f79b81a8b1ffe5b87d275df07f02f36f65acce8f36987f139735bc7f4f43ea459182f619cfdc70c436dd8402f3962e07c6d6a661580c726
+  metadata.gz: 440fe7236b3791f5c252ade1d65aebdbde2e5688a907c564a3dcd5c8e9fc07e148eee268f6974d0716252170456f0bdba25bcb5f60137b3e4bfb0c79834c8a9b
+  data.tar.gz: 59b547292fbfb7b3f619d7e2e85d1f02d739baf4dcc09ddae74c852d14cc478ace63e095ac019ab6b48a4b65bfe632c3f558274b20e2b9a03fb47c3b29935e58

data/README.md

@@ -8,6 +8,8 @@ What's on tap?
 
 ## Command line tool
 
+List beers:
+
     $ punky_brewster
     8  WIRED  HOPWIRED                    $16.00/L  7.3%
     ALL  CHIEFS , NO  INDIANS             $14.00/L  6.0%
@@ -15,19 +17,24 @@ What's on tap?
     DALES  ESB  (EXTRA  SPECIAL  BITTER)  $14.00/L  5.6%
     ...
 
+Sort beers (can be sorted by `price`, `abv`, or `abv_per_dollar`):
+
     $ punky_brewster --sort price
     CROUCHER LOW RIDER IPA            $12.00/L  2.7%
     TUATARA ITI AMERICAN PALE ALE     $12.50/L  5.8%
     MUSSEL INN CAPTAIN COOKER         $12.50/L  5.7%
     VALKYRIE FRIGG RED PILSENER       $13.50/L  5.0%
+    ...
 
+List beers sorted by most ABV per dollar:
+
+    $ punky_brewster --holla-for-dollar
+    MIKE'S VANILLA COFFEE PORTER      $16.00/L  8.0%  0.50%/$
+    RAINDOGS OXYMORON BLACK IPA       $14.50/L  7.0%  0.48%/$
+    GOLDEN EAGLE BIG YANK             $16.00/L  7.5%  0.47%/$
+    MUSSEL INN CAPTAIN COOKER         $12.50/L  5.7%  0.46%/$
+    ...
 
-    $ punky_brewster --sort abv
-    CROUCHER LOW RIDER IPA            $12.00/L  2.7%
-    RENAISSANCE PARADOX PILSENER      $14.00/L  4.0%
-    GARAGE PROJECT HAPI DAZE          $14.00/L  4.2%
-    GOLDEN ALE FRESH HOP              $16.00/L  4.5%
-    INVERCARGILL PITCHBLACK STOUT     $13.50/L  4.5%
 
 ## Ruby Library
 
@@ -45,18 +52,6 @@ require 'punky_brewster/server'
 run PunkyBrewster::Server
 ```
 
-```http
-$ curl -i localhost:9292
-
-HTTP/1.1 200 OK
-Content-Type: application/json
-Transfer-Encoding: chunked
-Connection: close
-Server: thin
-
-[{"name":"EPIC PALE ALE","price":14.0,"abv":5.4},{"name":"8 WIRED HOPWIRED","price":16.0,"abv":7.3},{"name":"MUSSEL INN CAPTAIN COOKER","price":12.5,"abv":5.7},{"name":"FUNK ESTATE NZPA FRESH HOP","price":16.0,"abv":5.5},{"name":"INVERCARGILL PITCHBLACK STOUT","price":13.5,"abv":4.5},{"name":"GOLDEN EAGLE BIG YANK","price":16.0,"abv":7.5},{"name":"RENAISSANCE PARADOX PILSENER","price":14.0,"abv":4.0}]
-```
-
 Mount alongside other Rack apps (Rails, Sinatra, etc.):
 
 ```ruby
@@ -73,6 +68,20 @@ use Rack::JSONP
 run PunkyBrewster::Server
 ```
 
+Response:
+
+```json
+[
+  {
+    "name": "EPIC PALE ALE",
+    "price": 14.0,
+    "abv": 5.4,
+    "image_url": "http://www.punkybrewster.co.nz/uploads/..."
+  },
+  ...
+]
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/punky_brewster/beer.rb

@@ -0,0 +1,7 @@
+module PunkyBrewster
+  class Beer < Struct.new(:name, :price, :abv, :image_url)
+    def abv_per_dollar
+      (abv.to_f / price).round(2)
+    end
+  end
+end

data/lib/punky_brewster/beer_list_response.rb

@@ -2,6 +2,8 @@ require "nokogiri"
 
 module PunkyBrewster
   class BeerListResponse
+    IMAGE_URL_BASE = 'http://www.punkybrewster.co.nz'
+
     def initialize(raw_response)
       @raw_response = raw_response
     end
@@ -21,6 +23,8 @@ module PunkyBrewster
             beer_list << Beer.new
             # Includes non-breaking spaces
             beer_list.last.name = node.text.upcase.gsub(/[\s\u00A0]+/, ' ')
+          elsif node.name == 'img'
+            beer_list.last.image_url = IMAGE_URL_BASE + node[:src]
           elsif price = node.text.scan(/^\$(\d+\.\d+)\/L$/).flatten.first
             beer_list.last.price = price.to_f
           elsif abv = node.text.scan(/(\d+\.\d+)\s*%/).flatten.first

data/lib/punky_brewster/cli.rb

@@ -11,13 +11,24 @@ module PunkyBrewster
     end
 
     desc "list", "Show current beer list"
-    method_option :sort, default: "name", enum: %w( name price abv )
+    method_option :sort, default: "name", enum: %w( name price abv abv_per_dollar )
+    method_option :cheapskate, type: :boolean, default: false
+    method_option :holla_for_dollar, type: :boolean, default: false
     def list
+      show_abv_per_dollar = options[:holla_for_dollar] || options[:cheapskate]
+
       beers = BeerListRequest.new.beers
-      sorted = beers.sort_by { |beer| beer.send(options[:sort]) }
+
+      if options[:holla_for_dollar]
+        sorted = beers.sort { |a, b| b.abv_per_dollar <=> a.abv_per_dollar }
+      else
+        sorted = beers.sort_by { |beer| beer.send(options[:sort]) }
+      end
 
       rows = sorted.map do |beer|
-        [beer.name, "$%0.2f/L" % beer.price, "%0.1f%" % beer.abv]
+        row = [beer.name, "$%0.2f/L" % beer.price, "%0.1f%" % beer.abv]
+        row << ("%0.2f%%/$" % beer.abv_per_dollar) if show_abv_per_dollar
+        row
       end
 
       print_table rows

data/lib/punky_brewster/version.rb

@@ -1,3 +1,3 @@
 module PunkyBrewster
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/punky_brewster.rb

@@ -1,7 +1,4 @@
 require "punky_brewster/version"
+require "punky_brewster/beer"
 require "punky_brewster/beer_list_request"
 require "punky_brewster/beer_list_response"
-
-module PunkyBrewster
-  Beer = Struct.new(:name, :price, :abv)
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: punky_brewster
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Pete Nicholls
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -155,6 +155,7 @@ files:
 - bin/setup
 - exe/punky_brewster
 - lib/punky_brewster.rb
+- lib/punky_brewster/beer.rb
 - lib/punky_brewster/beer_list_request.rb
 - lib/punky_brewster/beer_list_response.rb
 - lib/punky_brewster/cli.rb