Reports pick up their data from the row rather than the sale object.

4 files changed, 34 insertions, 30 deletions

diff --git a/lib/reports/sales_by_country.rb b/lib/reports/sales_by_country.rb
index 4017dbf..6729ba6 100644
--- a/lib/reports/sales_by_country.rb
+++ b/lib/reports/sales_by_country.rb
@@ -1,20 +1,19 @@
 module SalesReporter
   module Reports
     class SalesByCountry
-      def render(sales)
-        sales_by_country = {}
+      def initialize
+        @countries = Hash.new { |h,k| h[k] = { :count => 0, :total => 0, :sales => [] } }
+      end
 
-        sales.each do |s|
-          c = s.country
-          if sales_by_country[c]
-            sales_by_country[c][:count] += s.quantity
-            sales_by_country[c][:total] += s.amount
-          else
-            sales_by_country[c] = {:count => s.quantity, :total => s.amount}
-          end
-        end
+      def add_sale(sale, row)
+        c = row['Country']
+        @countries[c][:sales] << sale
+        @countries[c][:count] += sale.quantity
+        @countries[c][:total] += sale.amount
+      end
 
-        sorted = sales_by_country.sort { |a,b| b[1][:count] <=> a[1][:count] }
+      def render
+        sorted = @countries.sort { |a,b| b[1][:count] <=> a[1][:count] }
 
         puts "Country: Streams:  Revenue:"
         puts "------------------------------------------"
diff --git a/lib/reports/sales_by_date.rb b/lib/reports/sales_by_date.rb
index 4bc9094..b2d58df 100644
--- a/lib/reports/sales_by_date.rb
+++ b/lib/reports/sales_by_date.rb
@@ -1,10 +1,18 @@
 module SalesReporter
   module Reports
     class SalesByDate
-      def render(sales)
+      def initialize
+        @sales = []
+      end
+
+      def add_sale(sale, row)
+        @sales << sale
+      end
+
+      def render
         sales_by_date = {}
 
-        sales.each do |s|
+        @sales.each do |s|
           d = s.date
           if sales_by_date[d]
             sales_by_date[d][:count] += s.quantity
diff --git a/lib/reports/sales_by_shop.rb b/lib/reports/sales_by_shop.rb
index 66caf63..2c8a70b 100644
--- a/lib/reports/sales_by_shop.rb
+++ b/lib/reports/sales_by_shop.rb
@@ -1,20 +1,19 @@
 module SalesReporter
   module Reports
     class SalesByShop
-      def render(sales)
-        sales_by_shop = {}
+      def initialize
+        @shops = Hash.new { |h,k| h[k] = { :count => 0, :total => 0, :sales => [] } }
+      end
 
-        sales.each do |s|
-          shop = s.shop
-          if sales_by_shop[shop]
-            sales_by_shop[shop][:count] += s.quantity
-            sales_by_shop[shop][:total] += s.amount
-          else
-            sales_by_shop[shop] = {:count => s.quantity, :total => s.amount}
-          end
-        end
+      def add_sale(sale, row)
+        shop = row['Shop']
+        @shops[shop][:sales] << sale
+        @shops[shop][:count] += sale.quantity
+        @shops[shop][:total] += sale.amount
+      end
 
-        sorted = sales_by_shop.sort { |a,b| b[1][:count] <=> a[1][:count] }
+      def render
+        sorted = @shops.sort { |a,b| b[1][:count] <=> a[1][:count] }
 
         puts "Shop:               Streams:  Revenue:"
         puts "------------------------------------------"
diff --git a/lib/sale.rb b/lib/sale.rb
index 17c6f18..f02a471 100644
--- a/lib/sale.rb
+++ b/lib/sale.rb
@@ -1,14 +1,12 @@
 module SalesReporter
   class Sale
-    attr_reader :date, :amount, :quantity, :country, :shop
+    attr_reader :date, :amount, :quantity
 
-    def initialize(date_, amount, quantity, country, shop)
+    def initialize(date_, amount, quantity)
       @date = sanitize_date(date_)
       raise TypeError('sanitize failed') unless @date.is_a? Date
       @amount = amount
       @quantity = quantity
-      @country = country
-      @shop = shop
     end
 
     private