reports_kit 0.2.0 → 0.3.0

data/spec/fixtures/generate_outputs.yml

@@ -400,6 +400,70 @@
   - - foo/bar2
     - 0
     - 2
+- :type: table
+  :report_options:
+    :aggregations:
+    - :from: columns
+      :operator: sum
+      :label: Total
+  :table_data:
+  - - 
+    - Repo Issues
+    - Labels
+  - - foo/bar1
+    - 2
+    - 1
+  - - foo/bar2
+    - 0
+    - 2
+  - - Total
+    - 2
+    - 3
+- :type: table
+  :report_options:
+    :aggregations:
+    - :from: rows
+      :operator: sum
+      :label: Total
+  :table_data:
+  - - 
+    - Repo Issues
+    - Labels
+    - Total
+  - - foo/bar1
+    - 2
+    - 1
+    - 3
+  - - foo/bar2
+    - 0
+    - 2
+    - 2
+- :type: table
+  :report_options:
+    :aggregations:
+    - :from: columns
+      :operator: sum
+      :label: Total
+    - :from: rows
+      :operator: sum
+      :label: Total
+  :table_data:
+  - - 
+    - Repo Issues
+    - Labels
+    - Total
+  - - foo/bar1
+    - 2
+    - 1
+    - 3
+  - - foo/bar2
+    - 0
+    - 2
+    - 2
+  - - Total
+    - 2
+    - 3
+    - 5
 - :chart_data:
     :labels:
     - foo/bar1

data/spec/reports_kit/report_builder_spec.rb

@@ -6,23 +6,21 @@ describe ReportsKit::ReportBuilder do
   context 'with a datetime dimension' do
     let(:properties) do
       {
-        measure: {
-          key: 'issue',
-          filters: [
-            {
-              key: 'opened_at',
-              criteria: {
-                operator: 'between',
-                value: '-1w - now'
-              }
+        measure: 'issue',
+        filters: [
+          {
+            key: 'opened_at',
+            criteria: {
+              operator: 'between',
+              value: '-1w - now'
             }
-          ]
-        }
+          }
+        ]
       }
     end
 
     it 'transforms the filter criteria' do
-      expect(subject.date_range('opened_at')).to include("#{format_criteria_time(1.week.ago)} - #{format_criteria_time(Time.zone.now)}")
+      expect(subject.date_range('opened_at')).to include("#{format_configuration_time(1.week.ago)} - #{format_configuration_time(Time.zone.now)}")
     end
   end
 end

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

@@ -24,10 +24,8 @@ describe ReportsKit::Reports::Data::Generate do
     context 'with default granularity' do
       let(:properties) do
         {
-          measure: {
-            key: 'issue',
-            dimensions: %w(opened_at)
-          }
+          measure: 'issue',
+          dimensions: %w(opened_at)
         }
       end
       let!(:issues) do
@@ -58,22 +56,20 @@ describe ReportsKit::Reports::Data::Generate do
         })
       end
 
-      context 'with a datetime filter' do
+      context 'with an absolute datetime filter' do
         let(:properties) do
           {
-            measure: {
-              key: 'issue',
-              filters: [
-                {
-                  key: 'opened_at',
-                  criteria: {
-                    operator: 'between',
-                    value: "#{format_criteria_time(now - 1.week)} - #{format_criteria_time(now)}"
-                  }
+            measure: 'issue',
+            filters: [
+              {
+                key: 'opened_at',
+                criteria: {
+                  operator: 'between',
+                  value: "#{format_configuration_time(now - 1.week)} - #{format_configuration_time(now)}"
                 }
-              ],
-              dimensions: %w(opened_at)
-            }
+              }
+            ],
+            dimensions: %w(opened_at)
           }
         end
 
@@ -82,29 +78,57 @@ describe ReportsKit::Reports::Data::Generate do
             labels: [format_week_offset(1), format_week_offset(0)],
             datasets: [
               {
-                label: "Issues",
+                label: 'Issues',
                 data: [0, 1]
               }
             ]
           })
         end
 
+        context 'with a old end date' do
+          let(:properties) do
+            {
+              measure: 'issue',
+              filters: [
+                {
+                  key: 'opened_at',
+                  criteria: {
+                    operator: 'between',
+                    value: "#{format_configuration_time(now - 2.weeks)} - #{format_configuration_time(now - 1.week)}"
+                  }
+                }
+              ],
+              dimensions: %w(opened_at)
+            }
+          end
+
+          it 'returns the chart_data' do
+            expect(chart_data).to eq({
+              labels: [format_week_offset(2), format_week_offset(1)],
+              datasets: [
+                {
+                  label: 'Issues',
+                  data: [2, 0]
+                }
+              ]
+            })
+          end
+        end
+
         context 'with zero results' do
           let(:properties) do
             {
-              measure: {
-                key: 'tag',
-                filters: [
-                  {
-                    key: 'created_at',
-                    criteria: {
-                      operator: 'between',
-                      value: "#{format_criteria_time(now - 1.week)} - #{format_criteria_time(now)}"
-                    }
+              measure: 'tag',
+              filters: [
+                {
+                  key: 'created_at',
+                  criteria: {
+                    operator: 'between',
+                    value: "#{format_configuration_time(now - 1.week)} - #{format_configuration_time(now)}"
                   }
-                ],
-                dimensions: %w(created_at)
-              }
+                }
+              ],
+              dimensions: %w(created_at)
             }
           end
 
@@ -124,7 +148,7 @@ describe ReportsKit::Reports::Data::Generate do
           end
         end
 
-        context 'with multiple measures and datetime filters with different keys' do
+        context 'with multiple series and datetime filters with different keys' do
           let!(:tags) do
             [
               create(:tag, repo: repo, created_at: now - 1.weeks),
@@ -133,20 +157,20 @@ describe ReportsKit::Reports::Data::Generate do
           end
           let(:properties) do
             {
-              measures: [
+              series: [
                 {
-                  key: 'issue',
+                  measure: 'issue',
                   filters: %w(opened_at),
                   dimensions: %w(opened_at)
                 },
                 {
-                  key: 'tag',
+                  measure: 'tag',
                   filters: %w(created_at),
                   dimensions: %w(created_at)
                 }
               ],
               ui_filters: {
-                created_at: "#{format_criteria_time(now - 1.week)} - #{format_criteria_time(now)}"
+                created_at: "#{format_configuration_time(now - 1.week)} - #{format_configuration_time(now)}"
               }
             }
           end
@@ -156,11 +180,11 @@ describe ReportsKit::Reports::Data::Generate do
               labels: [format_week_offset(2), format_week_offset(1), format_week_offset(0)],
               datasets: [
                 {
-                  label: "Issues",
+                  label: 'Issues',
                   data: [2, 0, 1]
                 },
                 {
-                  label: "Tags",
+                  label: 'Tags',
                   data: [0, 1, 1]
                 }
               ]
@@ -168,15 +192,63 @@ describe ReportsKit::Reports::Data::Generate do
           end
         end
       end
+
+      context 'with a relative datetime filter' do
+        let(:properties) do
+          {
+            measure: 'issue',
+            filters: [
+              {
+                key: 'opened_at',
+                criteria: {
+                  operator: 'between',
+                  value: '-1w - now'
+                }
+              }
+            ],
+            dimensions: %w(opened_at)
+          }
+        end
+
+        it 'returns the chart_data' do
+          expect(chart_data).to eq({
+            labels: [format_week_offset(1), format_week_offset(0)],
+            datasets: [
+              {
+                label: 'Issues',
+                data: [0, 1]
+              }
+            ]
+          })
+        end
+
+        context 'when a record\'s timestamp is closer to the beginning of the week than the current date' do
+          let!(:issues) do
+            [
+              create(:issue, repo: repo, opened_at: Date.parse('2009-12-22'))
+            ]
+          end
+
+          it 'includes record' do
+            expect(chart_data).to eq({
+              labels: [format_week_offset(1), format_week_offset(0)],
+              datasets: [
+                {
+                  label: 'Issues',
+                  data: [1, 0]
+                }
+              ]
+            })
+          end
+        end
+      end
     end
 
     context 'with day granularity' do
       let(:properties) do
         {
-          measure: {
-            key: 'issue',
-            dimensions: [{ key: 'opened_at', granularity: 'day' }]
-          }
+          measure: 'issue',
+          dimensions: [{ key: 'opened_at', granularity: 'day' }]
         }
       end
       let!(:issues) do
@@ -207,10 +279,8 @@ describe ReportsKit::Reports::Data::Generate do
   context 'with an association dimension' do
     let(:properties) do
       {
-        measure: {
-          key: 'issue',
-          dimensions: %w(repo)
-        }
+        measure: 'issue',
+        dimensions: %w(repo)
       }
     end
     let!(:issues) do
@@ -234,7 +304,24 @@ describe ReportsKit::Reports::Data::Generate do
       it 'returns the chart_data' do
         expect(chart_data).to eq({
           labels: [repo.to_s],
-          datasets: [{ label: "Issues", data: [2.0] }]
+          datasets: [{ label: 'Issues', data: [2.0] }]
+        })
+      end
+    end
+
+    context 'with a limit' do
+      let(:properties) do
+        {
+          measure: 'issue',
+          dimensions: %w(repo),
+          limit: 1
+        }
+      end
+
+      it 'returns the chart_data' do
+        expect(chart_data).to eq({
+          labels: [repo.to_s],
+          datasets: [{ label: 'Issues', data: [2] }]
         })
       end
     end
@@ -242,10 +329,8 @@ describe ReportsKit::Reports::Data::Generate do
     context 'with a dimension limit' do
       let(:properties) do
         {
-          measure: {
-            key: 'issue',
-            dimensions: [{ key: 'repo', limit: 1 }]
-          }
+          measure: 'issue',
+          dimensions: [{ key: 'repo', limit: 1 }]
         }
       end
 
@@ -263,9 +348,9 @@ describe ReportsKit::Reports::Data::Generate do
           measure: {
             key: 'issue',
             name: 'Average Durations',
-            aggregation: 'average_duration',
-            dimensions: %w(repo)
-          }
+            aggregation: 'average_duration'
+          },
+          dimensions: %w(repo)
         }
       end
       let!(:issues) do
@@ -287,26 +372,24 @@ describe ReportsKit::Reports::Data::Generate do
     context 'with a belongs_to association filter' do
       let(:properties) do
         {
-          measure: {
-            key: 'issue',
-            filters: [
-              {
-                key: 'repo',
-                criteria: {
-                  operator: 'include',
-                  value: [repo.id]
-                }
+          measure: 'issue',
+          filters: [
+            {
+              key: 'repo',
+              criteria: {
+                operator: 'include',
+                value: [repo.id]
               }
-            ],
-            dimensions: %w(repo)
-          }
+            }
+          ],
+          dimensions: %w(repo)
         }
       end
 
       it 'returns the chart_data' do
         expect(chart_data).to eq({
           labels: [repo.to_s],
-          datasets: [{ label: "Issues", data: [2.0] }]
+          datasets: [{ label: 'Issues', data: [2.0] }]
         })
       end
     end
@@ -314,19 +397,17 @@ describe ReportsKit::Reports::Data::Generate do
     context 'with a has_many association filter' do
       let(:properties) do
         {
-          measure: {
-            key: 'issue',
-            filters: [
-              {
-                key: 'tags',
-                criteria: {
-                  operator: 'include',
-                  value: [tag.id]
-                }
+          measure: 'issue',
+          filters: [
+            {
+              key: 'tags',
+              criteria: {
+                operator: 'include',
+                value: [tag.id]
               }
-            ],
-            dimensions: %w(repo)
-          }
+            }
+          ],
+          dimensions: %w(repo)
         }
       end
       let(:tag) { create(:tag) }
@@ -338,7 +419,7 @@ describe ReportsKit::Reports::Data::Generate do
         chart_data
         expect(chart_data).to eq({
           labels: [repo.to_s],
-          datasets: [{ label: "Issues", data: [1.0] }]
+          datasets: [{ label: 'Issues', data: [1.0] }]
         })
       end
     end
@@ -346,19 +427,17 @@ describe ReportsKit::Reports::Data::Generate do
     context 'with a has_many :through association filter' do
       let(:properties) do
         {
-          measure: {
-            key: 'issue',
-            filters: [
-              {
-                key: 'labels',
-                criteria: {
-                  operator: 'include',
-                  value: [label.id]
-                }
+          measure: 'issue',
+          filters: [
+            {
+              key: 'labels',
+              criteria: {
+                operator: 'include',
+                value: [label.id]
               }
-            ],
-            dimensions: %w(repo)
-          }
+            }
+          ],
+          dimensions: %w(repo)
         }
       end
       let(:label) { create(:label) }
@@ -369,7 +448,7 @@ describe ReportsKit::Reports::Data::Generate do
       it 'returns the chart_data' do
         expect(chart_data).to eq({
           labels: [repo.to_s],
-          datasets: [{ label: "Issues", data: [1.0] }]
+          datasets: [{ label: 'Issues', data: [1.0] }]
         })
       end
     end
@@ -378,10 +457,8 @@ describe ReportsKit::Reports::Data::Generate do
   context 'with a boolean dimension' do
     let(:properties) do
       {
-        measure: {
-          key: 'issue',
-          dimensions: %w(locked)
-        }
+        measure: 'issue',
+        dimensions: %w(locked)
       }
     end
     let!(:issues) do
@@ -403,13 +480,11 @@ describe ReportsKit::Reports::Data::Generate do
   context 'with datetime and association dimensions' do
     let(:properties) do
       {
-        measure: {
-          key: 'issue',
-          dimensions: [
-            { key: 'opened_at', label: nil },
-            { key: 'repo' }
-          ]
-        }
+        measure: 'issue',
+        dimensions: [
+          { key: 'opened_at', label: nil },
+          { key: 'repo' }
+        ]
       }
     end
     let!(:issues) do
@@ -436,6 +511,84 @@ describe ReportsKit::Reports::Data::Generate do
       })
     end
 
+    context "with format: 'csv'" do
+      subject { described_class.new(properties.merge(format: 'csv'), context_record: context_record).perform }
+
+      it 'returns the table_data' do
+        expect(table_data).to eq([
+          [nil, repo.to_s, repo2.to_s],
+          [format_csv_week_offset(2), 1, 0],
+          [format_csv_week_offset(1), 0, 0],
+          [format_csv_week_offset(0), 1, 1]
+        ])
+      end
+
+      context 'with a data_format_method that adds HTML tags' do
+        subject { described_class.new(properties.merge(format: 'csv', report_options: { data_format_method: 'add_label_link' }), context_record: context_record).perform }
+
+        it 'returns the table_data without the HTML tags' do
+          expect(table_data).to eq([
+            [nil, repo.to_s, repo2.to_s],
+            ["#{format_csv_week_offset(2)} Bar", 1, 0],
+            ["#{format_csv_week_offset(1)} Bar", 0, 0],
+            ["#{format_csv_week_offset(0)} Bar", 1, 1]
+          ])
+        end
+      end
+
+      context 'with a csv_data_format_method' do
+        subject { described_class.new(properties.merge(format: 'csv', report_options: { csv_data_format_method: 'prepend_column' }), context_record: context_record).perform }
+
+        it 'returns the table_data' do
+          expect(table_data).to eq([
+            [nil, 'Day of Month', repo.to_s, repo2.to_s],
+            [format_csv_week_offset(2), 13, 1, 0],
+            [format_csv_week_offset(1), 20, 0, 0],
+            [format_csv_week_offset(0), 27, 1, 1]
+          ])
+        end
+      end
+
+      context 'with both a data_format_method and a csv_data_format_method' do
+        subject { described_class.new(properties.merge(format: 'csv', report_options: { data_format_method: 'add_label_link', csv_data_format_method: 'prepend_column' }), context_record: context_record).perform }
+
+        it 'returns the table_data' do
+          expect(table_data).to eq([
+            [nil, 'Day of Month', repo.to_s, repo2.to_s],
+            ["#{format_csv_week_offset(2)} Bar", 13, 1, 0],
+            ["#{format_csv_week_offset(1)} Bar", 20, 0, 0],
+            ["#{format_csv_week_offset(0)} Bar", 27, 1, 1]
+          ])
+        end
+      end
+
+      context 'with a csv_data_format_method and aggregations' do
+        subject { described_class.new(properties.merge(format: 'csv', report_options: report_options), context_record: context_record).perform }
+        let(:report_options) do
+          {
+            csv_data_format_method: 'prepend_column',
+            aggregations: [
+              {
+                from: 'columns',
+                operator: 'sum',
+                label: 'Total'
+              }
+            ]
+          }
+        end
+
+        it 'returns the table_data' do
+          expect(table_data).to eq([
+            [nil, 'Day of Month', repo.to_s, repo2.to_s],
+            [format_csv_week_offset(2), 13, 1, 0],
+            [format_csv_week_offset(1), 20, 0, 0],
+            [format_csv_week_offset(0), 27, 1, 1],
+            ['Total', nil, 2, 1]
+          ])
+        end
+      end
+    end
+
     context "with format: 'table'" do
       subject { described_class.new(properties.merge(format: 'table'), context_record: context_record).perform }
 
@@ -447,10 +600,23 @@ describe ReportsKit::Reports::Data::Generate do
           [format_week_offset(0), 1, 1]
         ])
       end
+
+      context 'with a data_format_method that adds HTML tags' do
+        subject { described_class.new(properties.merge(format: 'table', report_options: { data_format_method: 'add_label_link' }), context_record: context_record).perform }
+
+        it 'returns the table_data with the HTML tags' do
+          expect(table_data).to eq([
+            [nil, repo.to_s, repo2.to_s],
+            ["<a href='#'>#{format_week_offset(2)}</a> Bar", 1, 0],
+            ["<a href='#'>#{format_week_offset(1)}</a> Bar", 0, 0],
+            ["<a href='#'>#{format_week_offset(0)}</a> Bar", 1, 1]
+          ])
+        end
+      end
     end
 
-    context "with a data_format_method" do
-      subject { described_class.new(properties.merge(data_format_method: 'add_label_suffix'), context_record: context_record).perform }
+    context 'with a data_format_method' do
+      subject { described_class.new(properties.merge(report_options: { data_format_method: 'add_label_suffix' }), context_record: context_record).perform }
 
       it 'returns the chart_data' do
         expect(chart_data).to eq({
@@ -467,21 +633,79 @@ describe ReportsKit::Reports::Data::Generate do
           ]
         })
       end
+
+      context 'with dependence on the context_record' do
+        subject { described_class.new(properties.merge(report_options: { data_format_method: 'add_context_record_suffix' }), context_record: context_record).perform }
+        let(:context_record) { repo }
+
+        it 'returns the chart_data' do
+          expect(chart_data).to eq({
+            labels: ["#{format_week_offset(2)} #{context_record}", "#{format_week_offset(1)} #{context_record}", "#{format_week_offset(0)} #{context_record}"],
+            datasets: [
+              {
+                label: repo.to_s,
+                data: [1, 0, 1]
+              }
+            ]
+          })
+        end
+      end
+    end
+
+    context 'with an edit_relation_method' do
+      subject { described_class.new(properties.merge(report_options: { edit_relation_method: 'empty_result_set_for_relation' }), context_record: context_record).perform }
+
+      it 'returns the chart_data' do
+        expect(chart_data).to eq({
+          labels: [],
+          datasets: [
+            {
+              label: 'Issues',
+              data: []
+            }
+          ]
+        })
+      end
     end
   end
 
-  context 'with two measures' do
+  context 'with a dimension with a blank label' do
     let(:properties) do
       {
-        measures: [
+        measure: 'issue',
+        dimensions: %w(repo)
+      }
+    end
+
+    before do
+      allow_any_instance_of(Repo).to receive(:to_s).and_return(nil)
+    end
+
+    it 'hides the dimension' do
+      expect(chart_data).to eq({
+        labels: [],
+        datasets: [
           {
-            key: 'issue',
+            label: 'Issues',
+            data: []
+          }
+        ]
+      })
+    end
+  end
+
+  context 'with two series' do
+    let(:properties) do
+      {
+        series: [
+          {
+            measure: 'issue',
             dimensions: [{ key: 'created_at', label: nil }]
           },
           {
-            key: 'tag',
+            measure: 'tag',
             dimensions: %w(created_at)
-          },
+          }
         ]
       }
     end
@@ -515,6 +739,67 @@ describe ReportsKit::Reports::Data::Generate do
       })
     end
 
+    context 'with edit_dimension_keys_method and a dimension without data' do
+      let(:properties) do
+        {
+          series: [
+            {
+              measure: 'issue',
+              dimensions: %w(repo)
+            },
+            {
+              measure: 'tag',
+              dimensions: %w(repo)
+            }
+          ],
+          report_options: {
+            edit_dimension_keys_method: 'all_repo_ids'
+          }
+        }
+      end
+      let!(:repo3) { create(:repo) }
+
+      it 'returns the chart_data' do
+        expect(chart_data).to eq({
+          labels: [repo, repo2, repo3].map(&:to_s),
+          datasets: [
+            {
+              label: 'Issues',
+              data: [2, 1, 0]
+            },
+            {
+              label: 'Tags',
+              data: [2, 0, 0]
+            }
+          ]
+        })
+      end
+    end
+
+    context 'with concurrent queries enabled' do
+      around :each do |example|
+        ReportsKit.configuration.use_concurrent_queries = true
+        example.run
+        ReportsKit.configuration.use_concurrent_queries = false
+      end
+
+      it 'returns the chart_data' do
+        expect(chart_data).to eq({
+          labels: [format_week_offset(2), format_week_offset(1), format_week_offset(0)],
+          datasets: [
+            {
+              label: 'Issues',
+              data: [1, 0, 2]
+            },
+            {
+              label: 'Tags',
+              data: [1, 1, 0]
+            }
+          ]
+        })
+      end
+    end
+
     context "with format: 'table'" do
       subject { described_class.new(properties.merge(format: 'table'), context_record: context_record).perform }
 
@@ -535,9 +820,9 @@ describe ReportsKit::Reports::Data::Generate do
         {
           measure: {
             key: 'issue',
-            aggregation: 'average_duration',
-            dimensions: %w(repo created_at)
-          }
+            aggregation: 'average_duration'
+          },
+          dimensions: %w(repo created_at)
         }
       end
       let!(:issues) do
@@ -557,19 +842,53 @@ describe ReportsKit::Reports::Data::Generate do
     end
   end
 
+  describe 'configuration' do
+    let(:properties) do
+      {
+        measure: 'issue',
+        dimensions: %w(repo)
+      }
+    end
+    let!(:issues) do
+      [
+        create(:issue, repo: repo),
+        create(:issue, repo: repo),
+        create(:issue, repo: repo2)
+      ]
+    end
+
+    context 'with default_properties' do
+      around :each do |example|
+        ReportsKit.configuration.default_properties = {
+          chart: {
+            options: {
+              foo: 'bar'
+            }
+          }
+        }
+        example.run
+        ReportsKit.configuration.default_properties = nil
+      end
+
+      it 'returns the chart_data' do
+        expect(subject[:chart_data][:options][:foo]).to eq('bar')
+      end
+    end
+  end
+
   describe 'composite aggregations' do
-    context 'with two measures' do
+    context 'with two series' do
       let(:properties) do
         {
           name: name,
           composite_operator: composite_operator,
-          measures: [
+          series: [
             {
-              key: 'issue',
+              measure: 'issue',
               dimensions: %w(created_at)
             },
             {
-              key: 'tag',
+              measure: 'tag',
               dimensions: %w(created_at)
             }
           ]
@@ -630,13 +949,13 @@ describe ReportsKit::Reports::Data::Generate do
             name: name,
             composite_operator: composite_operator,
             value_format_method: 'format_percentage',
-            measures: [
+            series: [
               {
-                key: 'issue',
+                measure: 'issue',
                 dimensions: %w(created_at)
               },
               {
-                key: 'tag',
+                measure: 'tag',
                 dimensions: %w(created_at)
               }
             ]
@@ -656,6 +975,106 @@ describe ReportsKit::Reports::Data::Generate do
         end
       end
 
+      context 'with a limit' do
+        let(:properties) do
+          {
+            name: name,
+            composite_operator: '+',
+            limit: 1,
+            series: [
+              {
+                measure: 'issue',
+                dimensions: %w(repo)
+              },
+              {
+                measure: 'tag',
+                dimensions: %w(repo)
+              }
+            ]
+          }
+        end
+
+        it 'returns the chart_data' do
+          expect(chart_data).to eq({
+            labels: [repo.to_s],
+            datasets: [
+              {
+                label: name,
+                data: [5]
+              }
+            ]
+          })
+        end
+      end
+
+      context 'with a limit and an order' do
+        context 'with an ascending order' do
+          let(:properties) do
+            {
+              name: name,
+              composite_operator: '%',
+              limit: 1,
+              order: '1',
+              series: [
+                {
+                  measure: 'issue',
+                  dimensions: %w(repo)
+                },
+                {
+                  measure: 'tag',
+                  dimensions: %w(repo)
+                }
+              ]
+            }
+          end
+
+          it 'returns the chart_data' do
+            expect(chart_data).to eq({
+              labels: [repo2.to_s],
+              datasets: [
+                {
+                  label: name,
+                  data: [0]
+                }
+              ]
+            })
+          end
+        end
+
+        context 'with a descending order' do
+          let(:properties) do
+            {
+              name: name,
+              composite_operator: '%',
+              limit: 1,
+              order: '1 desc',
+              series: [
+                {
+                  measure: 'issue',
+                  dimensions: %w(repo)
+                },
+                {
+                  measure: 'tag',
+                  dimensions: %w(repo)
+                }
+              ]
+            }
+          end
+
+          it 'returns the chart_data' do
+            expect(chart_data).to eq({
+              labels: [repo.to_s],
+              datasets: [
+                {
+                  label: name,
+                  data: [66.7]
+                }
+              ]
+            })
+          end
+        end
+      end
+
       context 'with a boolean dimension' do
         let!(:issues) do
           [
@@ -669,13 +1088,13 @@ describe ReportsKit::Reports::Data::Generate do
           {
             name: name,
             composite_operator: composite_operator,
-            measures: [
+            series: [
               {
-                key: 'issue',
+                measure: 'issue',
                 dimensions: %w(locked)
               },
               {
-                key: 'issue',
+                measure: 'issue',
                 dimensions: %w(locked)
               }
             ]
@@ -698,27 +1117,27 @@ describe ReportsKit::Reports::Data::Generate do
       context 'with a nested composite aggregation' do
         let(:properties) do
           {
-            measures: [
+            series: [
               {
                 name: name,
                 composite_operator: '+',
-                measures: [
+                series: [
                   {
-                    key: 'issue',
+                    measure: 'issue',
                     dimensions: %w(created_at)
                   },
                   {
-                    key: 'tag',
+                    measure: 'tag',
                     dimensions: %w(created_at)
                   }
                 ]
               },
               {
-                key: 'issue',
+                measure: 'issue',
                 dimensions: %w(created_at)
               },
               {
-                key: 'tag',
+                measure: 'tag',
                 dimensions: %w(created_at)
               }
             ]
@@ -748,36 +1167,36 @@ describe ReportsKit::Reports::Data::Generate do
         context 'with ui_filters' do
           let(:properties) do
             {
-              measures: [
+              series: [
                 {
                   name: name,
                   composite_operator: '+',
-                  measures: [
+                  series: [
                     {
-                      key: 'issue',
+                      measure: 'issue',
                       filters: %w(created_at),
                       dimensions: %w(created_at)
                     },
                     {
-                      key: 'tag',
+                      measure: 'tag',
                       filters: %w(created_at),
                       dimensions: %w(created_at)
                     }
                   ]
                 },
                 {
-                  key: 'issue',
+                  measure: 'issue',
                   filters: %w(created_at),
                   dimensions: %w(created_at)
                 },
                 {
-                  key: 'tag',
+                  measure: 'tag',
                   filters: %w(created_at),
                   dimensions: %w(created_at)
                 }
               ],
               ui_filters: {
-                created_at: "#{format_criteria_time(now - 1.week)} - #{format_criteria_time(now)}"
+                created_at: "#{format_configuration_time(now - 1.week)} - #{format_configuration_time(now)}"
               }
             }
           end
@@ -806,17 +1225,17 @@ describe ReportsKit::Reports::Data::Generate do
         context 'with two dimensions' do
           let(:properties) do
             {
-              measures: [
+              series: [
                 {
                   name: name,
                   composite_operator: '+',
-                  measures: [
+                  series: [
                     {
-                      key: 'issue',
+                      measure: 'issue',
                       dimensions: %w(created_at repo)
                     },
                     {
-                      key: 'tag',
+                      measure: 'tag',
                       dimensions: %w(created_at repo)
                     }
                   ]