mongoid-report 0.1.6 → 0.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Nzk0NTgwOTk3NDY5NjYzNzQ4YjM5NmQ1NjVlNTI2ZGI1YTA0NDcwMg==
+    ZDE4ZGZlZmJmOWFmMDJkNjY5Yjk3YTRmY2FlMjMwZGVlOTQzNzY4Nw==
   data.tar.gz: !binary |-
-    YjNjYmU3MjIxNzQxOGFlM2JlYzBjZjQ1OWNhYTM0MWNkMDc5ZjQyYw==
+    MTZkNzhlMTkzNTQxZWY0ZmNlMzc4YmQzM2IxMmIyZjJlOWE1ZGEwNA==
 SHA512:
   metadata.gz: !binary |-
-    MGE2NTQ1M2EyYWQzYjcxMDZiNzFiNTM2YjJkYTAyMWI3NjJjMmZiYWVlYTdk
-    NDAxZjI0YWY3NWVmMzY2Zjc2N2ZiZDcyYmI5NzQ0NWQ0YjMwOTYyMzM2NWZm
-    NDc2Mzg5MTJlNGE4MjYyNWRmYTA4ZmMxMDE0OTRiMGI1NTNlOTY=
+    MDU4NDgwNDc2ZmM2MjRiMmFmYzkxZmM2ODBkNWRjNzY2NDIxOTE3YjQzNjBh
+    YmJkNDMxYjgyZWQ5NTRkNzJlNGUwZDdmYjU3MjQzZTc2ZjkzMTMwMTAyZDQw
+    OTYwZmJiYzc3Y2FjYjAzZGNhZDNkODA0M2U0NjNhYTY4NmU4NmM=
   data.tar.gz: !binary |-
-    ODZhMDdjOTk2YWRkOGQyM2FkZTlhZTdiMzBiYzM5NmFjN2MzM2ZkNWI3NzJh
-    M2VlZmFkNjUzNmZlMGM5YzZiM2Q1YTkzOGZjYzNhZGNjN2MwMGIyNGEyZWVj
-    MzVmMDVlMTE1MWY0Njk1ZWVjNDg5ZGNmNTBmOTNiODcyYTgwNjA=
+    MTNiMjcyZGZmMzZkNTIzZTI4MGVjZGQ2OTY4ZDBjMTY1ODAwOWVlNDI3MjM4
+    ODVmMmQwNTUxMDNhOWY0M2NjOWNlOWY0MTBlYTVjNTkyNWQ3YTc1NTFkOTU5
+    NWE3OTBmNGU3MTNjOWJjYzUxYjVkNjU2OGI5ZmE4NjNiYTA0MjY=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongoid-report (0.1.6)
+    mongoid-report (0.1.7)
       mongoid (> 3.0.1)
 
 GEM

data/README.md

@@ -21,14 +21,14 @@ framework.
   class Report1
     include Mongoid::Report
 
-    aggregation_field :field1, for: Model
+    column :field1, for: Model
   end
 
   class Report2
     include Mongoid::Report
 
     attach_to Model do
-      aggregation_field :field1
+      column :field1
     end
   end
 
@@ -37,7 +37,7 @@ framework.
 
     group_by :day, for: Model
 
-    aggregation_field :field1, for: Model
+    column :field1, for: Model
   end
 
   class Report4
@@ -46,7 +46,7 @@ framework.
     attach_to Model do
       group_by :day
 
-      aggregation_field :field1
+      column :field1
     end
   end
 
@@ -56,7 +56,7 @@ framework.
     attach_to Model, as: 'summary-report' do
       group_by :day
 
-      aggregation_field :field1
+      column :field1
     end
   end
 ```

data/lib/mongoid/report.rb

@@ -51,6 +51,10 @@ module Mongoid
         report_module_settings[klass][:queries]
       end
 
+      def mapping(klass)
+        report_module_settings[klass][:mapping]
+      end
+
       # We should pass here mongoid document
       def aggregate_for(report_name)
         Scope.new(self, report_name)
@@ -87,11 +91,11 @@ module Mongoid
 
       def group_by(*fields)
         define_report_method(*fields) do |groups, report_name, _|
-          settings[report_name][:group_by] = groups
+          settings[report_name][:group_by] = groups.map(&:to_s)
         end
       end
 
-      def aggregation_field(*fields)
+      def column(*fields)
         define_report_method(*fields) do |columns, report_name, options|
           columns.each do |column|
             name = options.fetch(:as) { column }
@@ -100,13 +104,21 @@ module Mongoid
         end
       end
 
-      def column(*fields)
-        # Because of representing fields as hash instead of columns we should
-        # have the last variable as columns.
+      def columns(*fields)
         define_report_method(*fields) do |_, report_name, columns|
-          columns.each do |name, function|
-            add_column(report_name, name, function)
+          self.settings[report_name][:columns] = columns.stringify_keys!
+        end
+      end
+
+      def mapping(*fields)
+        define_report_method(*fields) do |_, report_name, mapping|
+          mapping.stringify_keys!
+
+          mapping.each do |key, value|
+            mapping[key] = value.to_s
           end
+
+          self.settings[report_name][:mapping] = mapping
         end
       end
 
@@ -153,20 +165,16 @@ module Mongoid
             fields:    ActiveSupport::OrderedHash.new,
             group_by:  [],
             queries:   [],
+            columns:   {},
+            mapping:   {},
             compiled:  false,
-            columns:   ActiveSupport::OrderedHash.new,
           }
         end
       end
 
       def add_field(attach_name, field, name)
-        settings[attach_name][:fields][field] = name
+        settings[attach_name][:fields][field.to_s] = name.to_s
       end
-
-      def add_column(attach_name, name, function)
-        settings[attach_name][:columns][name] = function
-      end
-
     end
 
   end

data/lib/mongoid/report/attach_proxy.rb

@@ -11,28 +11,34 @@ module Mongoid
         super(context, collection, options)
       end
 
-      def aggregation_field(*fields)
+      def columns(*fields)
         proxy_options = fields.extract_options!
         proxy_options.merge!(options)
-        context.aggregation_field(*fields, proxy_options)
+        context.columns(*fields, proxy_options)
       end
 
-      def group_by(*fields)
+      def column(*fields)
         proxy_options = fields.extract_options!
         proxy_options.merge!(options)
-        context.group_by(*fields, proxy_options)
+        context.column(*fields, proxy_options)
       end
 
-      def filter(*fields)
+      def mapping(*fields)
         proxy_options = fields.extract_options!
         proxy_options.merge!(options)
-        context.filter(*fields, proxy_options)
+        context.mapping(*fields, proxy_options)
       end
 
-      def column(*fields)
+      def group_by(*fields)
         proxy_options = fields.extract_options!
         proxy_options.merge!(options)
-        context.column(*fields, proxy_options)
+        context.group_by(*fields, proxy_options)
+      end
+
+      def filter(*fields)
+        proxy_options = fields.extract_options!
+        proxy_options.merge!(options)
+        context.filter(*fields, proxy_options)
       end
     end
 

data/lib/mongoid/report/collection.rb

@@ -9,41 +9,44 @@ module Mongoid
         @rows    = rows
         @fields  = fields
         @columns = columns
-
-        # Apply dyncamic columns in context of row and apply indifferent access
-        # for the rows.
-        rows = compile_dynamic_fields(rows, columns)
+        @rows    = compile_rows
 
         # Collection should behave like Array using delegator method.
-        super(rows)
+        super(@rows)
       end
 
-      def summary
-        @summary ||= reduce(Hash.new{|h, k| h[k] = 0}) do |summary, row|
-          @fields.each do |field|
-            next if @columns.has_key?(field.to_s)
-            summary[field] += row[field.to_s]
-          end
-
+      def compile_rows
+        @rows.map do |row|
           @columns.each do |name, function|
-            summary[name] = function.call(@context, row)
+            next unless @fields.include?(name)
+            row[name] = function.call(@context, row, { summary: false })
           end
 
-          summary
-        end.with_indifferent_access
+          row
+        end
       end
 
-      private
+      def summary
+        @summary ||= reduce(Hash.new{|h, k| h[k] = 0}) do |summary, row|
+          # Find summary for aggregated rows
+          @fields.each do |field|
+            # Don't apply for dynamic calculated columns lets wait until we get
+            # all summaried mongo columns and then apply dynamic columns
+            # calculations.
+            next if @columns.has_key?(field)
+            summary[field] += row[field]
+          end
 
-      def compile_dynamic_fields(rows, columns)
-        rows.map do |row|
+          # Apply dynamic columns for summarized row
           @columns.each do |name, function|
-            row[name] = function.call(@context, row)
+            next unless @fields.include?(name)
+            summary[name] = function.call(@context, row, { summary: true })
           end
 
-          row.with_indifferent_access
+          summary
         end
       end
+
     end
 
   end

data/lib/mongoid/report/queries_builder.rb

@@ -17,7 +17,9 @@ module Mongoid
       end
 
       def fields
-        @fields ||= settings[:fields]
+        @fields ||= settings[:fields].select do |field, _|
+          !settings[:columns].include?(field.to_sym)
+        end
       end
 
       def in_fields

data/lib/mongoid/report/scope.rb

@@ -38,6 +38,7 @@ module Mongoid
                 if value.respond_to?(:call)
                   value = value.call(context)
                 end
+
                 new_query[function_name][name] = value
               end
             end

data/lib/mongoid/report/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Report
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

data/spec/mongoid/report/aggregation_spec.rb

@@ -12,7 +12,7 @@ describe Mongoid::Report do
         include Mongoid::Report
 
         attach_to Model do
-          aggregation_field :field1
+          column :field1
         end
       end
 
@@ -33,7 +33,12 @@ describe Mongoid::Report do
       klass.create!(day: today     , field1: 1)
       klass.create!(day: yesterday , field1: 1)
 
-      example = Report3.new
+      Report = Class.new do
+        include Mongoid::Report
+        group_by :day, for: Model
+        column :field1, for: Model
+      end
+      example = Report.new
 
       rows = example.aggregate_for(klass)
       rows = rows.all
@@ -52,7 +57,13 @@ describe Mongoid::Report do
       klass.create(day: two_days_ago , field1: 1 , field2: 2)
       klass.create(day: today        , field1: 1 , field2: 3)
 
-      example = Report3.new
+      Report = Class.new do
+        include Mongoid::Report
+        group_by :day, for: Model
+        column :field1, for: Model
+      end
+      example = Report.new
+
       scope = example.aggregate_for(Model)
       scope = scope.query('$match' => { :day  => { '$gte' => yesterday.mongoize, '$lte' => today.mongoize } })
       scope = scope.query('$match' => { :field2 => 2 })
@@ -71,7 +82,13 @@ describe Mongoid::Report do
     it 'skips empty match in query' do
       klass.create(day: today , field1: 1 , field2: 2)
 
-      example = Report3.new
+      Report = Class.new do
+        include Mongoid::Report
+        group_by :day, for: Model
+        column :field1, for: Model
+      end
+      example = Report.new
+
       scope = example.aggregate_for(Model)
       scope = scope.query()
       scope = scope.query({})
@@ -84,20 +101,6 @@ describe Mongoid::Report do
     end
   end
 
-  class Report7
-    include Mongoid::Report
-
-    attach_to Model, as: 'example1' do
-      group_by :day
-      aggregation_field :field1
-    end
-
-    attach_to Model, as: 'example2' do
-      group_by :day
-      aggregation_field :field2
-    end
-  end
-
   describe '.aggregate' do
     it 'aggregates all defined groups in the report class' do
       klass.create(day: today        , field1: 1 , field2: 2)
@@ -105,7 +108,21 @@ describe Mongoid::Report do
       klass.create(day: yesterday    , field1: 1 , field2: 2)
       klass.create(day: two_days_ago , field1: 1 , field2: 2)
 
-      example = Report7.new
+      Report = Class.new do
+        include Mongoid::Report
+
+        attach_to Model, as: 'example1' do
+          group_by :day
+          column :field1
+        end
+
+        attach_to Model, as: 'example2' do
+          group_by :day
+          column :field2
+        end
+      end
+
+      example = Report.new
       scope = example.aggregate
       scope
         .query('$match' => { :day  => { '$gte' => yesterday.mongoize, '$lte' => today.mongoize } })
@@ -128,29 +145,29 @@ describe Mongoid::Report do
       expect(rows[1]['day']).to eq(yesterday)
     end
 
-    class Report8
-      include Mongoid::Report
-
-      report 'example' do
-        attach_to Model, as: 'model1' do
-          group_by :day
-          aggregation_field :field1
-        end
-
-        attach_to Model, as: 'model2' do
-          group_by :day
-          aggregation_field :field2
-        end
-      end
-    end
-
     it 'should still aggregate with combined report' do
       klass.create(day: today        , field1: 1 , field2: 2)
       klass.create(day: today        , field1: 1 , field2: 2)
       klass.create(day: yesterday    , field1: 1 , field2: 2)
       klass.create(day: two_days_ago , field1: 1 , field2: 2)
 
-      example = Report8.new
+      Report = Class.new do
+        include Mongoid::Report
+
+        report 'example' do
+          attach_to Model, as: 'model1' do
+            group_by :day
+            column :field1
+          end
+
+          attach_to Model, as: 'model2' do
+            group_by :day
+            column :field2
+          end
+        end
+      end
+      example = Report.new
+
       scope = example.aggregate
       scope
         .query('$match' => { :day  => { '$gte' => yesterday.mongoize, '$lte' => today.mongoize } })
@@ -173,29 +190,29 @@ describe Mongoid::Report do
       expect(rows[1]['day']).to eq(yesterday)
     end
 
-    class Report11
-      include Mongoid::Report
-
-      report 'example' do
-        attach_to Model, as: 'model1' do
-          group_by :day
-          aggregation_field :field1, as: 'new-field1'
-        end
-
-        attach_to Model, as: 'model2' do
-          group_by :day
-          aggregation_field :field2
-        end
-      end
-    end
-
     it 'should still aggregate with combined report and project using the new names' do
       klass.create(day: today        , field1: 1 , field2: 2)
       klass.create(day: today        , field1: 1 , field2: 2)
       klass.create(day: yesterday    , field1: 1 , field2: 2)
       klass.create(day: two_days_ago , field1: 1 , field2: 2)
 
-      example = Report11.new
+      Report = Class.new do
+        include Mongoid::Report
+
+        report 'example' do
+          attach_to Model, as: 'model1' do
+            group_by :day
+            column :field1, as: 'new-field1'
+          end
+
+          attach_to Model, as: 'model2' do
+            group_by :day
+            column :field2
+          end
+        end
+      end
+      example = Report.new
+
       scope = example.aggregate
       scope
         .query('$match' => { :day  => { '$gte' => yesterday.mongoize, '$lte' => today.mongoize } })
@@ -219,19 +236,19 @@ describe Mongoid::Report do
     end
   end
 
-  class Report15
-    include Mongoid::Report
-
-    filter field2: 2, for: Model
-    aggregation_field :field1, for: Model
-  end
-
   describe '.filter' do
     it 'creates filter' do
       klass.create(field1: 1, field2: 2)
       klass.create(field1: 3, field2: 4)
 
-      example = Report15.new
+      Report = Class.new do
+        include Mongoid::Report
+
+        filter field2: 2, for: Model
+        column :field1, for: Model
+      end
+      example = Report.new
+
       scope = example.aggregate
       scope = scope.all
 
@@ -240,22 +257,22 @@ describe Mongoid::Report do
       expect(rows[0]['field1']).to eq(1)
     end
 
-    class Report16
-      include Mongoid::Report
-
-      report 'example' do
-        attach_to Model do
-          filter field2: 2
-          aggregation_field :field1
-        end
-      end
-    end
-
     it 'creates filter in report scope' do
       klass.create(field1: 1, field2: 2)
       klass.create(field1: 3, field2: 4)
 
-      example = Report16.new
+      Report = Class.new do
+        include Mongoid::Report
+
+        report 'example' do
+          attach_to Model do
+            filter field2: 2
+            column :field1
+          end
+        end
+      end
+
+      example = Report.new
       scope = example.aggregate
       scope = scope.all
 
@@ -264,24 +281,24 @@ describe Mongoid::Report do
       expect(rows[0]['field1']).to eq(1)
     end
 
-    class Report17
-      include Mongoid::Report
-
-      report 'example' do
-        attach_to Model do
-          filter field2: 2,
-                 day: ->(context) { Date.parse("20-12-2004").mongoize }
-          aggregation_field :field1
-        end
-      end
-    end
-
     it 'creates filter in report scope' do
       klass.create(day: today     , field1: 1 , field2: 2)
       klass.create(day: yesterday , field1: 1 , field2: 2)
       klass.create(day: today     , field1: 3 , field2: 4)
 
-      example = Report17.new
+      Report = Class.new do
+        include Mongoid::Report
+
+        report 'example' do
+          attach_to Model do
+            filter field2: 2,
+              day: ->(context) { Date.parse("20-12-2004").mongoize }
+            column :field1
+          end
+        end
+      end
+      example = Report.new
+
       scope = example.aggregate
       scope = scope.all
 
@@ -290,29 +307,29 @@ describe Mongoid::Report do
       expect(rows[0]['field1']).to eq(1)
     end
 
-    class Report18
-      include Mongoid::Report
-
-      def values
-        [1, 2]
-      end
-
-      report 'example' do
-        attach_to Model do
-          group_by :day
-          filter field2: ->(context) { { '$in' => context.values } }
-          aggregation_field :field1
-        end
-      end
-    end
-
     it 'creates filter in report scope' do
       klass.create(day: today     , field1: 1 , field2: 2)
       klass.create(day: today     , field1: 1 , field2: 2)
       klass.create(day: yesterday , field1: 1 , field2: 2)
       klass.create(day: today     , field1: 3 , field2: 4)
 
-      example = Report18.new
+      Report = Class.new do
+        include Mongoid::Report
+
+        def values
+          [1, 2]
+        end
+
+        report 'example' do
+          attach_to Model do
+            group_by :day
+            filter field2: ->(context) { { '$in' => context.values } }
+            column :field1
+          end
+        end
+      end
+      example = Report.new
+
       scope = example.aggregate
       scope = scope.all
 

data/spec/mongoid/report/column_spec.rb

@@ -12,8 +12,8 @@ describe Mongoid::Report do
       report 'example' do
         attach_to Model do
           group_by :day
-          aggregation_field :field1
-          column 'dynamic-field1' => ->(context, row) { row['field1'] * 10 }
+          columns :'dynamic-field1' => ->(context, row, options) { row['field1'] * 10 }
+          column :field1, :'dynamic-field1'
         end
       end
     end

data/spec/mongoid/report/queries_builder_spec.rb

@@ -4,44 +4,60 @@ describe Mongoid::Report::QueriesBuilder do
 
   describe '.queries' do
     it 'builds queries for aggregation' do
-      queries = Report1.new.queries(Model)
+      Report = Class.new do
+        include Mongoid::Report
+        column :field1, for: Model
+      end
+      report = Report.new
+
+      queries = report.queries(Model)
       expect(queries.size).to eq(3)
       expect(queries[0]).to eq(
         '$project' => {
           :_id    => 1,
-          :field1 => 1,
+          'field1' => 1,
         })
       expect(queries[1]).to eq(
         '$group' => {
           :_id    => { },
-          :field1 => { '$sum'  => '$field1' },
+          'field1' => { '$sum'  => '$field1' },
         })
       expect(queries[2]).to eq(
         '$project' => {
           :_id    => 0,
-          :field1 => '$field1',
+          'field1' => '$field1',
         })
     end
 
     it 'builds queries using custom one group' do
-      queries = Report4.new.queries(Model)
+      Report = Class.new do
+        include Mongoid::Report
+
+        attach_to Model do
+          group_by :day
+          column :field1
+        end
+      end
+      report = Report.new
+
+      queries = report.queries(Model)
       expect(queries.size).to eq(3)
       expect(queries[0]).to eq(
         '$project' => {
-          :_id    => 1,
-          :field1 => 1,
-          :day    => 1,
+          :_id     => 1,
+          'field1' => 1,
+          'day'    => 1,
         })
       expect(queries[1]).to eq(
         '$group' => {
-          :_id    => { :day => '$day' },
-          :field1 => { '$sum' => '$field1' },
+          :_id    => { 'day' => '$day' },
+          'field1' => { '$sum' => '$field1' },
         })
       expect(queries[2]).to eq(
         '$project' => {
-          :_id    => 0,
-          :day    => '$_id.day',
-          :field1 => '$field1',
+          :_id     => 0,
+          'day'    => '$_id.day',
+          'field1' => '$field1',
         })
     end
 
@@ -51,7 +67,7 @@ describe Mongoid::Report::QueriesBuilder do
       attach_to Model do
         group_by :day, :field2
 
-        aggregation_field :field1, :field3
+        column :field1, :field3
       end
     end
 
@@ -60,25 +76,25 @@ describe Mongoid::Report::QueriesBuilder do
       expect(queries.size).to eq(3)
       expect(queries[0]).to eq(
         '$project' => {
-          :_id    => 1,
-          :field1 => 1,
-          :field3 => 1,
-          :day    => 1,
-          :field2 => 1,
+          :_id     => 1,
+          'field1' => 1,
+          'field3' => 1,
+          'day'    => 1,
+          'field2' => 1,
         })
       expect(queries[1]).to eq(
         '$group' => {
-          :_id    => { :day => '$day', :field2 => '$field2' },
-          :field1 => { '$sum' => '$field1' },
-          :field3 => { '$sum' => '$field3' },
+          :_id    => { 'day' => '$day', 'field2' => '$field2' },
+          'field1' => { '$sum' => '$field1' },
+          'field3' => { '$sum' => '$field3' },
         })
       expect(queries[2]).to eq(
         '$project' => {
-          :_id    => 0,
-          :day    => '$_id.day',
-          :field2 => '$_id.field2',
-          :field1 => '$field1',
-          :field3 => '$field3',
+          :_id     => 0,
+          'day'    => '$_id.day',
+          'field2' => '$_id.field2',
+          'field1' => '$field1',
+          'field3' => '$field3',
         })
     end
   end

data/spec/mongoid/report/set_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Mongoid::Report do
+  let(:klass) { Model }
+
+  it 'allows to save options per report and attached model' do
+    2.times { klass.create!(field1: 1) }
+
+    Report = Class.new do
+      include Mongoid::Report
+
+      report 'example' do
+        attach_to Model do
+          columns :'new-field' => ->(context, row, options) { row[context.mapping('example-models')['field3'].to_s] }
+          mapping :'field3' => :field1
+
+          column :field1, :'new-field'
+        end
+      end
+    end
+    example = Report.new
+
+    rows = example.aggregate_for('example-models')
+    rows = rows.all
+
+    expect(rows.size).to eq(1)
+    expect(rows[0]['field1']).to eq(2)
+    expect(rows[0]['new-field']).to eq(2)
+  end
+end

data/spec/mongoid/report/summary_spec.rb

@@ -12,12 +12,17 @@ describe Mongoid::Report do
       klass.create!(day: today     , field1: 1)
       klass.create!(day: yesterday , field1: 1)
 
-      example = Report3.new
+      Report = Class.new do
+        include Mongoid::Report
+        group_by :day, for: Model
+        column :field1, for: Model
+      end
+      example = Report.new
+
       rows = example.aggregate_for(klass)
       rows = rows.all
 
       expect(rows.count).to eq(2)
-      expect(rows.summary[:field1]).to eq(3)
       expect(rows.summary['field1']).to eq(3)
     end
 
@@ -25,10 +30,15 @@ describe Mongoid::Report do
       Report = Class.new do
         include Mongoid::Report
 
+        COLUMNS = {
+          :'new-field1' => ->(context, row, options) { row['field1'] * 10 },
+          :'new-field2' => ->(context, row, options) { row['field1'] * 20 },
+        }
+
         report 'example' do
           attach_to Model do
-            aggregation_field :field1
-            column 'new-field1' => ->(context, row) { row['field1'] * 10 }
+            columns COLUMNS
+            column :field1, 'new-field1'
           end
         end
       end
@@ -41,8 +51,13 @@ describe Mongoid::Report do
       rows = example.aggregate_for('example-models')
       rows = rows.all
 
+      expect(rows[0].keys.size).to eq(2)
       expect(rows[0]['field1']).to eq(3)
       expect(rows[0]['new-field1']).to eq(30)
+
+      expect(rows.summary.keys.size).to eq(2)
+      expect(rows.summary['field1']).to eq(3)
+      expect(rows.summary['new-field1']).to eq(30)
     end
   end
 

data/spec/mongoid/report/threads_spec.rb

@@ -9,11 +9,11 @@ describe Mongoid::Report do
       include Mongoid::Report
 
       attach_to Model, as: 'field1-aggregation' do
-        aggregation_field :field1
+        column :field1
       end
 
       attach_to Model, as: 'field2-aggregation' do
-        aggregation_field :field2
+        column :field2
       end
     end
 

data/spec/mongoid/report_spec.rb

@@ -2,89 +2,126 @@ require 'spec_helper'
 
 describe Mongoid::Report do
 
-  describe '.aggregation_field' do
+  describe '.column' do
+    let(:report_klass) do
+      Class.new do
+        include Mongoid::Report
+        column :field1, for: Model
+      end
+    end
+
     it 'defines aggegration settings' do
-      expect(Report1).to be_respond_to(:settings)
+      expect(report_klass).to be_respond_to(:settings)
     end
 
     it 'defines aggregation field for specific model to make queries' do
-      fields = Report1.fields(Model)
-      expect(fields).to eq({ field1: :field1 })
+      fields = report_klass.fields(Model)
+      expect(fields).to eq({ 'field1' => 'field1' })
     end
   end
 
-  describe '.attach_to' do
+ describe '.attach_to' do
+    let(:report_klass) do
+      Class.new do
+        include Mongoid::Report
+        attach_to Model do
+          column :field1
+        end
+      end
+    end
+
     it 'defines method in report class to attach report to the model' do
-      expect(Report2).to be_respond_to(:attach_to)
+      expect(report_klass).to be_respond_to(:attach_to)
     end
 
     it 'defines field in terms of attached model' do
-      fields = Report2.fields(Model)
-      expect(fields).to eq({ field1: :field1 })
+      fields = report_klass.fields(Model)
+      expect(fields).to eq({ 'field1' => 'field1' })
     end
   end
 
   describe '.group_by' do
+    let(:report_klass1) do
+      Class.new do
+        include Mongoid::Report
+        group_by :day, for: Model
+        column :field1, for: Model
+      end
+    end
+
     it 'defines group by method as class method' do
-      expect(Report3).to be_respond_to(:group_by)
+      expect(report_klass1).to be_respond_to(:group_by)
     end
 
     it 'stores group by settings under report class' do
-      group_by_settings = Report3.settings[Model][:group_by]
-      expect(group_by_settings).to eq([:day])
+      group_by_settings = report_klass1.settings[Model][:group_by]
+      expect(group_by_settings).to eq(['day'])
     end
 
-    it 'defines groups in terms of attached model' do
-      groups = Report4.groups(Model)
-      expect(groups).to eq([:day])
+    let(:report_klass2) do
+      Class.new do
+        include Mongoid::Report
+        attach_to Model do
+          group_by :day
+          column :field1
+        end
+      end
     end
-  end
-
-  class Report6
-    include Mongoid::Report
 
-    attach_to Model, as: 'example1' do
-      aggregation_field :field1
+    it 'defines groups in terms of attached model' do
+      groups = report_klass2.groups(Model)
+      expect(groups).to eq(['day'])
     end
   end
 
   describe '.as' do
+    let(:report_klass) do
+      Class.new do
+        include Mongoid::Report
+        attach_to Model, as: 'example1' do
+          column :field1
+        end
+      end
+    end
+
     it 'creates settings with "as" name' do
-      expect(Report6.settings).to have_key('example1')
+      expect(report_klass.settings).to have_key('example1')
     end
   end
 
-  class Report7
-    include Mongoid::Report
-
-    report 'example' do
-      attach_to Model, as: 'model1' do
-        aggregation_field :field1
-      end
-
-      attach_to Model do
-        aggregation_field :field1
+  describe '.report' do
+    let(:report_klass) do
+      Class.new do
+        include Mongoid::Report
+        report 'example' do
+          attach_to Model, as: 'model1' do
+            column :field1
+          end
+
+          attach_to Model do
+            column :field1
+          end
+        end
       end
     end
-  end
 
-  describe '.report' do
     it 'creates settings with report-<attached-model-name' do
-      expect(Report7.settings).to have_key('example-model1')
-      expect(Report7.settings).to have_key("example-#{Model.collection.name}")
+      expect(report_klass.settings).to have_key('example-model1')
+      expect(report_klass.settings).to have_key("example-#{Model.collection.name}")
     end
   end
 
-  class Report10
-    include Mongoid::Report
-
-    aggregation_field :field1, for: Model, as: 'field-name'
-  end
+  describe '.column `as` option' do
+    let(:report_klass) do
+      Class.new do
+        include Mongoid::Report
+        column :field1, for: Model, as: 'field-name'
+      end
+    end
 
-  describe '.aggregation_field `as` option' do
     it 'creates settings with report-<attached-model-name' do
-      expect(Report10.fields(Model).keys).to eq([:field1])
-      expect(Report10.fields(Model).values).to eq(['field-name'])
+      expect(report_klass.fields(Model).keys).to eq(['field1'])
+      expect(report_klass.fields(Model).values).to eq(['field-name'])
     end
   end
 
@@ -95,7 +132,7 @@ describe Mongoid::Report do
         include Mongoid::Report
 
         attach_to Model do
-          aggregation_field :field1
+          column :field1
         end
       end
 
@@ -103,7 +140,7 @@ describe Mongoid::Report do
         include Mongoid::Report
 
         attach_to Model do
-          aggregation_field :field2
+          column :field2
         end
       end
 
@@ -116,13 +153,13 @@ describe Mongoid::Report do
 
     class ReportKlass1 < ReportKlass
       attach_to Model do
-        aggregation_field :field1
+        column :field1
       end
     end
 
     class ReportKlass2 < ReportKlass
       attach_to Model do
-        aggregation_field :field2
+        column :field2
       end
     end
 

data/spec/support/models.rb

@@ -7,35 +7,3 @@ class Model
 
   field :day,    type: Date
 end
-
-class Report1
-  include Mongoid::Report
-
-  aggregation_field :field1, for: Model
-end
-
-class Report2
-  include Mongoid::Report
-
-  attach_to Model do
-    aggregation_field :field1
-  end
-end
-
-class Report3
-  include Mongoid::Report
-
-  group_by :day, for: Model
-
-  aggregation_field :field1, for: Model
-end
-
-class Report4
-  include Mongoid::Report
-
-  attach_to Model do
-    group_by :day
-
-    aggregation_field :field1
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-report
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -85,6 +85,7 @@ files:
 - spec/mongoid/report/column_spec.rb
 - spec/mongoid/report/config_spec.rb
 - spec/mongoid/report/queries_builder_spec.rb
+- spec/mongoid/report/set_spec.rb
 - spec/mongoid/report/summary_spec.rb
 - spec/mongoid/report/threads_spec.rb
 - spec/mongoid/report_spec.rb
@@ -119,6 +120,7 @@ test_files:
 - spec/mongoid/report/column_spec.rb
 - spec/mongoid/report/config_spec.rb
 - spec/mongoid/report/queries_builder_spec.rb
+- spec/mongoid/report/set_spec.rb
 - spec/mongoid/report/summary_spec.rb
 - spec/mongoid/report/threads_spec.rb
 - spec/mongoid/report_spec.rb