reports_kit 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dcd95571d20aa7e439e9b97a97cefbd87ab3900
-  data.tar.gz: 5ca4d871580f9d8dba7fa71a8219d6997a1b6472
+  metadata.gz: 13094de820c79cec7858078fa4c307a0137c001f
+  data.tar.gz: 971b1281d81369b1539aad7c4ac977a72c66558b
 SHA512:
-  metadata.gz: 63afd0e91d6953bd43313af32908090c758a8adae00f56a2ce520af5cd934237f549cbf66e6fd32da95642f301b8888017ab3de4c6306a748a78d07189100445
-  data.tar.gz: d46b89fd02d6183f09ab3de6cb1550718c5f04319cb3dfa673bfc27f9b0fba41290bcf82e5a98a3478954707e778ca40b14aa3fb873810de165f4b43c8754fb6
+  metadata.gz: 9c2d64e334083cb58173e9d3ae7daa4453a45c2f6715bf971ea01bc5b1f1b4a0d01bcddf4abc50c7acdaa2d2cedf31bc78ddbe16e1f8e97e363f0200fe53f8e4
+  data.tar.gz: f666b9e785d28c22754f8fd6e3fe178f04f3add4599b3b0673240e15d3ea7547a051e952ae683b3a334a6de6d43e24bcb062c86a95c61646e74f916aa9064691

data/gemfiles/rails_4_mysql.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    reports_kit (0.3.2)
+    reports_kit (0.4.0)
       rails (>= 3)
       spreadsheet (>= 1.1)
 

data/gemfiles/rails_4_postgresql.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    reports_kit (0.3.2)
+    reports_kit (0.4.0)
       rails (>= 3)
       spreadsheet (>= 1.1)
 

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

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    reports_kit (0.3.2)
+    reports_kit (0.4.0)
       rails (>= 3)
       spreadsheet (>= 1.1)
 

data/gemfiles/rails_5_mysql.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    reports_kit (0.3.2)
+    reports_kit (0.4.0)
       rails (>= 3)
       spreadsheet (>= 1.1)
 

data/gemfiles/rails_5_postgresql.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    reports_kit (0.3.2)
+    reports_kit (0.4.0)
       rails (>= 3)
       spreadsheet (>= 1.1)
 

data/lib/reports_kit.rb

@@ -31,6 +31,7 @@ require 'reports_kit/reports/data/format_table'
 require 'reports_kit/reports/data/format_two_dimensions'
 require 'reports_kit/reports/data/generate'
 require 'reports_kit/reports/data/generate_for_properties'
+require 'reports_kit/reports/data/normalize_properties'
 require 'reports_kit/reports/data/populate_one_dimension'
 require 'reports_kit/reports/data/populate_two_dimensions'
 require 'reports_kit/reports/data/utils'
@@ -44,12 +45,14 @@ require 'reports_kit/reports/filter_types/string'
 
 require 'reports_kit/reports/abstract_series'
 require 'reports_kit/reports/composite_series'
+require 'reports_kit/reports/contextual_filter'
 require 'reports_kit/reports/dimension'
 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/inferrable_configuration'
+require 'reports_kit/reports/model_settings'
 require 'reports_kit/reports/properties'
 require 'reports_kit/reports/properties_to_filter'
 require 'reports_kit/reports/series'

data/lib/reports_kit/base_controller.rb

@@ -6,5 +6,12 @@ module ReportsKit
     def context_record
       ReportsKit.configuration.context_record(self)
     end
+
+    private
+
+    def modify_context_params
+      modify_context_params_method = ReportsKit.configuration.modify_context_params_method
+      params[:context_params] = modify_context_params_method.call(params[:context_params], self) if modify_context_params_method
+    end
   end
 end

data/lib/reports_kit/configuration.rb

@@ -1,8 +1,8 @@
 module ReportsKit
   class Configuration
     attr_accessor :autocomplete_results_method, :cache_duration, :cache_store, :context_record_method, :custom_methods,
-      :default_dimension_limit, :default_properties, :first_day_of_week, :properties_method, :report_filename_method,
-      :use_concurrent_queries
+      :default_dimension_limit, :default_properties, :first_day_of_week, :modify_context_params_method, :properties_method,
+      :report_filename_method, :use_concurrent_queries
 
     DEFAULT_PROPERTIES_METHOD = lambda do |env|
       path = Rails.root.join('config', 'reports_kit', 'reports', "#{report_key}.yml")
@@ -18,6 +18,7 @@ module ReportsKit
       self.default_dimension_limit = 30
       self.default_properties = nil
       self.first_day_of_week = :sunday
+      self.modify_context_params_method = nil
       self.properties_method = DEFAULT_PROPERTIES_METHOD
       self.report_filename_method = nil
       self.use_concurrent_queries = false

data/lib/reports_kit/filters_controller.rb

@@ -1,5 +1,7 @@
 module ReportsKit
   class FiltersController < ReportsKit::BaseController
+    before_action :modify_context_params
+
     def autocomplete
       properties = Reports::Properties.generate(self)
       results = Reports::GenerateAutocompleteResults.new(params, properties, context_record: context_record).perform

data/lib/reports_kit/model_configuration.rb

@@ -1,9 +1,10 @@
 module ReportsKit
   class ModelConfiguration
-    attr_accessor :aggregations, :dimensions, :filters
+    attr_accessor :aggregations, :contextual_filters, :dimensions, :filters
 
     def initialize
       self.aggregations = []
+      self.contextual_filters = []
       self.dimensions = []
       self.filters = []
     end
@@ -12,6 +13,10 @@ module ReportsKit
       aggregations << { key: key.to_s, expression: expression }.merge(properties).symbolize_keys
     end
 
+    def contextual_filter(key, method)
+      contextual_filters << { key: key, method: method }
+    end
+
     def dimension(key, properties)
       dimensions << { key: key.to_s }.merge(properties).symbolize_keys
     end

data/lib/reports_kit/reports/contextual_filter.rb

@@ -0,0 +1,19 @@
+module ReportsKit
+  module Reports
+    class ContextualFilter
+      attr_accessor :key, :model_settings
+
+      delegate :settings_from_model, to: :model_settings
+
+      def initialize(key, series:)
+        self.key = key.to_sym
+        self.model_settings = ModelSettings.new(series, :contextual_filters, self.key)
+      end
+
+      def apply(relation, context_params)
+        raise ArgumentError.new("contextual_filter with key :#{key} not defined in #{model_class}") if settings_from_model.blank?
+        settings_from_model[:method].call(relation, context_params)
+      end
+    end
+  end
+end

data/lib/reports_kit/reports/data/format_table.rb

@@ -4,8 +4,6 @@ module ReportsKit
       class FormatTable
         attr_accessor :data, :format, :first_column_label, :report_options
 
-        VALID_AGGREGATION_OPERATORS = [:sum]
-
         def initialize(data, format:, first_column_label:, report_options:)
           self.data = data
           self.format = format

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

@@ -6,10 +6,11 @@ module ReportsKit
 
         attr_accessor :properties, :context_record
 
-        def initialize(properties, context_record: nil)
+        def initialize(properties, context_record: nil, context_params: nil)
           self.properties = properties.deep_symbolize_keys
           self.properties = ReportsKit.configuration.default_properties.deep_merge(self.properties) if ReportsKit.configuration.default_properties
-          self.properties = Utils.normalize_properties(self.properties)
+          self.properties[:context_params] = context_params if context_params
+          self.properties = NormalizeProperties.new(self.properties).perform
           self.context_record = context_record
         end
 

data/lib/reports_kit/reports/data/normalize_properties.rb

@@ -0,0 +1,62 @@
+module ReportsKit
+  module Reports
+    module Data
+      class NormalizeProperties
+        attr_accessor :raw_properties
+
+        def initialize(raw_properties)
+          self.raw_properties = raw_properties.dup
+        end
+
+        def perform
+          context_properties = raw_properties.slice(:context_params, :contextual_filters)
+          properties = recursively_normalize_properties(raw_properties)
+          populate_context_properties(properties, context_properties: context_properties)
+        end
+
+        private
+
+        def normalize_filters(series_properties, ui_filters)
+          series_properties[:filters] = series_properties[:filters].map do |filter_properties|
+            filter_properties = { key: filter_properties } if filter_properties.is_a?(String)
+            key = filter_properties[:key]
+            ui_key = filter_properties[:ui_key]
+            value = ui_filters[key.to_sym]
+            value ||= ui_filters[ui_key.to_sym] if ui_key
+            if value
+              filter_properties[:criteria] ||= {}
+              filter_properties[:criteria][:value] = value
+            end
+            filter_properties
+          end
+          series_properties
+        end
+
+        def recursively_normalize_properties(properties, ui_filters: nil)
+          can_have_nesting = properties[:composite_operator].present? || properties[:series].is_a?(Array)
+          ui_filters ||= properties[:ui_filters]
+          properties[:series] ||= properties.slice(*Series::VALID_KEYS).presence
+          properties[:series] = [properties[:series]] if properties[:series].is_a?(Hash) && properties[:series].present?
+          return properties if ui_filters.blank? || properties[:series].blank?
+          properties[:series] = properties[:series].map do |series_properties|
+            series_properties = recursively_normalize_properties(series_properties, ui_filters: ui_filters) if can_have_nesting
+            next(series_properties) if series_properties[:filters].blank?
+            normalize_filters(series_properties, ui_filters)
+          end
+          properties
+        end
+
+        def populate_context_properties(properties, context_properties: nil)
+          return properties if context_properties.blank? || properties.blank? || properties[:series].blank?
+          can_have_nesting = properties[:composite_operator].present? || properties[:series].is_a?(Array)
+          properties[:series] = properties[:series].map do |series_properties|
+            series_properties = series_properties.merge(context_properties)
+            series_properties = populate_context_properties(series_properties, context_properties: context_properties) if can_have_nesting
+            series_properties
+          end
+          properties
+        end
+      end
+    end
+  end
+end

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

@@ -146,37 +146,6 @@ module ReportsKit
           formatted_value = value_format_method.call(raw_value) if value_format_method
           Value.new(raw_value, formatted_value)
         end
-
-        def self.normalize_filters(series_properties, ui_filters)
-          series_properties[:filters] = series_properties[:filters].map do |filter_properties|
-            filter_properties = { key: filter_properties } if filter_properties.is_a?(String)
-            key = filter_properties[:key]
-            ui_key = filter_properties[:ui_key]
-            value = ui_filters[key.to_sym]
-            value ||= ui_filters[ui_key.to_sym] if ui_key
-            if value
-              filter_properties[:criteria] ||= {}
-              filter_properties[:criteria][:value] = value
-            end
-            filter_properties
-          end
-          series_properties
-        end
-
-        def self.normalize_properties(properties, ui_filters: nil)
-          can_have_nesting = properties[:composite_operator].present? || properties[:series].is_a?(Array)
-          ui_filters ||= properties[:ui_filters]
-          properties = properties.dup
-          properties[:series] ||= properties.slice(*Series::VALID_KEYS).presence
-          properties[:series] = [properties[:series]] if properties[:series].is_a?(Hash) && properties[:series].present?
-          return properties if ui_filters.blank? || properties[:series].blank?
-          properties[:series] = properties[:series].map do |series_properties|
-            series_properties = normalize_properties(series_properties, ui_filters: ui_filters) if can_have_nesting
-            next(series_properties) if series_properties[:filters].blank?
-            normalize_filters(series_properties, ui_filters)
-          end
-          properties
-        end
       end
     end
   end

data/lib/reports_kit/reports/inferrable_configuration.rb

@@ -9,13 +9,15 @@ module ReportsKit
         :text
       ]
 
-      attr_accessor :inferrable, :inferrable_type
+      attr_accessor :inferrable, :inferrable_type, :model_settings
 
       delegate :key, :expression, :series, to: :inferrable
+      delegate :model_class, :settings_from_model, to: :model_settings
 
       def initialize(inferrable, inferrable_type)
         self.inferrable = inferrable
         self.inferrable_type = inferrable_type
+        self.model_settings = ModelSettings.new(series, inferrable_type, key)
       end
 
       def configuration_strategy
@@ -47,15 +49,6 @@ module ReportsKit
         column_type == :datetime
       end
 
-      def settings_from_model
-        return {} if model_configuration.blank?
-        return {} if model_configuration.public_send(inferrable_type).blank?
-        config_hash = model_configuration.public_send(inferrable_type).find do |hash|
-          hash[:key] == key
-        end
-        config_hash || {}
-      end
-
       def reflection
         model_class.reflect_on_association(expression.to_sym)
       end
@@ -118,16 +111,6 @@ module ReportsKit
         column_type = model_class.columns_hash[expression.to_s].try(:type)
         return column_type if SUPPORTED_COLUMN_TYPES.include?(column_type)
       end
-
-      def model_configuration
-        return unless model_class && model_class.respond_to?(:reports_kit_configuration)
-        model_class.reports_kit_configuration
-      end
-
-      def model_class
-        return unless series
-        series.model_class
-      end
     end
   end
 end

data/lib/reports_kit/reports/model_settings.rb

@@ -0,0 +1,35 @@
+module ReportsKit
+  module Reports
+    class ModelSettings
+      attr_accessor :series, :model_configuration_type, :key
+
+      def initialize(series, model_configuration_type, key)
+        self.series = series
+        self.model_configuration_type = model_configuration_type
+        self.key = key
+      end
+
+      def settings_from_model
+        return {} if model_configuration.blank?
+        config_hashes = model_configuration.public_send(model_configuration_type)
+        return {} if config_hashes.blank?
+        config_hash = config_hashes.find do |hash|
+          hash[:key] == key
+        end
+        config_hash || {}
+      end
+
+      def model_class
+        return unless series
+        series.model_class
+      end
+
+      private
+
+      def model_configuration
+        return unless model_class && model_class.respond_to?(:reports_kit_configuration)
+        model_class.reports_kit_configuration
+      end
+    end
+  end
+end

data/lib/reports_kit/reports/series.rb

@@ -1,9 +1,9 @@
 module ReportsKit
   module Reports
     class Series < AbstractSeries
-      VALID_KEYS = [:measure, :dimensions, :filters, :limit, :report_options]
+      VALID_KEYS = [:measure, :dimensions, :contextual_filters, :context_params, :filters, :limit, :context_params, :report_options]
 
-      attr_accessor :properties, :dimensions, :filters, :context_record
+      attr_accessor :properties, :dimensions, :contextual_filters, :filters, :context_record
 
       def initialize(properties, context_record: nil)
         properties = { measure: properties } if properties.is_a?(String)
@@ -13,6 +13,7 @@ module ReportsKit
         properties[:measure] = { key: properties[:measure] } if properties[:measure].is_a?(String)
         raise ArgumentError.new("Measure properties must be a String or Hash, not a #{properties.class.name}: #{properties.inspect}") unless properties.is_a?(Hash)
 
+        contextual_filter_keys = properties[:contextual_filters] || []
         dimension_hashes = properties[:dimensions] || []
         dimension_hashes = dimension_hashes.values if dimension_hashes.is_a?(Hash) && dimension_hashes.key?(:'0')
         filter_hashes = properties[:filters] || []
@@ -22,6 +23,7 @@ module ReportsKit
         self.context_record = context_record
         self.dimensions = dimension_hashes.map { |dimension_hash| DimensionWithSeries.new(dimension: Dimension.new(dimension_hash), series: self) }
         self.filters = filter_hashes.map { |filter_hash| FilterWithSeries.new(filter: Filter.new(filter_hash), series: self) }
+        self.contextual_filters = contextual_filter_keys.map { |key| ContextualFilter.new(key, series: self) }
       end
 
       def key
@@ -91,6 +93,9 @@ module ReportsKit
         filters.each do |filter|
           relation = filter.apply(relation)
         end
+        contextual_filters.each do |filter|
+          relation = filter.apply(relation, properties[:context_params])
+        end
         relation
       end
 

data/lib/reports_kit/reports_controller.rb

@@ -3,6 +3,8 @@ require 'spreadsheet'
 
 module ReportsKit
   class ReportsController < ReportsKit::BaseController
+    before_action :modify_context_params
+
     VALID_PARAMS_PROPERTIES_KEYS = [:ui_filters]
 
     def index
@@ -35,7 +37,7 @@ module ReportsKit
     end
 
     def report_data
-      Reports::Data::Generate.new(properties, context_record: context_record).perform
+      Reports::Data::Generate.new(properties, context_record: context_record, context_params: context_params).perform
     end
 
     def properties

data/lib/reports_kit/version.rb

@@ -1,3 +1,3 @@
 module ReportsKit
-  VERSION = '0.3.3'
+  VERSION = '0.4.0'
 end

data/spec/reports_kit/reports/data/generate/contextual_filters_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe ReportsKit::Reports::Data::Generate do
+  subject { described_class.new(properties).perform }
+
+  let(:repo) { create(:repo) }
+  let(:repo2) { create(:repo) }
+  let(:chart_data) do
+    chart_data = subject[:chart_data].except(:options)
+    chart_data[:datasets] = chart_data[:datasets].map do |dataset|
+      dataset.except(:backgroundColor, :borderColor)
+    end
+    chart_data
+  end
+
+  let!(:issues) do
+    [
+      create(:issue, repo: repo),
+      create(:issue, repo: repo),
+      create(:issue, repo: repo2)
+    ]
+  end
+
+  context 'with a contextual_filter' do
+    context 'with context_params' do
+      let(:properties) do
+        {
+          measure: 'issue',
+          contextual_filters: %w(for_repo),
+          dimensions: %w(repo),
+          context_params: { repo_id: repo.id }
+        }
+      end
+
+      it 'returns the chart_data' do
+        expect(chart_data).to eq({
+          labels: [repo.to_s],
+          datasets: [{ label: 'Issues', data: [2] }]
+        })
+      end
+    end
+
+    context 'without context_params' do
+      let(:properties) do
+        {
+          measure: 'issue',
+          contextual_filters: %w(for_repo),
+          dimensions: %w(repo)
+        }
+      end
+
+      it 'returns the chart_data' do
+        expect(chart_data).to eq({
+          labels: [repo.to_s, repo2.to_s],
+          datasets: [{ label: 'Issues', data: [2, 1] }]
+        })
+      end
+    end
+  end
+end

data/spec/reports_kit/reports/data/normalize_properties_spec.rb

@@ -0,0 +1,196 @@
+require 'spec_helper'
+
+describe ReportsKit::Reports::Data::NormalizeProperties do
+  describe '#perform' do
+    let(:normalized_properties) { described_class.new(properties).perform }
+    let(:series) { normalized_properties[:series] }
+    let(:context_params) { { foo: 'bar' } }
+    let(:name) { 'Foo' }
+
+    context 'without a series key' do
+      let(:properties) do
+        {
+          measure: 'issue',
+          dimensions: %w(opened_at)
+        }
+      end
+
+      it 'normalizes' do
+        expect(series).to eq([properties])
+      end
+    end
+
+    context 'with a series key' do
+      let(:properties) do
+        {
+          series: {
+            measure: 'issue',
+            dimensions: %w(opened_at)
+          }
+        }
+      end
+
+      it 'normalizes' do
+        expect(series).to eq([properties[:series]])
+      end
+    end
+
+    context 'with a series array and context_params' do
+      let(:properties) do
+        {
+          series: [{
+            measure: 'issue',
+            dimensions: %w(opened_at)
+          }],
+          context_params: context_params
+        }
+      end
+
+      it 'normalizes' do
+        expect(series).to eq([{
+          measure: 'issue',
+          dimensions: %w(opened_at),
+          context_params: context_params
+        }])
+      end
+    end
+
+    context 'with a composite series and context_params' do
+      let(:properties) do
+        {
+          name: name,
+          composite_operator: '%',
+          series: [
+            {
+              measure: 'issue',
+              dimensions: %w(created_at)
+            },
+            {
+              measure: 'tag',
+              dimensions: %w(created_at)
+            }
+          ],
+          context_params: context_params
+        }
+      end
+
+      it 'copies the context_params to the series' do
+        expect(normalized_properties).to eq({
+          name: name,
+          composite_operator: '%',
+          series: [
+            {
+              measure: 'issue',
+              dimensions: %w(created_at),
+              context_params: context_params
+            },
+            {
+              measure: 'tag',
+              dimensions: %w(created_at),
+              context_params: context_params
+            }
+          ],
+          context_params: context_params
+        })
+      end
+    end
+
+    context 'with a composite series and context_params' do
+      let(:properties) do
+        {
+          series: [
+            {
+              name: name,
+              composite_operator: '+',
+              series: [
+                {
+                  measure: 'issue',
+                  dimensions: %w(created_at)
+                }
+              ]
+            }
+          ],
+          context_params: context_params
+        }
+      end
+
+      it 'copies the context_params to the series' do
+        expect(normalized_properties).to eq({
+          series: [
+            {
+              name: name,
+              composite_operator: '+',
+              series: [
+                {
+                  measure: 'issue',
+                  dimensions: %w(created_at),
+                  context_params: context_params
+                }
+              ],
+              context_params: context_params
+            }
+          ],
+          context_params: context_params
+        })
+      end
+    end
+
+    context 'with a composite series, a series, and context_params' do
+      let(:properties) do
+        {
+          series: [
+            {
+              measure: 'issue',
+              dimensions: %w(opened_at)
+            },
+            {
+              name: name,
+              composite_operator: '%',
+              series: [
+                {
+                  measure: 'issue',
+                  dimensions: %w(created_at)
+                },
+                {
+                  measure: 'tag',
+                  dimensions: %w(created_at)
+                }
+              ]
+            }
+          ],
+          context_params: context_params
+        }
+      end
+
+      it 'copies the context_params to the series' do
+        expect(normalized_properties).to eq({
+          series: [
+            {
+              measure: 'issue',
+              dimensions: %w(opened_at),
+              context_params: context_params
+            },
+            {
+              name: name,
+              composite_operator: '%',
+              series: [
+                {
+                  measure: 'issue',
+                  dimensions: %w(created_at),
+                  context_params: context_params
+                },
+                {
+                  measure: 'tag',
+                  dimensions: %w(created_at),
+                  context_params: context_params
+                }
+              ],
+              context_params: context_params
+            }
+          ],
+          context_params: context_params
+        })
+      end
+    end
+  end
+end

data/spec/support/models/issue.rb

@@ -8,6 +8,7 @@ class Issue < ActiveRecord::Base
 
   reports_kit do
     aggregation :average_duration, [:average, REPORTS_KIT_DATABASE_TYPE == :mysql ? 'DATEDIFF(closed_at, opened_at)' : '(closed_at::date - opened_at::date)']
+    contextual_filter :for_repo, ->(relation, context_params) { context_params ? relation.where(repo_id: context_params[:repo_id]) : relation }
     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.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Tom Benner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-14 00:00:00.000000000 Z
+date: 2017-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -221,6 +221,7 @@ files:
 - lib/reports_kit/reports/adapters/mysql.rb
 - lib/reports_kit/reports/adapters/postgresql.rb
 - lib/reports_kit/reports/composite_series.rb
+- lib/reports_kit/reports/contextual_filter.rb
 - lib/reports_kit/reports/data/add_table_aggregations.rb
 - lib/reports_kit/reports/data/aggregate_composite.rb
 - lib/reports_kit/reports/data/aggregate_one_dimension.rb
@@ -231,6 +232,7 @@ files:
 - 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/normalize_properties.rb
 - lib/reports_kit/reports/data/populate_one_dimension.rb
 - lib/reports_kit/reports/data/populate_two_dimensions.rb
 - lib/reports_kit/reports/data/utils.rb
@@ -246,6 +248,7 @@ files:
 - lib/reports_kit/reports/filter_with_series.rb
 - lib/reports_kit/reports/generate_autocomplete_results.rb
 - lib/reports_kit/reports/inferrable_configuration.rb
+- lib/reports_kit/reports/model_settings.rb
 - lib/reports_kit/reports/properties.rb
 - lib/reports_kit/reports/properties_to_filter.rb
 - lib/reports_kit/reports/series.rb
@@ -263,7 +266,9 @@ files:
 - spec/fixtures/generate_outputs.yml
 - spec/reports_kit/form_builder_spec.rb
 - spec/reports_kit/relative_time_spec.rb
+- spec/reports_kit/reports/data/generate/contextual_filters_spec.rb
 - spec/reports_kit/reports/data/generate_spec.rb
+- spec/reports_kit/reports/data/normalize_properties_spec.rb
 - spec/reports_kit/reports/dimension_with_series_spec.rb
 - spec/reports_kit/reports/filter_with_series_spec.rb
 - spec/spec_helper.rb