reports_kit 0.1.0 → 0.2.0

data/spec/reports_kit/reports/dimension_with_measure_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+describe ReportsKit::Reports::DimensionWithMeasure do
+  subject { described_class.new(dimension: dimension, measure: measure) }
+  let(:dimension) { ReportsKit::Reports::Dimension.new(properties) }
+  let(:measure) { ReportsKit::Reports::Measure.new(key: 'issue', dimensions: [properties]) }
+
+  describe 'settings' do
+    context 'with a datetime dimension' do
+      let(:properties) { 'opened_at' }
+
+      it 'returns the settings' do
+        expect(subject.settings).to eq({ column: 'issues.opened_at', group: database_adapter.truncate_to_week('issues.opened_at') })
+      end
+    end
+
+    context 'with a string dimension' do
+      let(:properties) { 'title' }
+
+      it 'returns the settings' do
+        expect(subject.settings).to eq({ column: 'issues.title', group: "issues.title" })
+      end
+    end
+
+    context 'with a text dimension' do
+      let(:properties) { 'description' }
+
+      it 'returns the settings' do
+        expect(subject.settings).to eq({ column: 'issues.description', group: "issues.description" })
+      end
+    end
+
+    context 'with a belongs_to association dimension' do
+      let(:properties) { 'repo' }
+
+      it 'returns the settings' do
+        expect(subject.settings).to eq({ column: 'issues.repo_id', group: 'issues.repo_id' })
+      end
+    end
+
+    context 'with a has_many association dimension' do
+      let(:properties) { 'tags' }
+
+      it 'returns the settings' do
+        expect(subject.settings).to eq({ joins: :tags, column: 'tags.id', group: 'issues.issue_id' })
+      end
+    end
+
+    context 'with a has_many :through association dimension' do
+      let(:properties) { 'labels' }
+
+      it 'returns the settings' do
+        expect(subject.settings).to eq({ joins: :issues_labels, column: 'issues_labels.label_id', group: 'issues_labels.label_id' })
+      end
+    end
+
+    describe ':key_to_label setting' do
+      context 'with a Proc' do
+        let(:properties) { 'titleized_state' }
+
+        it 'returns the result of the Proc' do
+          expect(subject.key_to_label('foo')).to eq('Foo')
+        end
+      end
+    end
+
+  end
+
+end

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

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

data/spec/spec_helper.rb

@@ -2,19 +2,20 @@ require 'reports_kit'
 
 require 'database_cleaner'
 require 'pry'
+require 'pry-byebug'
 require 'timecop'
 require 'support/factory_girl'
 require 'support/helpers'
 
 directory = File.dirname(File.absolute_path(__FILE__))
 Dir.glob("#{directory}/factories/*.rb") { |file| require file }
-Dir.glob("#{directory}/support/models/*.rb") { |file| require file }
 
 Time.zone = ActiveSupport::TimeZone.new('UTC')
 ActiveRecord::Base.default_timezone = :utc
 
 if Gem.loaded_specs.has_key?('mysql2')
   REPORTS_KIT_DATABASE_ADAPTER = ReportsKit::Reports::Adapters::Mysql
+  REPORTS_KIT_DATABASE_TYPE = :mysql
   ActiveRecord::Base.establish_connection(
     adapter: 'mysql2',
     host: 'localhost',
@@ -23,6 +24,7 @@ if Gem.loaded_specs.has_key?('mysql2')
   )
 else
   REPORTS_KIT_DATABASE_ADAPTER = ReportsKit::Reports::Adapters::Postgresql
+  REPORTS_KIT_DATABASE_TYPE = :postgresql
   ActiveRecord::Base.establish_connection(
     adapter: 'postgresql',
     host: 'localhost',
@@ -30,6 +32,8 @@ else
     username: 'postgres'
   )
 end
+Dir.glob("#{directory}/support/models/*.rb") { |file| require file }
+require 'support/config'
 require 'support/schema'
 
 RSpec.configure do |config|
@@ -47,8 +51,9 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 
+  TIMECOP_TIME = Time.utc(2010)
   config.before(:each) do
-    Timecop.freeze(Time.utc(2010))
+    Timecop.freeze(TIMECOP_TIME)
   end
   config.after(:each) do
     Timecop.return

data/spec/support/config.rb

@@ -0,0 +1,11 @@
+ReportsKit.configure do |config|
+  config.custom_methods = {
+    format_percentage: -> (value) { "#{value.round(0)}%" },
+    add_label_suffix: -> (data) {
+      data[:entities].each do |entity|
+        entity.label = "#{entity.label} Foo" if entity.label
+      end
+      data
+    }
+  }
+end

data/spec/support/helpers.rb

@@ -7,15 +7,15 @@ module Helpers
     REPORTS_KIT_DATABASE_ADAPTER
   end
 
-  def date_string_for_filter(time)
+  def format_criteria_time(time)
     time.strftime('%b %-d, %Y')
   end
 
   def format_day_offset(day_offset)
-    ReportsKit::Reports::Data::Utils.format_time((now - day_offset.days))
+    ReportsKit::Reports::Data::Utils.format_display_time((now - day_offset.days))
   end
 
   def format_week_offset(week_offset)
-    ReportsKit::Reports::Data::Utils.format_time((now - week_offset.weeks).beginning_of_week)
+    ReportsKit::Reports::Data::Utils.format_display_time((now - week_offset.weeks).beginning_of_week(ReportsKit.configuration.first_day_of_week))
   end
 end

data/spec/support/models/issue.rb

@@ -1,6 +1,13 @@
 class Issue < ActiveRecord::Base
+  include ReportsKit::Model
+
   belongs_to :repo
   has_many :issues_labels
   has_many :labels, through: :issues_labels
   has_many :tags
+
+  reports_kit do
+    aggregation :average_duration, [:average, REPORTS_KIT_DATABASE_TYPE == :mysql ? 'DATEDIFF(closed_at, opened_at)' : '(closed_at::date - opened_at::date)']
+    dimension :titleized_state, group: 'issues.state', key_to_label: -> (state) { state.try(:titleize) }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reports_kit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tom Benner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: spreadsheet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -141,8 +169,10 @@ files:
 - app/assets/javascripts/reports_kit/lib/_init.js
 - app/assets/javascripts/reports_kit/lib/chart.js
 - app/assets/javascripts/reports_kit/lib/report.js
+- app/assets/javascripts/reports_kit/lib/table.js
 - app/assets/javascripts/reports_kit/vendor/chart.js
 - app/assets/javascripts/reports_kit/vendor/daterangepicker.js
+- app/assets/javascripts/reports_kit/vendor/jquery.tablesorter.min.js
 - app/assets/javascripts/reports_kit/vendor/moment.js
 - app/assets/javascripts/reports_kit/vendor/select2.full.js
 - app/assets/stylesheets/reports_kit/application.css.scss
@@ -151,6 +181,7 @@ files:
 - app/assets/stylesheets/reports_kit/vendor/daterangepicker.css
 - app/assets/stylesheets/reports_kit/vendor/select2-bootstrap.css
 - app/assets/stylesheets/reports_kit/vendor/select2.css
+- config/initializers/mime_types.rb
 - config/routes.rb
 - docs/README.md
 - docs/dimensions.md
@@ -190,20 +221,34 @@ files:
 - gemfiles/postgresql.gemfile.lock
 - lib/reports_kit.rb
 - lib/reports_kit/base_controller.rb
+- lib/reports_kit/cache.rb
 - lib/reports_kit/configuration.rb
 - lib/reports_kit/engine.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/adapters/mysql.rb
 - lib/reports_kit/reports/adapters/postgresql.rb
+- lib/reports_kit/reports/composite_measure.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_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/filter.rb
 - lib/reports_kit/reports/filter_types/base.rb
 - lib/reports_kit/reports/filter_types/boolean.rb
@@ -211,6 +256,7 @@ 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/generate_autocomplete_results.rb
 - lib/reports_kit/reports/inferrable_configuration.rb
 - lib/reports_kit/reports/measure.rb
@@ -225,10 +271,13 @@ files:
 - spec/factories/tag_factory.rb
 - spec/fixtures/generate_inputs.yml
 - spec/fixtures/generate_outputs.yml
+- 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_spec.rb
-- spec/reports_kit/reports/filter_spec.rb
+- spec/reports_kit/reports/dimension_with_measure_spec.rb
+- spec/reports_kit/reports/filter_with_measure_spec.rb
 - spec/spec_helper.rb
+- spec/support/config.rb
 - spec/support/factory_girl.rb
 - spec/support/helpers.rb
 - spec/support/models/issue.rb

data/spec/reports_kit/reports/dimension_spec.rb

@@ -1,54 +0,0 @@
-require 'spec_helper'
-
-describe ReportsKit::Reports::Dimension do
-  subject { described_class.new(properties, measure: measure) }
-  let(:measure) { ReportsKit::Reports::Measure.new('issue') }
-
-  context 'with a datetime dimension' do
-    let(:properties) { 'opened_at' }
-
-    it 'returns the settings' do
-      expect(subject.settings).to eq({ column: 'issues.opened_at', group: database_adapter.truncate_to_week('issues.opened_at') })
-    end
-  end
-
-  context 'with a string dimension' do
-    let(:properties) { 'title' }
-
-    it 'returns the settings' do
-      expect(subject.settings).to eq({ column: 'issues.title', group: "issues.title" })
-    end
-  end
-
-  context 'with a text dimension' do
-    let(:properties) { 'description' }
-
-    it 'returns the settings' do
-      expect(subject.settings).to eq({ column: 'issues.description', group: "issues.description" })
-    end
-  end
-
-  context 'with a belongs_to association dimension' do
-    let(:properties) { 'repo' }
-
-    it 'returns the settings' do
-      expect(subject.settings).to eq({ column: 'issues.repo_id', group: 'issues.repo_id' })
-    end
-  end
-
-  context 'with a has_many association dimension' do
-    let(:properties) { 'tags' }
-
-    it 'returns the settings' do
-      expect(subject.settings).to eq({ joins: :tags, column: 'tags.id', group: 'issues.issue_id' })
-    end
-  end
-
-  context 'with a has_many :through association dimension' do
-    let(:properties) { 'labels' }
-
-    it 'returns the settings' do
-      expect(subject.settings).to eq({ joins: :issues_labels, column: 'issues_labels.label_id', group: 'issues.label_id' })
-    end
-  end
-end