From 1aa812034f41e79d3497a14528bcb66d362c4eb2 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Fri, 14 Nov 2014 14:29:06 +0100 Subject: Instantiate reports instead of using static methods. --- parse_report.rb | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'parse_report.rb') diff --git a/parse_report.rb b/parse_report.rb index 2286cc0..9a2340c 100644 --- a/parse_report.rb +++ b/parse_report.rb @@ -1,4 +1,4 @@ -require 'sale' +require_relative 'lib/sale' require 'csv' def parse_csv(csv_file) @@ -13,7 +13,8 @@ def parse_csv(csv_file) CSV.foreach(csv_file, csv_opts) do |row| if row.count > 0 - sales << SalesReporter::Sale.new(row["Date"], row["revenue EUR"], row["quantity"], row["Country"], row["Shop"]) + sale = SalesReporter::Sale.new(row["Date"], row["revenue EUR"], row["quantity"], row["Country"], row["Shop"]) + sales << sale end end @@ -21,15 +22,22 @@ def parse_csv(csv_file) end def load_reports + reports = [] + Dir[File.join('lib', 'reports', '*.rb')].each do |f| require_relative f end + + SalesReporter::Reports.constants.each do |report| + reports << SalesReporter::Reports.const_get(report).new + end + + reports end sales = parse_csv(ARGV[0]) +reports = load_reports -load_reports - -SalesReporter::Reports.constants.each do |report| - SalesReporter::Reports.const_get(report).render(sales) +reports.each do |report| + report.render(sales) end -- cgit v1.2.3