reports_kit 0.2.0 → 0.3.0

data/spec/reports_kit/reports/{dimension_with_measure_spec.rb → dimension_with_series_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe ReportsKit::Reports::DimensionWithMeasure do
-  subject { described_class.new(dimension: dimension, measure: measure) }
+describe ReportsKit::Reports::DimensionWithSeries do
+  subject { described_class.new(dimension: dimension, series: series) }
   let(:dimension) { ReportsKit::Reports::Dimension.new(properties) }
-  let(:measure) { ReportsKit::Reports::Measure.new(key: 'issue', dimensions: [properties]) }
+  let(:series) { ReportsKit::Reports::Series.new(measure: 'issue', dimensions: [properties]) }
 
   describe 'settings' do
     context 'with a datetime dimension' do
@@ -18,7 +18,7 @@ describe ReportsKit::Reports::DimensionWithMeasure do
       let(:properties) { 'title' }
 
       it 'returns the settings' do
-        expect(subject.settings).to eq({ column: 'issues.title', group: "issues.title" })
+        expect(subject.settings).to eq({ column: 'issues.title', group: 'issues.title' })
       end
     end
 
@@ -26,7 +26,7 @@ describe ReportsKit::Reports::DimensionWithMeasure do
       let(:properties) { 'description' }
 
       it 'returns the settings' do
-        expect(subject.settings).to eq({ column: 'issues.description', group: "issues.description" })
+        expect(subject.settings).to eq({ column: 'issues.description', group: 'issues.description' })
       end
     end
 
@@ -63,7 +63,5 @@ describe ReportsKit::Reports::DimensionWithMeasure do
         end
       end
     end
-
   end
-
 end

data/spec/reports_kit/reports/{filter_with_measure_spec.rb → filter_with_series_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe ReportsKit::Reports::FilterWithMeasure do
-  subject { described_class.new(filter: filter, measure: measure) }
+describe ReportsKit::Reports::FilterWithSeries do
+  subject { described_class.new(filter: filter, series: series) }
   let(:filter) { ReportsKit::Reports::Filter.new(properties) }
-  let(:measure) { ReportsKit::Reports::Measure.new(key: 'issue', dimensions: %w(repo)) }
+  let(:series) { ReportsKit::Reports::Series.new(measure: 'issue', dimensions: %w(repo)) }
 
   context 'with a datetime filter' do
     let(:properties) { 'opened_at' }

data/spec/spec_helper.rb

@@ -13,12 +13,12 @@ Dir.glob("#{directory}/factories/*.rb") { |file| require file }
 Time.zone = ActiveSupport::TimeZone.new('UTC')
 ActiveRecord::Base.default_timezone = :utc
 
-if Gem.loaded_specs.has_key?('mysql2')
+if Gem.loaded_specs.key?('mysql2')
   REPORTS_KIT_DATABASE_ADAPTER = ReportsKit::Reports::Adapters::Mysql
   REPORTS_KIT_DATABASE_TYPE = :mysql
   ActiveRecord::Base.establish_connection(
     adapter: 'mysql2',
-    host: 'localhost',
+    host: ENV['MYSQL_HOST'] || 'localhost',
     database: 'reports_kit_test',
     username: 'root'
   )
@@ -27,7 +27,7 @@ else
   REPORTS_KIT_DATABASE_TYPE = :postgresql
   ActiveRecord::Base.establish_connection(
     adapter: 'postgresql',
-    host: 'localhost',
+    host: ENV['POSTGRESQL_HOST'] || 'localhost',
     database: 'reports_kit_test',
     username: 'postgres'
   )
@@ -60,8 +60,8 @@ RSpec.configure do |config|
   end
 
   config.before(:suite) do
-    DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with(:truncation)
+    # To support multi-threaded ActiveRecord queries, we need to use :truncation instead of :transaction.
+    DatabaseCleaner.strategy = [:truncation, pre_count: true]
   end
 
   config.around(:each) do |example|

data/spec/support/config.rb

@@ -1,11 +1,41 @@
 ReportsKit.configure do |config|
   config.custom_methods = {
     format_percentage: -> (value) { "#{value.round(0)}%" },
-    add_label_suffix: -> (data) {
+    add_label_link: -> (data:, properties:, context_record:) {
+      data[:entities].each do |entity|
+        entity.label = "<a href='#'>#{entity.label}</a> Bar" if entity.label
+      end
+      data
+    },
+    add_label_suffix: -> (data:, properties:, context_record:) {
       data[:entities].each do |entity|
         entity.label = "#{entity.label} Foo" if entity.label
       end
       data
+    },
+    add_context_record_suffix: -> (data:, properties:, context_record:) {
+      data[:entities].each do |entity|
+        entity.label = "#{entity.label} #{context_record}" if entity.label
+      end
+      data
+    },
+    empty_result_set_for_relation: -> (relation) {
+      relation.where('0 = 1')
+    },
+    prepend_column: -> (data:, properties:, context_record:) {
+      values = data[:entities].map do |entity|
+        value = entity.instance.is_a?(Date) ? entity.instance.mday : nil
+        ReportsKit::Value.new(value, value)
+      end
+      new_dataset = {
+        entity: ReportsKit::Entity.new('day_of_month', 'Day of Month', 'day_of_month'),
+        values: values
+      }
+      data[:datasets] = [new_dataset] + data[:datasets]
+      data
+    },
+    all_repo_ids: -> (dimension_keys:, properties:, context_record:) {
+      Repo.pluck(:id)
     }
   }
 end

data/spec/support/helpers.rb

@@ -7,8 +7,12 @@ module Helpers
     REPORTS_KIT_DATABASE_ADAPTER
   end
 
-  def format_criteria_time(time)
-    time.strftime('%b %-d, %Y')
+  def format_configuration_time(time)
+    ReportsKit::Reports::Data::Utils.format_configuration_time(time)
+  end
+
+  def format_csv_week_offset(week_offset)
+    ReportsKit::Reports::Data::Utils.format_csv_time((now - week_offset.weeks).beginning_of_week(ReportsKit.configuration.first_day_of_week))
   end
 
   def format_day_offset(day_offset)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reports_kit
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Tom Benner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -160,6 +160,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".travis.yml"
 - Appraisals
 - Gemfile
 - MIT-LICENSE
@@ -224,31 +225,32 @@ files:
 - lib/reports_kit/cache.rb
 - lib/reports_kit/configuration.rb
 - lib/reports_kit/engine.rb
+- lib/reports_kit/entity.rb
 - lib/reports_kit/helper.rb
 - lib/reports_kit/model.rb
 - lib/reports_kit/model_configuration.rb
 - lib/reports_kit/order.rb
 - lib/reports_kit/relative_time.rb
 - lib/reports_kit/report_builder.rb
-- lib/reports_kit/reports/abstract_measure.rb
+- lib/reports_kit/reports/abstract_series.rb
 - lib/reports_kit/reports/adapters/mysql.rb
 - lib/reports_kit/reports/adapters/postgresql.rb
-- lib/reports_kit/reports/composite_measure.rb
+- lib/reports_kit/reports/composite_series.rb
+- lib/reports_kit/reports/data/add_table_aggregations.rb
+- lib/reports_kit/reports/data/aggregate_composite.rb
+- lib/reports_kit/reports/data/aggregate_one_dimension.rb
+- lib/reports_kit/reports/data/aggregate_two_dimensions.rb
 - lib/reports_kit/reports/data/chart_options.rb
-- lib/reports_kit/reports/data/composite_aggregation.rb
-- lib/reports_kit/reports/data/entity.rb
 - lib/reports_kit/reports/data/format_one_dimension.rb
+- lib/reports_kit/reports/data/format_table.rb
 - lib/reports_kit/reports/data/format_two_dimensions.rb
 - lib/reports_kit/reports/data/generate.rb
 - lib/reports_kit/reports/data/generate_for_properties.rb
-- lib/reports_kit/reports/data/one_dimension.rb
 - lib/reports_kit/reports/data/populate_one_dimension.rb
 - lib/reports_kit/reports/data/populate_two_dimensions.rb
-- lib/reports_kit/reports/data/two_dimensions.rb
 - lib/reports_kit/reports/data/utils.rb
-- lib/reports_kit/reports/data/value.rb
 - lib/reports_kit/reports/dimension.rb
-- lib/reports_kit/reports/dimension_with_measure.rb
+- lib/reports_kit/reports/dimension_with_series.rb
 - lib/reports_kit/reports/filter.rb
 - lib/reports_kit/reports/filter_types/base.rb
 - lib/reports_kit/reports/filter_types/boolean.rb
@@ -256,12 +258,13 @@ files:
 - lib/reports_kit/reports/filter_types/number.rb
 - lib/reports_kit/reports/filter_types/records.rb
 - lib/reports_kit/reports/filter_types/string.rb
-- lib/reports_kit/reports/filter_with_measure.rb
+- lib/reports_kit/reports/filter_with_series.rb
 - lib/reports_kit/reports/generate_autocomplete_results.rb
 - lib/reports_kit/reports/inferrable_configuration.rb
-- lib/reports_kit/reports/measure.rb
+- lib/reports_kit/reports/series.rb
 - lib/reports_kit/reports_controller.rb
 - lib/reports_kit/resources_controller.rb
+- lib/reports_kit/value.rb
 - lib/reports_kit/version.rb
 - reports_kit.gemspec
 - spec/factories/issue_factory.rb
@@ -274,8 +277,8 @@ files:
 - spec/reports_kit/relative_time_spec.rb
 - spec/reports_kit/report_builder_spec.rb
 - spec/reports_kit/reports/data/generate_spec.rb
-- spec/reports_kit/reports/dimension_with_measure_spec.rb
-- spec/reports_kit/reports/filter_with_measure_spec.rb
+- spec/reports_kit/reports/dimension_with_series_spec.rb
+- spec/reports_kit/reports/filter_with_series_spec.rb
 - spec/spec_helper.rb
 - spec/support/config.rb
 - spec/support/factory_girl.rb

data/lib/reports_kit/reports/data/entity.rb

@@ -1,7 +0,0 @@
-module ReportsKit
-  module Reports
-    module Data
-      Entity = Struct.new(:key, :label, :instance)
-    end
-  end
-end

data/lib/reports_kit/reports/data/value.rb

@@ -1,7 +0,0 @@
-module ReportsKit
-  module Reports
-    module Data
-      Value = Struct.new(:raw, :formatted)
-    end
-  end
-end