ratebeer 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45bf83b47740dbbdbed33401175d33db8917f672
-  data.tar.gz: f5eaa7e062b02b8391d094e8395c57265b3f92e2
+  metadata.gz: cf9d9f5539a98733d67f57195ea03c9517b82278
+  data.tar.gz: 79d95ea76346b5e93b1bb73ac27ca088c746d4f9
 SHA512:
-  metadata.gz: fc34adee973d864596e83ee5570c5540a8ff0216c847fc2b9dd2a8b5e4121240ec13a443dfb346b69768be0e9ea0898b35eed18df8349879b0dbd221a3dda6f5
-  data.tar.gz: 3bcf0702e0cad27ef4b2a08da5000b8465043c30d11934d49191078e3df001c66900a09393826f9d42075e1d3381257f146a829bb6c9a3d1f21e5732f8878def
+  metadata.gz: 6bcd1a25689ec578662d50f7bfafd271a525eb548f4eebb00724184c92ceb055a67346c5ca89f46a782d08b3c93f24c0ccda8d230edef609046df20e836d2eab
+  data.tar.gz: aeb41234258c933f21c410c77f9d3d96f8b38c3f3ca1f532624d27b2b4f51d456c88e29f3e2ad68e6b18dbc703ed357fab49631e296fb3e19d7fcb1262b9f7e9

data/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby '2.3.0'
+ruby '2.4.0'
 
 gemspec
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ratebeer (0.0.8)
+    ratebeer (0.1.0)
       i18n
       nokogiri
 
@@ -51,7 +51,7 @@ DEPENDENCIES
   rspec
 
 RUBY VERSION
-   ruby 2.3.0p0
+   ruby 2.4.0p0
 
 BUNDLED WITH
-   1.12.5
+   1.14.4

data/lib/ratebeer.rb

@@ -13,7 +13,7 @@ module RateBeer
   # @return [RateBeer::Beer] beer with passed ID#
   #
   def beer(id, name = nil)
-    Beer.new(id, name: name)
+    Beer::Beer.new(id, name: name)
   end
 
   # Create new brewery instance, using ID and name passed as arguments.
@@ -23,7 +23,7 @@ module RateBeer
   # @return [RateBeer::Brewery] brewery with passed ID#
   #
   def brewery(id, name = nil)
-    Brewery.new(id, name: name)
+    Brewery::Brewery.new(id, name: name)
   end
 
   # Create new style instance, using ID and name passed as arguments.

data/lib/ratebeer/beer.rb

@@ -1,193 +1,154 @@
-require_relative "brewery"
-require_relative "review"
-require_relative "style"
-require_relative "scraping"
-require_relative "urls"
+# frozen_string_literal: true
 
-module RateBeer
-  class Beer
-    # Each key represents an item of data accessible for each beer, and defines
-    # dynamically a series of methods for accessing this data.
-    #
-    def self.data_keys
-      [:name,
-       :brewery,
-       :style,
-       :glassware,
-       :availability,
-       :abv,
-       :calories,
-       :description,
-       :retired,
-       :rating]
-    end
-
-    include RateBeer::Scraping
-    include RateBeer::URLs
-
-    # CSS selector for the root element containing beer information.
-    ROOT_SELECTOR = '#container table'.freeze
-
-    # CSS selector for the beer information element.
-    INFO_SELECTOR = 'table'.freeze
+require_relative 'beer/alias'
+require_relative 'brewery'
+require_relative 'review'
+require_relative 'style'
+require_relative 'scraping'
+require_relative 'urls'
 
-    # Create RateBeer::Beer instance.
-    #
-    # Requires the RateBeer ID# for the beer in question.
+module RateBeer
+  module Beer
+    # The Beer class.
     #
-    # @param [Integer, String] id ID# of beer to retrieve
-    # @param [String] name Name of the beer to which ID# relates if known
-    # @param [hash] options Options hash for entity created
+    # This class represents one beer found on RateBeer.com, and provides
+    # functionality for obtaining information from the site.
     #
-    def initialize(id, name: nil, **options)
-      super
-    end
-
-    def doc
-      unless instance_variable_defined?("@doc")
-        @doc = noko_doc(URI.join(BASE_URL, beer_url(id)))
-        validate_beer
-        redirect_if_aliased
+    # The key functionality is defined in the self.data_keys method, each key
+    # representing a piece of accessible data.
+    class Beer
+      # Each key represents an item of data accessible for each beer. The
+      # included scraping module defines dynamically a series of methods for
+      # accessing this data.
+      #
+      def self.data_keys
+        [:name,
+         :brewery,
+         :style,
+         :glassware,
+         :abv,
+         :description,
+         :retired,
+         :rating]
       end
-      @doc
-    end
 
-    def root
-      @root ||= doc.at_css(ROOT_SELECTOR)
-    end
-
-    def info_root
-      @info_root ||= root.at_css(INFO_SELECTOR)
-    end
+      include RateBeer::Beer
+      include RateBeer::Scraping
+      include RateBeer::URLs
+
+      # CSS selector for the root element containing beer information.
+      ROOT_SELECTOR = '#container table'
+
+      # CSS selector for the beer information element.
+      INFO_SELECTOR = 'table'
+
+      # Create RateBeer::Beer instance.
+      #
+      # Requires the RateBeer ID# for the beer in question.
+      #
+      # @param [Integer, String] id ID# of beer to retrieve
+      # @param [String] name Name of the beer to which ID# relates if known
+      # @param [hash] options Options hash for entity created
+      #
+      def initialize(id, name: nil, **options)
+        super
+      end
 
-    # Return reviews of this beer.
-    #
-    def reviews(order: :most_recent, limit: 10)
-      Review.retrieve(self, order: order, limit: limit)
-    end
+      def doc
+        unless instance_variable_defined?('@doc')
+          @doc = noko_doc(URI.join(BASE_URL, beer_url(id)))
+          validate_beer
+          scrape_name # Name must be scraped before any possible redirection.
+          @doc = redirect_if_alias(@doc) || @doc
+        end
+        @doc
+      end
 
-    private
+      def root
+        @root ||= doc.at_css(ROOT_SELECTOR)
+      end
 
-    # Redirects this beer to the "proper" beer page if it represents an alias
-    # of another beer.
-    #
-    # This method overwrites the value of @doc, so that this will scrape the
-    # details of the proper beer, and not the alias.
-    def redirect_if_aliased
-      # retrieve details of the proper beer instead.
-      alias_pattern = /Also known as(.|\n)*Proceed to the aliased beer\.{3}/
-      local_root = doc.at_css(ROOT_SELECTOR)
-      if local_root.css('tr')[1].css('div div').text =~ alias_pattern
-        scrape_name # Set the name to the original, non-aliased beer.
-        alias_node = local_root.css('tr')[1]
-                               .css('div div')
-                               .css('a')
-                               .first
-        @alias_id = alias_node['href'].split('/').last.to_i
-        @doc = noko_doc(URI.join(BASE_URL, beer_url(@alias_id)))
+      def info_root
+        @info_root ||= root.at_css(INFO_SELECTOR)
       end
-    end
 
-    def validate_beer
-      error_message = 'we didn\'t find this beer'
-      if name == error_message
-        raise PageNotFoundError.new("Beer not found - #{id}")
+      # Return reviews of this beer.
+      #
+      def reviews(order: :most_recent, limit: 10)
+        Review.retrieve(self, order: order, limit: limit)
       end
-    end
 
-    def scrape_name
-      @name ||= fix_characters(doc.css('h1').text.strip)
-    end
+      private
 
-    def scrape_brewery
-      brewery_element = doc.at_css("a[itemprop='brand']")
-      brewery_id = id_from_link(brewery_element)
-      brewery_name = fix_characters(brewery_element.text)
-      @brewery = Brewery.new(brewery_id, name: brewery_name)
-    end
+      def validate_beer
+        error_indicator = 'we didn\'t find this beer'
+        error_message = "Beer not found - #{id}"
+        raise PageNotFoundError, error_message if name == error_indicator
+      end
 
-    def scrape_style
-      style_element = doc.at_css("a[href^='/beerstyles']")
-      style_id = id_from_link(style_element)
-      style_name = fix_characters(style_element.text)
-      @style = Style.new(style_id, name: style_name)
-    end
+      def scrape_name
+        @name ||= fix_characters(doc.css('h1').text.strip)
+      end
 
-    def scrape_glassware
-      glassware_elements = doc.css("a[href^='/ShowGlassware.asp']")
-      @glassware = glassware_elements.map do |el|
-        [:id, :name].zip([el['href'].split('GWID=').last.to_i, el.text]).to_h
+      def scrape_brewery
+        brewery_element = doc.at_css("a[itemprop='brand']")
+        brewery_id = id_from_link(brewery_element)
+        brewery_name = fix_characters(brewery_element.text)
+        @brewery = Brewery::Brewery.new(brewery_id, name: brewery_name)
       end
-    end
 
-    def scrape_availability
-      raw_info = info_root.css('td')[1]
-                          .css('table')
-                          .css('td')
-                          .children
-                          .children
-                          .map(&:text)
-                          .reject(&:empty?)
-                          .each_slice(2)
-                          .to_a
-                          .tap { |a| a.last.unshift('distribution') }
-                          .map do |(k, v)|
-        [k =~ /bottl/ ? :bottling : symbolize_text(k), v]
-      end
-      @availability = raw_info.to_h.merge(seasonal: scrape_misc[:seasonal])
-    end
+      def scrape_style
+        style_element = doc.at_css("a[href^='/beerstyles']")
+        style_id = id_from_link(style_element)
+        style_name = fix_characters(style_element.text)
+        @style = Style.new(style_id, name: style_name)
+      end
 
-    def scrape_abv
-      @abv = scrape_misc[:abv]
-    end
+      def scrape_glassware
+        glassware_elements = doc.css("a[href^='/ShowGlassware.asp']")
+        @glassware = glassware_elements.map do |el|
+          [:id, :name].zip([el['href'].split('GWID=').last.to_i, el.text]).to_h
+        end
+      end
 
-    def scrape_calories
-      @calories = scrape_misc[:est_calories]
-    end
+      def scrape_abv
+        @abv = scrape_misc[:abv]
+      end
 
-    def scrape_description
-      @description = info_root.next_element
-                              .next_element
-                              .children
-                              .children
-                              .map(&:text)
-                              .map(&:strip)
-                              .drop(1)
-                              .reject(&:empty?)
-                              .join("\n")
-      @description = fix_characters(@description)
-    end
+      def scrape_description
+        @description = fix_characters(doc.at_css('#_description3').text)
+      end
 
-    def scrape_retired
-      @retired = !(root.css('span.beertitle2') && 
-                   root.css('span.beertitle2').text =~ /RETIRED/).nil?  
-    end
+      def scrape_retired
+        element = doc.at_css('span.beertitle2')
+        @retired = element && element.text.match?(/RETIRED/) || false
+      end
 
-    def scrape_rating
-      raw_rating = [:overall,
-                    :style].zip(info_root.css('div')
-                           .select { |d| d['title'] =~ /This figure/ }
-                           .map { |d| d['title'].split(':').first.to_f }).to_h
-      @rating = raw_rating.merge(ratings:       scrape_misc[:ratings],
-                                 weighted_avg:  scrape_misc[:weighted_avg],
-                                 mean:          scrape_misc[:mean])
-    end
+      def scrape_rating
+        raw_rating = [:overall,
+                      :style].zip(doc.css('#_aggregateRating6 div')
+                             .select { |d| d['title'] =~ /This figure/ }
+                             .map { |d| d['title'].split(':').first.to_f }).to_h
+        @rating = raw_rating.merge(ratings:       scrape_misc[:ratings],
+                                   weighted_avg:  scrape_misc[:weighted_avg],
+                                   mean:          scrape_misc[:mean])
+      end
 
-    # Scrapes the miscellaneous information contained on the beer page.
-    #
-    # This information relates to various other specific types of information.
-    # As such, other scrapers rely on this method for information.
-    def scrape_misc
-      info_root.next_element
-               .first_element_child
-               .children
-               .map(&:text)
-               .flat_map { |x| x.gsub(nbsp, ' ').strip.split(':') }
-               .map(&:strip)
-               .reject(&:empty?)
-               .each_slice(2)
-               .map { |(k, v)| [symbolize_text(k), v.to_f.zero? ? v : v.to_f] }
-               .to_h
+      # Scrapes the miscellaneous information contained on the beer page.
+      #
+      # This information relates to various other specific types of information.
+      # As such, other scrapers rely on this method for information.
+      def scrape_misc
+        doc.at_css('.stats-container')
+           .children
+           .map(&:text)
+           .flat_map { |x| x.gsub(nbsp, ' ').strip.split(':') }
+           .map(&:strip)
+           .reject(&:empty?)
+           .each_slice(2)
+           .map { |(k, v)| [symbolize_text(k), v.to_f.zero? ? v : v.to_f] }
+           .to_h
+      end
     end
   end
 end

data/lib/ratebeer/beer/alias.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require_relative '../urls'
+
+module RateBeer
+  module Beer
+    # Redirects a beer if it is an alias.
+    #
+    def redirect_if_alias(doc)
+      Alias.new(doc).try_redirect
+    end
+
+    # The Alias class.
+    #
+    # RateBeer treats certain beers as aliases of another (e.g. Koenig Ludwig
+    # Weissbier - https://www.ratebeer.com/beer/konig-ludwig-weissbier/14945/)
+    # and provides a link to the "original" beer. This class is used to handle
+    # redirection where a beer is an alias.
+    #
+    class Alias
+      include RateBeer::URLs
+
+      # CSS selector for container with alias information.
+      ALIAS_SELECTOR = '.row.columns-container .col-sm-8'.freeze
+
+      # Create an Alias instance.
+      #
+      # The Alias class deals with handling beers which may be aliases of
+      # others, and so requires redirection to the "proper" beer's page.
+      #
+      # @param [Nokogiri::Doc] document representing a RateBeer.com beer page
+      #
+      def initialize(doc)
+        @doc = doc
+      end
+
+      # Redirects this beer to the "proper" beer page if it represents an alias
+      # of another beer.
+      #
+      # This method returns a new doc value if the beer is an alias, or nil if
+      # not.
+      def try_redirect
+        redirect_to_alias if aliased_beer?
+      end
+
+      private
+
+      def aliased_beer?
+        alias_pattern = /Also known as(.|\n)*Proceed to the aliased beer\.{3}/
+        alias_container && alias_container.text =~ alias_pattern
+      end
+
+      def redirect_to_alias
+        alias_node = alias_container.at_css('a')
+        alias_id = alias_node['href'].split('/').last.to_i
+        noko_doc(URI.join(BASE_URL, beer_url(alias_id)))
+      end
+
+      def alias_container
+        @doc.at_css(ALIAS_SELECTOR)
+      end
+    end
+  end
+end

data/lib/ratebeer/brewery.rb

@@ -2,187 +2,114 @@
 
 require_relative 'scraping'
 require_relative 'urls'
+require_relative 'brewery/beer_list'
 
 module RateBeer
   # The brewery class represents one brewery found in RateBeer, with methods
   # for accessing information found about the brewery on the site.
-  class Brewery
-    # Each key represents an item of data accessible for each beer, and defines
-    # dynamically a series of methods for accessing this data.
-    #
-    def self.data_keys
-      [:name,
-       :type,
-       :address,
-       :telephone,
-       :beers]
-    end
-
-    include RateBeer::Scraping
-    include RateBeer::URLs
-
-    attr_reader :established, :location
-
-    # CSS selector for the brewery information element.
-    INFO_SELECTOR = "div[itemtype='http://schema.org/LocalBusiness']".freeze
-
-    # Create RateBeer::Brewery instance.
-    #
-    # Requires the RateBeer ID# for the brewery in question. Optionally accepts
-    # a name parameter where the name is already known.
-    #
-    # @param [Integer, String] id ID# for the brewery
-    # @param [String] name The name of the specified brewery
-    # @param [hash] options Options hash for entity created
-    #
-    def initialize(id, name: nil, **options)
-      super
-      if options
-        @established = options[:established]
-        @location    = options[:location]
-        @type        = options[:type]
-        @status      = options[:status]
+  module Brewery
+    class Brewery
+      # Each key represents an item of data accessible for each beer, and defines
+      # dynamically a series of methods for accessing this data.
+      #
+      def self.data_keys
+        [:name,
+         :type,
+         :address,
+         :telephone,
+         :beers]
       end
-    end
-
-    def doc
-      @doc ||= noko_doc(URI.join(BASE_URL, brewery_url(id)))
-      validate_brewery
-      @doc
-    end
-
-    def info_root
-      @info_root ||= doc.at_css(INFO_SELECTOR)
-    end
 
-    private
-
-    # Validates whether the brewery with the given ID exists.
-    #
-    # Throws an exception if the brewery does not exist.
-    def validate_brewery
-      error_message = "This brewer, ID##{id}, is no longer in the database. "\
-                      'RateBeer Home'
-      if @doc.at_css('body p').text == error_message
-        raise PageNotFoundError.new("Brewery not found - #{id}")
+      include RateBeer::Scraping
+      include RateBeer::URLs
+
+      attr_reader :established, :location
+
+      # CSS selector for the brewery information element.
+      INFO_SELECTOR = "div[itemtype='http://schema.org/LocalBusiness']".freeze
+
+      # Create RateBeer::Brewery instance.
+      #
+      # Requires the RateBeer ID# for the brewery in question. Optionally accepts
+      # a name parameter where the name is already known.
+      #
+      # @param [Integer, String] id ID# for the brewery
+      # @param [String] name The name of the specified brewery
+      # @param [hash] options Options hash for entity created
+      #
+      def initialize(id, name: nil, **options)
+        super
+        if options
+          @established = options[:established]
+          @location    = options[:location]
+          @type        = options[:type]
+          @status      = options[:status]
+        end
       end
-    end
-
-    # Scrapes the brewery's name.
-    def scrape_name
-      @name = fix_characters(info_root.css('h1').first.text)
-    end
 
-    # Scrapes the brewery's address.
-    def scrape_address
-      address_root = info_root.css('div[itemprop="address"] b span')
-      address_details = address_root.map { |e| extract_address_element(e) }
-      @address = address_details.to_h
-    end
-
-    # Extracts one element of address details from a node contained within the
-    # address div.
-    def extract_address_element(node)
-      key = case node.attributes['itemprop'].value
-            when 'streetAddress'   then :street
-            when 'addressLocality' then :city
-            when 'addressRegion'   then :state
-            when 'addressCountry'  then :country
-            when 'postalCode'      then :postcode
-            else raise 'unrecognised attribute'
-            end
-      [key, node.text.strip]
-    end
+      def doc
+        @doc ||= noko_doc(URI.join(BASE_URL, brewery_url(id)))
+        validate_brewery
+        @doc
+      end
 
-    # Scrapes the telephone number of the brewery.
-    def scrape_telephone
-      @telephone = info_root.at_css('span[itemprop="telephone"]')
-    end
+      def info_root
+        @info_root ||= doc.at_css(INFO_SELECTOR)
+      end
 
-    # Scrapes the type of brewery.
-    def scrape_type
-      @type = info_root.css('div')[1]
-    end
+      private
+
+      # Validates whether the brewery with the given ID exists.
+      #
+      # Throws an exception if the brewery does not exist.
+      def validate_brewery
+        error_message = "This brewer, ID##{id}, is no longer in the database. "\
+                        'RateBeer Home'
+        if @doc.at_css('body p').text == error_message
+          raise PageNotFoundError.new("Brewery not found - #{id}")
+        end
+      end
 
-    # Scrapes beers list for brewery.
-    def scrape_beers
-      beers_doc = noko_doc(URI.join(BASE_URL, brewery_beers_url(id)))
-      rows = beers_doc.css('table#brewer-beer-table tbody tr')
-      @beers = rows.map { |row| process_beer_row(row) }.reject(&:nil?)
-    end
+      # Scrapes the brewery's name.
+      def scrape_name
+        @name = fix_characters(info_root.css('h1').first.text)
+      end
 
-    # Process a row of data representing one beer brewed by/at a brewery.
-    #
-    # @param [Nokogiri::XML::Element] row HTML TR row wrapped as a Nokogiri
-    #   element
-    # @param [String] location the location at which a brewery's beer is brewed
-    #   where this location differs from the brewery's regular brewsite/venue
-    # @param [String] brewer the client for whom this brewery brewed the beer,
-    #   where the brewery is brewing for a different company/brewery
-    # @return [RateBeer::Beer] a beer object representing the scraped beer,
-    #   containing scraped attributes
-    #
-    def process_beer_row(row)
-      beer = process_beer_name_cell(row.css('td').first)
-      beer[:abv] = row.css('td')[1].text.to_f
-      beer[:date_added] = Date.strptime(row.css('td')[2].text, '%m/%d/%Y')
-      Beer.new(id, beer.merge(process_rating_info(row)))
-    end
+      # Scrapes the brewery's address.
+      def scrape_address
+        address_root = info_root.css('div[itemprop="address"] b span')
+        address_details = address_root.map { |e| extract_address_element(e) }
+        @address = address_details.to_h
+      end
 
-    # Processes the cell containing the beer's name and other information.
-    #
-    # This cell contains information on the beer's name, its style, whether it
-    # is retired, and who is was brewed for or by.
-    def process_beer_name_cell(node)
-      beer_link = node.at_css('strong a')
-      name = fix_characters(beer_link.text)
-      id = id_from_link(beer_link)
-      info = node.at_css('em.real-small')
-      brewed_at_for = process_brewed_at_for(node)
-      style = process_style_info(node)
-      { id:     id,
-        name:   name,
-        style:  style,
-        retired:  info && info.text =~ /retired/ || false }.merge(brewed_at_for)
-    end
+      # Extracts one element of address details from a node contained within the
+      # address div.
+      def extract_address_element(node)
+        key = case node.attributes['itemprop'].value
+              when 'streetAddress'   then :street
+              when 'addressLocality' then :city
+              when 'addressRegion'   then :state
+              when 'addressCountry'  then :country
+              when 'postalCode'      then :postcode
+              else raise 'unrecognised attribute'
+              end
+        [key, node.text.strip]
+      end
 
-    # Processes information on who the beer was brewed for or by, or at.
-    def process_brewed_at_for(node)
-      brewed_at_for_node = node.at_css('div.small em')
-      return {} if brewed_at_for_node.nil?
-      node_text = brewed_at_for_node.children.first.text
-      key = if node_text.include?('Brewed at')
-              :brewed_at
-            elsif node_text.include?('Brewed by/for')
-              :brewed_by_for
-            end
-      other_brewer_node = brewed_at_for_node.at_css('a')
-      { key => Brewery.new(id_from_link(other_brewer_node),
-                           name: other_brewer_node.text) }
-    end
+      # Scrapes the telephone number of the brewery.
+      def scrape_telephone
+        @telephone = info_root.at_css('span[itemprop="telephone"]')
+      end
 
-    # Processes the style information contained within a beer name cell.
-    def process_style_info(node)
-      style_node = node.css('a').find do |n|
-        n.children.any? { |c| c.name == 'span' }
+      # Scrapes the type of brewery.
+      def scrape_type
+        @type = info_root.css('div')[1]
       end
-      name = style_node.text
-      id = id_from_link(style_node)
-      Style.new(id, name: name)
-    end
 
-    # Processes rating information from a beer row.
-    def process_rating_info(row)
-      cell_indices = { avg_rating:      4,
-                       overall_rating:  5,
-                       style_rating:    6,
-                       num_ratings:     7 }
-      rating = cell_indices.map do |attr, i|
-        val = row.css('td')[i].text.gsub(nbsp, ' ').strip
-        conversion = attr == :avg_rating ? :to_f : :to_i
-        [attr, val.send(conversion)]
+      # Scrapes beers list for brewery.
+      def scrape_beers
+        @beers = BeerList.new(self).beers
       end
-      rating.to_h
     end
   end
 end

data/lib/ratebeer/brewery/beer_list.rb

@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+require_relative '../urls'
+
+module RateBeer
+  module Brewery
+    # The BeerList class extracts a list of beers for a given brewery.
+    class BeerList
+      include RateBeer::Scraping
+      include RateBeer::URLs
+
+      attr_reader :brewery, :id
+
+      def initialize(brewery)
+        @brewery = brewery
+        @id = brewery.id
+      end
+
+      def beers
+        beers_doc = noko_doc(URI.join(BASE_URL, brewery_beers_url(id)))
+        rows = beers_doc.css('table#brewer-beer-table tbody tr')
+        @beers = rows.map { |row| process_beer_row(row) }.reject(&:nil?)
+      end
+
+      private
+
+      # Process a row of data representing one beer brewed by/at a brewery.
+      #
+      # @param [Nokogiri::XML::Element] row HTML TR row wrapped as a Nokogiri
+      #   element
+      # @param [String] location the location at which a brewery's beer is brewed
+      #   where this location differs from the brewery's regular brewsite/venue
+      # @param [String] brewer the client for whom this brewery brewed the beer,
+      #   where the brewery is brewing for a different company/brewery
+      # @return [RateBeer::Beer] a beer object representing the scraped beer,
+      #   containing scraped attributes
+      #
+      def process_beer_row(row)
+        beer = process_beer_name_cell(row.css('td').first)
+        beer[:abv] = row.css('td')[1].text.to_f
+        beer[:date_added] = Date.strptime(row.css('td')[2].text, '%m/%d/%Y')
+        Beer::Beer.new(id, beer.merge(process_rating_info(row)))
+      end
+
+      # Processes the cell containing the beer's name and other information.
+      #
+      # This cell contains information on the beer's name, its style, whether it
+      # is retired, and who is was brewed for or by.
+      def process_beer_name_cell(node)
+        beer_link = node.at_css('strong a')
+        name = fix_characters(beer_link.text)
+        id = id_from_link(beer_link)
+        info = node.at_css('em.real-small')
+        brewed_at_for = process_brewed_at_for(node)
+        style = process_style_info(node)
+        { id:     id,
+          name:   name,
+          style:  style,
+          retired:  info && info.text =~ /retired/ || false }.merge(brewed_at_for)
+      end
+
+      # Processes information on who the beer was brewed for or by, or at.
+      def process_brewed_at_for(node)
+        brewed_at_for_node = node.at_css('div.small em')
+        return {} if brewed_at_for_node.nil?
+        node_text = brewed_at_for_node.children.first.text
+        key = if node_text.include?('Brewed at')
+                :brewed_at
+              elsif node_text.include?('Brewed by/for')
+                :brewed_by_for
+              end
+        other_brewer_node = brewed_at_for_node.at_css('a')
+        { key => Brewery.new(id_from_link(other_brewer_node),
+                             name: other_brewer_node.text) }
+      end
+
+      # Processes the style information contained within a beer name cell.
+      def process_style_info(node)
+        style_node = node.css('a').find do |n|
+          n.children.any? { |c| c.name == 'span' }
+        end
+        name = style_node.text
+        id = id_from_link(style_node)
+        Style.new(id, name: name)
+      end
+
+      # Processes rating information from a beer row.
+      def process_rating_info(row)
+        cell_indices = { avg_rating:      4,
+                         style_rating:    5,
+                         num_ratings:     6 }
+        rating = cell_indices.map do |attr, i|
+          val = row.css('td')[i].text.gsub(nbsp, ' ').strip
+          conversion = attr == :avg_rating ? :to_f : :to_i
+          [attr, val.send(conversion)]
+        end
+        rating.to_h
+      end
+    end
+  end
+end

data/lib/ratebeer/location.rb

@@ -40,10 +40,6 @@ module RateBeer
       @doc
     end
 
-    def heading
-      @heading ||= doc.at_css('.col-lg-9')
-    end
-
     private
 
     def validate_location
@@ -53,20 +49,19 @@ module RateBeer
     end
 
     def scrape_name
-      @name = heading.at_css('h1')
-                     .text
-                     .split('Breweries')
-                     .first
-                     .strip
+      @name = doc.at_css('h1')
+                 .text
+                 .split('Breweries')
+                 .first
+                 .strip
     end
 
     def scrape_num_breweries
-      @num_breweries = heading.at_css('li.active')
-                              .text
-                              .scan(/Active \((\d*)\)/)
-                              .first
-                              .first
-                              .to_i
+      @num_breweries = doc.at_css('li.active')
+                          .text
+                          .split(' ')
+                          .first
+                          .to_i
     end
 
     def scrape_breweries
@@ -86,12 +81,12 @@ module RateBeer
                              .strip
           type = cells[1].text.strip
           established = status == 'Active' ? cells[3].text.to_i : nil
-          Brewery.new(id,
-                      name:        name,
-                      location:    location,
-                      type:        type,
-                      established: established,
-                      status:      status)
+          Brewery::Brewery.new(id,
+                               name:        name,
+                               location:    location,
+                               type:        type,
+                               established: established,
+                               status:      status)
         end
       end
     end

data/lib/ratebeer/review.rb

@@ -57,11 +57,11 @@ module RateBeer
       #   beer, up to the review_limit
       #
       def retrieve(beer, order: :most_recent, limit: 10)
-        if beer.is_a?(RateBeer::Beer)
+        if beer.is_a?(RateBeer::Beer::Beer)
           beer_id = beer.id
         elsif beer.is_a?(Integer)
           beer_id = beer
-          beer    = RateBeer::Beer.new(beer)
+          beer    = RateBeer::Beer::Beer.new(beer)
         else
           raise "unknown beer value: #{beer}"
         end
@@ -69,7 +69,7 @@ module RateBeer
         reviews = num_pages(limit).times.flat_map do |page_number|
           url = URI.join(BASE_URL, review_url(beer_id, url_suffix(order), page_number))
           doc = RateBeer::Scraping.noko_doc(url)
-          root = doc.css("#container table table")[3]
+          root = doc.at_css('.reviews-container')
 
           # All reviews are contained within the sole cell in the sole row of
           # the selected table. Each review consists of rating information, 
@@ -77,7 +77,7 @@ module RateBeer
           #
           # The components are contained within div, small, div tags 
           # respectively. We need to scrape these specifically.
-          root.css('td')
+          root.at_css('div div')
               .children
               .select { |x| x.name == 'div' || x.name == 'small' }
               .map(&:text)
@@ -126,7 +126,7 @@ module RateBeer
       @beer = if options[:beer].is_a?(RateBeer::Beer)
                 options[:beer]
               elsif options[:beer].is_a?(Integer)
-                RateBeer::Beer.new(options[:beer])
+                RateBeer::Beer::Beer.new(options[:beer])
               else
                 raise ArgumentError.new("incorrect beer parameter: #{options[:beer]}")
               end

data/lib/ratebeer/scraping.rb

@@ -14,10 +14,12 @@ module RateBeer
 
     # Run method on inclusion in class.
     def self.included(base)
-      base.data_keys.each do |attr|
-        define_method(attr) do
-          send("scrape_#{attr}") unless instance_variable_defined?("@#{attr}")
-          instance_variable_get("@#{attr}")
+      if base.respond_to?(:data_keys)
+        base.data_keys.each do |attr|
+          define_method(attr) do
+            send("scrape_#{attr}") unless instance_variable_defined?("@#{attr}")
+            instance_variable_get("@#{attr}")
+          end
         end
       end
     end
@@ -128,7 +130,7 @@ module RateBeer
     # strings scraped from RateBeer.com
     #
     def fix_characters(string)
-      string = string.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
+      string = string.encode('UTF-8', invalid: :replace, undef: :replace, replace: '')
       characters = { nbsp     => " ",
                      "\u0093" => "ž",
                      "\u0092" => "'",

data/lib/ratebeer/search.rb

@@ -108,7 +108,7 @@ module RateBeer
     def scrape_beers
       unless instance_variable_defined?('@beers')
         run_search
-        @beers = @beers.sort_by(&:id)
+        @beers = @beers && @beers.sort_by(&:id)
       end
       @beers
     end
@@ -124,7 +124,7 @@ module RateBeer
     # Generate parameters to use in POST request.
     #
     def post_params
-      { 'BeerName' => @query }
+      { 'beername' => @query }
     end
 
     # Process breweries table returned in search.
@@ -146,7 +146,7 @@ module RateBeer
         end
         result[:url] = row.at_css('a')['href']
         result[:id]  = result[:url].split('/').last.to_i
-        Brewery.new(result[:id], name: result[:name])
+        Brewery::Brewery.new(result[:id], name: result[:name])
       end
     end
 
@@ -183,14 +183,14 @@ module RateBeer
     def process_beer_row(row)
       result = [:id, :name, :score, :ratings, :url].zip([nil]).to_h
       content = row.element_children.map { |x| fix_characters(x.text) }
-      result[:name] = content.first
+      result[:name] = row.element_children.first.at_css('a').text
       result[:score], result[:ratings] = content.values_at(3, 4)
                                                 .map do |n|
         n.nil? || n.empty? ? nil : n.to_i
       end
       result[:url] = row.at_css('a')['href']
       result[:id]  = result[:url].split('/').last.to_i
-      b = Beer.new(result[:id], name: result[:name])
+      b = Beer::Beer.new(result[:id], name: result[:name])
       b.brewery.name if @scrape_beer_brewers
       b
     end

data/lib/ratebeer/style.rb

@@ -35,9 +35,9 @@ module RateBeer
       #
       def all_styles(include_hidden = false)
         doc  = Scraping.noko_doc(URI.join(BASE_URL, '/beerstyles/'))
-        root = doc.at_css('div.container-fluid table')
+        root = doc.at_css('div.container-fluid')
 
-        categories = root.css('.groupname').map(&:text)
+        categories = root.css('h3').map(&:text)
         style_node = root.css('.styleGroup')
 
         styles = style_node.flat_map.with_index do |list, i|
@@ -109,8 +109,8 @@ module RateBeer
       @beers = beer_list.css('tr').drop(1).map do |row|
         cells = row.css('td')
         url   = cells[1].at_css('a')['href']
-        [cells[0].text.to_i, Beer.new(url.split('/').last,
-                                      name: fix_characters(cells[1].text))]
+        [cells[0].text.to_i, Beer::Beer.new(url.split('/').last,
+                                            name: fix_characters(cells[1].text))]
       end.to_h
     end
   end

data/lib/ratebeer/urls.rb

@@ -1,10 +1,11 @@
-module RateBeer
+# frozen_string_literal: true
 
+module RateBeer
   # This module contains URLs or URL patterns for use throughout the Gem.
   #
   module URLs
-    BASE_URL   = "http://www.ratebeer.com"
-    SEARCH_URL = "/findbeer.asp"
+    BASE_URL   = 'https://www.ratebeer.com'
+    SEARCH_URL = '/search'
 
     # Return URL to info page for beer with id
     #

data/spec/lib/ratebeer/beer_spec.rb

@@ -1,23 +1,23 @@
 require 'spec_helper'
 
-describe RateBeer::Beer do
+describe RateBeer::Beer::Beer do
   before :all do
-    @valid     = RateBeer::Beer.new(1411) # ID for Tennents Lager (sorry...)
-    @retired   = RateBeer::Beer.new(213_225) # ID for BrewDog Vice Bier
-    @with_name = RateBeer::Beer.new(422, name: 'Stone IPA')
+    @valid     = RateBeer.beer(1411) # ID for Tennents Lager (sorry...)
+    @retired   = RateBeer.beer(213_225) # ID for BrewDog Vice Bier
+    @with_name = RateBeer.beer(422, 'Stone IPA')
   end
 
   describe '#new' do
     it 'creates a beer instance' do
-      expect(@valid).to be_a RateBeer::Beer
+      expect(@valid).to be_a RateBeer::Beer::Beer
     end
 
     it 'requires an ID# as parameter' do
-      expect { RateBeer::Beer.new }.to raise_error(ArgumentError)
+      expect { RateBeer.beer }.to raise_error(ArgumentError)
     end
 
     it 'accepts a name parameter' do
-      expect(@with_name).to be_a RateBeer::Beer
+      expect(@with_name).to be_a RateBeer::Beer::Beer
     end
   end
 
@@ -46,9 +46,7 @@ describe RateBeer::Beer do
                                              :url,
                                              :style,
                                              :glassware,
-                                             :availability,
                                              :abv,
-                                             :calories,
                                              :description,
                                              :retired,
                                              :rating)

data/spec/lib/ratebeer/brewery_spec.rb

@@ -2,21 +2,21 @@ require 'spec_helper'
 
 describe RateBeer::Brewery do
   before :all do
-    @valid     = RateBeer::Brewery.new(8534) # ID for BrewDog
-    @with_name = RateBeer::Brewery.new(1069, name: 'Cantillon Brewery')
+    @valid     = RateBeer.brewery(8534) # ID for BrewDog
+    @with_name = RateBeer.brewery(1069, 'Cantillon Brewery')
   end
 
   describe '#new' do
     it 'creates a brewery instance' do
-      expect(@valid).to be_a RateBeer::Brewery
+      expect(@valid).to be_a RateBeer::Brewery::Brewery
     end
 
     it 'requires an ID# as parameter' do
-      expect { RateBeer::Brewery.new }.to raise_error(ArgumentError)
+      expect { RateBeer::Brewery::Brewery.new }.to raise_error(ArgumentError)
     end
 
     it 'accepts a name parameter' do
-      expect(@with_name).to be_a RateBeer::Brewery
+      expect(@with_name).to be_a RateBeer::Brewery::Brewery
     end
   end
 
@@ -36,7 +36,7 @@ describe RateBeer::Brewery do
     end
 
     it 'returns an array of beer instances' do
-      @valid.beers.each { |b| expect(b).to be_a RateBeer::Beer }
+      @valid.beers.each { |b| expect(b).to be_a RateBeer::Beer::Beer }
     end
 
     it 'returns a list of beers produced by brewery' do
@@ -48,7 +48,7 @@ describe RateBeer::Brewery do
                162_521,
                87_321,
                118_987,
-               119_594].map { |id| RateBeer::Beer.new(id) }
+               119_594].map { |id| RateBeer.beer(id) }
       expect(@valid.beers).to include(*beers)
     end
   end

data/spec/lib/ratebeer/country_spec.rb

@@ -41,7 +41,7 @@ describe RateBeer::Country do
                             2809,
                             2878,
                             11582,
-                            8031].map { |i| RateBeer::Brewery.new(i) }
+                            8031].map { |i| RateBeer::Brewery::Brewery.new(i) }
       expect(@country.breweries).to include(*expected_breweries)
     end
 

data/spec/lib/ratebeer/region_spec.rb

@@ -39,7 +39,7 @@ describe RateBeer::Region do
     it "returns a series of RateBeer::Brewery instances" do
       expected_breweries = [25_211,
                             3132,
-                            1097].map { |i| RateBeer::Brewery.new(i) }
+                            1097].map { |i| RateBeer::Brewery::Brewery.new(i) }
       expect(@region.breweries).to include(*expected_breweries)
     end
 

data/spec/lib/ratebeer/review_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe RateBeer::Review do
   before :all do
     # Create Review instance with Beer instance
-    @beer = RateBeer::Beer.new(135361) # BrewDog Punk IPA
+    @beer = RateBeer.beer(135361) # BrewDog Punk IPA
     @constructed_params = { beer: @beer,
                             reviewer: "Johnny Tester", 
                             reviewer_rank: 1234,
@@ -43,7 +43,7 @@ describe RateBeer::Review do
     end
 
     it "recognises a beer specified by ID#" do
-      expect(@reviews_by_id.first.beer).to eq RateBeer::Beer.new(@beer_id)
+      expect(@reviews_by_id.first.beer).to eq RateBeer.beer(@beer_id)
     end
 
     it "retrieves reviews for beer specified by ID#" do

data/spec/lib/ratebeer/search_spec.rb

@@ -18,7 +18,7 @@ describe RateBeer::Search do
   describe '#run_search' do
     before :all do
       @failed_search     = RateBeer::Search.new('random param 1234').run_search
-      @successful_search = RateBeer::Search.new('heineken').run_search
+      @successful_search = RateBeer::Search.new('dugges').run_search
     end
 
     it 'executes a search using specified query parameter' do
@@ -45,22 +45,15 @@ describe RateBeer::Search do
     it 'returns a list of specific beers matching the query parameter' do
       beers = @successful_search.beers
       names = beers.map(&:name)
-      expect(names).to include('Heineken',
-                               'Heineken Beer',
-                               'Heineken Golden Fire Strong',
-                               'Heineken Kylian',
-                               'Heineken Oud Bruin',
-                               'Heineken Tarwebok')
+      expect(names).to include('Dugges / Stillwater Tropic Thunder',
+                               'Dugges Almost Imperial',
+                               'Dugges Bärliner')
     end
 
     it 'returns a list of specific breweries matching the query parameter' do
       breweries = @successful_search.breweries
       names     = breweries.map(&:name)
-      expect(names).to include('Heineken UK',
-                               'Heineken Italia',
-                               'Al Ahram (Heineken)',
-                               'Pivovar Corgon (Heineken)',
-                               'Bralima (Heineken)')
+      expect(names).to include('Dugges Bryggeri')
     end
   end
 end

data/spec/lib/ratebeer_spec.rb

@@ -4,14 +4,14 @@ describe RateBeer do
   describe '.beer' do
     it 'creates a new beer' do
       beer = RateBeer.beer(1234, 'Magic Lager')
-      expect(beer).to eq RateBeer::Beer.new(1234, name: 'Magic Lager')
+      expect(beer).to eq RateBeer::Beer::Beer.new(1234, name: 'Magic Lager')
     end
   end
 
   describe '.brewery' do
     it 'creates a new brewery' do
       brewery = RateBeer.brewery(456, 'Magic BrewCo')
-      expect(brewery).to eq RateBeer::Brewery.new(456, name: 'Magic BrewCo')
+      expect(brewery).to eq RateBeer::Brewery::Brewery.new(456, name: 'Magic BrewCo')
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ratebeer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dan Meakin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-30 00:00:00.000000000 Z
+date: 2017-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -38,7 +38,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: RateBeer provides a way to access information from RateBeer.com.
+description: |-
+  RateBeer provides a way to access information from \
+                    \RateBeer.com.
 email: dan@danmeakin.com
 executables: []
 extensions: []
@@ -52,7 +54,9 @@ files:
 - bin/ratebeer
 - lib/ratebeer.rb
 - lib/ratebeer/beer.rb
+- lib/ratebeer/beer/alias.rb
 - lib/ratebeer/brewery.rb
+- lib/ratebeer/brewery/beer_list.rb
 - lib/ratebeer/country.rb
 - lib/ratebeer/location.rb
 - lib/ratebeer/region.rb
@@ -89,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Unofficial RateBeer API