reports_kit 0.0.4 → 0.1.0

data/lib/reports_kit/version.rb

@@ -1,3 +1,3 @@
 module ReportsKit
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
 end

data/reports_kit.gemspec

@@ -14,11 +14,12 @@ Gem::Specification.new do |s|
   s.license       = 'MIT'
 
   s.add_dependency 'rails', '>= 3'
-  s.add_dependency 'pg', '>= 0.15'
 
+  s.add_development_dependency 'appraisal'
   s.add_development_dependency 'rspec', '~> 3'
   s.add_development_dependency 'database_cleaner', '~> 1'
   s.add_development_dependency 'factory_girl', '~> 4'
+  s.add_development_dependency 'pg', '>= 0.15'
   s.add_development_dependency 'pry', '~> 0'
   s.add_development_dependency 'timecop', '~> 0'
 end

data/spec/fixtures/generate_inputs.yml

@@ -12,6 +12,11 @@
   - repo
   chart:
     foo: bar
+- measure: issue
+  dimensions:
+  - repo
+  chart:
+    type: pie
 - measure:
     key: issue
   dimensions:

data/spec/fixtures/generate_outputs.yml

@@ -25,6 +25,7 @@
       :legend:
         :labels:
           :usePointStyle: true
+      :maintainAspectRatio: false
       :tooltips:
         :xPadding: 8
         :yPadding: 7
@@ -55,6 +56,7 @@
       :legend:
         :labels:
           :usePointStyle: true
+      :maintainAspectRatio: false
       :tooltips:
         :xPadding: 8
         :yPadding: 7
@@ -86,10 +88,19 @@
       :legend:
         :labels:
           :usePointStyle: true
+      :maintainAspectRatio: false
       :tooltips:
         :xPadding: 8
         :yPadding: 7
   :type: bar
+- :chart_data:
+    :labels: []
+    :datasets:
+    - :label: Issues
+      :data: []
+      :backgroundColor: []
+    :options: {}
+  :type: pie
 - :chart_data:
     :labels: []
     :datasets:
@@ -116,6 +127,7 @@
       :legend:
         :labels:
           :usePointStyle: true
+      :maintainAspectRatio: false
       :tooltips:
         :xPadding: 8
         :yPadding: 7
@@ -146,6 +158,7 @@
       :legend:
         :labels:
           :usePointStyle: true
+      :maintainAspectRatio: false
       :tooltips:
         :xPadding: 8
         :yPadding: 7
@@ -172,6 +185,7 @@
       :legend:
         :labels:
           :usePointStyle: true
+      :maintainAspectRatio: false
       :tooltips:
         :xPadding: 8
         :yPadding: 7
@@ -202,6 +216,7 @@
       :legend:
         :labels:
           :usePointStyle: true
+      :maintainAspectRatio: false
       :tooltips:
         :xPadding: 8
         :yPadding: 7

data/spec/reports_kit/reports/data/generate_spec.rb

@@ -18,66 +18,99 @@ describe ReportsKit::Reports::Data::Generate do
   let(:chart_options) { subject[:chart_data][:options] }
 
   context 'with a datetime dimension' do
-    let(:properties) do
-      {
-        measure: 'issue',
-        dimensions: %w(opened_at)
-      }
-    end
-    let!(:issues) do
-      [
-        create(:issue, repo: repo, opened_at: now - 2.weeks),
-        create(:issue, repo: repo, opened_at: now - 2.weeks),
-        create(:issue, repo: repo, opened_at: now)
-      ]
-    end
+    context 'with default granularity' do
+      let(:properties) do
+        {
+          measure: 'issue',
+          dimensions: %w(opened_at)
+        }
+      end
+      let!(:issues) do
+        [
+          create(:issue, repo: repo, opened_at: now - 2.weeks),
+          create(:issue, repo: repo, opened_at: now - 2.weeks),
+          create(:issue, repo: repo, opened_at: now)
+        ]
+      end
 
-    it 'returns the type' do
-      expect(chart_type).to eq('bar')
-    end
+      it 'returns the type' do
+        expect(chart_type).to eq('bar')
+      end
 
-    it 'returns the data' do
-      expect(chart_data).to eq({
-        labels: [
-          format_time(2),
-          format_time(1),
-          format_time(0)
-        ],
-        datasets: [
+      it 'returns the data' do
+        expect(chart_data).to eq({
+          labels: [
+            format_week_offset(2),
+            format_week_offset(1),
+            format_week_offset(0)
+          ],
+          datasets: [
+            {
+              label: 'Issues',
+              data: [2, 0, 1]
+            }
+          ]
+        })
+      end
+
+      context 'with a datetime filter' do
+        let(:properties) do
           {
-            label: 'Issues',
-            data: [2, 0, 1]
+            measure: {
+              key: 'issue',
+              filters: [
+                {
+                  key: 'opened_at',
+                  criteria: {
+                    operator: 'between',
+                    value: "#{date_string_for_filter(now - 1.week)} - #{date_string_for_filter(now)}"
+                  }
+                }
+              ]
+            },
+            dimensions: %w(opened_at)
           }
-        ]
-      })
-    end
+        end
 
-    context 'with a datetime filter' do
-      let(:properties) do
-        {
-          measure: {
-            key: 'issue',
-            filters: [
+        it 'returns the chart_data' do
+          expect(chart_data).to eq({
+            labels: [format_week_offset(1), format_week_offset(0)],
+            datasets: [
               {
-                key: 'opened_at',
-                criteria: {
-                  operator: 'between',
-                  value: "#{date_string_for_filter(now - 1.week)} - #{date_string_for_filter(now)}"
-                }
+                label: "Issues",
+                data: [0, 1]
               }
             ]
-          },
-          dimensions: %w(opened_at)
+          })
+        end
+      end
+    end
+
+    context 'with day granularity' do
+      let(:properties) do
+        {
+          measure: 'issue',
+          dimensions: [{ key: 'opened_at', granularity: 'day' }]
         }
       end
+      let!(:issues) do
+        [
+          create(:issue, repo: repo, opened_at: now - 2.days),
+          create(:issue, repo: repo, opened_at: now)
+        ]
+      end
 
-      it 'returns the chart_data' do
+      it 'returns the data' do
         expect(chart_data).to eq({
-          labels: [format_time(0)],
+          labels: [
+            format_day_offset(2),
+            format_day_offset(1),
+            format_day_offset(0)
+          ],
           datasets: [
             {
-              label: "Issues",
-              data: [1.0]
+              label: 'Issues',
+              data: [1, 0, 1]
             }
           ]
         })
@@ -226,7 +259,7 @@ describe ReportsKit::Reports::Data::Generate do
 
     it 'returns the chart_data' do
       expect(chart_data).to eq({
-        labels: [format_time(2), format_time(1), format_time(0)],
+        labels: [format_week_offset(2), format_week_offset(1), format_week_offset(0)],
         datasets: [
           {
             label: repo.to_s,

data/spec/reports_kit/reports/dimension_spec.rb

@@ -8,7 +8,23 @@ describe ReportsKit::Reports::Dimension do
     let(:properties) { 'opened_at' }
 
     it 'returns the settings' do
-      expect(subject.settings).to eq({ column: 'issues.opened_at', group: "date_trunc('week', issues.opened_at::timestamp)" })
+      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
 

data/spec/spec_helper.rb

@@ -12,13 +12,24 @@ Dir.glob("#{directory}/support/models/*.rb") { |file| require file }
 
 Time.zone = ActiveSupport::TimeZone.new('UTC')
 ActiveRecord::Base.default_timezone = :utc
-ActiveRecord::Base.establish_connection(
-  adapter: 'postgresql',
-  host: 'localhost',
-  database: 'reports_kit_test',
-  username: 'postgres',
-  encoding: 'unicode'
-)
+
+if Gem.loaded_specs.has_key?('mysql2')
+  REPORTS_KIT_DATABASE_ADAPTER = ReportsKit::Reports::Adapters::Mysql
+  ActiveRecord::Base.establish_connection(
+    adapter: 'mysql2',
+    host: 'localhost',
+    database: 'reports_kit_test',
+    username: 'root'
+  )
+else
+  REPORTS_KIT_DATABASE_ADAPTER = ReportsKit::Reports::Adapters::Postgresql
+  ActiveRecord::Base.establish_connection(
+    adapter: 'postgresql',
+    host: 'localhost',
+    database: 'reports_kit_test',
+    username: 'postgres'
+  )
+end
 require 'support/schema'
 
 RSpec.configure do |config|

data/spec/support/helpers.rb

@@ -3,11 +3,19 @@ module Helpers
     Time.zone.now
   end
 
+  def database_adapter
+    REPORTS_KIT_DATABASE_ADAPTER
+  end
+
   def date_string_for_filter(time)
     time.strftime('%b %-d, %Y')
   end
 
-  def format_time(week_offset)
+  def format_day_offset(day_offset)
+    ReportsKit::Reports::Data::Utils.format_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)
   end
 end

data/spec/support/schema.rb

@@ -4,6 +4,7 @@ ActiveRecord::Schema.define do
   create_table :issues, :force => :cascade do |t|
     t.integer  :repo_id
     t.string   :title
+    t.text     :description
     t.integer  :source_user_id
     t.string   :state
     t.boolean  :locked

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reports_kit
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Tom Benner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-04 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +132,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- Appraisals
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -169,6 +184,10 @@ files:
 - docs/images/users_by_created_at.png
 - docs/images/users_by_created_at_with_filter.png
 - docs/measures.md
+- gemfiles/mysql.gemfile
+- gemfiles/mysql.gemfile.lock
+- gemfiles/postgresql.gemfile
+- gemfiles/postgresql.gemfile.lock
 - lib/reports_kit.rb
 - lib/reports_kit/base_controller.rb
 - lib/reports_kit/configuration.rb
@@ -177,6 +196,8 @@ files:
 - lib/reports_kit/model.rb
 - lib/reports_kit/model_configuration.rb
 - lib/reports_kit/report_builder.rb
+- lib/reports_kit/reports/adapters/mysql.rb
+- lib/reports_kit/reports/adapters/postgresql.rb
 - lib/reports_kit/reports/data/chart_options.rb
 - lib/reports_kit/reports/data/generate.rb
 - lib/reports_kit/reports/data/one_dimension.rb