lcbo 0.9.5 → 0.9.6

data/CHANGELOG.md

@@ -1,6 +1,21 @@
+Version 0.9.6
+
+  * Removed instances of `Enumerable#reduce` in favour of `Hash[]` for
+    constructing hashes.
+  * Added `price_per_liter_in_cents` and `price_per_liter_of_alcohol_in_cents`
+    to ProductPage.
+
+Version 0.9.5
+
+  * Fixed an encoding bug.
+
+Version 0.9.4
+
+  * Set default value for `ProductListsCrawler`'s `:page` param to zero.
+
 Version 0.9.3
 
-  * 4x speed boost to InventoryPage.parse courtesy of Justin Giancola.
+  * 4x speed boost to `InventoryPage.parse` courtesy of Justin Giancola.
 
 Version 0.9.2
 

data/lib/lcbo/crawlkit/page.rb

@@ -125,9 +125,7 @@ module LCBO
       end
 
       def as_hash
-        @as_hash ||= begin
-          fields.reduce({}) { |hsh, field| hsh.merge(field => send(field)) }
-        end
+        @as_hash ||= Hash[fields.map { |field| [field, send(field)] }]
       end
 
       protected

data/lib/lcbo/ext.rb

@@ -2,11 +2,11 @@ module LCBO
   module HashExt
 
     def self.symbolize_keys(input)
-      input.reduce({}) { |hsh, (key, value)| hsh.merge(key.to_sym => value) }
+      Hash[input.map { |key, value| [key.to_sym, value] }]
     end
 
     def self.stringify_keys(input)
-      input.reduce({}) { |hsh, (key, value)| hsh.merge(key.to_s => value) }
+      Hash[input.map { |key, value| [key.to_sym, value] }]
     end
 
   end

data/lib/lcbo/pages/product_page.rb

@@ -121,23 +121,40 @@ module LCBO
     end
 
     emits :alcohol_content do
-      match = find_info_line(/ Alcohol\/Vol.\Z/)
-      if match
+      if (match = find_info_line(/ Alcohol\/Vol.\Z/))
         ac = match.gsub(/%| Alcohol\/Vol./, '').to_f
-        ac.zero? ? nil : (ac * 100).to_i
+        (ac * 100).to_i
+      else
+        0
+      end
+    end
+
+    emits :price_per_liter_of_alcohol_in_cents do
+      if alcohol_content > 0 && volume_in_milliliters > 0
+        alc_frac = alcohol_content.to_f / 1000.0
+        alc_vol  = (volume_in_milliliters.to_f / 1000.0) * alc_frac
+        (price_in_cents.to_f / alc_vol).to_i
+      else
+        0
+      end
+    end
+
+    emits :price_per_liter_in_cents do
+      if volume_in_milliliters > 0
+        (price_in_cents.to_f / (volume_in_milliliters.to_f / 1000.0)).to_i
+      else
+        0
       end
     end
 
     emits :sugar_content do
-      match = match = find_info_line(/\ASugar Content : /)
-      if match
+      if (match = find_info_line(/\ASugar Content : /))
         match.gsub('Sugar Content : ', '')
       end
     end
 
     emits :producer_name do
-      match = find_info_line(/\ABy: /)
-      if match
+      if (match = find_info_line(/\ABy: /))
         CrawlKit::TitleCaseHelper[
           match.gsub(/By: |Tasting Note|Serving Suggestion|NOTE:/, '')
         ]
@@ -252,9 +269,7 @@ module LCBO
     end
 
     def info_cell_line_after(item)
-      i = info_cell_lines.index(item)
-      return unless i
-      info_cell_lines[i + 1]
+      (i = info_cell_lines.index(item)) ? info_cell_lines[i + 1] : nil
     end
 
     def info_cell_html

data/lib/lcbo/version.rb

@@ -1,3 +1,3 @@
 module LCBO
-  VERSION = '0.9.5'
+  VERSION = '0.9.6'
 end

data/spec/pages/product_pages.yml

@@ -14,6 +14,8 @@
     :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"
     :package: 750 mL bottle
     :package_unit_type: bottle
@@ -51,6 +53,8 @@
     :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
     :package_unit_type: bottle
@@ -88,6 +92,8 @@
     :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
     :package: 750 mL bottle
     :package_unit_type: bottle
@@ -125,6 +131,8 @@
     :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"
     :package: 330 mL bottle
     :package_unit_type: bottle
@@ -162,6 +170,8 @@
     :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
@@ -199,6 +209,8 @@
     :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: 3168
     :sugar_content:
     :package: 1750 mL bottle
     :package_unit_type: bottle
@@ -236,6 +248,8 @@
     :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:
     :package: 750 mL bottle
     :package_unit_type: bottle

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Carsten Nielsen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-30 00:00:00 -05:00
+date: 2010-12-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency