beer_list 1.1.0 → 2.0.0.rc1

data/README.md

@@ -88,7 +88,8 @@ will create the following code in path/to/establishments/applebirds.rb
 module BeerList
   module Establishments
     class Applebirds < Establishment
-      URL = 'http://applebirds.com/beers'
+      URL     = 'http://applebirds.com/beers'
+      ADDRESS = nil
 
       # Handles parsing and manipulating a Mechanize::Page object
       # in order to scrape the contents of your beer list.
@@ -101,6 +102,10 @@ module BeerList
       def url
         URL
       end
+
+      def address
+        ADDRESS
+      end
     end
   end
 end
@@ -175,7 +180,7 @@ BeerList.send_lists
 ```
 
 Both .send_list and .send_lists accept an optional URL as the last argument. If you don't pass one,
-it will use the default in your configuration. If neither doesn't exist, it will raise an error.
+it will use the default in your configuration. If neither exist, it will raise an error.
 
 ### Leads
 

data/beer_list.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'beer_list'
-  spec.version       = '1.1.0'
+  spec.version       = '2.0.0.rc1'
   spec.authors       = ['Dan Olson']
   spec.email         = ['olson_dan@yahoo.com']
   spec.description   = 'A utility for retrieving the beer list from various establishments'

data/lib/beer_list/cli.rb

@@ -12,6 +12,9 @@ module BeerList
     option :selector,
            aliases: '-s',
            banner:  'Optional selector to use for scraping'
+    option :address,
+           aliases: '-a',
+           banner:  'The physical address of your establishment'
 
     desc 'establish ESTABLISHMENT', 'Generate a subclass of BeerList::Establishments::Establishment in the given directory'
     def establish(klass)
@@ -36,9 +39,9 @@ module BeerList
         puts BeerList.lists_as_json
       else
         BeerList.lists.each do |list|
-          puts '*' * (list.establishment.size + 10)
-          puts "**** #{list.establishment} ****"
-          puts '*' * (list.establishment.size + 10)
+          puts '*' * (list.listable_name.size + 10)
+          puts "**** #{list.listable_name} ****"
+          puts '*' * (list.listable_name.size + 10)
           puts
           puts list
           puts

data/lib/beer_list/establishments/acadia_cafe.rb

@@ -1,7 +1,8 @@
 module BeerList
   module Establishments
     class AcadiaCafe < Establishment
-      URL = 'http://acadiacafe.com/as_beer-menu-and-happy-hour-specials'
+      URL     = 'http://acadiacafe.com/as_beer-menu-and-happy-hour-specials'
+      ADDRESS = '329 Cedar Ave, Minneapolis, MN 55454'
 
       def get_list
         base_list
@@ -13,6 +14,10 @@ module BeerList
         URL
       end
 
+      def address
+        ADDRESS
+      end
+
       private
 
       def base_list

data/lib/beer_list/establishments/blue_door_pub.rb

@@ -1,7 +1,8 @@
 module BeerList
   module Establishments
     class BlueDoorPub < Establishment
-      URL = 'http://thebdp.com/?page_id=159'
+      URL     = 'http://thebdp.com/?page_id=159'
+      ADDRESS = '1811 Selby Ave, St Paul, MN 55104'
 
       def get_list
         page.search('div.two-columns li a').map(&:text)
@@ -10,6 +11,10 @@ module BeerList
       def url
         URL
       end
+
+      def address
+        ADDRESS
+      end
     end
   end
 end

data/lib/beer_list/establishments/blue_nile.rb

@@ -2,7 +2,8 @@ module BeerList
   module Establishments
     class BlueNile < Establishment
       RESTAURANT_NAME = 'Blue Nile'
-      URL = 'http://www.bluenilempls.com/bar-b.html'
+      URL             = 'http://www.bluenilempls.com/bar-b.html'
+      ADDRESS         = '2027 E Franklin Ave, Minneapolis, MN 55404'
 
       def get_list
         base_list
@@ -13,6 +14,10 @@ module BeerList
         URL
       end
 
+      def address
+        ADDRESS
+      end
+
       private
 
       def headers

data/lib/beer_list/establishments/bulldog_lowertown.rb

@@ -1,7 +1,8 @@
 module BeerList
   module Establishments
     class BulldogLowertown < Establishment
-      URL = 'http://www.thebulldoglowertown.com/beer/'
+      URL     = 'http://www.thebulldoglowertown.com/beer/'
+      ADDRESS = '237 E 6th St, St Paul, MN 55101'
 
       def get_list
         page.search('ul.beerlist li').map(&:text)
@@ -10,6 +11,10 @@ module BeerList
       def url
         URL
       end
+
+      def address
+        ADDRESS
+      end
     end
   end
 end

data/lib/beer_list/establishments/bulldog_northeast.rb

@@ -1,7 +1,8 @@
 module BeerList
   module Establishments
     class BulldogNortheast < Establishment
-      URL = 'http://www.thebulldognortheast.com/beer/'
+      URL     = 'http://www.thebulldognortheast.com/beer/'
+      ADDRESS = '401 E Hennepin Ave, Minneapolis, MN 55414'
 
       def get_list
         list = page.search('p.copy_menu_item_desc').map(&:text)
@@ -12,6 +13,10 @@ module BeerList
       def url
         URL
       end
+
+      def address
+        ADDRESS
+      end
     end
   end
 end

data/lib/beer_list/establishments/bulldog_uptown.rb

@@ -1,7 +1,8 @@
 module BeerList
   module Establishments
     class BulldogUptown < Establishment
-      URL = 'http://www.thebulldoguptown.com/beer/'
+      URL     = 'http://www.thebulldoguptown.com/beer/'
+      ADDRESS = '2549 Lyndale Ave S, Minneapolis, MN 55405'
 
       def get_list
         list = page.search('span.menuTitle').map(&:text)
@@ -16,6 +17,10 @@ module BeerList
       def url
         URL
       end
+
+      def address
+        ADDRESS
+      end
     end
   end
 end

data/lib/beer_list/establishments/busters_on28th.rb

@@ -1,7 +1,8 @@
 module BeerList
   module Establishments
     class BustersOn28th < Establishment
-      URL = 'http://busterson28th.com/bottles/'
+      URL     = 'http://busterson28th.com/bottles/'
+      ADDRESS = '4204 S 28th Ave, Minneapolis, Minnesota 55406'
 
       def get_list
         base_list
@@ -15,6 +16,10 @@ module BeerList
         URL
       end
 
+      def address
+        ADDRESS
+      end
+
       private
 
       def base_list

data/lib/beer_list/establishments/edina_grill.rb

@@ -1,7 +1,8 @@
 module BeerList
   module Establishments
     class EdinaGrill < Establishment
-      URL = 'http://www.edinagrill.com/beer_taps.php'
+      URL     = 'http://www.edinagrill.com/beer_taps.php'
+      ADDRESS = '5028 France Ave S, Edina, MN 55424'
 
       def get_list
         page.search('li span').map(&:text)
@@ -10,6 +11,10 @@ module BeerList
       def url
         URL
       end
+
+      def address
+        ADDRESS
+      end
     end
   end
 end

data/lib/beer_list/establishments/establishment.rb

@@ -3,16 +3,9 @@ module BeerList
     class Establishment
       include BeerList::Listable
 
-      def get_list
-        raise "#{__method__} is not implemented in #{self.class.name}"
-      end
-
-      def url
-        raise "#{__method__} is not implemented in #{self.class.name}"
-      end
-
-      def short_class_name
-        self.class.name.split('::').last
+      def name
+        class_name = self.class.name.split('::').last
+        class_name.split(/([A-Z]{1}[a-z]+)/).reject(&:empty?).join(' ')
       end
     end
   end

data/lib/beer_list/establishments/ginger_hop.rb

@@ -1,7 +1,8 @@
 module BeerList
   module Establishments
     class GingerHop < Establishment
-      URL = 'http://www.gingerhop.com/beer'
+      URL   = 'http://www.gingerhop.com/beer'
+      ADDRESS = '201 E Hennepin Ave, Minneapolis, MN 55414'
 
       def get_list
         page.search('div.left-col h5').map(&:text)
@@ -10,6 +11,10 @@ module BeerList
       def url
         URL
       end
+
+      def address
+        ADDRESS
+      end
     end
   end
 end

data/lib/beer_list/establishments/groveland_tap.rb

@@ -1,7 +1,8 @@
 module BeerList
   module Establishments
     class GrovelandTap < Establishment
-      URL = 'http://www.grovelandtap.com/beer_taps.php'
+      URL   = 'http://www.grovelandtap.com/beer_taps.php'
+      ADDRESS = '1834 St Clair Ave, St Paul, MN 55105'
 
       def get_list
         page.search('p.MsoNormal').map(&:text)
@@ -10,6 +11,10 @@ module BeerList
       def url
         URL
       end
+
+      def address
+        ADDRESS
+      end
     end
   end
 end

data/lib/beer_list/establishments/happy_gnome.rb

@@ -3,6 +3,7 @@ module BeerList
     class HappyGnome < Establishment
       attr_accessor :url
 
+      ADDRESS = '498 Selby Ave, St Paul, MN 55102'
       DRAFTS  = 'http://thehappygnome.com/menus/drafts/'
       BOTTLES = 'http://thehappygnome.com/menus/bottled-beers/'
 
@@ -15,6 +16,10 @@ module BeerList
         get_bottle_list
       end
 
+      def address
+        ADDRESS
+      end
+
       private
 
       def get_the_list

data/lib/beer_list/establishments/icehouse.rb

@@ -0,0 +1,43 @@
+module BeerList
+  module Establishments
+    class Icehouse < Establishment
+      URL     = 'http://www.icehousempls.com/drinks/beer/'
+      ADDRESS = "2528 Nicollet Ave, Minneapolis, MN 55404"
+
+      def get_list
+        base_list
+        only_caps
+        reject_empty
+        capitalize
+      end
+
+      def url
+        URL
+      end
+
+      def address
+        ADDRESS
+      end
+
+      private
+
+      def base_list
+        @icehouse = page.search('article#menu dd').map(&:text)
+      end
+
+      def only_caps
+        @icehouse = @icehouse.map { |b| b.match(/\A([0-9]+)?\s?([A-Z]+\s?)+/).to_s }
+      end
+
+      def reject_empty
+        @icehouse = @icehouse.reject { |b| b.empty? }
+      end
+
+      def capitalize
+        @icehouse.map do |b|
+          b.split(' ').map(&:capitalize).join(' ')
+        end
+      end
+    end
+  end
+end

data/lib/beer_list/establishments/longfellow_grill.rb

@@ -1,7 +1,8 @@
 module BeerList
   module Establishments
     class LongfellowGrill < Establishment
-      URL = 'http://www.longfellowgrill.com/beer_taps.php'
+      URL     = 'http://www.longfellowgrill.com/beer_taps.php'
+      ADDRESS = '2990 W River Pkwy, Minneapolis, MN 55406'
       STATE_AND_PRICE_REGEX = /\s*(?:\([A-Z]*\))*\s*\**\s*\d+\.\d{2}$/
 
       def get_list
@@ -14,6 +15,10 @@ module BeerList
         URL
       end
 
+      def address
+        ADDRESS
+      end
+
       private
 
       def get_base_list

data/lib/beer_list/establishments/lowry_uptown.rb

@@ -1,7 +1,8 @@
 module BeerList
   module Establishments
     class LowryUptown < Establishment
-      URL = 'http://www.thelowryuptown.com/drink'
+      URL     = 'http://www.thelowryuptown.com/drink'
+      ADDRESS = '2112 Hennepin Ave, Minneapolis, MN 55405'
 
       def get_list
         base_list
@@ -13,6 +14,10 @@ module BeerList
         URL
       end
 
+      def address
+        ADDRESS
+      end
+
       private
 
       def base_list

data/lib/beer_list/establishments/mackenzie_pub.rb

@@ -1,7 +1,8 @@
 module BeerList
   module Establishments
     class MackenziePub < Establishment
-      URL = 'http://mackenziepub.com/drink/beer/'
+      URL     = 'http://mackenziepub.com/drink/beer/'
+      ADDRESS = '918 Hennepin Ave, Minneapolis, MN 55403'
 
       def get_list
         base_list
@@ -12,6 +13,10 @@ module BeerList
         URL
       end
 
+      def address
+        ADDRESS
+      end
+
       private
 
       def base_list

data/lib/beer_list/establishments/macs_industrial.rb

@@ -1,7 +1,8 @@
 module BeerList
   module Establishments
     class MacsIndustrial < Establishment
-      URL = 'http://www.macsindustrial.com/tap_page.php'
+      URL     = 'http://www.macsindustrial.com/tap_page.php'
+      ADDRESS = '312 Central Ave SE, Minneapolis, MN 55414'
 
       def get_list
         build_list
@@ -11,6 +12,10 @@ module BeerList
         URL
       end
 
+      def address
+        ADDRESS
+      end
+
       private
 
       def build_list

data/lib/beer_list/establishments/mc_coys_mn.rb

@@ -3,6 +3,7 @@ module BeerList
     class McCoysMN < Establishment
       attr_accessor :url
 
+      ADDRESS = '3801 Grand Way, St Louis Park, MN 55416'
       DRAFTS  = 'http://mccoysmn.com/beer/'
       BOTTLES = 'http://mccoysmn.com/beer/bottles'
 
@@ -16,6 +17,10 @@ module BeerList
         get_bottle_list
       end
 
+      def address
+        ADDRESS
+      end
+
       private
 
       def get_draft_list

data/lib/beer_list/establishments/muddy_pig.rb

@@ -1,7 +1,8 @@
 module BeerList
   module Establishments
     class MuddyPig < Establishment
-      URL = 'http://muddypig.com/beer/'
+      URL   = 'http://muddypig.com/beer/'
+      ADDRESS = '162 Dale St N, St Paul, MN 55102'
 
       def get_list
         page.search('p').last.text.split("\n")
@@ -10,6 +11,10 @@ module BeerList
       def url
         URL
       end
+
+      def address
+        ADDRESS
+      end
     end
   end
 end

data/lib/beer_list/establishments/muddy_waters.rb

@@ -1,7 +1,8 @@
 module BeerList
   module Establishments
     class MuddyWaters < Establishment
-      URL = 'http://muddywatersmpls.com/booze.html'
+      URL   = 'http://muddywatersmpls.com/booze.html'
+      ADDRESS = '2933 Lyndale Ave S, Minneapolis, MN 55408'
 
       def get_list
         get_processed_list
@@ -11,6 +12,10 @@ module BeerList
         URL
       end
 
+      def address
+        ADDRESS
+      end
+
       def get_processed_list
         all = page.search('div.graphic_textbox_layout_style_default p').map(&:text)
 

data/lib/beer_list/establishments/new_bohemia.rb

@@ -1,7 +1,8 @@
 module BeerList
   module Establishments
     class NewBohemia < Establishment
-      URL = 'http://www.newbohemiausa.com/bier/'
+      URL     = 'http://www.newbohemiausa.com/bier/'
+      ADDRESS = '233 E Hennepin Ave, Minneapolis, MN 55414'
 
       def get_list
         base_list
@@ -12,6 +13,10 @@ module BeerList
         URL
       end
 
+      def address
+        ADDRESS
+      end
+
       private
 
       def base_list

data/lib/beer_list/establishments/red_cow.rb

@@ -0,0 +1,31 @@
+module BeerList
+  module Establishments
+    class RedCow < Establishment
+      URL     = 'http://redcowmn.com/beer'
+      ADDRESS = '3624 W 50th St, Minneapolis, MN 55410'
+
+      def get_list
+        base_list
+        match_before_paren
+      end
+
+      def url
+        URL
+      end
+
+      def address
+        ADDRESS
+      end
+
+      private
+
+      def base_list
+        @red_cow = page.search('.sqs-block-content li').map(&:text)
+      end
+
+      def match_before_paren
+        @red_cow = @red_cow.map { |b| b.match(/\(/) ? $`.strip : b.strip }
+      end
+    end
+  end
+end

data/lib/beer_list/establishments/stanleys_bar_room.rb

@@ -2,6 +2,7 @@ module BeerList
   module Establishments
     class StanleysBarRoom < Establishment
       URL = 'http://www.stanleysbarroom.com/drinks/beer-list/'
+      ADDRESS = '2500 University Ave NE, Minneapolis, MN 55418'
 
       def get_list
         base_list
@@ -12,6 +13,10 @@ module BeerList
         URL
       end
 
+      def address
+        ADDRESS
+      end
+
       private
 
       def base_list

data/lib/beer_list/establishments/three_squares.rb

@@ -1,7 +1,8 @@
 module BeerList
   module Establishments
     class ThreeSquares < Establishment
-      URL = 'http://www.3squaresrestaurant.com/beer_taps.php'
+      URL     = 'http://www.3squaresrestaurant.com/beer_taps.php'
+      ADDRESS = '12690 Arbor Lakes Pkwy N, Maple Grove, Minnesota 55369'
 
       def get_list
         page.at('ul').text.split("\r\n")
@@ -10,6 +11,10 @@ module BeerList
       def url
         URL
       end
+
+      def address
+        ADDRESS
+      end
     end
   end
 end

data/lib/beer_list/establishments/washington_square.rb

@@ -1,7 +1,8 @@
 module BeerList
   module Establishments
     class WashingtonSquare < Establishment
-      URL = 'http://www.washingtonsquareonline.net/as_on-tap'
+      URL     = 'http://www.washingtonsquareonline.net/as_on-tap'
+      ADDRESS = '4736 Washington Ave, St Paul, MN 55110'
 
       def get_list
         base_list
@@ -13,6 +14,10 @@ module BeerList
         URL
       end
 
+      def address
+        ADDRESS
+      end
+
       private
 
       def base_list

data/lib/beer_list/list.rb

@@ -1,15 +1,15 @@
 module BeerList
   class List < Array
-    attr_reader :establishment
+    attr_reader :listable
 
     def initialize(opts={})
-      ary            = opts[:array] || []
-      @establishment = opts[:establishment]
+      ary       = opts[:array] || []
+      @listable = opts[:listable]
       super ary.sort
     end
 
     def to_hash
-      Hash[establishment, self.to_a]
+      { name: listable_name, address: listable.address, list: to_a }
     end
 
     alias :old_to_json :to_json
@@ -17,5 +17,9 @@ module BeerList
     def to_json
       to_hash.to_json
     end
+
+    def listable_name
+      listable.name
+    end
   end
 end

data/lib/beer_list/listable.rb

@@ -2,17 +2,16 @@ module BeerList
   module Listable
     attr_accessor :page
 
-    def list
-      visit_page unless page
-      @list ||= BeerList::List.new establishment: short_class_name, array: get_list
-    end
-
-    def short_class_name
-      raise NotImplementedError
+    # Templates
+    [:get_list, :url, :address, :name].each do |m|
+      define_method m do
+        nil
+      end
     end
 
-    def get_list
-      raise NotImplementedError
+    def list
+      visit_page unless page
+      @list ||= BeerList::List.new listable: self, array: get_list || []
     end
 
     private

data/lib/beer_list/scraper.rb

@@ -21,7 +21,7 @@ module BeerList
     end
 
     def send_json(url, json)
-      url = "http://#{url}" unless url.start_with? 'http://'
+      url = "http://#{url}" unless url.start_with? 'http'
       agent.post url, "{\"beer_list\": #{json}}", 'Content-Type' => 'application/json'
       true
     end

data/lib/beer_list.rb

@@ -32,15 +32,6 @@ module BeerList
       settings.establishments_dir
     end
 
-    ### DEPRECATED ###
-    def establishments_dir=(directory)
-      puts <<-dep
-        BeerList.establishments_dir= is deprecated and will be removed.
-        Please use BeerList.configure instead
-      dep
-      settings.establishments_dir = directory
-    end
-
     def establishments
       return [] if @establishments.nil?
       @establishments.dup
@@ -67,20 +58,18 @@ module BeerList
     end
 
     def lists_as_hash
-      lists.inject({}) do |hsh, list|
-        hsh.merge! list.to_hash
-      end
+      lists.map &:to_hash
     end
 
     def lists_as_json
-      lists_as_hash.to_json
+      lists.map &:to_json
     end
 
     def send_list(list, url=nil)
       url ||= default_url
       raise NoUrlError unless url
       raise NotAListError unless list.is_a? BeerList::List
-      scraper.send_json url, list.to_json
+      scraper.send_json url, [list.to_json]
     end
 
     def send_lists(url=nil)
@@ -104,8 +93,8 @@ module BeerList
     end
 
     def establishments_eq_lists?
-      list_names = @lists.map(&:establishment)
-      establishments.map(&:short_class_name).all? { |name| list_names.include? name }
+      list_names = @lists.map { |list| list.listable_name }
+      establishments.map(&:name).all? { |name| list_names.include? name }
     end
 
     def method_missing(method, *args, &block)
@@ -117,6 +106,16 @@ module BeerList
       end
     end
 
+    def respond_to_missing?(method, include_private=false)
+      class_name = method.to_s.split('_').map(&:capitalize).join
+      !!get_class_with_namespace(class_name) || super
+    end if RUBY_VERSION >= '1.9'
+
+    def respond_to?(method, include_private=false)
+      class_name = method.to_s.split('_').map(&:capitalize).join
+      !!get_class_with_namespace(class_name) || super
+    end if RUBY_VERSION < '1.9'
+
     def is_establishment?(class_name)
       BeerList::Establishments.constants.include? class_name.to_sym
     end

data/lib/generators/establishment_generator.rb

@@ -12,6 +12,7 @@ module BeerList
       @url       = args[:url] || DEFAULT_URL
       @selector  = args[:selector] || '.selector'
       @directory = args[:directory] || ESTABLISHMENTS_DIR
+      @address   = args[:address] # Fallback to nil if not given
       write_file
     end
 

data/lib/generators/templates/establishment.erb

@@ -1,7 +1,8 @@
 module BeerList
   module Establishments
     class <%= @klass %> < Establishment
-      URL = '<%= @url %>'
+      URL     = '<%= @url %>'
+      ADDRESS = <%= @address.inspect %>
 
       # Handles parsing and manipulating a Mechanize::Page object
       # in order to scrape the contents of your beer list.
@@ -14,6 +15,10 @@ module BeerList
       def url
         URL
       end
+
+      def address
+        ADDRESS
+      end
     end
   end
 end

data/spec/lib/beer_list/establishments/establishment_spec.rb

@@ -4,7 +4,7 @@ module BeerList
   module Establishments
 
     describe Establishment do
-      let(:establishment){ BeerList::Establishments::MuddyWaters.new }
+      let(:establishment){ BeerList::Establishments::Establishment.new }
 
       describe '#list' do
         it 'returns a BeerList::List' do
@@ -16,21 +16,31 @@ module BeerList
 
       describe '#get_list' do
         context 'when it is not implemented in a subclass' do
-          it 'raises an exception' do
-            expect { establishment.get_list }.to raise_error
+          it 'returns nil' do
+            establishment.get_list.should be_nil
           end
         end
       end
 
       describe '#url' do
-        it 'raises an exception unless it is implemented in a subclass' do
-          expect { establishment.get_list }.to raise_error
+        context 'when it is not implemented in a subclass' do
+          it 'returns nil' do
+            establishment.url.should be_nil
+          end
+        end
+      end
+
+      describe '#address' do
+        context 'when it is not implemented in a subclass' do
+          it 'returns nil' do
+            establishment.address.should be_nil
+          end
         end
       end
 
-      describe '#short_class_name' do
+      describe '#name' do
         it 'returns a usable name' do
-          establishment.short_class_name.should == 'MuddyWaters'
+          establishment.name.should == 'Establishment'
         end
       end
     end

data/spec/lib/beer_list/list_spec.rb

@@ -2,29 +2,29 @@ require 'spec_helper'
 
 module BeerList
   describe List do
-    let(:est_name){ 'MuddyWaters' }
-    let(:list){ List.new array: [], establishment: est_name }
+    let(:listable){ stub('listable', name: 'Applebirds', address: '123 Fake St') }
+    let(:list){ List.new array: ['item'], listable: listable }
 
-    it 'knows its establishent' do
-      list.establishment.should == est_name
+    it 'knows its listable' do
+      list.listable.should == listable
     end
 
     describe '#to_hash' do
-      it 'hashes its establishment name with its content' do
-        expected = { est_name => [] }
+      it 'hashes its listable info with its list' do
+        expected = { name: 'Applebirds', address: '123 Fake St', list: ['item']}
         list.to_hash.should == expected
       end
     end
 
     describe '#to_json' do
       it 'returns the list as json' do
-        expected = "{\"MuddyWaters\":[]}"
+        expected = "{\"name\":\"Applebirds\",\"address\":\"123 Fake St\",\"list\":[\"item\"]}"
         list.to_json.should == expected
       end
     end
 
     context 'when array is nil (the establishment has yet to implement #get_list)' do
-      let(:list){ List.new array: nil, establishment: est_name }
+      let(:list){ List.new array: nil, listable: listable }
 
       it { list.should be_empty }
     end

data/spec/lib/beer_list_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe BeerList do
   let(:establishment){ BeerList::Establishments::ThreeSquares.new }
+  let(:scraper){ stub }
 
   describe '.configure' do
     before do
@@ -21,11 +22,6 @@ describe BeerList do
   end
 
   describe '.establishments' do
-
-    after(:each) do
-      BeerList.clear_establishments!
-    end
-
     it 'returns an array' do
       BeerList.establishments.should be_an_instance_of Array
     end
@@ -91,17 +87,13 @@ describe BeerList do
     end
 
     context 'when establishments are registered' do
-      before(:all) do
-        BeerList.add_establishments establishment
-      end
-
-      after(:all) do
-        BeerList.clear_establishments!
-      end
+      let(:list){ BeerList::List.new listable: establishment, array: [] }
 
       before do
-        establishment.stub(:visit_page)
-        establishment.stub(:get_list){ ['Darkness', 'Pliney the Elder'] }
+        BeerList.stub(:establishments){ [establishment] }
+        BeerList.stub(:update_necessary?){ true }
+        BeerList.stub(:scraper){ scraper }
+        scraper.should_receive(:beer_list).with(establishment){ list }
       end
 
       it 'returns an array of lists' do
@@ -109,28 +101,28 @@ describe BeerList do
       end
 
       it 'contains lists for the registered establishments' do
-        BeerList.lists.first.establishment.should == 'ThreeSquares'
+        BeerList.lists.first.listable.should == establishment
       end
 
       describe '.lists_as_hash' do
-        it 'returns a hash' do
-          BeerList.lists_as_hash.should be_an_instance_of Hash
+        it 'returns an array of hashes' do
+          BeerList.lists_as_hash.all? { |l| l.is_a? Hash }.should be_true
         end
       end
 
       describe '.lists_as_json' do
-        it 'returns JSON' do
-          expect { JSON.parse(BeerList.lists_as_json) }.to_not raise_error
+        it 'returns an array of valid JSON' do
+          expect { BeerList.lists_as_json.each { |j| JSON.parse(j) } }.to_not raise_error
         end
       end
     end
   end
 
   describe 'sending lists' do
-    let(:scraper){ stub }
     let(:url){ 'http://omg.io' }
     let(:json){ "{\"foo\":\"bar\"}" }
     let(:list){ BeerList::List.new }
+    let(:expected){ [url, [json]] }
 
     before do
       BeerList.stub(:scraper).and_return scraper
@@ -139,7 +131,7 @@ describe BeerList do
 
     describe '.send_list' do
       it 'delegates to the scraper' do
-        scraper.should_receive(:send_json).with(url, json)
+        scraper.should_receive(:send_json).with *expected
         BeerList.send_list list, url
       end
     end
@@ -151,7 +143,7 @@ describe BeerList do
       end
 
       it 'delegates to the scraper' do
-        scraper.should_receive(:send_json).with(url, json)
+        scraper.should_receive(:send_json).with *expected
         BeerList.send_lists url
       end
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: beer_list
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 2.0.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Dan Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -106,6 +106,7 @@ files:
 - lib/beer_list/establishments/ginger_hop.rb
 - lib/beer_list/establishments/groveland_tap.rb
 - lib/beer_list/establishments/happy_gnome.rb
+- lib/beer_list/establishments/icehouse.rb
 - lib/beer_list/establishments/longfellow_grill.rb
 - lib/beer_list/establishments/lowry_uptown.rb
 - lib/beer_list/establishments/mackenzie_pub.rb
@@ -114,6 +115,7 @@ files:
 - lib/beer_list/establishments/muddy_pig.rb
 - lib/beer_list/establishments/muddy_waters.rb
 - lib/beer_list/establishments/new_bohemia.rb
+- lib/beer_list/establishments/red_cow.rb
 - lib/beer_list/establishments/stanleys_bar_room.rb
 - lib/beer_list/establishments/three_squares.rb
 - lib/beer_list/establishments/washington_square.rb
@@ -147,9 +149,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24