reports_kit 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f73a1370ec5380438c97d70101c44741b71e11d4
-  data.tar.gz: 512485a9a8703592305f62bc0af6f21cc339d4f0
+  metadata.gz: dce804c6f31b50a81956706d29aa594ecc4f945c
+  data.tar.gz: 03fc82ecfa636b3e20ae44b21d679d30b1b25f0a
 SHA512:
-  metadata.gz: 7f05e2853acc4f162d822351bdeb4e25243557334af27cde8b20edbccc825f95b1458e076a514490b054eb733807d32fa6d310f84e20412f9793d4d56fa47c46
-  data.tar.gz: 58c18993f9d3e24025a4fafe901b2c0345b8fa0019aedc01258873d0a128cc22bf1c92fbd173a7703bf5000c3919d10720f1b4b766c6d0fe5e509b7e9ad31e9b
+  metadata.gz: 0a7c324823890a61f417e69b923c18c5ab946ae6ecc238f8ed1fc8e9dfbf28a46e517772b5f248a6e9c9d8e6522dbd5b5410aeffa091d3efe76bbdd3709f62c0
+  data.tar.gz: 3de91410a8d07370d2664bae9a4deb04cd57100074c66672db30ae591e4f21d824fec442819946dd8993ff5675a50508eb9cebaec40970c68a6624ddd7856bf1

data/.travis.yml

@@ -15,6 +15,7 @@ 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;'
+  - mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql -u root mysql
   - bundle exec appraisal install
 
 script: bundle exec appraisal rspec

data/gemfiles/rails_4_mysql.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    reports_kit (0.5.0)
+    reports_kit (0.7.0)
       rails (>= 3)
       spreadsheet (>= 1.1)
 
@@ -63,6 +63,8 @@ GEM
       activesupport (>= 3.0.0)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
+    groupdate (3.2.0)
+      activesupport (>= 3)
     i18n (0.8.6)
     loofah (2.1.1)
       crass (~> 1.0.2)
@@ -149,6 +151,7 @@ DEPENDENCIES
   appraisal
   database_cleaner (~> 1)
   factory_girl (~> 4)
+  groupdate (~> 3)
   mysql2
   pg (>= 0.15)
   pry (~> 0)
@@ -159,4 +162,4 @@ DEPENDENCIES
   timecop (~> 0)
 
 BUNDLED WITH
-   1.15.4
+   1.16.1

data/gemfiles/rails_4_postgresql.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    reports_kit (0.5.0)
+    reports_kit (0.7.0)
       rails (>= 3)
       spreadsheet (>= 1.1)
 
@@ -63,6 +63,8 @@ GEM
       activesupport (>= 3.0.0)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
+    groupdate (3.2.0)
+      activesupport (>= 3)
     i18n (0.8.6)
     loofah (2.1.1)
       crass (~> 1.0.2)
@@ -148,6 +150,7 @@ DEPENDENCIES
   appraisal
   database_cleaner (~> 1)
   factory_girl (~> 4)
+  groupdate (~> 3)
   pg
   pry (~> 0)
   pry-byebug (~> 1)
@@ -157,4 +160,4 @@ DEPENDENCIES
   timecop (~> 0)
 
 BUNDLED WITH
-   1.15.4
+   1.16.1

data/gemfiles/rails_5.1.4_postgresql.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    reports_kit (0.4.1)
+    reports_kit (0.7.0)
       rails (>= 3)
       spreadsheet (>= 1.1)
 
@@ -66,6 +66,8 @@ GEM
       activesupport (>= 3.0.0)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
+    groupdate (3.2.0)
+      activesupport (>= 3)
     i18n (0.8.6)
     loofah (2.1.1)
       crass (~> 1.0.2)
@@ -154,6 +156,7 @@ DEPENDENCIES
   appraisal
   database_cleaner (~> 1)
   factory_girl (~> 4)
+  groupdate (~> 3)
   pg
   pry (~> 0)
   pry-byebug (~> 1)
@@ -163,4 +166,4 @@ DEPENDENCIES
   timecop (~> 0)
 
 BUNDLED WITH
-   1.15.4
+   1.16.1

data/gemfiles/rails_5_mysql.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    reports_kit (0.5.0)
+    reports_kit (0.7.0)
       rails (>= 3)
       spreadsheet (>= 1.1)
 
@@ -66,6 +66,8 @@ GEM
       activesupport (>= 3.0.0)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
+    groupdate (3.2.0)
+      activesupport (>= 3)
     i18n (0.8.6)
     loofah (2.1.1)
       crass (~> 1.0.2)
@@ -155,6 +157,7 @@ DEPENDENCIES
   appraisal
   database_cleaner (~> 1)
   factory_girl (~> 4)
+  groupdate (~> 3)
   mysql2
   pg (>= 0.15)
   pry (~> 0)
@@ -165,4 +168,4 @@ DEPENDENCIES
   timecop (~> 0)
 
 BUNDLED WITH
-   1.15.4
+   1.16.1

data/gemfiles/rails_5_postgresql.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    reports_kit (0.5.0)
+    reports_kit (0.7.0)
       rails (>= 3)
       spreadsheet (>= 1.1)
 
@@ -66,6 +66,8 @@ GEM
       activesupport (>= 3.0.0)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
+    groupdate (3.2.0)
+      activesupport (>= 3)
     i18n (0.8.6)
     loofah (2.1.1)
       crass (~> 1.0.2)
@@ -154,6 +156,7 @@ DEPENDENCIES
   appraisal
   database_cleaner (~> 1)
   factory_girl (~> 4)
+  groupdate (~> 3)
   pg
   pry (~> 0)
   pry-byebug (~> 1)
@@ -163,4 +166,4 @@ DEPENDENCIES
   timecop (~> 0)
 
 BUNDLED WITH
-   1.15.4
+   1.16.1

data/lib/reports_kit.rb

@@ -15,6 +15,7 @@ require 'reports_kit/order'
 require 'reports_kit/relative_time'
 require 'reports_kit/report_builder'
 require 'reports_kit/reports_controller'
+require 'reports_kit/utils'
 require 'reports_kit/value'
 require 'reports_kit/version'
 
@@ -25,6 +26,7 @@ require 'reports_kit/reports/data/add_table_aggregations'
 require 'reports_kit/reports/data/aggregate_composite'
 require 'reports_kit/reports/data/aggregate_one_dimension'
 require 'reports_kit/reports/data/aggregate_two_dimensions'
+require 'reports_kit/reports/data/chart_data_for_data_method'
 require 'reports_kit/reports/data/chart_options'
 require 'reports_kit/reports/data/format_one_dimension'
 require 'reports_kit/reports/data/format_table'
@@ -51,6 +53,7 @@ require 'reports_kit/reports/dimension_with_series'
 require 'reports_kit/reports/filter'
 require 'reports_kit/reports/filter_with_series'
 require 'reports_kit/reports/generate_autocomplete_results'
+require 'reports_kit/reports/generate_autocomplete_method_results'
 require 'reports_kit/reports/inferrable_configuration'
 require 'reports_kit/reports/model_settings'
 require 'reports_kit/reports/properties'
@@ -65,4 +68,12 @@ module ReportsKit
   def self.configuration
     @configuration ||= Configuration.new
   end
+
+  def self.parse_date_range(string)
+    ReportsKit::Reports::Data::Utils.parse_date_range(string)
+  end
+
+  def self.format_date_range(string)
+    ReportsKit::Reports::Data::Utils.format_date_range(string)
+  end
 end

data/lib/reports_kit/configuration.rb

@@ -13,7 +13,6 @@ module ReportsKit
       self.autocomplete_results_method = nil
       self.cache_duration = 5.minutes
       self.cache_store = nil
-      self.context_record_method = nil
       self.custom_methods = {}
       self.default_dimension_limit = 30
       self.default_properties = nil

data/lib/reports_kit/form_builder.rb

@@ -15,7 +15,7 @@ module ReportsKit
 
     def check_box(filter_key, options = {})
       filter = properties_to_filter.perform(filter_key)
-      checked = filter.normalized_properties[:criteria][:value] == 'true'
+      checked = options.key?(:value) ? options[:value] : filter.normalized_properties[:criteria].try(:[], :value) == 'true'
       check_box_tag(filter_key, '1', checked, options)
     end
 
@@ -23,7 +23,7 @@ module ReportsKit
       filter = properties_to_filter.perform(filter_key)
       defaults = { class: 'form-control input-sm date_range_picker' }
       options = defaults.deep_merge(options)
-      value = filter.normalized_properties[:criteria][:value].presence
+      value = options[:value].presence || filter.normalized_properties[:criteria].try(:[], :value).presence
       value ||= default_date_range_value
       text_field_tag(filter_key, value, options)
     end
@@ -50,7 +50,7 @@ module ReportsKit
       filter = properties_to_filter.perform(filter_key)
       defaults = { class: 'form-control input-sm' }
       options = defaults.deep_merge(options)
-      text_field_tag(filter_key, filter.normalized_properties[:criteria][:value], options)
+      text_field_tag(filter_key, filter.normalized_properties[:criteria].try(:[], :value), options)
     end
 
     private

data/lib/reports_kit/reports/adapters/mysql.rb

@@ -16,6 +16,10 @@ module ReportsKit
             raise ArgumentError.new("Unsupported first_day_of_week: #{ReportsKit.configuration.first_day_of_week}")
           end
         end
+
+        def self.truncate_to_month(column)
+          "DATE_SUB(DATE(#{column}), INTERVAL DAY(#{column}) - 1 DAY)"
+        end
       end
     end
   end

data/lib/reports_kit/reports/adapters/postgresql.rb

@@ -16,6 +16,10 @@ module ReportsKit
             raise ArgumentError.new("Unsupported first_day_of_week: #{ReportsKit.configuration.first_day_of_week}")
           end
         end
+
+        def self.truncate_to_month(column)
+          "DATE_TRUNC('month', #{column}::date)"
+        end
       end
     end
   end

data/lib/reports_kit/reports/data/chart_data_for_data_method.rb

@@ -0,0 +1,62 @@
+module ReportsKit
+  class ChartDataForDataMethod
+    attr_accessor :properties
+
+    def initialize(properties)
+      self.properties = properties
+    end
+
+    def perform
+      klass, method_name = ReportsKit::Utils.string_to_class_method(properties[:data_method], 'data_method')
+      raw_data = klass.public_send(method_name, properties)
+      {
+        raw_data: raw_data,
+        formatted_data: format_returned_data(raw_data)
+      }
+    end
+
+    private
+
+    def format_returned_data(returned_data)
+      return [] if returned_data.blank?
+      returned_data = returned_data.to_a
+
+      first_key = returned_data.first.first
+      if first_key.is_a?(Array) && first_key.length == 2
+        format_two_dimensional_returned_data(returned_data)
+      else
+        {
+          labels: returned_data.map(&:first),
+          datasets: [
+            {
+              data: returned_data.map(&:last)
+            }
+          ]
+        }
+      end
+    end
+
+    def format_two_dimensional_returned_data(returned_data)
+      primary_keys_secondary_keys_values = {}
+      secondary_keys_primary_keys_values = {}
+      secondary_keys = []
+      returned_data.each do |(primary_key, secondary_key), value|
+        secondary_keys_primary_keys_values[secondary_key] ||= {}
+        secondary_keys_primary_keys_values[secondary_key][primary_key] = value
+        primary_keys_secondary_keys_values[primary_key] ||= {}
+        primary_keys_secondary_keys_values[primary_key][secondary_key] = value
+      end
+      primary_keys = primary_keys_secondary_keys_values.keys
+      datasets = secondary_keys_primary_keys_values.map do |secondary_key, primary_keys_values|
+        {
+          label: secondary_key,
+          data: primary_keys.map { |primary_key| primary_keys_values[primary_key] || 0 }
+        }
+      end
+      {
+        labels: primary_keys,
+        datasets: datasets
+      }
+    end
+  end
+end

data/lib/reports_kit/reports/data/generate.rb

@@ -18,6 +18,23 @@ module ReportsKit
           data = ReportsKit::Cache.get(properties, context_record)
           return data.deep_symbolize_keys if data
 
+          data_method_data = ChartDataForDataMethod.new(properties).perform if has_data_method?
+          chart_data = data_method_data ? data_method_data[:formatted_data] : properties_to_chart_data
+          data = { chart_data: chart_data }
+          data = ChartOptions.new(data, options: properties[:chart], inferred_options: inferred_options).perform
+          data[:report_options] = report_options if report_options
+          data = format_table_data(data, data_method_data) if table_or_csv?
+          ReportsKit::Cache.set(properties, context_record, data)
+          data
+        end
+
+        private
+
+        def has_data_method?
+          properties[:data_method].present?
+        end
+
+        def properties_to_chart_data
           if two_dimensions?
             raw_data = Data::FormatTwoDimensions.new(serieses.first, serieses_results.first.last, order: order, limit: limit).perform
           else
@@ -27,18 +44,9 @@ module ReportsKit
           raw_data = Data::AddTableAggregations.new(raw_data, report_options: report_options).perform if table_or_csv?
           raw_data = data_format_method.call(data: raw_data, properties: properties, context_record: context_record) if data_format_method
           raw_data = csv_data_format_method.call(data: raw_data, properties: properties, context_record: context_record) if csv_data_format_method && format == 'csv'
-          chart_data = format_chart_data(raw_data)
-
-          data = { chart_data: chart_data }
-          data = ChartOptions.new(data, options: properties[:chart], inferred_options: inferred_options).perform
-          data[:report_options] = report_options if report_options
-          data = format_table_data(data) if table_or_csv?
-          ReportsKit::Cache.set(properties, context_record, data)
-          data
+          format_chart_data(raw_data)
         end
 
-        private
-
         def format_chart_data(raw_data)
           chart_data = {}
           chart_data[:labels] = raw_data[:entities].map(&:label)
@@ -51,14 +59,18 @@ module ReportsKit
           chart_data
         end
 
-        def format_table_data(data)
+        def format_table_data(data, data_method_data)
+          data[:type] = format
+          if has_data_method?
+            data[:table_data] = data_method_data[:raw_data]
+            return data
+          end
           data[:table_data] = Data::FormatTable.new(
             data.delete(:chart_data),
             format: format,
-            first_column_label: primary_dimension.label,
+            first_column_label: primary_dimension.try(:label),
             report_options: report_options
           ).perform
-          data[:type] = format
           data
         end
 
@@ -132,6 +144,7 @@ module ReportsKit
         end
 
         def inferred_options
+          return {} if has_data_method?
           {
             x_axis_label: primary_dimension.label,
             y_axis_label: serieses.length == 1 ? serieses.first.label : nil

data/lib/reports_kit/reports/data/utils.rb

@@ -14,6 +14,11 @@ module ReportsKit
           time.strftime('%b %-d, \'%y')
         end
 
+        def self.format_date_range(string)
+          start_at, end_at = parse_date_range(string, type: Array)
+          [format_display_time(start_at), FilterTypes::Datetime::SEPARATOR, format_display_time(end_at)].join(' ')
+        end
+
         def self.format_time_value(value)
           time = RelativeTime.parse(value, prevent_exceptions: true)
           return value unless time
@@ -36,6 +41,18 @@ module ReportsKit
           RelativeTime.parse(string)
         end
 
+        def self.parse_date_range(string, type: nil)
+          return if string.blank?
+          start_string, end_string = string.split(FilterTypes::Datetime::SEPARATOR)
+          start_at = parse_date_string(start_string)
+          end_at = parse_date_string(end_string)
+          if type == Array
+            [start_at, end_at]
+          else
+            (start_at..end_at)
+          end
+        end
+
         def self.populate_sparse_hash(hash, dimension:)
           keys = hash.keys
           is_nested = dimension.series.has_two_dimensions?
@@ -69,15 +86,23 @@ module ReportsKit
           first_key = first_key.to_date
           granularity = dimension.granularity
 
-          first_key = first_key.beginning_of_week(ReportsKit.configuration.first_day_of_week) if granularity == 'week'
           keys = keys.sort
           last_key = (dimension.last_key || keys.last).to_date
-          last_key = last_key.beginning_of_week(ReportsKit.configuration.first_day_of_week) if granularity == 'week'
-          last_key ||= Date.today.beginning_of_week(ReportsKit.configuration.first_day_of_week) if granularity == 'week'
+          if granularity == 'week'
+            first_key = first_key.beginning_of_week(ReportsKit.configuration.first_day_of_week)
+            last_key = last_key.beginning_of_week(ReportsKit.configuration.first_day_of_week)
+          elsif granularity == 'month'
+            first_key = first_key.beginning_of_month
+            last_key = last_key.beginning_of_month
+          end
 
           date = first_key
           populated_keys = []
-          interval = granularity == 'week' ? 1.week : 1.day
+          interval = case granularity
+                     when 'day' then 1.day
+                     when 'month' then 1.month
+                     else 1.week
+                     end
           loop do
             populated_keys << date
             break if date >= last_key
@@ -111,9 +136,10 @@ module ReportsKit
 
         def self.dimension_to_dimension_ids_dimension_instances(dimension, dimension_ids)
           return nil unless dimension.instance_class
-          dimension_instances = dimension.instance_class.where(id: dimension_ids.uniq)
+          primary_key = dimension.instance_class.primary_key
+          dimension_instances = dimension.instance_class.where(primary_key => dimension_ids.uniq)
           dimension_ids_dimension_instances = dimension_instances.map do |dimension_instance|
-            [dimension_instance.id, dimension_instance]
+            [dimension_instance.send(primary_key), dimension_instance]
           end
           Hash[dimension_ids_dimension_instances]
         end

data/lib/reports_kit/reports/dimension_with_series.rb

@@ -2,7 +2,7 @@ module ReportsKit
   module Reports
     class DimensionWithSeries
       DEFAULT_GRANULARITY = 'week'
-      VALID_GRANULARITIES = %w(day week).freeze
+      VALID_GRANULARITIES = %w(day week month).freeze
       ADAPTER_NAMES_CLASSES = {
         'mysql2' => Adapters::Mysql,
         'postgresql' => Adapters::Postgresql
@@ -52,7 +52,11 @@ module ReportsKit
         elsif configured_by_association?
           inferred_settings_from_association[:column]
         elsif configured_by_column? && configured_by_time?
-          granularity == 'day' ? day_expression : week_expression
+          case granularity
+          when 'day' then day_expression
+          when 'month' then month_expression
+          else week_expression
+          end
         elsif configured_by_column?
           column_expression
         else
@@ -131,6 +135,10 @@ module ReportsKit
       def week_expression
         adapter.truncate_to_week(column_expression)
       end
+
+      def month_expression
+        adapter.truncate_to_month(column_expression)
+      end
     end
   end
 end

data/lib/reports_kit/reports/filter_types/datetime.rb

@@ -17,13 +17,7 @@ module ReportsKit
         end
 
         def start_at_end_at
-          @start_at_end_at ||= begin
-            return unless valid?
-            start_string, end_string = value.split(SEPARATOR)
-            start_at = ReportsKit::Reports::Data::Utils.parse_date_string(start_string)
-            end_at = ReportsKit::Reports::Data::Utils.parse_date_string(end_string)
-            adjust_range_to_dimension(start_at, end_at)
-          end
+          @start_at_end_at ||= valid? ? adjust_range_to_dimension(*Reports::Data::Utils.parse_date_range(value, type: Array)) : nil
         end
 
         def start_at
@@ -41,6 +35,10 @@ module ReportsKit
             start_at.beginning_of_week(ReportsKit.configuration.first_day_of_week),
             end_at.end_of_week(ReportsKit.configuration.first_day_of_week)
           ] if primary_dimension.granularity == 'week'
+          return [
+            start_at.beginning_of_month,
+            end_at.end_of_month
+          ] if primary_dimension.granularity == 'month'
           [start_at, end_at]
         end
 

data/lib/reports_kit/reports/generate_autocomplete_method_results.rb

@@ -0,0 +1,29 @@
+module ReportsKit
+  module Reports
+    class GenerateAutocompleteMethodResults
+      attr_accessor :filter_key, :params, :properties
+
+      def initialize(filter_key, properties, params)
+        self.filter_key = filter_key
+        self.params = params
+        self.properties = properties
+      end
+
+      def perform
+        return unless properties[:ui_filters]
+        klass, method_name = ReportsKit::Utils.string_to_class_method(autocomplete_method, 'autocomplete_method')
+        klass.public_send(method_name, params, properties)
+      end
+
+      private
+
+      def filter_hash
+        properties[:ui_filters].find { |filter_params| filter_params.is_a?(Hash) && filter_params[:key] == filter_key }
+      end
+
+      def autocomplete_method
+        filter_hash[:autocomplete_method]
+      end
+    end
+  end
+end

data/lib/reports_kit/reports/generate_autocomplete_results.rb

@@ -1,10 +1,11 @@
 module ReportsKit
   module Reports
     class GenerateAutocompleteResults
-      attr_accessor :params, :filter_key, :filter, :context_params, :context_record
+      attr_accessor :params, :properties, :filter_key, :filter, :context_params, :context_record
 
       def initialize(params, properties, context_record: nil)
         self.params = params
+        self.properties = properties
         self.context_params = params[:context_params]
         self.filter_key = params[:key]
         self.filter = Reports::PropertiesToFilter.new(properties, context_record: context_record).perform(filter_key)
@@ -12,6 +13,8 @@ module ReportsKit
       end
 
       def perform
+        autocomplete_method_results = Reports::GenerateAutocompleteMethodResults.new(filter_key, properties, params).perform
+        return autocomplete_method_results if autocomplete_method_results
         raise ArgumentError.new("Could not find a model for filter_key: '#{filter_key}'") unless model
         return autocomplete_results_method.call(params: params, context_record: context_record, relation: relation) if autocomplete_results_method
         results = filter.apply_contextual_filters(relation, context_params)

data/lib/reports_kit/utils.rb

@@ -0,0 +1,11 @@
+module ReportsKit
+  class Utils
+    def self.string_to_class_method(string, string_identifer)
+      class_name, method_name = string.split('.')
+      raise ArgumentError.new("The #{string_identifer} value should be a class method with a format of MyClass.my_method") unless class_name && method_name
+      klass = class_name.constantize
+      raise ArgumentError.new("The #{string_identifer} class (#{class_name}) does not respond to a method named \"#{method_name}\"") unless klass.respond_to?(method_name)
+      [klass, method_name]
+    end
+  end
+end

data/lib/reports_kit/version.rb

@@ -1,3 +1,3 @@
 module ReportsKit
-  VERSION = '0.5.0'
+  VERSION = '0.7.0'
 end

data/reports_kit.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3'
   s.add_development_dependency 'database_cleaner', '~> 1'
   s.add_development_dependency 'factory_girl', '~> 4'
+  s.add_development_dependency 'groupdate', '~> 3'
   s.add_development_dependency 'pg', '>= 0.15'
   s.add_development_dependency 'pry', '~> 0'
   s.add_development_dependency 'pry-byebug', '~> 1'

data/spec/fixtures/generate_inputs.yml

@@ -242,3 +242,13 @@
     - key: opened_at
     - key: repo
   order: count desc
+- data_method: ExampleDataMethods.issues_by_opened_at
+- data_method: ExampleDataMethods.issues_by_opened_at_and_repo
+- data_method: ExampleDataMethods.issues_by_opened_at_with_filters
+- data_method: ExampleDataMethods.issues_by_opened_at_with_filters
+  ui_filters:
+    state: open
+- data_method: ExampleDataMethods.issues_by_opened_at_with_filters
+  ui_filters:
+    state: open
+  format: table

data/spec/fixtures/generate_outputs.yml

@@ -1064,3 +1064,153 @@
         :xPadding: 8
         :yPadding: 7
   :type: bar
+- :chart_data:
+    :labels:
+    - Dec 13, '09
+    - Dec 20, '09
+    - Dec 27, '09
+    :datasets:
+    - :data:
+      - 1
+      - 0
+      - 1
+      :backgroundColor: "#1f77b4"
+      :borderColor: "#1f77b4"
+    :options:
+      :scales:
+        :xAxes:
+        - :gridLines:
+            :display: false
+          :barPercentage: 0.9
+          :categoryPercentage: 0.9
+        :yAxes:
+        - :ticks:
+            :beginAtZero: true
+      :legend:
+        :labels:
+          :usePointStyle: true
+      :maintainAspectRatio: false
+      :tooltips:
+        :xPadding: 8
+        :yPadding: 7
+  :type: bar
+- :chart_data:
+    :labels:
+    - Dec 13, '09
+    - Dec 20, '09
+    - Dec 27, '09
+    :datasets:
+    - :label: foo/bar1
+      :data:
+      - 1
+      - 0
+      - 1
+      :backgroundColor: "#1f77b4"
+      :borderColor: "#1f77b4"
+    :options:
+      :scales:
+        :xAxes:
+        - :gridLines:
+            :display: false
+          :barPercentage: 0.9
+          :categoryPercentage: 0.9
+        :yAxes:
+        - :ticks:
+            :beginAtZero: true
+      :legend:
+        :labels:
+          :usePointStyle: true
+      :maintainAspectRatio: false
+      :tooltips:
+        :xPadding: 8
+        :yPadding: 7
+  :type: bar
+- :chart_data:
+    :labels:
+    - Dec 13, '09
+    - Dec 20, '09
+    - Dec 27, '09
+    :datasets:
+    - :data:
+      - 1
+      - 0
+      - 1
+      :backgroundColor: "#1f77b4"
+      :borderColor: "#1f77b4"
+    :options:
+      :scales:
+        :xAxes:
+        - :gridLines:
+            :display: false
+          :barPercentage: 0.9
+          :categoryPercentage: 0.9
+        :yAxes:
+        - :ticks:
+            :beginAtZero: true
+      :legend:
+        :labels:
+          :usePointStyle: true
+      :maintainAspectRatio: false
+      :tooltips:
+        :xPadding: 8
+        :yPadding: 7
+  :type: bar
+- :chart_data:
+    :labels:
+    - Dec 13, '09
+    :datasets:
+    - :data:
+      - 1
+      :backgroundColor: "#1f77b4"
+      :borderColor: "#1f77b4"
+    :options:
+      :scales:
+        :xAxes:
+        - :gridLines:
+            :display: false
+          :barPercentage: 0.9
+          :categoryPercentage: 0.9
+        :yAxes:
+        - :ticks:
+            :beginAtZero: true
+      :legend:
+        :labels:
+          :usePointStyle: true
+      :maintainAspectRatio: false
+      :tooltips:
+        :xPadding: 8
+        :yPadding: 7
+  :type: bar
+- :chart_data:
+    :labels:
+    - Date
+    - Dec 13, '09
+    :datasets:
+    - :data:
+      - Issue count
+      - 1
+      :backgroundColor: "#1f77b4"
+      :borderColor: "#1f77b4"
+    :options:
+      :scales:
+        :xAxes:
+        - :gridLines:
+            :display: false
+          :barPercentage: 0.9
+          :categoryPercentage: 0.9
+        :yAxes:
+        - :ticks:
+            :beginAtZero: true
+      :legend:
+        :labels:
+          :usePointStyle: true
+      :maintainAspectRatio: false
+      :tooltips:
+        :xPadding: 8
+        :yPadding: 7
+  :type: table
+  :table_data:
+  - - Date
+    - Issue count
+  - - Dec 13, '09
+    - 1

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

@@ -274,6 +274,36 @@ describe ReportsKit::Reports::Data::Generate do
         })
       end
     end
+
+    context 'with month granularity' do
+      let(:properties) do
+        {
+          measure: 'issue',
+          dimensions: [{ key: 'opened_at', granularity: 'month' }]
+        }
+      end
+      let!(:issues) do
+        [
+          create(:issue, repo: repo, opened_at: now - 2.days),
+          create(:issue, repo: repo, opened_at: now)
+        ]
+      end
+
+      it 'returns the data' do
+        expect(chart_data).to eq({
+          labels: [
+            ReportsKit::Reports::Data::Utils.format_display_time(issues.first.opened_at.beginning_of_month),
+            ReportsKit::Reports::Data::Utils.format_display_time(issues.last.opened_at.beginning_of_month)
+          ],
+          datasets: [
+            {
+              label: 'Issues',
+              data: [1, 1]
+            }
+          ]
+        })
+      end
+    end
   end
 
   context 'with an association dimension' do

data/spec/reports_kit/reports/generate_autocomplete_results_spec.rb

@@ -23,7 +23,7 @@ describe ReportsKit::Reports::GenerateAutocompleteResults do
     end
 
     it 'returns the results' do
-      expect(subject).to eq([
+      expect(subject).to match_array([
         { id: repo.id, text: repo.to_s },
         { id: repo2.id, text: repo2.to_s }
       ])
@@ -42,7 +42,7 @@ describe ReportsKit::Reports::GenerateAutocompleteResults do
       end
 
       it 'returns the results' do
-        expect(subject).to eq([
+        expect(subject).to match_array([
           { id: repo.id, text: repo.to_s }
         ])
       end
@@ -59,7 +59,7 @@ describe ReportsKit::Reports::GenerateAutocompleteResults do
       end
 
       it 'returns the results' do
-        expect(subject).to eq([
+        expect(subject).to match_array([
           { id: repo.id, text: repo.to_s },
           { id: repo2.id, text: repo2.to_s }
         ])

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'reports_kit'
 
 require 'database_cleaner'
+require 'groupdate'
 require 'pry'
 require 'pry-byebug'
 require 'timecop'
@@ -35,6 +36,7 @@ Dir.glob("#{directory}/support/models/**/*.rb") { |file| require file }
 Dir.glob("#{directory}/factories/*.rb") { |file| require file }
 
 require 'support/config'
+require 'support/example_data_methods'
 require 'support/schema'
 
 RSpec.configure do |config|

data/spec/support/example_data_methods.rb

@@ -0,0 +1,25 @@
+class ExampleDataMethods
+  def self.issues_by_opened_at(properties)
+    Issue.group_by_week(:opened_at).count.map { |date, count| [format_date(date), count] }
+  end
+
+  def self.issues_by_opened_at_and_repo(properties)
+    Issue.group_by_week(:opened_at).joins(:repo).group('repos.full_name').count.map do |(date, name), count|
+      [[format_date(date), name], count]
+    end
+  end
+
+  def self.issues_by_opened_at_with_filters(properties)
+    format = properties[:format]
+    ui_filters = properties[:ui_filters]
+    issues = Issue.group_by_week(:opened_at)
+    issues = issues.where(state: ui_filters[:state]) if ui_filters.try(:[], :state).present?
+    dates_issue_counts = issues.count.map { |date, count| [format_date(date), count] }
+    return dates_issue_counts unless format == 'table'
+    [['Date', 'Issue count']] + dates_issue_counts
+  end
+
+  def self.format_date(date)
+    date.strftime('%b %-d, \'%y')
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reports_kit
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Tom Benner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2018-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: groupdate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -226,6 +240,7 @@ files:
 - 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_data_for_data_method.rb
 - lib/reports_kit/reports/data/chart_options.rb
 - lib/reports_kit/reports/data/format_one_dimension.rb
 - lib/reports_kit/reports/data/format_table.rb
@@ -246,6 +261,7 @@ files:
 - lib/reports_kit/reports/filter_types/records.rb
 - lib/reports_kit/reports/filter_types/string.rb
 - lib/reports_kit/reports/filter_with_series.rb
+- lib/reports_kit/reports/generate_autocomplete_method_results.rb
 - lib/reports_kit/reports/generate_autocomplete_results.rb
 - lib/reports_kit/reports/inferrable_configuration.rb
 - lib/reports_kit/reports/model_settings.rb
@@ -253,6 +269,7 @@ files:
 - lib/reports_kit/reports/properties_to_filter.rb
 - lib/reports_kit/reports/series.rb
 - lib/reports_kit/reports_controller.rb
+- lib/reports_kit/utils.rb
 - lib/reports_kit/value.rb
 - lib/reports_kit/version.rb
 - reports_kit.gemspec
@@ -274,6 +291,7 @@ files:
 - spec/reports_kit/reports/generate_autocomplete_results_spec.rb
 - spec/spec_helper.rb
 - spec/support/config.rb
+- spec/support/example_data_methods.rb
 - spec/support/factory_girl.rb
 - spec/support/helpers.rb
 - spec/support/models/issue.rb