lcbo 1.2.3 → 1.3.0

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+Version 1.3.0
+
+  * Updated `StoreListPage` to use current XML-based store locator endpoint.
+  * Fixed issue where store opening times of 12:00 PM were reported as midnight.
+  * Fixed product description, serving suggestion, and tasting note parsing.
+  * Added new `#sugar_in_grams_per_liter` attribute to `ProductPage`,
+    `#sugar_content` still reflects the product sweetness descriptor if present.
+  * Added new `#varietal` attribute to `ProductPage`, this appears for some
+    wines selected by the LCBO.
+  * Added new `#style` attribute to `ProductPage`, this reflects the LCBO's
+    designated style for selected wines.
+  * Fixed alcohol content parsing for products.
+  * Added `#clearance_sale_savings_in_cents` and `#has_clearance_sale` indicator
+    to `ProductPage` and included savings calculation in product price.
+  * Fixed product category parsing and added new `#tertiary_category`.
+  * Updated dependencies.
+
 Version 1.2.3
 
   * Updated `ProductPage` to return `RedirectedError` for gift cards which now

data/Gemfile

@@ -1,2 +1,7 @@
 source :rubygems
 gemspec
+
+group :development do
+  gem 'rake'
+  gem 'awesome_print'
+end

data/Rakefile

@@ -1,61 +1,16 @@
-require 'rubygems/specification' unless defined?(Gem::Specification)
-require 'rubygems/package_task'
+require 'bundler/setup'
+require 'bundler/gem_tasks'
 require 'rake/testtask'
 
-def gemspec
-  @gemspec ||= begin
-    Gem::Specification.load(File.expand_path('lcbo.gemspec'))
-  end
-end
-
 task :default => :spec
 
 desc 'Start an irb console'
 task :console do
-  system 'irb -I lib -r lcbo'
-end
-
-desc 'Validates the gemspec'
-task :gemspec do
-  gemspec.validate
-end
-
-desc 'Displays the current version'
-task :version do
-  puts "Current version: #{gemspec.version}"
-end
-
-desc 'Installs the gem locally'
-task :install => :package do
-  sh "gem install pkg/#{gemspec.name}-#{gemspec.version}"
-end
-
-desc 'Release the gem'
-task :release => :package do
-  sh "gem push pkg/#{gemspec.name}-#{gemspec.version}.gem"
+  system 'bundle exec irb -I lib -r lcbo -r ap'
 end
 
-Gem::PackageTask.new(gemspec) do |pkg|
-  pkg.gem_spec = gemspec
-end
-task :gem => :gemspec
-task :package => :gemspec
-
 Rake::TestTask.new(:spec) do |t|
   t.libs += %w[lcbo spec]
   t.test_files = FileList['spec/**/*.rb']
   t.verbose = true
 end
-
-desc 'Download all HTML indicated in YAML assertion files'
-task :download_support do
-  require 'yaml'
-  require 'open-uri'
-  product_pages = YAML.load_file('./spec/support/product_pages.yml')
-  product_pages.each do |spec|
-    html = open(spec[:uri]).read
-    File.open("./spec/support/product_pages/#{spec[:file]}", ?w) { |file|
-      file.print(html)
-    }
-  end
-end

data/lcbo.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
   s.rubyforge_project = 'lcbo'
 
   s.add_dependency 'typhoeus',      '~> 0.3.3'
-  s.add_dependency 'nokogiri',      '~> 1.5.0'
+  s.add_dependency 'nokogiri',      '~> 1.5.5'
   s.add_dependency 'unicode_utils', '~> 1.2.2'
-  s.add_dependency 'stringex',      '~> 1.3.0'
+  s.add_dependency 'stringex',      '~> 1.3.3'
 
   s.files         = `git ls-files`.split(?\n)
   s.test_files    = `git ls-files -- {test,spec}/*`.split(?\n)

data/lib/lcbo/pages/product_page.rb

@@ -35,15 +35,27 @@ module LCBO
     end
 
     emits :regular_price_in_cents do
-      if has_limited_time_offer
-        info_cell_line_after('Was:').sub('$ ', '').to_f * 100
+      if has_limited_time_offer || has_clearance_sale
+        (info_cell_line_after('Was:').sub('$ ', '').to_f * 100).to_i
       else
         price_in_cents
       end
     end
 
+    emits :clearance_sale_savings_in_cents do
+      if has_clearance_sale
+        regular_price_in_cents - price_in_cents
+      else
+        0
+      end
+    end
+
     emits :limited_time_offer_savings_in_cents do
-      regular_price_in_cents - price_in_cents
+      if has_limited_time_offer
+        regular_price_in_cents - price_in_cents
+      else
+        0
+      end
     end
 
     emits :limited_time_offer_ends_on do
@@ -75,16 +87,20 @@ module LCBO
     end
 
     emits :primary_category do
-      if stock_category
-        cat = stock_category.split(',')[0]
-        cat ? cat.strip : cat
+      if (cats = stock_categories)
+        cats[0]
       end
     end
 
     emits :secondary_category do
-      if stock_category
-        cat = stock_category.split(',')[1]
-        cat ? cat.strip : cat
+      if (cats = stock_categories)
+        cats[1]
+      end
+    end
+
+    emits :tertiary_category do
+      if (cats = stock_categories)
+        cats[2]
       end
     end
 
@@ -133,8 +149,8 @@ module LCBO
     end
 
     emits :alcohol_content do
-      if (match = find_info_line(/ Alcohol\/Vol.\Z/))
-        ac = match.gsub(/%| Alcohol\/Vol./, '').to_f
+      if (match = find_info_line(/% Alcohol\/Vol\./))
+        ac = match.gsub('% Alcohol/Vol.', '').to_f
         (ac * 100).to_i
       else
         0
@@ -159,9 +175,21 @@ module LCBO
       end
     end
 
+    emits :style do
+      if (match = find_info_line(/\AStyle: /))
+        match.sub('Style: ', '')
+      end
+    end
+
     emits :sugar_content do
-      if (match = find_info_line(/\ASugar Content : /))
-        match.gsub('Sugar Content : ', '')
+      if (match = find_info_line(/\ASweetness Descriptor: /))
+        match.sub('Sweetness Descriptor: ', '')
+      end
+    end
+
+    emits :sugar_in_grams_per_liter do
+      if (match = find_info_line(/\ASugar Content: /))
+        match.sub('Sugar Content: ', '').to_i
       end
     end
 
@@ -173,6 +201,14 @@ module LCBO
       end
     end
 
+    emits :varietal do
+      if (match = find_info_line(/\AVarietal: /))
+        match.sub('Varietal: ', '').strip
+      else
+        nil
+      end
+    end
+
     emits :released_on do
       if html.include?('Release Date:')
         date = info_cell_line_after('Release Date:')
@@ -183,23 +219,27 @@ module LCBO
     end
 
     emits :is_discontinued do
-      html.include?('PRODUCT DISCONTINUED')
+      info_cell_text.include?('PRODUCT DISCONTINUED')
     end
 
     emits :has_limited_time_offer do
-      html.include?('<B>Limited Time Offer</B>')
+      info_cell_text.include?('Limited Time Offer')
+    end
+
+    emits :has_clearance_sale do
+      info_cell_text.include?('CLEARANCE SALE')
     end
 
     emits :has_bonus_reward_miles do
-      html.include?('<B>Bonus Reward Miles Offer</B>')
+      info_cell_text.include?('Bonus Reward Miles Offer')
     end
 
     emits :has_value_added_promotion do
-      html.include?('<B>Value Added Promotion</B>')
+      info_cell_text.include?('Value Added Promotion')
     end
 
     emits :is_seasonal do
-      html.include?('<font color="#ff0000">SEASONAL/LIMITED QUANTITIES</font>')
+      info_cell_text.include?('SEASONAL/LIMITED QUANTITIES')
     end
 
     emits :is_vqa do
@@ -212,21 +252,21 @@ module LCBO
 
     emits :description do
       if html.include?('<B>Description</B>')
-        match = html.match(/<B>Description<\/B><\/font><BR>\n\t\t\t(.+?)<BR>\n\t\t\t<BR>/m)
+        match = html.match(/<B>Description<\/B><\/font>\n\t\t\t<BR>\n\t\t\t(.+?)\n\t\t\t<BR>/m)
         CrawlKit::CaptionHelper[match && match.captures[0]]
       end
     end
 
     emits :serving_suggestion do
       if html.include?('<B>Serving Suggestion</B>')
-        match = html.match(/<B>Serving Suggestion<\/B><\/font><BR>\n\t\t\t(.+?)<BR><BR>/m)
+        match = html.match(/<B>Serving Suggestion<\/B><\/font><BR>\n\t\t\t(.+?)\n\t\t\t<BR>/m)
         CrawlKit::CaptionHelper[match && match.captures[0]]
       end
     end
 
     emits :tasting_note do
       if html.include?('<B>Tasting Note</B>')
-        match = html.match(/<B>Tasting Note<\/B><\/font><BR>\n\t\t\t(.+?)<BR>\n\t\t\t<BR>/m)
+        match = html.match(/<B>Tasting Note<\/B><\/font>\n\t\t\t<BR>\n\t\t\t(.+?)\n\t\t\t<BR>/m)
         CrawlKit::CaptionHelper[match && match.captures[0]]
       end
     end
@@ -258,17 +298,19 @@ module LCBO
       !info_cell_lines[2].include?('Price:')
     end
 
-    def stock_category
-      cat = get_info_lines_at_offset(12).reject do |line|
-        l = line.strip
-        l == '' ||
-        l.include?('Price:') ||
-        l.include?('Bonus Reward Miles Offer') ||
-        l.include?('Value Added Promotion') ||
-        l.include?('Limited Time Offer') ||
-        l.include?('NOTE:')
-      end.first
-      cat ? cat.strip : nil
+    def stock_categories
+      @stock_categories ||= begin
+        # Always appears above alcohol content
+        if (idx = info_cell_lines.index { |l| l =~ /Alcohol\/Vol\./ })
+          cats = info_cell_lines[idx - 1].
+            split(',').
+            map(&:strip).
+            reject { |cat| cat == '' || cat.nil? }
+          cats.empty? ? nil : cats
+        else
+          nil
+        end
+      end
     end
 
     def product_details_form(name)

data/lib/lcbo/pages/store_list_page.rb

@@ -3,43 +3,18 @@ module LCBO
 
     include CrawlKit::Page
 
-    STORE_COUNT_RANGE = 595..630
+    STORE_COUNT_RANGE = 600..635
 
     on :after_parse, :verify_number_of_stores
 
-    http_method :post
-    uri 'http://www.lcbo.com/lcbo-ear/lcbo/store/searchResults.do'
-
-    default_body_params \
-      :language               => 'EN',
-      :searchType             => 'proximity',
-      :numstores              => '999',
-      :streetNumber           => '',
-      :streetName             => '',
-      :streetType             => '',
-      :streetDirection        => '',
-      :municipality_proximity => '',
-      :postalCode             => 'M5V1K1',
-      :'Find Stores.x'        => '68',
-      :'Find Stores.y'        => '9',
-      :municipality_citywide  => ''
+    uri 'http://www.lcbo.com/lcbo-webapp/storequery.do?searchType=proximity&longitude=-79.0&latitude=43.0&numstores=999&language=EN'
 
     emits :store_ids do
       @store_ids ||= begin
-        anchors.reduce([]) { |ary, a|
-          if (match = a.attribute('href').value.match(/\&STORE=([0-9]+)/))
-            ary << match.captures[0].to_i
-          else
-            next ary
-          end
-        }.sort
+        doc.xpath('//store/locationnumber').map { |node| node.content.to_i }
       end
     end
 
-    def anchors
-      doc.css('.store-location-list td[width="14%"] a.item-details-col0')
-    end
-
     def verify_number_of_stores
       return if STORE_COUNT_RANGE.include?(store_ids.length)
       raise CrawlKit::MalformedError,

data/lib/lcbo/pages/store_page.rb

@@ -143,9 +143,9 @@ module LCBO
           next [day, [nil, nil]] if text.include?('Closed')
           times = text.split('-')
           open, close = *times.map { |time|
-            ord = time.include?('PM') ? 12 : 0
             hour, min = *time.sub(/AM|PM/, '').strip.split(':').map { |t| t.to_i }
-            hour += ord
+            hour += 12 if time.include?('PM') && (hour >= 1 && hour <= 11)
+            hour = 0   if time.include?('AM') && hour == 12
             (hour * 60) + min
           }
           [day, (open == close ? [nil, nil] : [open, close])]

data/lib/lcbo/version.rb

@@ -1,3 +1,3 @@
 module LCBO
-  VERSION = '1.2.3'
+  VERSION = '1.3.0'
 end

data/spec/pages/product_pages.yml

@@ -1,219 +1,279 @@
 - :file: 1.html
   :desc: Seasonal product
-  :uri: http://lcbo.com/lcbo-ear/lcbo/product/details.do?language=EN&itemNumber=122408
+  :uri: http://lcbo.com/lcbo-ear/lcbo/product/details.do?language=EN&itemNumber=234880
   :method: :get
   :query_params:
-    :id: 122408
+    :id: 234880
   :expectation:
-    :id: 122408
-    :name: Pascual Toso Malbec Rose
-    :tags: ["pascual", "toso", "malbec", "rose", "wine", "argentina", "bottle"]
-    :price_in_cents: 1195
-    :regular_price_in_cents: 1195
+    :id: 234880
+    :name: Muskoka Lakes Georgian Bay Rose Qc
+    :tags:
+    - muskoka
+    - lakes
+    - georgian
+    - bay
+    - rose
+    - qc
+    - wine
+    - specialty
+    - winesother
+    - ontario
+    - canada
+    - winery
+    - bottle
+    :price_in_cents: 1695
+    :regular_price_in_cents: 1695
+    :clearance_sale_savings_in_cents: 0
     :limited_time_offer_savings_in_cents: 0
     :limited_time_offer_ends_on:
     :bonus_reward_miles: 0
     :bonus_reward_miles_ends_on:
-    :alcohol_content: 1270
-    :price_per_liter_of_alcohol_in_cents: 1254
-    :price_per_liter_in_cents: 1593
-    :sugar_content: "1"
+    :stock_type: LCBO
+    :primary_category: Wine
+    :secondary_category: Specialty Wines/Other
+    :tertiary_category: Fruit Wine
+    :origin: Ontario, Canada
     :package: 750 mL bottle
     :package_unit_type: bottle
     :package_unit_volume_in_milliliters: 750
     :total_package_units: 1
     :total_package_volume_in_milliliters: 750
-    :origin: Argentina
-    :producer_name: Pascual Toso
+    :volume_in_milliliters: 750
+    :alcohol_content: 1250
+    :price_per_liter_of_alcohol_in_cents: 1808
+    :price_per_liter_in_cents: 2260
+    :style:
+    :sugar_content:
+    :sugar_in_grams_per_liter: 33
+    :producer_name: Muskoka Lakes Winery
+    :varietal: Rose Wines
     :released_on:
-    :stock_type: LCBO
-    :primary_category: Wine
-    :secondary_category:
-    :is_vqa: false
-    :is_kosher: false
-    :has_bonus_reward_miles: false
-    :has_limited_time_offer: false
     :is_discontinued: false
+    :has_limited_time_offer: false
+    :has_clearance_sale: false
+    :has_bonus_reward_miles: false
+    :has_value_added_promotion: false
     :is_seasonal: true
+    :is_vqa: false
+    :is_kosher: false
     :description:
-    :tasting_note:
     :serving_suggestion:
-    :image_thumb_url:
-    :image_url:
+    :tasting_note: The granite shores of Georgian Bay yield crisp, sweet apples, and tart,
+      mouth-watering cranberries. Together, they make a crisp, dry, refreshing wine. The
+      nose is tree fruit with a hint of peach and floral notes. On the palate, it is fruit
+      forward, with good acidity and a dry, lingering finish. A perfect sipping wine,
+      or pair with poached salmon or grilled chicken.
+    :value_added_promotion_description:
+    :image_thumb_url: http://lcbo.com/app/images/products/website/0234880.jpg
+    :image_url: http://lcbo.com/app/images/products/0234880.jpg
 
 - :file: 2.html
   :desc: Product with limited time offer
-  :uri: http://lcbo.com/lcbo-ear/lcbo/product/details.do?language=EN&itemNumber=18
+  :uri: http://lcbo.com/lcbo-ear/lcbo/product/details.do?language=EN&itemNumber=105742
   :method: :get
   :query_params:
-    :id: 18
+    :id: 105742
   :expectation:
-    :id: 18
-    :name: Heineken Lager
-    :tags: ["heineken", "lager", "beer", "netherlands", "heineken's", "heinekens", "brouwerijen", "nederland", "bv", "bottle"]
-    :price_in_cents: 1250
-    :regular_price_in_cents: 1350
-    :limited_time_offer_savings_in_cents: 100
-    :limited_time_offer_ends_on: 2010-08-15
+    :id: 105742
+    :name: Appleton Estate Extra Rum
+    :tags:
+    - appleton
+    - estate
+    - extra
+    - rum
+    - spirits
+    - jamaica
+    - j
+    - wray
+    - nephew
+    - limited
+    - bottle
+    :price_in_cents: 3495
+    :regular_price_in_cents: 3895
+    :clearance_sale_savings_in_cents: 0
+    :limited_time_offer_savings_in_cents: 400
+    :limited_time_offer_ends_on: 2012-12-02
     :bonus_reward_miles: 0
     :bonus_reward_miles_ends_on:
-    :alcohol_content: 500
-    :price_per_liter_of_alcohol_in_cents: 1262
-    :price_per_liter_in_cents: 631
-    :sugar_content: "7"
-    :package: 6x330 mL bottle
+    :stock_type: LCBO
+    :primary_category: Spirits
+    :secondary_category: Rum
+    :tertiary_category: Light/Amber
+    :origin: Jamaica
+    :package: 750 mL bottle
     :package_unit_type: bottle
-    :package_unit_volume_in_milliliters: 330
-    :total_package_units: 6
-    :total_package_volume_in_milliliters: 1980
-    :origin: Netherlands
-    :producer_name: Heineken's Brouwerijen Nederland Bv
+    :package_unit_volume_in_milliliters: 750
+    :total_package_units: 1
+    :total_package_volume_in_milliliters: 750
+    :volume_in_milliliters: 750
+    :alcohol_content: 4300
+    :price_per_liter_of_alcohol_in_cents: 1083
+    :price_per_liter_in_cents: 4660
+    :style:
+    :sugar_content:
+    :sugar_in_grams_per_liter:
+    :producer_name: J. Wray & Nephew Limited
+    :varietal:
     :released_on:
-    :stock_type: LCBO
-    :primary_category: Beer
-    :secondary_category: Lager
-    :has_bonus_reward_miles: false
+    :is_discontinued: false
     :has_limited_time_offer: true
+    :has_clearance_sale: false
+    :has_bonus_reward_miles: false
+    :has_value_added_promotion: false
+    :is_seasonal: false
     :is_vqa: false
     :is_kosher: false
-    :is_discontinued: false
-    :is_seasonal: false
     :description:
-    :tasting_note: "Pale gold colour; softly perfumed nose with some hoppy elements; soft grain taste; gently bitter finish."
-    :serving_suggestion: "Medium curry, pizza or burgers"
-    :image_thumb_url:
-    :image_url:
+    :serving_suggestion: Serve neat; on the rocks; with cola; on in cooking recipes.
+    :tasting_note: Deep golden/copper colour; vanilla bean, caramel/molasses, buchwheat
+      honey and spicey cinamon/nutmeg aromas; quite elegant on palate with warm, mildly
+      spicy, brown sugar flavours and a smooth, lingering finish.
+    :value_added_promotion_description:
+    :image_thumb_url: http://lcbo.com/app/images/products/website/0105742.jpg
+    :image_url: http://lcbo.com/app/images/products/0105742.jpg
 
 - :file: 3.html
   :desc: Product with bonus air miles
-  :uri: http://lcbo.com/lcbo-ear/lcbo/product/details.do?language=EN&itemNumber=280461
+  :uri: http://lcbo.com/lcbo-ear/lcbo/product/details.do?language=EN&itemNumber=508614
   :method: :get
   :query_params:
-    :id: 280461
+    :id: 508614
   :expectation:
-    :id: 280461
-    :name: Dom Pérignon Brut Champagne
-    :tags: ["dom", "pérignon", "brut", "champagne", "wine", "france", "moet", "chandon", "sa", "bottle", "perignon"]
-    :price_in_cents: 21995
-    :regular_price_in_cents: 21995
+    :id: 508614
+    :name: Veuve Clicquot Ponsardin Brut Champagne
+    :tags:
+    - veuve
+    - clicquot
+    - ponsardin
+    - brut
+    - champagne
+    - wine
+    - france
+    - clicquot-ponsardin
+    - clicquotponsardin
+    - sa
+    - bottle
+    :price_in_cents: 9195
+    :regular_price_in_cents: 9195
+    :clearance_sale_savings_in_cents: 0
     :limited_time_offer_savings_in_cents: 0
     :limited_time_offer_ends_on:
-    :bonus_reward_miles: 30
-    :bonus_reward_miles_ends_on: 2010-08-14
-    :alcohol_content: 1250
-    :price_per_liter_of_alcohol_in_cents: 23461
-    :price_per_liter_in_cents: 29326
-    :sugar_content: XD
+    :bonus_reward_miles: 25
+    :bonus_reward_miles_ends_on: 2012-12-01
+    :stock_type: VINTAGES
+    :primary_category: Wine
+    :secondary_category: Champagne
+    :tertiary_category:
+    :origin: Champagne, France
     :package: 750 mL bottle
     :package_unit_type: bottle
     :package_unit_volume_in_milliliters: 750
     :total_package_units: 1
     :total_package_volume_in_milliliters: 750
-    :origin: Champagne, France
-    :producer_name: Moet & Chandon S.A.
-    :released_on: 2010-05-15
-    :stock_type: VINTAGES
-    :primary_category: Wine
-    :secondary_category: Champagne
-    :has_bonus_reward_miles: true
+    :volume_in_milliliters: 750
+    :alcohol_content: 1200
+    :price_per_liter_of_alcohol_in_cents: 10216
+    :price_per_liter_in_cents: 12260
+    :style: Rich & Complex
+    :sugar_content: XD - Extra Dry
+    :sugar_in_grams_per_liter: 8
+    :producer_name: Veuve Clicquot-Ponsardin S.A.
+    :varietal: Sparkling (Champagne)
+    :released_on: 2012-04-18
+    :is_discontinued: false
     :has_limited_time_offer: false
+    :has_clearance_sale: false
+    :has_bonus_reward_miles: true
+    :has_value_added_promotion: false
+    :is_seasonal: false
     :is_vqa: false
     :is_kosher: false
-    :is_discontinued: false
-    :is_seasonal: false
-    :description: "The legend now joins our Essentials Collection. Purported to be the father of all Champagne, Dom Pérignon continues to impress generation after generation. This ultimate anniversary, or birthday celebration, bubbly is only made in the greatest years. Loaded with stylish aromas of citrus, artisanal bread, green apple, mineral and pear, it's quite dry and vibrantly refreshing on the palate. Every vintage Robert Parker has reviewed from 1982 to the present has received scores in the range of 92 to 98 points! Expect to be impressed."
-    :tasting_note:
+    :description: An iconoclast like Veuve Cliquot herself (who took over her husband's
+      domaine after his passing in 1805), this rich and racy bubbly has notes of date,
+      apple, black raspberry and bread dough. Deserving of a fine meal like king crab
+      legs or lobster-stuffed ravioli.
     :serving_suggestion:
-    :image_thumb_url:
-    :image_url:
+    :tasting_note:
+    :value_added_promotion_description:
+    :image_thumb_url: http://lcbo.com/app/images/products/website/0508614.jpg
+    :image_url: http://lcbo.com/app/images/products/0508614.jpg
 
 - :file: 4.html
   :desc: Discontinued product
-  :uri: http://lcbo.com/lcbo-ear/lcbo/product/details.do?language=EN&itemNumber=479154
+  :uri: http://lcbo.com/lcbo-ear/lcbo/product/details.do?language=EN&itemNumber=586214
   :method: :get
   :query_params:
-    :id: 479154
+    :id: 586214
   :expectation:
-    :id: 479154
-    :name: Floris Ninkeberry Gardenbeer
-    :tags: ["floris", "ninkeberry", "gardenbeer", "beer", "ale", "belgium", "brouwerij", "huyghe", "bottle"]
-    :price_in_cents: 250
-    :regular_price_in_cents: 250
+    :id: 586214
+    :name: Woody's Ice Blueberry 330 Ml-B
+    :tags:
+    - woody's
+    - woodys
+    - ice
+    - blueberry
+    - '330'
+    - ml
+    - b
+    - ml-b
+    - mlb
+    - ready
+    - to
+    - drinkcoolers
+    - ready-to-drinkcoolers
+    - readytodrinkcoolers
+    - spirit
+    - coolers
+    - england
+    - united
+    - kingdom
+    - beverage
+    - brands
+    - ltd
+    - bottle
+    :price_in_cents: 225
+    :regular_price_in_cents: 225
+    :clearance_sale_savings_in_cents: 0
     :limited_time_offer_savings_in_cents: 0
     :limited_time_offer_ends_on:
     :bonus_reward_miles: 0
     :bonus_reward_miles_ends_on:
-    :alcohol_content: 350
-    :price_per_liter_of_alcohol_in_cents: 2164
-    :price_per_liter_in_cents: 757
-    :sugar_content: "8"
+    :stock_type: LCBO
+    :primary_category: Ready-to-Drink/Coolers
+    :secondary_category: Spirit Coolers
+    :tertiary_category:
+    :origin: England, United Kingdom
     :package: 330 mL bottle
     :package_unit_type: bottle
     :package_unit_volume_in_milliliters: 330
     :total_package_units: 1
     :total_package_volume_in_milliliters: 330
-    :origin: Belgium
-    :producer_name: Brouwerij Huyghe
+    :volume_in_milliliters: 330
+    :alcohol_content: 550
+    :price_per_liter_of_alcohol_in_cents: 1239
+    :price_per_liter_in_cents: 681
+    :style:
+    :sugar_content:
+    :sugar_in_grams_per_liter:
+    :producer_name: Beverage Brands Ltd.
+    :varietal:
     :released_on:
-    :stock_type: LCBO
-    :primary_category: Beer
-    :secondary_category: Ale
-    :has_bonus_reward_miles: false
-    :has_limited_time_offer: false
-    :is_vqa: false
-    :is_kosher: false
     :is_discontinued: true
-    :is_seasonal: false
-    :description:
-    :tasting_note:
-    :serving_suggestion:
-    :image_thumb_url:
-    :image_url:
-
-- :file: 5.html
-  :desc: Product with release date
-  :uri: http://lcbo.com/lcbo-ear/lcbo/product/details.do?language=EN&itemNumber=148528
-  :method: :get
-  :query_params:
-    :id: 148528
-  :expectation:
-    :id: 148528
-    :name: Bodegas Ruconia Rey Don Garcia El de Najera Crianza 2005
-    :tags: ["bodegas", "ruconia", "rey", "don", "garcia", "el", "de", "najera", "crianza", "2005", "wine", "red", "rioja", "spain", "sl", "bottle"]
-    :price_in_cents: 1595
-    :regular_price_in_cents: 1595
-    :limited_time_offer_savings_in_cents: 0
-    :limited_time_offer_ends_on:
-    :bonus_reward_miles: 0
-    :bonus_reward_miles_ends_on:
-    :alcohol_content: 1320
-    :price_per_liter_of_alcohol_in_cents: 1611
-    :price_per_liter_in_cents: 2126
-    :sugar_content: "XD"
-    :package: 750 mL bottle
-    :package_unit_type: bottle
-    :package_unit_volume_in_milliliters: 750
-    :total_package_units: 1
-    :total_package_volume_in_milliliters: 750
-    :origin: Rioja, Spain
-    :producer_name: Bodegas Ruconia S.L.
-    :released_on: 2010-01-23
-    :stock_type: VINTAGES
-    :primary_category: Wine
-    :secondary_category: Red Wine
-    :has_bonus_reward_miles: false
     :has_limited_time_offer: false
+    :has_clearance_sale: false
+    :has_bonus_reward_miles: false
+    :has_value_added_promotion: false
+    :is_seasonal: false
     :is_vqa: false
     :is_kosher: false
-    :is_discontinued: false
-    :is_seasonal: false
     :description:
-    :tasting_note: "Excellent example of a more mature Crianza, featuring aromas of cherry, dried fruit, vanilla and sweet oak spice. Dry and fruity, this wine's tannins have softened out considerably making this wine very approachable. A fine wine for a rich lamb stew or roast beef. (VINTAGES panel, July 2009)"
     :serving_suggestion:
+    :tasting_note:
+    :value_added_promotion_description:
     :image_thumb_url:
     :image_url:
 
-- :file: 6.html
+- :file: 5.html
   :desc: Standard product
   :uri: http://lcbo.com/lcbo-ear/lcbo/product/details.do?language=EN&itemNumber=582973
   :method: :get
@@ -222,259 +282,308 @@
   :expectation:
     :id: 582973
     :name: Bombay Sapphire London Dry Gin
-    :tags: ["bombay", "sapphire", "london", "dry", "gin", "spirits", "england", "united", "kingdom", "company", "ltd", "bottle"]
+    :tags:
+    - bombay
+    - sapphire
+    - london
+    - dry
+    - gin
+    - spirits
+    - england
+    - united
+    - kingdom
+    - company
+    - ltd
+    - bottle
     :price_in_cents: 5595
     :regular_price_in_cents: 5595
+    :clearance_sale_savings_in_cents: 0
     :limited_time_offer_savings_in_cents: 0
     :limited_time_offer_ends_on:
     :bonus_reward_miles: 0
     :bonus_reward_miles_ends_on:
-    :alcohol_content: 4000
-    :price_per_liter_of_alcohol_in_cents: 792
-    :price_per_liter_in_cents: 3197
-    :sugar_content:
+    :stock_type: LCBO
+    :primary_category: Spirits
+    :secondary_category: Gin
+    :tertiary_category:
+    :origin: England, United Kingdom
     :package: 1750 mL bottle
     :package_unit_type: bottle
     :package_unit_volume_in_milliliters: 1750
     :total_package_units: 1
     :total_package_volume_in_milliliters: 1750
-    :origin: England, United Kingdom
+    :volume_in_milliliters: 1750
+    :alcohol_content: 4000
+    :price_per_liter_of_alcohol_in_cents: 799
+    :price_per_liter_in_cents: 3197
+    :style:
+    :sugar_content:
+    :sugar_in_grams_per_liter:
     :producer_name: Bombay Spirits Company Ltd.
+    :varietal:
     :released_on:
-    :stock_type: LCBO
-    :primary_category: Spirits
-    :secondary_category: Gin
-    :has_bonus_reward_miles: false
+    :is_discontinued: false
     :has_limited_time_offer: false
+    :has_clearance_sale: false
+    :has_bonus_reward_miles: false
+    :has_value_added_promotion: false
+    :is_seasonal: false
     :is_vqa: false
     :is_kosher: false
-    :is_discontinued: false
-    :is_seasonal: false
     :description:
-    :tasting_note: "Clear water white; complex mix of herbs and juniper on the nose with crisp lemon peel flavours; smooth and refreshing"
-    :serving_suggestion: "Martinis, mixed drinks"
+    :serving_suggestion: Serve with grilled shrimp, or use in classic gin & tonic or martini
+    :tasting_note: Clear water white; complex mix of herbs and juniper on the nose with
+      crisp lemon peel and citrus flavours; smooth and refreshing
+    :value_added_promotion_description:
     :image_thumb_url:
     :image_url:
 
-- :file: 7.html
+- :file: 6.html
   :desc: VQA product
-  :uri: http://lcbo.com/lcbo-ear/lcbo/product/details.do?language=EN&itemNumber=2183079
+  :uri: http://lcbo.com/lcbo-ear/lcbo/product/details.do?language=EN&itemNumber=125310
   :method: :get
   :query_params:
-    :id: 2183079
+    :id: 125310
   :expectation:
-    :id: 2183079
-    :name: Lake & River Series Cabernet Franc VQA
-    :tags: ["lake", "river", "series", "cabernet", "franc", "vqa", "wine", "ontario", "canada", "colio", "wines", "of", "ltd", "bottle"]
-    :price_in_cents: 1095
-    :regular_price_in_cents: 1095
+    :id: 125310
+    :name: Norman Hardie County Unfiltered Pinot Noir 2010
+    :tags:
+    - norman
+    - hardie
+    - county
+    - unfiltered
+    - pinot
+    - noir
+    - '2010'
+    - wine
+    - red
+    - ontario
+    - canada
+    - wines
+    - bottle
+    :price_in_cents: 3500
+    :regular_price_in_cents: 3500
+    :clearance_sale_savings_in_cents: 0
     :limited_time_offer_savings_in_cents: 0
     :limited_time_offer_ends_on:
     :bonus_reward_miles: 0
     :bonus_reward_miles_ends_on:
-    :alcohol_content: 1220
-    :price_per_liter_of_alcohol_in_cents: 1196
-    :price_per_liter_in_cents: 1460
-    :sugar_content:
+    :stock_type: VINTAGES
+    :primary_category: Wine
+    :secondary_category: Red Wine
+    :tertiary_category:
+    :origin: Ontario, Canada
     :package: 750 mL bottle
     :package_unit_type: bottle
     :package_unit_volume_in_milliliters: 750
     :total_package_units: 1
     :total_package_volume_in_milliliters: 750
-    :origin: Ontario, Canada
-    :producer_name: Colio Wines of Canada Ltd.
+    :volume_in_milliliters: 750
+    :alcohol_content: 1150
+    :price_per_liter_of_alcohol_in_cents: 4057
+    :price_per_liter_in_cents: 4666
+    :style:
+    :sugar_content:
+    :sugar_in_grams_per_liter: 3
+    :producer_name: Hardie Wines
+    :varietal: Pinot Noir
     :released_on:
-    :stock_type: LCBO
-    :primary_category: Wine
-    :secondary_category:
-    :has_bonus_reward_miles: false
+    :is_discontinued: false
     :has_limited_time_offer: false
+    :has_clearance_sale: false
+    :has_bonus_reward_miles: false
+    :has_value_added_promotion: false
+    :is_seasonal: false
     :is_vqa: true
     :is_kosher: false
-    :is_discontinued: false
-    :is_seasonal: false
     :description:
-    :tasting_note:
     :serving_suggestion:
-    :image_thumb_url:
-    :image_url:
+    :tasting_note:
+    :value_added_promotion_description:
+    :image_thumb_url: http://lcbo.com/app/images/products/website/0125310.jpg
+    :image_url: http://lcbo.com/app/images/products/0125310.jpg
 
-- :file: 8.html
+- :file: 7.html
   :desc: Kosher Product
-  :uri: http://lcbo.com/lcbo-ear/lcbo/product/details.do?language=EN&itemNumber=114173
+  :uri: http://lcbo.com/lcbo-ear/lcbo/product/details.do?language=EN&itemNumber=256453
   :method: :get
   :query_params:
-    :id: 114173
+    :id: 256453
   :expectation:
-    :id: 114173
-    :name: 05 Sauv Blanc Weinstock Cellar K
-    :tags: ["05", "sauv", "blanc", "weinstock", "cellar", "k", "wine", "california", "united", "states", "royal", "wines", "bottle"]
-    :price_in_cents: 2295
-    :regular_price_in_cents: 2295
+    :id: 256453
+    :name: Coco de Java Liqueur K
+    :tags:
+    - coco
+    - de
+    - java
+    - liqueur
+    - k
+    - spirits
+    - liqueurliquor
+    - usa
+    - castle
+    - bottle
+    :price_in_cents: 2790
+    :regular_price_in_cents: 3495
+    :clearance_sale_savings_in_cents: 705
     :limited_time_offer_savings_in_cents: 0
     :limited_time_offer_ends_on:
     :bonus_reward_miles: 0
     :bonus_reward_miles_ends_on:
     :stock_type: VINTAGES
-    :primary_category: Wine
-    :secondary_category:
-    :origin: California, United States
+    :primary_category: Spirits
+    :secondary_category: Liqueur/Liquor
+    :tertiary_category: Coffee
+    :origin: USA
     :package: 750 mL bottle
     :package_unit_type: bottle
     :package_unit_volume_in_milliliters: 750
     :total_package_units: 1
     :total_package_volume_in_milliliters: 750
     :volume_in_milliliters: 750
-    :alcohol_content: 1350
-    :price_per_liter_of_alcohol_in_cents: 2266
-    :price_per_liter_in_cents: 3060
+    :alcohol_content: 2400
+    :price_per_liter_of_alcohol_in_cents: 1550
+    :price_per_liter_in_cents: 3720
+    :style:
     :sugar_content:
-    :producer_name: Royal Wines
+    :sugar_in_grams_per_liter:
+    :producer_name: Castle Spirits
+    :varietal:
     :released_on:
     :is_discontinued: false
     :has_limited_time_offer: false
+    :has_clearance_sale: true
     :has_bonus_reward_miles: false
+    :has_value_added_promotion: false
     :is_seasonal: false
     :is_vqa: false
     :is_kosher: true
     :description:
     :serving_suggestion:
     :tasting_note:
+    :value_added_promotion_description:
     :image_thumb_url:
     :image_url:
 
-- :file: 9.html
+- :file: 8.html
   :desc: Product with Value Added Promotion
-  :uri: http://lcbo.com/lcbo-ear/lcbo/product/details.do?language=EN&itemNumber=56796
-  :method: :get
-  :query_params:
-    :id: 56796
-  :expectation:
-    :id: 56796
-    :name: Heineken Draught Keg
-    :tags: ["heineken", "draught", "keg", "beer", "lager", "netherlands", "heineken's", "heinekens", "brouwerijen", "nederland", "bv", "can"]
-    :price_in_cents: 2995
-    :regular_price_in_cents: 2995
-    :limited_time_offer_savings_in_cents: 0
-    :limited_time_offer_ends_on:
-    :bonus_reward_miles: 0
-    :bonus_reward_miles_ends_on:
-    :stock_type: LCBO
-    :primary_category: Beer
-    :secondary_category: Lager
-    :origin: Netherlands
-    :package: 5000 mL can
-    :package_unit_type: can
-    :package_unit_volume_in_milliliters: 5000
-    :total_package_units: 1
-    :total_package_volume_in_milliliters: 5000
-    :volume_in_milliliters: 5000
-    :alcohol_content: 500
-    :price_per_liter_of_alcohol_in_cents: 1198
-    :price_per_liter_in_cents: 599
-    :sugar_content: "3"
-    :producer_name: Heineken's Brouwerijen Nederland Bv
-    :released_on:
-    :is_discontinued: false
-    :has_limited_time_offer: false
-    :has_bonus_reward_miles: false
-    :has_value_added_promotion: true
-    :is_seasonal: false
-    :is_vqa: false
-    :is_kosher: false
-    :description:
-    :serving_suggestion: Medium curry, pizza or burgers
-    :tasting_note: Pale gold colour; softly perfumed nose with some hoppy elements; soft grain taste; gently bitter finish.
-    :value_added_promotion_description: 5000 mL can comes with FREE Cooler Bag Wrap until Jan 1, 2011 or while supplies last!
-    :image_thumb_url:
-    :image_url:
-
-- :file: 10.html
-  :desc: Product with Image
-  :uri: http://lcbo.com/lcbo-ear/lcbo/product/details.do?language=EN&itemNumber=90399
+  :uri: http://lcbo.com/lcbo-ear/lcbo/product/details.do?language=EN&itemNumber=42
   :method: :get
   :query_params:
-    :id: 90399
+    :id: 42
   :expectation:
-    :id: 90399
-    :name: Yellow Tail Bubbles Rose
-    :tags: ["yellow", "tail", "bubbles", "rose", "wine", "sparkling", "australia", "casella", "wines", "bottle"]
-    :price_in_cents: 1395
-    :regular_price_in_cents: 1395
+    :id: 42
+    :name: Canadian Club Whisky
+    :tags:
+    - canadian
+    - club
+    - whisky
+    - spirits
+    - whiskywhiskey
+    - canada
+    - company
+    - bottle
+    :price_in_cents: 2495
+    :regular_price_in_cents: 2495
+    :clearance_sale_savings_in_cents: 0
     :limited_time_offer_savings_in_cents: 0
     :limited_time_offer_ends_on:
     :bonus_reward_miles: 0
     :bonus_reward_miles_ends_on:
     :stock_type: LCBO
-    :primary_category: Wine
-    :secondary_category: Sparkling Wine
-    :origin: Australia
+    :primary_category: Spirits
+    :secondary_category: Whisky/Whiskey
+    :tertiary_category: Canadian
+    :origin: Canada
     :package: 750 mL bottle
     :package_unit_type: bottle
     :package_unit_volume_in_milliliters: 750
     :total_package_units: 1
     :total_package_volume_in_milliliters: 750
     :volume_in_milliliters: 750
-    :alcohol_content: 1200
-    :price_per_liter_of_alcohol_in_cents: 1550
-    :price_per_liter_in_cents: 1860
-    :sugar_content: "2"
-    :producer_name: Casella Wines
+    :alcohol_content: 4000
+    :price_per_liter_of_alcohol_in_cents: 831
+    :price_per_liter_in_cents: 3326
+    :style:
+    :sugar_content:
+    :sugar_in_grams_per_liter:
+    :producer_name: Canadian Club Whisky Company
+    :varietal:
     :released_on:
     :is_discontinued: false
     :has_limited_time_offer: false
+    :has_clearance_sale: false
     :has_bonus_reward_miles: false
-    :has_value_added_promotion: false
+    :has_value_added_promotion: true
     :is_seasonal: false
     :is_vqa: false
     :is_kosher: false
     :description:
-    :serving_suggestion: "Perfect on its own or with appetizers"
-    :tasting_note: "Pale salmon colour with medium-sized bubbles; aromas of candied raspberry, strawberry, and pink grapefruit; dry, very crisp and fresh acidity, laden with candied fruit flavours through to the finish."
-    :value_added_promotion_description:
-    :image_thumb_url: http://lcbo.com/app/images/products/website/0090399.jpg
-    :image_url: http://lcbo.com/app/images/products/0090399.jpg
+    :serving_suggestion: On the rocks or in a cocktail
+    :tasting_note: Golden amber colour; corn mash nose with peach & vanilla notes; matching
+      smooth flavour
+    :value_added_promotion_description: 750 mL bottle comes with FREE Devil's Cut 50ml
+      until Dec 1, 2012 or while supplies last!
+    :image_thumb_url: http://lcbo.com/app/images/products/website/0000042.jpg
+    :image_url: http://lcbo.com/app/images/products/0000042.jpg
 
-- :file: 11.html
+- :file: 9.html
   :desc: Vintages product with no image
-  :uri: http://lcbo.com/lcbo-ear/lcbo/product/details.do?language=EN&itemNumber=905596
+  :uri: http://lcbo.com/lcbo-ear/lcbo/product/details.do?language=EN&itemNumber=965293
   :method: :get
   :query_params:
-    :id: 905596
+    :id: 965293
   :expectation:
-    :id: 905596
-    :name: Terredora Campore Fiano Di Avellino 2008
-    :tags: ["terredora", "campore", "fiano", "di", "avellino", "2008", "wine", "white", "campania", "italy", "terre", "dora", "paulo", "ss", "bottle"]
-    :price_in_cents: 2895
-    :regular_price_in_cents: 2895
+    :id: 965293
+    :name: ! '''Luce'' Grappa'
+    :tags:
+    - ! '''luce'''
+    - luce
+    - grappa
+    - spirits
+    - eau
+    - de
+    - vie
+    - eau-de-vie
+    - eaudevie
+    - italy
+    - bottle
+    :price_in_cents: 6995
+    :regular_price_in_cents: 6995
+    :clearance_sale_savings_in_cents: 0
     :limited_time_offer_savings_in_cents: 0
     :limited_time_offer_ends_on:
     :bonus_reward_miles: 0
     :bonus_reward_miles_ends_on:
     :stock_type: VINTAGES
-    :primary_category: Wine
-    :secondary_category: White Wine
-    :origin: "Campania, Italy"
-    :package: 750 mL bottle
+    :primary_category: Spirits
+    :secondary_category: Eau-de-Vie
+    :tertiary_category: Grappa
+    :origin: Italy
+    :package: 500 mL bottle
     :package_unit_type: bottle
-    :package_unit_volume_in_milliliters: 750
+    :package_unit_volume_in_milliliters: 500
     :total_package_units: 1
-    :total_package_volume_in_milliliters: 750
-    :volume_in_milliliters: 750
-    :alcohol_content: 1300
-    :price_per_liter_of_alcohol_in_cents: 2969
-    :price_per_liter_in_cents: 3860
-    :sugar_content: D
-    :producer_name: "Terre Dora Di Paulo S.S."
-    :released_on: 2011-01-22
+    :total_package_volume_in_milliliters: 500
+    :volume_in_milliliters: 500
+    :alcohol_content: 4000
+    :price_per_liter_of_alcohol_in_cents: 3497
+    :price_per_liter_in_cents: 13990
+    :style:
+    :sugar_content:
+    :sugar_in_grams_per_liter:
+    :producer_name: Luce
+    :varietal:
+    :released_on:
     :is_discontinued: false
     :has_limited_time_offer: false
+    :has_clearance_sale: false
     :has_bonus_reward_miles: false
     :has_value_added_promotion: false
     :is_seasonal: false
     :is_vqa: false
     :is_kosher: false
-    :description: "TASTING NOTE: Delivers amazing aromas of lemon and lime, with hints of mineral. A full-bodied, late-harvest style, offering lots of dried fruits, from citrus to melon. Spicy. If you want a denser, richer Fiano, this is for you. Drink now. Score: 91 (James Suckling, www.winespectator.com, April 30, 2010)"
+    :description:
     :serving_suggestion:
     :tasting_note:
     :value_added_promotion_description: