reports_kit 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be78c8c9d993eed5a9a37b88549beae7c7aa07af
-  data.tar.gz: c786cb1e077f885ab17ed25756030f9dc7f05569
+  metadata.gz: 50df5df0e40d9cd127c03bacec3905c401be05ab
+  data.tar.gz: 071d750fe875bcdaa4308fde9e6bf280b18c5d3e
 SHA512:
-  metadata.gz: afccc60cd1df78ddb7c686c89ee73ca43e666a377e3b7c2c5b5c466547177969e8b9c709c51be60a1382769d95d220aa1ebcf25d68bbac8257cd38b429a07e24
-  data.tar.gz: ebeeeeefab073d568870b1d6b93af59e7ef0bf305ad0f2463ceb31cac144d600b1263d69b143be84ef754a03d70a531409b950a43bf03d81811aff91d01b80f1
+  metadata.gz: a6fbfb97c8e5f30a23d1260c73046e5f1e19941b0cdaad796ae490c8ebcbf73eeacc3eb3cfc1cd974f80e58b7c31e56d7366e3311e6af9146da055a64c410f25
+  data.tar.gz: 57c6cdba6764b876efbe81d85f98285c5945b85f0571d8fa715806f2210b94b317698b06a957171ef78ea15fc23d2c21e904eb6f2f250e9036270f5217d26fd7

data/.rubocop.yml

@@ -75,6 +75,8 @@ Style/CaseIndentation:
     - case
     - end
   IndentOneStep: false
+Style/IndentHash:
+  EnforcedStyle: consistent
 Style/RaiseArgs:
   Enabled: false
 Style/SignalException:

data/.travis.yml

@@ -0,0 +1,20 @@
+cache: bundler
+
+language: ruby
+
+services:
+  - mysql
+  - postgresql
+
+rvm:
+  - '2.2.7'
+  - '2.3.4'
+  - '2.4.1'
+
+before_install: gem update bundler
+before_script:
+  - psql -c 'CREATE DATABASE reports_kit_test;' -U postgres
+  - mysql -e 'CREATE DATABASE IF NOT EXISTS reports_kit_test;'
+  - bundle exec appraisal install
+
+script: bundle exec appraisal rspec

data/README.md

@@ -1,5 +1,7 @@
 ReportsKit
 =====
+[![Build Status](https://travis-ci.org/tombenner/reports_kit.svg?branch=master)](https://travis-ci.org/tombenner/reports_kit)
+
 ReportsKit lets you easily create beautiful charts with customizable, interactive filters.
 
 For interactive examples, see [reportskit.co](https://www.reportskit.co/).
@@ -63,35 +65,27 @@ end
 Quick Start
 -----------
 
-After installation, you can create your first chart with a single line!
-
-In any view, create a chart that shows the number of records of a model (e.g. `user`) created over time:
-
-`app/views/users/index.html.haml`
-```haml
-= render_report measure: { key: 'user', dimensions: ['created_at'] }
-```
-
-You're done! `render_report` will render the following chart:
-
-[<img src="docs/images/users_by_created_at.png?raw=true" width="500" />](docs/images/users_by_created_at.png?raw=true)
+After installation, you can create your first chart with just a YAML file and a single line in any view.
 
-Instead of passing a hash to `render_report`, you can alternatively configure your charts using YAML and then pass the filename to `render_report`:
+Configure the chart in the YAML file:
 
 `config/reports_kit/reports/my_users.yml`
 ```yaml
-measure:
-  key: user
-  dimensions:
-  - created_at
+measure: user
+dimensions:
+- created_at
 ```
 
+Then pass that filename to `render_report` in a view:
+
 `app/views/users/index.html.haml`
 ```haml
 = render_report 'my_users'
 ```
 
-The YAML approach is more maintainable and readable, so we'll use it in the rest of the documentation.
+You're done! `render_report` will render the following chart:
+
+[<img src="docs/images/users_by_created_at.png?raw=true" width="500" />](docs/images/users_by_created_at.png?raw=true)
 
 ### Form Controls
 
@@ -109,7 +103,11 @@ Many other form controls are available; see [Filters](docs/filters.md) for more.
 
 ### How It Works
 
-In the Quick Start chart, `key: 'user'` tells ReportsKit to count the number of `User` records, and `dimensions: ['created_at']` tells it to group by the week of the `created_at` column. Since `created_at` is a `datetime` column, ReportsKit knows that it should sort the results chronologically.
+In the Quick Start chart, `measure: user` tells ReportsKit to count the number of `User` records, and `dimensions: ['created_at']` tells it to group by the week of the `created_at` column. Since `created_at` is a `datetime` column, ReportsKit knows that it should group the counts by week (the granularity is configurable), sort them chronologically, and add in zeros for any missing weeks.
+
+ReportsKit infers sane defaults from your ActiveRecord model configurations. If there was a `belongs_to :company` association on `User` and you used `dimensions: ['company']`, then ReportsKit would count users grouped by the `company_id` column and show company names on the x-axis.
+
+If you need more customization (e.g. custom filters, custom dimensions, custom aggregation functions, custom orders, aggregations of aggregations, etc), ReportsKit is very flexible and powerful and supports all of these with a simple syntax. It lets you use SQL, too.
 
 To learn how to use more of ReportsKit's features, check out the following resources:
 

data/app/assets/javascripts/reports_kit/lib/_init.js

@@ -3,6 +3,7 @@ window.ReportsKit = {};
 $(document).ready(function() {
   $('.reports_kit_report').each(function(index, el) {
     var el = $(el)
-    new ReportsKit.Report({ 'el': el });
+    var reportClass = el.data('report-class');
+    new ReportsKit[reportClass]().render({ 'el': el });
   });
 });

data/app/assets/javascripts/reports_kit/lib/chart.js

@@ -6,7 +6,8 @@ ReportsKit.Chart = (function(options) {
     self.report = options.report;
     self.el = self.report.el;
 
-    self.noResultsEl = $('<div>No data was found</div>').appendTo(self.report.visualizationEl).hide();
+    self.defaultEmptyStateText = 'No data was found';
+    self.emptyStateEl = $('<div>' + self.defaultEmptyStateText + '</div>').appendTo(self.report.visualizationEl).hide();
     self.loadingIndicatorEl = $('<div class="loading_indicator"></div>').appendTo(self.report.visualizationEl).hide();
     self.canvas = $('<canvas />').appendTo(self.report.visualizationEl);
   };
@@ -15,19 +16,32 @@ ReportsKit.Chart = (function(options) {
     var path = self.el.data('path');
     var separator = path.indexOf('?') === -1 ? '?' : '&';
     path += separator + 'properties=' + encodeURIComponent(JSON.stringify(self.report.properties()));
-    self.loadingIndicatorEl.fadeIn(5000);
+    self.loadingIndicatorEl.fadeIn(1000);
+    if (self.canvas.is(':visible')) {
+      self.canvas.fadeTo(300, 0.1);
+    }
     $.getJSON(path, function(response) {
       var data = response.data;
       var chartData = data.chart_data;
+      var isEmptyState = chartData.datasets.length === 0 ||
+        (chartData.datasets.length === 1 && chartData.datasets[0].data.length === 0);
+      var emptyStateText = (data.report_options && data.report_options.empty_state_text) || self.defaultEmptyStateText;
       var options = chartData.options;
-      options = self.addAdditionalOptions(options, chartData.standard_options)
+      options = self.addAdditionalOptions(options, data.report_options);
+
+      self.loadingIndicatorEl.stop(true, true).hide();
+      self.emptyStateEl.html(emptyStateText).toggle(isEmptyState);
+      if (isEmptyState) {
+        self.canvas.hide();
+        return;
+      }
+      self.canvas.show().fadeTo(300, 1);
 
       var args = {
         type: data.type,
         data: chartData,
         options: options
       };
-      self.loadingIndicatorEl.stop(true, true).hide();
 
       if (self.chart) {
         self.chart.data.datasets = chartData.datasets;
@@ -36,24 +50,19 @@ ReportsKit.Chart = (function(options) {
       } else {
         self.chart = new Chart(self.canvas, args);
       }
-      self.noResultsEl.toggle(self.chart.data.labels.length === 0);
     });
   };
 
-  self.addAdditionalOptions = function(options, standardOptions) {
+  self.addAdditionalOptions = function(options, reportOptions) {
     var additionalOptions = {};
-    var maxItems = standardOptions && standardOptions.legend && standardOptions.legend.max_items;
+    var maxItems = reportOptions && reportOptions.legend && reportOptions.legend.max_items;
     if (maxItems) {
-      additionalOptions = {
-        legend: {
-          labels: {
-            filter: function(item) {
-              return item.index < maxItems;
-            }
-          }
-        }
+      options.legend = options.legend || {};
+      options.legend.labels = options.legend.labels || {};
+      options.legend.labels.filter = options.legend.labels.filter || function(item) {
+        var index = (typeof item.datasetIndex === 'undefined') ? item.index : item.datasetIndex;
+        return index < maxItems;
       };
-      options = $.extend(true, options, additionalOptions);
     }
     return options;
   };

data/app/assets/javascripts/reports_kit/lib/report.js

@@ -1,8 +1,7 @@
-ReportsKit.Report = (function(options) {
+ReportsKit.Report = (function() {
   var self = this;
 
-  self.initialize = function(options) {
-    self.options = options;
+  self.render = function(options) {
     self.el = options.el;
     self.visualizationEl = self.el.find('.reports_kit_visualization');
 
@@ -11,33 +10,25 @@ ReportsKit.Report = (function(options) {
 
     self.initializeElements();
     self.initializeEvents();
+    self.initializeVisualization();
+    self.renderVisualization();
+  };
 
+  self.initializeVisualization = function() {
     if (self.defaultProperties.format == 'table') {
       self.visualization = new ReportsKit.Table({ report: self });
     } else {
       self.visualization = new ReportsKit.Chart({ report: self });
     }
-    self.render();
   };
 
   self.initializeElements = function() {
     self.exportButtons = self.el.find('[data-role=reports_kit_export_button]');
-    self.form.find('.date_range_picker').daterangepicker({
-      locale: {
-        format: 'MMM D, YYYY'
-      },
-      ranges: {
-        'Today': [moment(), moment()],
-        'Last 7 Days': [moment().subtract(7, 'days'), moment()],
-        'Last 30 Days': [moment().subtract(30, 'days'), moment()],
-        'Last 2 Months': [moment().subtract(2, 'months'), moment()],
-        'Last 3 Months': [moment().subtract(3, 'months'), moment()],
-        'Last 4 Months': [moment().subtract(4, 'months'), moment()],
-        'Last 6 Months': [moment().subtract(6, 'months'), moment()],
-        'Last 12 Months': [moment().subtract(12, 'months'), moment()],
-        'Year To Date': [moment().startOf('year'), moment()]
-      }
-    });
+    self.initializeAutocompletes();
+    self.initializeDateRangePickers();
+  };
+
+  self.initializeAutocompletes = function() {
     self.form.find('.select2').each(function(index, el) {
       el = $(el);
       var path = el.data('path');
@@ -67,12 +58,40 @@ ReportsKit.Report = (function(options) {
     });
   };
 
+  self.initializeDateRangePickers = function() {
+    self.form.find('.date_range_picker').daterangepicker({
+      opens: 'left',
+      drops: 'down',
+      showDropdowns: false,
+      showWeekNumbers: false,
+      timePicker: false,
+      buttonClasses: ['btn', 'btn-sm'],
+      applyClass: 'btn-primary btn-daterange-submit',
+      cancelClass: 'btn-default',
+      maxDate: moment(),
+      locale: {
+        format: 'MMM D, YYYY'
+      },
+      ranges: {
+        'Today': [moment(), moment()],
+        'Last 7 Days': [moment().subtract(7, 'days'), moment()],
+        'Last 30 Days': [moment().subtract(30, 'days'), moment()],
+        'Last 2 Months': [moment().subtract(2, 'months'), moment()],
+        'Last 3 Months': [moment().subtract(3, 'months'), moment()],
+        'Last 4 Months': [moment().subtract(4, 'months'), moment()],
+        'Last 6 Months': [moment().subtract(6, 'months'), moment()],
+        'Last 12 Months': [moment().subtract(12, 'months'), moment()],
+        'Year To Date': [moment().startOf('year'), moment()]
+      }
+    });
+  };
+
   self.initializeEvents = function() {
     self.form.find('select,input').on('change', function() {
-      self.render();
+      self.renderVisualization();
     })
     self.form.on('submit', function() {
-      self.render();
+      self.renderVisualization();
       return false;
     })
     self.exportButtons.on('click', self.onClickExportButton);
@@ -110,11 +129,9 @@ ReportsKit.Report = (function(options) {
     return false;
   };
 
-  self.render = function() {
+  self.renderVisualization = function() {
     self.visualization.render();
   };
 
-  self.initialize(options);
-
   return self;
 });

data/app/assets/javascripts/reports_kit/lib/table.js

@@ -6,6 +6,8 @@ ReportsKit.Table = (function(options) {
     self.report = options.report;
     self.el = self.report.el;
 
+    self.defaultEmptyStateText = 'No data was found';
+    self.emptyStateEl = $('<div>' + self.defaultEmptyStateText + '</div>').appendTo(self.report.visualizationEl).hide();
     self.loadingIndicatorEl = $('<div class="loading_indicator"></div>').appendTo(self.report.visualizationEl).hide();
     self.table = $('<table />', { 'class': 'table table-striped table-hover' }).appendTo(self.report.visualizationEl);
   };
@@ -14,19 +16,37 @@ ReportsKit.Table = (function(options) {
     var path = self.el.data('path');
     var separator = path.indexOf('?') === -1 ? '?' : '&';
     path += separator + 'properties=' + encodeURIComponent(JSON.stringify(self.report.properties()));
-    self.loadingIndicatorEl.fadeIn(100);
+    self.loadingIndicatorEl.fadeIn(1000);
+    if (self.table.is(':visible')) {
+      self.table.fadeTo(300, 0.1);
+    }
     $.getJSON(path, function(response) {
       var data = response.data;
       var tableData = data.table_data;
+      var reportOptions = data.report_options || {};
+      // If the data only includes column headers, then it we have an empty state.
+      var isEmptyState = tableData.length <= 1;
+      var emptyStateText = reportOptions.empty_state_text || self.defaultEmptyStateText;
+      self.emptyStateEl.html(emptyStateText);
 
       self.loadingIndicatorEl.stop(true, true).hide();
+      self.emptyStateEl.toggle(isEmptyState);
+      if (isEmptyState) {
+        self.table.hide();
+        return;
+      }
+      self.table.show().fadeTo(300, 1);
 
+      var rowAggregationsCount = self.rowAggregationsCount(reportOptions);
+      var rowAggregationsStartIndex = rowAggregationsCount ? (tableData.length - rowAggregationsCount) : null;
       var html = '';
       for(var i = 0; i < tableData.length; i++) {
         if (i == 0) {
           html += '<thead><tr>';
         } else if (i == 1) {
           html += '<tbody><tr>';
+        } else if (rowAggregationsCount && i == rowAggregationsStartIndex) {
+          html += '<tfoot><tr>';
         } else {
           html += '<tr>';
         }
@@ -35,12 +55,14 @@ ReportsKit.Table = (function(options) {
           if (i == 0 || j == 0) {
             html += '<th>' + (tableData[i][j] || '') + '</th>';
           } else {
-            html += '<td>' + tableData[i][j] + '</td>';
+            html += '<td>' + ((tableData[i][j] === null) ? '' : tableData[i][j]) + '</td>';
           }
         }
 
         if (i == 0) {
           html += '</tr></thead>';
+        } else if (i == tableData.length && rowAggregationsCount) {
+          html += '</tfoot></tbody>';
         } else if (i == tableData.length) {
           html += '</tr></tbody>';
         } else {
@@ -52,6 +74,19 @@ ReportsKit.Table = (function(options) {
     });
   };
 
+  self.rowAggregationsCount = function(reportOptions) {
+    if (!reportOptions.aggregations) {
+      return 0;
+    };
+    var rowAggregationsCount = 0;
+    for(var i = 0; i < reportOptions.aggregations.length; i++) {
+      if (reportOptions.aggregations[i].from === 'columns') {
+        rowAggregationsCount += 1;
+      }
+    }
+    return rowAggregationsCount;
+  };
+
   self.initialize(options);
 
   return self;

data/app/assets/stylesheets/reports_kit/reports.css.sass

@@ -7,6 +7,9 @@
     width: 180px
   .loading_indicator
     position: absolute
+    margin: 5px auto
+    left: 0
+    right: 0
     padding: 22px
     background: url(data:image/gif;base64,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) no-repeat center
 

data/docs/dimensions.md

@@ -15,71 +15,64 @@ end
 You can then use `dimensions: ['carrier']` to count the number of Flights per Carrier:
 
 ```yaml
-measure:
-  key: flight
-  dimensions:
-  - carrier
+measure: flight
+dimensions:
+- carrier
 ```
 [<img src="images/flights_by_carrier.png?raw=true" width="500" />](images/flights_by_carrier.png?raw=true)
 
 You can also use two dimensions:
 
 ```yaml
-measure:
-  key: flight
-  dimensions:
-  - carrier
-  - flight_at
+measure: flight
+dimensions:
+- carrier
+- flight_at
 ```
 [<img src="images/flights_by_carrier_and_flight_at.png?raw=true" width="500" />](images/flights_by_carrier_and_flight_at.png?raw=true)
 
 Dimensions can be configured using a string (`carrier`):
 
 ```yaml
-measure:
-  key: flight
-  dimensions:
-  - carrier
+measure: flight
+dimensions:
+- carrier
 ```
 
 Or, if you need to use options, you can configure them using a hash:
 
 ```yaml
-measure:
-  key: flight
-  dimensions:
-  - key: carrier
-    limit: 5
+measure: flight
+dimensions:
+- key: carrier
+  limit: 5
 ```
 #### Types
 
 ##### Association
 
 ```yaml
-measure:
-  key: flight
-  dimensions:
-  - carrier
+measure: flight
+dimensions:
+- carrier
 ```
 [<img src="images/flights_by_carrier.png?raw=true" width="500" />](images/flights_by_carrier.png?raw=true)
 
 ##### Datetime Column
 
 ```yaml
-measure:
-  key: flight
-  dimensions:
-  - flight_at
+measure: flight
+dimensions:
+- flight_at
 ```
 [<img src="images/flights_by_flight_at.png?raw=true" width="500" />](images/flights_by_flight_at.png?raw=true)
 
 ##### Integer Column
 
 ```yaml
-measure:
-  key: flight
-  dimensions:
-  - delay
+measure: flight
+dimensions:
+- delay
 ```
 [<img src="images/flights_by_delay.png?raw=true" width="500" />](images/flights_by_delay.png?raw=true)
 
@@ -100,10 +93,9 @@ end
 We can then use the `hours_delayed` dimension:
 
 ```yaml
-measure:
-  key: flight
-  dimensions:
-  - hours_delayed
+measure: flight
+dimensions:
+- hours_delayed
 ```
 [<img src="images/flights_by_hours_delayed.png?raw=true" width="500" />](images/flights_by_hours_delayed.png?raw=true)