punky_brewster 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6844c1b11fcbf2b357dcaa4d0642e9542d7d1911
-  data.tar.gz: aa60da5f829ee4e2ac68c82ad393a77920c155e0
+SHA256:
+  metadata.gz: '0812d42f527539d57072dcff9131ac306ebbbdc69eb6e21609e66d2a543183c1'
+  data.tar.gz: '08dca616a829a548b9766da45f71d00dcb1a1e90d8a305afd189aedbd966f58f'
 SHA512:
-  metadata.gz: b5fa3e019bf34fb1c0cdaa1600c391c50d209b5aba74e25a402caa2b4baad08cd933fc6c6e30fe4120485ffb50940886be62bcd2b5d4620350f95321878c4bcd
-  data.tar.gz: cf120db09b90f5c51d0a1c7d7df524eb685722219c11bf79c22fea35d3edbb98e17443b5580021293be26c61ed684f107340ae6800d4388044e575aacf41c664
+  metadata.gz: 90806764c5d4c56a5e30fb5bdc7751337ae4dc56528e530579aea51a8429c8270edf07fcfadfd803dea5b965711e12530f2e503e7b693a35b1bd6bdc0d127a79
+  data.tar.gz: 1f18d33364ed25d48fabc77cc00f58096e52352b95422a5e00c4fdebe67a905b1dee012ef5d250053bb5de5918882a80c779488a52c426e76b96a0af2e188bed

data/lib/punky_brewster.rb

@@ -1,4 +1,6 @@
 require "punky_brewster/version"
 require "punky_brewster/beer"
+require "punky_brewster/beer_repository"
+require "punky_brewster/beer_list"
 require "punky_brewster/beer_list_request"
 require "punky_brewster/beer_list_response"

data/lib/punky_brewster/beer_list.rb

@@ -0,0 +1,13 @@
+require 'json'
+
+module PunkyBrewster
+  class BeerList < Array
+    def serialized_properties
+      map(&:to_h)
+    end
+
+    def to_json
+      JSON.generate(serialized_properties)
+    end
+  end
+end

data/lib/punky_brewster/beer_list_response.rb

@@ -11,23 +11,23 @@ module PunkyBrewster
     def beers
       @beers ||= begin
         content = document.at_css('#content')
-        beer_list = []
+        list = []
 
         content.traverse do |node|
           if node.name == 'h2'
-            beer_list << Beer.new
+            list << Beer.new
             # Includes non-breaking spaces
-            beer_list.last.name = node.text.upcase.gsub(/[\s\u00A0]+/, ' ')
+            list.last.name = node.text.upcase.gsub(/[\s\u00A0]+/, ' ')
           elsif node.name == 'img'
-            beer_list.last.image_url = IMAGE_URL_BASE + node[:src]
+            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
+            list.last.price = price.to_f
           elsif abv = node.text.scan(/(\d+\.\d+)\s*%/).flatten.first
-            beer_list.last.abv = abv.to_f
+            list.last.abv = abv.to_f
           end
         end
 
-        beer_list.select(&:valid?)
+        BeerList.new(list.select(&:valid?))
       end
     end
 

data/lib/punky_brewster/beer_repository.rb

@@ -0,0 +1,11 @@
+module PunkyBrewster
+  class BeerRepository
+    def list
+      BeerListRequest.new.beers
+    end
+
+    def self.list(*args)
+      self.new(*args).list
+    end
+  end
+end

data/lib/punky_brewster/cli.rb

@@ -17,7 +17,7 @@ module PunkyBrewster
     def list
       show_abv_per_dollar = options[:holla_for_dollar] || options[:cheapskate]
 
-      beers = BeerListRequest.new.beers
+      beers = BeerRepository.list
 
       if options[:holla_for_dollar]
         sorted = beers.sort { |a, b| b.abv_per_dollar <=> a.abv_per_dollar }
@@ -26,7 +26,7 @@ module PunkyBrewster
       end
 
       rows = sorted.map do |beer|
-        row = [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

data/lib/punky_brewster/server.rb

@@ -3,13 +3,12 @@ require 'punky_brewster'
 
 module PunkyBrewster
   class Server
-    def self.call(env)
+
+    def call(env)
       headers = { 'Content-Type' => 'application/json' }
 
       begin
-        beers = BeerListRequest.new.beers
-        beers_properties = beers.map(&:to_h)
-        body = JSON.generate(beers_properties)
+        body = BeerRepository.list.to_json
         status = 200
       rescue => error
         body = JSON.generate(error: "#{error.class}: #{error}")
@@ -18,5 +17,10 @@ module PunkyBrewster
 
       [status, headers, [body]]
     end
+
+    def self.call(env)
+      self.new.call(env)
+    end
+
   end
 end

data/lib/punky_brewster/version.rb

@@ -1,3 +1,3 @@
 module PunkyBrewster
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: punky_brewster
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Pete Nicholls
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-26 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -156,8 +156,10 @@ files:
 - exe/punky_brewster
 - lib/punky_brewster.rb
 - lib/punky_brewster/beer.rb
+- lib/punky_brewster/beer_list.rb
 - lib/punky_brewster/beer_list_request.rb
 - lib/punky_brewster/beer_list_response.rb
+- lib/punky_brewster/beer_repository.rb
 - lib/punky_brewster/cli.rb
 - lib/punky_brewster/server.rb
 - lib/punky_brewster/version.rb
@@ -182,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: What's pouring at Punky Brewster?