active_reporter 0.6.3 → 0.6.4

data/lib/active_reporter/serializer/highcharts.rb

@@ -2,7 +2,7 @@ module ActiveReporter
   module Serializer
     class Highcharts < Table
       def colors
-        ['#7cb5ec', '#434348', '#90ed7d', '#f7a35c', '#8085e9', '#f15c80', '#e4d354', '#2b908f', '#f45b5b', '#91e8e1']
+        ["#7cb5ec", "#434348", "#90ed7d", "#f7a35c", "#8085e9", "#f15c80", "#e4d354", "#2b908f", "#f45b5b", "#91e8e1"]
       end
 
       def color_hash
@@ -118,7 +118,7 @@ module ActiveReporter
           human_aggregator_label(report.all_aggregators),
           human_aggregator_value_label(report.all_aggregators, xes[report.groupers.first][:value])
         ]
-        lines.map { |k, v| "<b>#{k}:</b> #{v}" }.join('<br/>')
+        lines.map { |k, v| "<b>#{k}:</b> #{v}" }.join("<br/>")
       end
 
       def filters_for(xes)
@@ -153,7 +153,7 @@ module ActiveReporter
       def highcharts_options
         {
           chart: {
-            type: 'column'
+            type: "column"
           },
           colors: colors,
           title: {
@@ -176,9 +176,9 @@ module ActiveReporter
             },
             stackLabels: {
               enabled: report.groupers.length >= 3,
-              format: '{stack}',
+              format: "{stack}",
               rotation: -45,
-              textAlign: 'left'
+              textAlign: "left"
             }
           },
           legend: {
@@ -190,7 +190,7 @@ module ActiveReporter
               events: {}
             },
             column: {
-              stacking: ('normal' if report.groupers.length >= 2)
+              stacking: ("normal" if report.groupers.length >= 2)
             }
           }
         }

data/lib/active_reporter/serializer.rb

@@ -1,7 +1,7 @@
-require 'active_reporter/serializer/base'
-require 'active_reporter/serializer/table'
-require 'active_reporter/serializer/csv'
-require 'active_reporter/serializer/form_field'
-require 'active_reporter/serializer/highcharts'
-require 'active_reporter/serializer/hash_table'
-require 'active_reporter/serializer/nested_hash'
+require "active_reporter/serializer/base"
+require "active_reporter/serializer/table"
+require "active_reporter/serializer/csv"
+require "active_reporter/serializer/form_field"
+require "active_reporter/serializer/highcharts"
+require "active_reporter/serializer/hash_table"
+require "active_reporter/serializer/nested_hash"

data/lib/active_reporter/tracker/base.rb

@@ -1,4 +1,4 @@
-require 'active_reporter/aggregator/base'
+require "active_reporter/aggregator/base"
 
 module ActiveReporter
   module Tracker

data/lib/active_reporter/tracker.rb

@@ -1,3 +1,3 @@
-require 'active_reporter/tracker/base'
-require 'active_reporter/tracker/delta'
-require 'active_reporter/tracker/value'
+require "active_reporter/tracker/base"
+require "active_reporter/tracker/delta"
+require "active_reporter/tracker/value"

data/lib/active_reporter/version.rb

@@ -1,3 +1,3 @@
 module ActiveReporter
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/lib/active_reporter.rb

@@ -17,10 +17,14 @@ module ActiveReporter
     private
 
     def database_adapter
-      ActiveRecord::Base.connection_config[:adapter]
+      @database_adapter ||= if ActiveRecord.gem_version < Gem::Version.new("6")
+        ActiveRecord::Base.connection_config[:adapter]
+      else
+        ActiveRecord::Base.connection_db_config.adapter
+      end
     end
   end
 end
 
-require 'deeply_enumerable'
-Dir.glob(File.join(__dir__, 'active_reporter', '*/')).each { |file| require file.chomp('/') }
+require "deeply_enumerable"
+Dir.glob(File.join(__dir__, "active_reporter", "*/")).each { |file| require file.chomp("/") }

data/spec/acceptance/data_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe 'more complicated case' do
+describe "more complicated case" do
   let(:report_model) do
     Class.new(ActiveReporter::Report) do
       report_on :Post
@@ -61,12 +61,12 @@ describe 'more complicated case' do
     expect(h1_json).to eq h2_json
   end
 
-  let(:joyce) { create(:author, name: 'James Joyce') }
-  let(:woolf) { create(:author, name: 'Virginia Woolf') }
+  let(:joyce) { create(:author, name: "James Joyce") }
+  let(:woolf) { create(:author, name: "Virginia Woolf") }
 
-  let(:oct_1) { Time.zone.parse('2015-10-01') }
-  let(:nov_1) { Time.zone.parse('2015-11-01') }
-  let(:dec_1) { Time.zone.parse('2015-12-01') }
+  let(:oct_1) { Time.zone.parse("2015-10-01") }
+  let(:nov_1) { Time.zone.parse("2015-11-01") }
+  let(:dec_1) { Time.zone.parse("2015-12-01") }
 
   let(:oct) { { min: oct_1, max: nov_1 } }
   let(:nov) { { min: nov_1, max: dec_1 } }
@@ -83,50 +83,50 @@ describe 'more complicated case' do
   let!(:post_8) { create(:post, author: nil, published_at: oct_1, likes: 2) }
   let!(:post_9) { create(:post, author: nil, published_at: nov_1, likes: 3) }
 
-  specify 'basic grouping, 1 grouper, no filters' do
+  specify "basic grouping, 1 grouper, no filters" do
     expect_equal data_by(:author), [
       { key: nil, values: [
         { key: :count, value: 2 },
         { key: :total_likes, value: 5 },
-        { key: :mean_likes, value: '2.5' },
+        { key: :mean_likes, value: "2.5" },
         { key: :min_likes, value: 2 },
         { key: :max_likes, value: 3 }
       ] },
       { key: joyce.name, values: [
         { key: :count, value: 4 },
         { key: :total_likes, value: 7 },
-        { key: :mean_likes, value: '1.75' },
+        { key: :mean_likes, value: "1.75" },
         { key: :min_likes, value: 1 },
         { key: :max_likes, value: 3 }
       ] },
       { key: woolf.name, values: [
         { key: :count, value: 3 },
         { key: :total_likes, value: 8 },
-        { key: :mean_likes, value: '2.6666666666666667' },
+        { key: :mean_likes, value: "2.6666666666666667" },
         { key: :min_likes, value: 2 },
         { key: :max_likes, value: 3 }
       ] }
     ]
 
-    expect_equal data_by(:published_at, bin_width: '1 month'), [
+    expect_equal data_by(:published_at, bin_width: "1 month"), [
       { key: nil, values: [
         { key: :count, value: 2 },
         { key: :total_likes, value: 6 },
-        { key: :mean_likes, value: '3.0' },
+        { key: :mean_likes, value: "3.0" },
         { key: :min_likes, value: 3 },
         { key: :max_likes, value: 3 }
       ] },
       { key: oct, values: [
         { key: :count, value: 4 },
         { key: :total_likes, value: 7 },
-        { key: :mean_likes, value: '1.75' },
+        { key: :mean_likes, value: "1.75" },
         { key: :min_likes, value: 1 },
         { key: :max_likes, value: 2 }
       ] },
       { key: nov, values: [
         { key: :count, value: 3 },
         { key: :total_likes, value: 7 },
-        { key: :mean_likes, value: '2.3333333333333333' },
+        { key: :mean_likes, value: "2.3333333333333333" },
         { key: :min_likes, value: 1 },
         { key: :max_likes, value: 3 }
       ] }
@@ -136,28 +136,28 @@ describe 'more complicated case' do
       { key: { min: 1, max: 2 }, values: [
         { key: :count, value: 2 },
         { key: :total_likes, value: 2 },
-        { key: :mean_likes, value: '1.0' },
+        { key: :mean_likes, value: "1.0" },
         { key: :min_likes, value: 1 },
         { key: :max_likes, value: 1 }
       ] },
       { key: { min: 2, max: 3 }, values: [
         { key: :count, value: 3 },
         { key: :total_likes, value: 6 },
-        { key: :mean_likes, value: '2.0' },
+        { key: :mean_likes, value: "2.0" },
         { key: :min_likes, value: 2 },
         { key: :max_likes, value: 2 }
       ] },
       { key: { min: 3, max: 4 }, values: [
         { key: :count, value: 4 },
         { key: :total_likes, value: 12 },
-        { key: :mean_likes, value: '3.0' },
+        { key: :mean_likes, value: "3.0" },
         { key: :min_likes, value: 3 },
         { key: :max_likes, value: 3 }
       ] }
     ]
   end
 
-  specify 'basic grouping, >=2 groupers, no filters' do
+  specify "basic grouping, >=2 groupers, no filters" do
     expect_equal data_by([:published_at, :author], bin_width: { months: 1 }), [
       { key: nil, values: [
         { key: nil,  values: [
@@ -170,14 +170,14 @@ describe 'more complicated case' do
         { key: oct, values: [
           { key: :count, value: 1 },
           { key: :total_likes, value: 2 },
-          { key: :mean_likes, value: '2.0' },
+          { key: :mean_likes, value: "2.0" },
           { key: :min_likes, value: 2 },
           { key: :max_likes, value: 2 }
         ] },
         { key: nov, values: [
           { key: :count, value: 1 },
           { key: :total_likes, value: 3 },
-          { key: :mean_likes, value: '3.0' },
+          { key: :mean_likes, value: "3.0" },
           { key: :min_likes, value: 3 },
           { key: :max_likes, value: 3 }
         ] }
@@ -186,21 +186,21 @@ describe 'more complicated case' do
         { key: nil,  values: [
           { key: :count, value: 1 },
           { key: :total_likes, value: 3 },
-          { key: :mean_likes, value: '3.0' },
+          { key: :mean_likes, value: "3.0" },
           { key: :min_likes, value: 3 },
           { key: :max_likes, value: 3 }
         ] },
         { key: oct, values: [
           { key: :count, value: 2 },
           { key: :total_likes, value: 3 },
-          { key: :mean_likes, value: '1.5' },
+          { key: :mean_likes, value: "1.5" },
           { key: :min_likes, value: 1 },
           { key: :max_likes, value: 2 }
         ] },
         { key: nov, values: [
           { key: :count, value: 1 },
           { key: :total_likes, value: 1 },
-          { key: :mean_likes, value: '1.0' },
+          { key: :mean_likes, value: "1.0" },
           { key: :min_likes, value: 1 },
           { key: :max_likes, value: 1 }
         ] }
@@ -209,21 +209,21 @@ describe 'more complicated case' do
         { key: nil,  values: [
           { key: :count, value: 1 },
           { key: :total_likes, value: 3 },
-          { key: :mean_likes, value: '3.0' },
+          { key: :mean_likes, value: "3.0" },
           { key: :min_likes, value: 3 },
           { key: :max_likes, value: 3 }
         ] },
         { key: oct, values: [
           { key: :count, value: 1 },
           { key: :total_likes, value: 2 },
-          { key: :mean_likes, value: '2.0' },
+          { key: :mean_likes, value: "2.0" },
           { key: :min_likes, value: 2 },
           { key: :max_likes, value: 2 }
         ] },
         { key: nov, values: [
           { key: :count, value: 1 },
           { key: :total_likes, value: 3 },
-          { key: :mean_likes, value: '3.0' },
+          { key: :mean_likes, value: "3.0" },
           { key: :min_likes, value: 3 },
           { key: :max_likes, value: 3 }
         ] }
@@ -231,50 +231,50 @@ describe 'more complicated case' do
     ]
   end
 
-  specify 'sorting with nulls (1 grouper)' do
+  specify "sorting with nulls (1 grouper)" do
     expect_equal data_by(:author, sort_desc: true), [
       { key: woolf.name, values: [
         { key: :count, value: 3 },
         { key: :total_likes, value: 8 },
-        { key: :mean_likes, value: '2.6666666666666667' },
+        { key: :mean_likes, value: "2.6666666666666667" },
         { key: :min_likes, value: 2 },
         { key: :max_likes, value: 3 }
       ] },
       { key: joyce.name, values: [
         { key: :count, value: 4 },
         { key: :total_likes, value: 7 },
-        { key: :mean_likes, value: '1.75' },
+        { key: :mean_likes, value: "1.75" },
         { key: :min_likes, value: 1 },
         { key: :max_likes, value: 3 }
       ] },
       { key: nil, values: [
         {key: :count, value: 2 },
         {key: :total_likes, value: 5 },
-        {key: :mean_likes, value: '2.5' },
+        {key: :mean_likes, value: "2.5" },
         {key: :min_likes, value: 2 },
         {key: :max_likes, value: 3 }
       ] }
     ]
 
-    expect_equal data_by(:published_at, bin_width: '1 month', sort_desc: true), [
+    expect_equal data_by(:published_at, bin_width: "1 month", sort_desc: true), [
       { key: nov, values: [
         { key: :count, value: 3 },
         { key: :total_likes, value: 7 },
-        { key: :mean_likes, value: '2.3333333333333333' },
+        { key: :mean_likes, value: "2.3333333333333333" },
         { key: :min_likes, value: 1 },
         { key: :max_likes, value: 3 }
       ] },
       { key: oct, values: [
         { key: :count, value: 4 },
         { key: :total_likes, value: 7 },
-        { key: :mean_likes, value: '1.75' },
+        { key: :mean_likes, value: "1.75" },
         { key: :min_likes, value: 1 },
         { key: :max_likes, value: 2 }
       ] },
       { key: nil, values: [
         { key: :count, value: 2 },
         { key: :total_likes, value: 6 },
-        { key: :mean_likes, value: '3.0' },
+        { key: :mean_likes, value: "3.0" },
         { key: :min_likes, value: 3 },
         { key: :max_likes, value: 3 }
       ] }
@@ -285,21 +285,21 @@ describe 'more complicated case' do
         { key: joyce.name, values: [
           { key: :count, value: 4 },
           { key: :total_likes, value: 7 },
-          { key: :mean_likes, value: '1.75' },
+          { key: :mean_likes, value: "1.75" },
           { key: :min_likes, value: 1 },
           { key: :max_likes, value: 3 }
         ] },
         { key: woolf.name, values: [
           { key: :count, value: 3 },
           { key: :total_likes, value: 8 },
-          { key: :mean_likes, value: '2.6666666666666667' },
+          { key: :mean_likes, value: "2.6666666666666667" },
           { key: :min_likes, value: 2 },
           { key: :max_likes, value: 3 }
         ] },
         { key: nil, values: [
           { key: :count, value: 2 },
           { key: :total_likes, value: 5 },
-          { key: :mean_likes, value: '2.5' },
+          { key: :mean_likes, value: "2.5" },
           { key: :min_likes, value: 2 },
           { key: :max_likes, value: 3 }
         ] }
@@ -309,69 +309,69 @@ describe 'more complicated case' do
         { key: nil, values: [
           { key: :count, value: 2 },
           { key: :total_likes, value: 5 },
-          { key: :mean_likes, value: '2.5' },
+          { key: :mean_likes, value: "2.5" },
           { key: :min_likes, value: 2 },
           { key: :max_likes, value: 3 }
         ] },
         { key: woolf.name, values: [
           { key: :count, value: 3 },
           { key: :total_likes, value: 8 },
-          { key: :mean_likes, value: '2.6666666666666667' },
+          { key: :mean_likes, value: "2.6666666666666667" },
           { key: :min_likes, value: 2 },
           { key: :max_likes, value: 3 }
         ] },
         { key: joyce.name, values: [
           { key: :count, value: 4 },
           { key: :total_likes, value: 7 },
-          { key: :mean_likes, value: '1.75' },
+          { key: :mean_likes, value: "1.75" },
           { key: :min_likes, value: 1 },
           { key: :max_likes, value: 3 }
         ] }
       ]
 
-      expect_equal data_by(:published_at, bin_width: '1 month', nulls_last: true), [
+      expect_equal data_by(:published_at, bin_width: "1 month", nulls_last: true), [
         { key: oct, values: [
           { key: :count, value: 4 },
           { key: :total_likes, value: 7 },
-          { key: :mean_likes, value: '1.75' },
+          { key: :mean_likes, value: "1.75" },
           { key: :min_likes, value: 1 },
           { key: :max_likes, value: 2 }
         ] },
         { key: nov, values: [
           { key: :count, value: 3 },
           { key: :total_likes, value: 7 },
-          { key: :mean_likes, value: '2.3333333333333333' },
+          { key: :mean_likes, value: "2.3333333333333333" },
           { key: :min_likes, value: 1 },
           { key: :max_likes, value: 3 }
         ] },
         { key: nil, values: [
           { key: :count, value: 2 },
           { key: :total_likes, value: 6 },
-          { key: :mean_likes, value: '3.0' },
+          { key: :mean_likes, value: "3.0" },
           { key: :min_likes, value: 3 },
           { key: :max_likes, value: 3 }
         ] }
       ]
 
-      expect_equal data_by(:published_at, bin_width: '1 month', sort_desc: true, nulls_last: true), [
+      expect_equal data_by(:published_at, bin_width: "1 month", sort_desc: true, nulls_last: true), [
         { key: nil, values: [
           { key: :count, value: 2 },
           { key: :total_likes, value: 6 },
-          { key: :mean_likes, value: '3.0' },
+          { key: :mean_likes, value: "3.0" },
           { key: :min_likes, value: 3 },
           { key: :max_likes, value: 3 }
         ] },
         { key: nov, values: [
           { key: :count, value: 3 },
           { key: :total_likes, value: 7 },
-          { key: :mean_likes, value: '2.3333333333333333' },
+          { key: :mean_likes, value: "2.3333333333333333" },
           { key: :min_likes, value: 1 },
           { key: :max_likes, value: 3 }
         ] },
         { key: oct, values: [
           { key: :count, value: 4 },
           { key: :total_likes, value: 7 },
-          { key: :mean_likes, value: '1.75' },
+          { key: :mean_likes, value: "1.75" },
           { key: :min_likes, value: 1 },
           { key: :max_likes, value: 2 }
         ] }

data/spec/active_reporter/aggregator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe ActiveReporter::Aggregator do
   let(:report_model) do
@@ -17,22 +17,22 @@ describe ActiveReporter::Aggregator do
 
   let(:report) { report_model.new(aggregators: aggregators, groupers: [:author, :status]) }
 
-  let!(:post_1) { create(:post, likes: 3, author: 'Alice') }
-  let!(:post_2) { create(:post, likes: 2, author: 'Alice') }
-  let!(:post_3) { create(:post, likes: 4, author: 'Bob') }
-  let!(:post_4) { create(:post, likes: 1, author: 'Bob') }
-  let!(:post_5) { create(:post, likes: 5, author: 'Bob') }
-  let!(:post_6) { create(:post, likes: 10, author: 'Chester') }
+  let!(:post_1) { create(:post, likes: 3, author: "Alice") }
+  let!(:post_2) { create(:post, likes: 2, author: "Alice") }
+  let!(:post_3) { create(:post, likes: 4, author: "Bob") }
+  let!(:post_4) { create(:post, likes: 1, author: "Bob") }
+  let!(:post_5) { create(:post, likes: 5, author: "Bob") }
+  let!(:post_6) { create(:post, likes: 10, author: "Chester") }
 
-  context 'aggregating post_ids' do
+  context "aggregating post_ids" do
     let(:aggregators) { :post_ids }
 
-    it 'should return post_ids values' do
+    it "should return post_ids values" do
       if ActiveReporter.database_type == :postgres
         expect(report.raw_data).to eq({
-          ['Alice', 'published', 'post_ids'] => [post_1.id, post_2.id],
-          ['Bob', 'published', 'post_ids'] => [post_3.id, post_4.id, post_5.id],
-          ['Chester', 'published', 'post_ids'] => [post_6.id],
+          ["Alice", "published", "post_ids"] => [post_1.id, post_2.id],
+          ["Bob", "published", "post_ids"] => [post_3.id, post_4.id, post_5.id],
+          ["Chester", "published", "post_ids"] => [post_6.id],
         })
       else
         expect { report.raw_data }.to raise_error(ActiveReporter::InvalidParamsError)
@@ -40,62 +40,62 @@ describe ActiveReporter::Aggregator do
     end
   end
 
-  context 'aggregating max_likes' do
+  context "aggregating max_likes" do
     let(:aggregators) { :max_likes }
 
-    it 'should return max_likes values' do
+    it "should return max_likes values" do
       expect(report.raw_data).to eq({
-        ['Alice', 'published', 'max_likes'] => 3,
-        ['Bob', 'published', 'max_likes'] => 5,
-        ['Chester', 'published', 'max_likes'] => 10,
+        ["Alice", "published", "max_likes"] => 3,
+        ["Bob", "published", "max_likes"] => 5,
+        ["Chester", "published", "max_likes"] => 10,
       })
     end
   end
 
-  context 'aggregating min_likes' do
+  context "aggregating min_likes" do
     let(:aggregators) { :min_likes }
 
-    it 'should return min_likes values' do
+    it "should return min_likes values" do
       expect(report.raw_data).to eq({
-        ['Alice', 'published', 'min_likes'] => 2,
-        ['Bob', 'published', 'min_likes'] => 1,
-        ['Chester', 'published', 'min_likes'] => 10
+        ["Alice", "published", "min_likes"] => 2,
+        ["Bob", "published", "min_likes"] => 1,
+        ["Chester", "published", "min_likes"] => 10
       })
     end
   end
 
-  context 'aggregating mean_likes' do
+  context "aggregating mean_likes" do
     let(:aggregators) { :mean_likes }
 
-    it 'should return mean_likes values' do
+    it "should return mean_likes values" do
       expect(report.raw_data.collect{ |k,v| [k, v.round(2)] }.to_h).to eq({
-        ['Alice', 'published', 'mean_likes'] => 2.50,
-        ['Bob', 'published', 'mean_likes'] => 3.33,
-        ['Chester', 'published', 'mean_likes'] => 10.00,
+        ["Alice", "published", "mean_likes"] => 2.50,
+        ["Bob", "published", "mean_likes"] => 3.33,
+        ["Chester", "published", "mean_likes"] => 10.00,
       })
     end
   end
 
-  context 'aggregating total_likes' do
+  context "aggregating total_likes" do
     let(:aggregators) { :total_likes }
 
-    it 'should return total_likes values' do
+    it "should return total_likes values" do
       expect(report.raw_data).to eq({
-        ['Alice', 'published', 'total_likes'] => 5,
-        ['Bob', 'published', 'total_likes'] => 10,
-        ['Chester', 'published', 'total_likes'] => 10
+        ["Alice", "published", "total_likes"] => 5,
+        ["Bob", "published", "total_likes"] => 10,
+        ["Chester", "published", "total_likes"] => 10
       })
     end
   end
 
-  context 'aggregating count' do
+  context "aggregating count" do
     let(:aggregators) { :count }
 
-    it 'should return count values' do
+    it "should return count values" do
       expect(report.raw_data).to eq({
-        ['Alice', 'published', 'count'] => 2,
-        ['Bob', 'published', 'count'] => 3,
-        ['Chester', 'published', 'count'] => 1
+        ["Alice", "published", "count"] => 2,
+        ["Bob", "published", "count"] => 3,
+        ["Chester", "published", "count"] => 1
       })
     end
   end