From c3e0f45f1a49b2c68e508d5a0fb4f07bfb734afd Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 14 Aug 2020 11:20:05 +1000 Subject: [PATCH] Remove unused Report class from lib Also removing related unused classes and their specs. --- .rubocop_todo.yml | 12 ------- knapsack_rspec_report.json | 3 -- lib/open_food_network/reports/report.rb | 35 ------------------- lib/open_food_network/reports/row.rb | 15 -------- lib/open_food_network/reports/rule.rb | 21 ----------- .../orders_and_fulfillments_report_spec.rb | 1 + .../open_food_network/reports/report_spec.rb | 15 -------- .../lib/open_food_network/reports/row_spec.rb | 19 ---------- .../open_food_network/reports/rule_spec.rb | 21 ----------- 9 files changed, 1 insertion(+), 141 deletions(-) delete mode 100644 lib/open_food_network/reports/report.rb delete mode 100644 lib/open_food_network/reports/row.rb delete mode 100644 lib/open_food_network/reports/rule.rb delete mode 100644 spec/lib/open_food_network/reports/report_spec.rb delete mode 100644 spec/lib/open_food_network/reports/row_spec.rb delete mode 100644 spec/lib/open_food_network/reports/rule_spec.rb diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 21d7bd8851..aec1f024b9 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -600,13 +600,7 @@ Style/ClassAndModuleChildren: - 'app/serializers/api/taxon_serializer.rb' - 'app/serializers/api/variant_serializer.rb' - 'lib/open_food_network/locking.rb' - - 'lib/open_food_network/reports/report.rb' - - 'lib/open_food_network/reports/row.rb' - - 'lib/open_food_network/reports/rule.rb' - 'spec/controllers/spree/admin/base_controller_spec.rb' - - 'spec/lib/open_food_network/reports/report_spec.rb' - - 'spec/lib/open_food_network/reports/row_spec.rb' - - 'spec/lib/open_food_network/reports/rule_spec.rb' # Offense count: 2 Style/ClassVars: @@ -1060,9 +1054,6 @@ Style/FrozenStringLiteralComment: - 'lib/open_food_network/referer_parser.rb' - 'lib/open_food_network/reports/line_items.rb' - 'lib/open_food_network/reports/list.rb' - - 'lib/open_food_network/reports/report.rb' - - 'lib/open_food_network/reports/row.rb' - - 'lib/open_food_network/reports/rule.rb' - 'lib/open_food_network/sales_tax_report.rb' - 'lib/open_food_network/scope_product_to_hub.rb' - 'lib/open_food_network/scope_variant_to_hub.rb' @@ -1293,9 +1284,6 @@ Style/FrozenStringLiteralComment: - 'spec/lib/open_food_network/products_and_inventory_report_spec.rb' - 'spec/lib/open_food_network/property_merge_spec.rb' - 'spec/lib/open_food_network/referer_parser_spec.rb' - - 'spec/lib/open_food_network/reports/report_spec.rb' - - 'spec/lib/open_food_network/reports/row_spec.rb' - - 'spec/lib/open_food_network/reports/rule_spec.rb' - 'spec/lib/open_food_network/sales_tax_report_spec.rb' - 'spec/lib/open_food_network/scope_variant_to_hub_spec.rb' - 'spec/lib/open_food_network/scope_variants_to_search_spec.rb' diff --git a/knapsack_rspec_report.json b/knapsack_rspec_report.json index 91499ba40e..f745a4438d 100644 --- a/knapsack_rspec_report.json +++ b/knapsack_rspec_report.json @@ -113,7 +113,6 @@ "spec/models/subscription_line_item_spec.rb": 0.021193265914916992, "spec/controllers/api/statuses_controller_spec.rb": 0.02451467514038086, "spec/lib/open_food_network/referer_parser_spec.rb": 0.015799283981323242, - "spec/lib/open_food_network/reports/rule_spec.rb": 0.01628732681274414, "spec/helpers/serializer_helper_spec.rb": 0.004682064056396484, "spec/jobs/heartbeat_job_spec.rb": 0.013271570205688477, "spec/services/mail_configuration_spec.rb": 0.01050567626953125, @@ -246,7 +245,6 @@ "spec/validators/integer_array_validator_spec.rb": 0.04994392395019531, "spec/validators/date_time_string_validator_spec.rb": 0.05316734313964844, "spec/models/product_import/reset_absent_spec.rb": 0.04071307182312012, - "spec/lib/open_food_network/reports/report_spec.rb": 0.04329681396484375, "spec/jobs/confirm_signup_job_spec.rb": 0.03060293197631836, "spec/services/order_cycle_distributed_variants_spec.rb": 0.02808237075805664, "spec/lib/open_food_network/feature_toggle_spec.rb": 0.0240786075592041, @@ -255,7 +253,6 @@ "spec/models/spree/calculator/flat_rate_spec.rb": 0.014808177947998047, "spec/models/spree/image_spec.rb": 0.014715909957885742, "spec/helpers/spree/admin/base_helper_spec.rb": 0.008042573928833008, - "spec/lib/open_food_network/reports/row_spec.rb": 0.005358695983886719, "engines/order_management/spec/controllers/order_management/reports/enterprise_fee_summaries_controller_spec.rb": 0.7100100517272949, "engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/parameters_spec.rb": 4.190261602401733, "engines/order_management/spec/services/order_management/reports/enterprise_fee_summary/report_data/enterprise_fee_type_total_spec.rb": 0.006247282028198242, diff --git a/lib/open_food_network/reports/report.rb b/lib/open_food_network/reports/report.rb deleted file mode 100644 index 2c4e5900f2..0000000000 --- a/lib/open_food_network/reports/report.rb +++ /dev/null @@ -1,35 +0,0 @@ -require 'open_food_network/reports/row' -require 'open_food_network/reports/rule' - -module OpenFoodNetwork::Reports - class Report - class_attribute :_header, :_columns, :_rules_head - - # -- API - def header - _header - end - - def columns - _columns.to_a - end - - def rules - # Flatten linked list and return as hashes - rules = [] - - rule = _rules_head - while rule - rules << rule - rule = rule.next - end - - rules.map(&:to_h) - end - - # -- DSL - def self.header(*columns) - self._header = columns - end - end -end diff --git a/lib/open_food_network/reports/row.rb b/lib/open_food_network/reports/row.rb deleted file mode 100644 index 35b4bffe33..0000000000 --- a/lib/open_food_network/reports/row.rb +++ /dev/null @@ -1,15 +0,0 @@ -module OpenFoodNetwork::Reports - class Row - def initialize - @columns = [] - end - - def column(&block) - @columns << block - end - - def to_a - @columns - end - end -end diff --git a/lib/open_food_network/reports/rule.rb b/lib/open_food_network/reports/rule.rb deleted file mode 100644 index cfb8b7e67f..0000000000 --- a/lib/open_food_network/reports/rule.rb +++ /dev/null @@ -1,21 +0,0 @@ -require 'open_food_network/reports/row' - -module OpenFoodNetwork::Reports - class Rule - attr_reader :next - - def group(&block) - @group = block - end - - def sort(&block) - @sort = block - end - - def to_h - h = { group_by: @group, sort_by: @sort } - h[:summary_columns] = @summary_row.to_a if @summary_row - h - end - end -end diff --git a/spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb b/spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb index af91f3a917..f970c4b83a 100644 --- a/spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb +++ b/spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb @@ -1,5 +1,6 @@ require 'spec_helper' require 'open_food_network/orders_and_fulfillments_report' +require 'open_food_network/order_grouper' describe OpenFoodNetwork::OrdersAndFulfillmentsReport do include AuthenticationHelper diff --git a/spec/lib/open_food_network/reports/report_spec.rb b/spec/lib/open_food_network/reports/report_spec.rb deleted file mode 100644 index 86e76bcec5..0000000000 --- a/spec/lib/open_food_network/reports/report_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'open_food_network/reports/report' - -module OpenFoodNetwork::Reports - class TestReport < Report - header 'One', 'Two', 'Three', 'Four' - end - - describe Report do - let(:report) { TestReport.new } - - it "returns the header" do - expect(report.header).to eq(%w(One Two Three Four)) - end - end -end diff --git a/spec/lib/open_food_network/reports/row_spec.rb b/spec/lib/open_food_network/reports/row_spec.rb deleted file mode 100644 index c541832edf..0000000000 --- a/spec/lib/open_food_network/reports/row_spec.rb +++ /dev/null @@ -1,19 +0,0 @@ -require 'spec_helper' -require 'open_food_network/reports/row' - -module OpenFoodNetwork::Reports - describe Row do - let(:row) { Row.new } - # rubocop:disable Style/Proc - let(:proc) { Proc.new {} } - # rubocop:enable Style/Proc - - it "can define a number of columns and return them as an array" do - row.column(&proc) - row.column(&proc) - row.column(&proc) - - expect(row.to_a).to eq([proc, proc, proc]) - end - end -end diff --git a/spec/lib/open_food_network/reports/rule_spec.rb b/spec/lib/open_food_network/reports/rule_spec.rb deleted file mode 100644 index eae5b26045..0000000000 --- a/spec/lib/open_food_network/reports/rule_spec.rb +++ /dev/null @@ -1,21 +0,0 @@ -require 'spec_helper' -require 'open_food_network/reports/rule' - -module OpenFoodNetwork::Reports - describe Rule do - let(:rule) { Rule.new } - # rubocop:disable Style/Proc - let(:proc) { Proc.new {} } - # rubocop:enable Style/Proc - - it "can define a group proc and return it in a hash" do - rule.group(&proc) - expect(rule.to_h).to eq(group_by: proc, sort_by: nil) - end - - it "can define a sort proc and return it in a hash" do - rule.sort(&proc) - expect(rule.to_h).to eq(group_by: nil, sort_by: proc) - end - end -end