punky_brewster 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ccaa60e6fd75389c787538911dc816419c55e2c
-  data.tar.gz: 1dd6f6f5e4a3bb929741b83013416adec9a84642
+  metadata.gz: 10745cdefe9b6de234e68aa53135e5bba7d89c41
+  data.tar.gz: 5c517479b5e736ac8c6d0f687be46e62fd2e89a9
 SHA512:
-  metadata.gz: 19b35e7f364c63046a5d71e06e97c099e818a56e65892d3b1b83f684a6a2a0d1bead5ef154f830e4cc276a8b79bc017a622ae76ba7d38c36bf9f25db33e7f34d
-  data.tar.gz: 356ef32df80c134cf234f59340b4c268692b52e75c418ab8134b919092b1d7d21564bce6b45d1abc73a103ea1a32f42f3a14088446129bae7d6518bc6e0b406d
+  metadata.gz: 9d698a5e0379d6b26d5ab8f726db3d227b24e11bb1eaeecf8fcf75ca99507b104cd719219782e4f46a8bc858926f77e4bc90ef5e6047f95ffd4c3f846b65b12c
+  data.tar.gz: ad7846f329c892c5f834e88ed27f258d2ecc0277fbb22d8fc2184c0a12fd3c587bb794fa80d85445cce46168dd905efcbea3a5831bfcda91b2c4338f258f2676

data/README.md

@@ -23,7 +23,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/punky_brewster/fork )
+1. Fork it ( https://github.com/Aupajo/punky_brewster/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/punky_brewster/beer_list_request.rb

@@ -0,0 +1,16 @@
+require "net/http"
+
+module PunkyBrewster
+  class BeerListRequest
+    URL = "http://www.punkybrewster.co.nz"
+
+    def response
+      raw_response = Net::HTTP.get_response(URI(URL))
+      BeerListResponse.new(raw_response)
+    end
+
+    def beers
+      response.beers
+    end
+  end
+end

data/lib/punky_brewster/beer_list_response.rb

@@ -0,0 +1,39 @@
+module PunkyBrewster
+  class BeerListResponse
+    def initialize(raw_response)
+      @raw_response = raw_response
+    end
+
+    def beers
+      @beers ||= begin
+        content = document.at_css('#content')
+        divide = content.at_css('.styled-hr')
+        past_divide = false
+        beer_list = []
+
+        content.traverse do |node|
+          past_divide = true if node == divide
+          next unless past_divide
+
+          if node.name == 'h2'
+            beer_list << Beer.new
+            # Includes non-breaking spaces
+            beer_list.last.name = node.text.upcase.gsub(/[\s\u00A0]+/, ' ')
+          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
+            beer_list.last.abv = abv.to_f
+          end
+        end
+
+        beer_list
+      end
+    end
+
+    private
+
+    def document
+      @document ||= Nokogiri::HTML(@raw_response.body)
+    end
+  end
+end

data/lib/punky_brewster/cli.rb

@@ -1,6 +1,5 @@
 require "thor"
 require "punky_brewster"
-require "ostruct"
 require "nokogiri"
 require "open-uri"
 
@@ -15,26 +14,7 @@ module PunkyBrewster
 
     desc "list", "Show current beer list"
     def list
-      response = open("http://www.punkybrewster.co.nz")
-      document = Nokogiri::HTML(response)
-      content = document.at_css('#content')
-      divide = content.at_css('.styled-hr')
-      past_divide = false
-      beers = []
-
-      content.traverse do |node|
-        past_divide = true if node == divide
-        next unless past_divide
-
-        if node.name == 'h2'
-          beers << OpenStruct.new
-          beers.last.name = node.text.upcase.gsub(/\s+/, ' ')
-        elsif price = node.text.scan(/^\$(\d+\.\d+)\/L$/).flatten.first
-          beers.last.price = price.to_f
-        elsif abv = node.text.scan(/(\d+\.\d+)\s*%/).flatten.first
-          beers.last.abv = abv.to_f
-        end
-      end
+      beers = BeerListRequest.new.beers
 
       rows = beers.sort_by(&:name).map do |beer|
         [beer.name, "$%0.2f/L" % beer.price, "%0.1f%" % beer.abv]

data/lib/punky_brewster/version.rb

@@ -1,3 +1,3 @@
 module PunkyBrewster
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/punky_brewster.rb

@@ -1,5 +1,7 @@
 require "punky_brewster/version"
+require "punky_brewster/beer_list_request"
+require "punky_brewster/beer_list_response"
 
 module PunkyBrewster
-  # Your code goes here...
+  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.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Pete Nicholls
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-18 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -127,6 +127,8 @@ files:
 - bin/setup
 - exe/punky_brewster
 - lib/punky_brewster.rb
+- lib/punky_brewster/beer_list_request.rb
+- lib/punky_brewster/beer_list_response.rb
 - lib/punky_brewster/cli.rb
 - lib/punky_brewster/version.rb
 - punky_brewster.gemspec