mongoid-report 0.1.7 → 0.1.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDE4ZGZlZmJmOWFmMDJkNjY5Yjk3YTRmY2FlMjMwZGVlOTQzNzY4Nw==
+    NWZhMzhiNGQzZDgxMTdlMjlhZGU2MTUyYTE5YzRjOGJmYTRhYTFjMw==
   data.tar.gz: !binary |-
-    MTZkNzhlMTkzNTQxZWY0ZmNlMzc4YmQzM2IxMmIyZjJlOWE1ZGEwNA==
+    NWEzNzVjYzY1M2IwOTgxZmNmZTc1ZDY3N2VmNjY3NTMwZjFmZWMzYw==
 SHA512:
   metadata.gz: !binary |-
-    MDU4NDgwNDc2ZmM2MjRiMmFmYzkxZmM2ODBkNWRjNzY2NDIxOTE3YjQzNjBh
-    YmJkNDMxYjgyZWQ5NTRkNzJlNGUwZDdmYjU3MjQzZTc2ZjkzMTMwMTAyZDQw
-    OTYwZmJiYzc3Y2FjYjAzZGNhZDNkODA0M2U0NjNhYTY4NmU4NmM=
+    Njc2NWE1OWIwYjE5NzJkNmJhOTYxYjM0MjNjMjMyMjkyMjMyZWM5ODVhZjc2
+    M2YzMDU3MmE3ZjI2MjFiNmVjMDE3MzA2ODIzMjIwOThlOThmOTViYjIxMmU4
+    MzY1Zjc1NjczYTk3NzViZDQyNGEzNjVhZTI2OTUzMzZlYjM1ZDU=
   data.tar.gz: !binary |-
-    MTNiMjcyZGZmMzZkNTIzZTI4MGVjZGQ2OTY4ZDBjMTY1ODAwOWVlNDI3MjM4
-    ODVmMmQwNTUxMDNhOWY0M2NjOWNlOWY0MTBlYTVjNTkyNWQ3YTc1NTFkOTU5
-    NWE3OTBmNGU3MTNjOWJjYzUxYjVkNjU2OGI5ZmE4NjNiYTA0MjY=
+    YjgyMjcyMWFmZjU2YzVmNGE3MzRjNTQ1ZTZhODQ4M2I3Y2RmOGQ1M2NiZjg4
+    YmY1Y2UzM2U3ZTI3MDlmODdkMmM3ODAyODVkNzVmY2EyNjA0NzZlNjM1MWVk
+    ODYwM2Y1OWI5YTlhOTM5ZmY1YmMxOWE2MWFjNGMwNzMzZTE2Y2Q=

data/Gemfile.lock

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

data/lib/mongoid/report/collection.rb

@@ -4,30 +4,25 @@ module Mongoid
   module Report
 
     class Collection < SimpleDelegator
-      def initialize(context, rows, fields, columns)
+      def initialize(context, rows, fields, columns, mapping)
         @context = context
         @rows    = rows
         @fields  = fields
         @columns = columns
-        @rows    = compile_rows
-
-        # Collection should behave like Array using delegator method.
-        super(@rows)
+        @mapping = mapping
+        @rows    = Rows.new(compile_rows)
       end
 
-      def compile_rows
-        @rows.map do |row|
-          @columns.each do |name, function|
-            next unless @fields.include?(name)
-            row[name] = function.call(@context, row, { summary: false })
-          end
+      class Rows < SimpleDelegator ; end
 
-          row
-        end
+      attr_reader :rows
+
+      def headers
+        @fields
       end
 
       def summary
-        @summary ||= reduce(Hash.new{|h, k| h[k] = 0}) do |summary, row|
+        @summary ||= @rows.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
@@ -40,13 +35,26 @@ module Mongoid
           # Apply dynamic columns for summarized row
           @columns.each do |name, function|
             next unless @fields.include?(name)
-            summary[name] = function.call(@context, row, { summary: true })
+            summary[name] = function.call(@context, row, { mapping: @mapping, summary: true })
           end
 
           summary
         end
       end
 
+      private
+
+      def compile_rows
+        @rows.map do |row|
+          @columns.each do |name, function|
+            next unless @fields.include?(name)
+            row[name] = function.call(@context, row, { mapping: @mapping, summary: false })
+          end
+
+          row
+        end
+      end
+
     end
 
   end

data/lib/mongoid/report/scope.rb

@@ -23,7 +23,7 @@ module Mongoid
         aggregation_queries = compile_queries
         rows = klass.collection.aggregate(aggregation_queries)
 
-        Collection.new(context, rows, fields, columns)
+        Collection.new(context, rows, fields, columns, mapping)
       end
 
       private
@@ -69,6 +69,10 @@ module Mongoid
       def columns
         context.report_module_settings[report_name][:columns]
       end
+
+      def mapping
+        context.report_module_settings[report_name][:mapping]
+      end
     end
 
   end

data/lib/mongoid/report/version.rb

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

data/spec/mongoid/report/aggregation_spec.rb

@@ -21,8 +21,9 @@ describe Mongoid::Report do
       klass.create!(field1: 1)
 
       example = Report.new
-      rows = example.aggregate_for(klass)
-      rows = rows.all
+      report = example.aggregate_for(klass)
+      report = report.all
+      rows = report.rows
 
       expect(rows.size).to eq(1)
       expect(rows[0]['field1']).to eq(3)
@@ -40,8 +41,10 @@ describe Mongoid::Report do
       end
       example = Report.new
 
-      rows = example.aggregate_for(klass)
-      rows = rows.all
+      report = example.aggregate_for(klass)
+      report = report.all
+
+      rows = report.rows
 
       expect(rows.size).to eq(2)
       expect(rows[0]['field1']).to eq(1)
@@ -70,7 +73,9 @@ describe Mongoid::Report do
       scope = scope.yield
       scope = scope.query('$sort' => { day: -1 })
 
-      rows  = scope.all
+      scope = scope.all
+
+      rows = scope.rows
 
       expect(rows.size).to eq(2)
       expect(rows[0]['field1']).to eq(2)
@@ -93,7 +98,9 @@ describe Mongoid::Report do
       scope = scope.query()
       scope = scope.query({})
 
-      rows  = scope.all
+      scope  = scope.all
+
+      rows = scope.rows
 
       expect(rows.size).to eq(1)
       expect(rows[0]['field1']).to eq(1)
@@ -130,14 +137,14 @@ describe Mongoid::Report do
         .query('$sort' => { day: -1 })
       scope = scope.all
 
-      rows = scope['example1']
+      rows = scope['example1'].rows
       expect(rows.size).to eq(2)
       expect(rows[0]['field1']).to eq(2)
       expect(rows[0]['day']).to eq(today)
       expect(rows[1]['field1']).to eq(1)
       expect(rows[1]['day']).to eq(yesterday)
 
-      rows = scope['example2']
+      rows = scope['example2'].rows
       expect(rows.size).to eq(2)
       expect(rows[0]['field2']).to eq(4)
       expect(rows[0]['day']).to eq(today)
@@ -175,14 +182,14 @@ describe Mongoid::Report do
         .query('$sort' => { day: -1 })
       scope = scope.all
 
-      rows = scope['example-model1']
+      rows = scope['example-model1'].rows
       expect(rows.size).to eq(2)
       expect(rows[0]['field1']).to eq(2)
       expect(rows[0]['day']).to eq(today)
       expect(rows[1]['field1']).to eq(1)
       expect(rows[1]['day']).to eq(yesterday)
 
-      rows = scope['example-model2']
+      rows = scope['example-model2'].rows
       expect(rows.size).to eq(2)
       expect(rows[0]['field2']).to eq(4)
       expect(rows[0]['day']).to eq(today)
@@ -220,14 +227,14 @@ describe Mongoid::Report do
         .query('$sort' => { day: -1 })
       scope = scope.all
 
-      rows = scope['example-model1']
+      rows = scope['example-model1'].rows
       expect(rows.size).to eq(2)
       expect(rows[0]['new-field1']).to eq(2)
       expect(rows[0]['day']).to eq(today)
       expect(rows[1]['new-field1']).to eq(1)
       expect(rows[1]['day']).to eq(yesterday)
 
-      rows = scope['example-model2']
+      rows = scope['example-model2'].rows
       expect(rows.size).to eq(2)
       expect(rows[0]['field2']).to eq(4)
       expect(rows[0]['day']).to eq(today)
@@ -252,7 +259,7 @@ describe Mongoid::Report do
       scope = example.aggregate
       scope = scope.all
 
-      rows = scope[Model]
+      rows = scope[Model].rows
       expect(rows.size).to eq(1)
       expect(rows[0]['field1']).to eq(1)
     end
@@ -276,7 +283,7 @@ describe Mongoid::Report do
       scope = example.aggregate
       scope = scope.all
 
-      rows = scope['example-models']
+      rows = scope['example-models'].rows
       expect(rows.size).to eq(1)
       expect(rows[0]['field1']).to eq(1)
     end
@@ -302,7 +309,7 @@ describe Mongoid::Report do
       scope = example.aggregate
       scope = scope.all
 
-      rows = scope['example-models']
+      rows = scope['example-models'].rows
       expect(rows.size).to eq(1)
       expect(rows[0]['field1']).to eq(1)
     end
@@ -333,7 +340,7 @@ describe Mongoid::Report do
       scope = example.aggregate
       scope = scope.all
 
-      rows = scope['example-models']
+      rows = scope['example-models'].rows
       expect(rows.size).to eq(2)
       expect(rows[0]['field1']).to eq(1)
       expect(rows[1]['field1']).to eq(2)

data/spec/mongoid/report/collection_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe Mongoid::Report::Collection do
+  let(:klass) { Model }
+
+  describe '.rows' do
+    it 'use returns aggregated rows' do
+      Report = Class.new do
+        include Mongoid::Report
+
+        attach_to Model do
+          column :field1
+        end
+      end
+
+      3.times { klass.create!(field1: 1) }
+
+      example = Report.new
+      report = example.aggregate_for(klass)
+      report = report.all
+
+      rows = report.rows
+      expect(rows.size).to eq(1)
+      expect(rows[0]['field1']).to eq(3)
+    end
+  end
+
+  describe '.headers' do
+    it 'returns columns for showing in the reports' do
+      Report = Class.new do
+        include Mongoid::Report
+
+        attach_to Model do
+          column :field1, :field3, :field2
+        end
+      end
+
+      report = Report.new
+      report = report
+        .aggregate_for(klass)
+        .all
+
+      expect(report.headers).to eq(["field1", "field3", "field2"])
+    end
+  end
+end

data/spec/mongoid/report/column_spec.rb

@@ -24,11 +24,11 @@ describe Mongoid::Report do
     klass.create(day: yesterday , field1: 1)
     klass.create(day: today     , field1: 1)
 
-    example = report_klass.new
-    scope = example.aggregate
+    report = report_klass.new
+    scope = report.aggregate
     scope = scope.all
 
-    rows = scope['example-models']
+    rows = scope['example-models'].rows
     expect(rows.size).to eq(2)
     expect(rows[0]['field1']).to eq(1)
     expect(rows[0]['dynamic-field1']).to eq(10)

data/spec/mongoid/report/set_spec.rb

@@ -11,17 +11,19 @@ describe Mongoid::Report do
 
       report 'example' do
         attach_to Model do
-          columns :'new-field' => ->(context, row, options) { row[context.mapping('example-models')['field3'].to_s] }
+          columns :'new-field' => ->(context, row, options) { row[options[:mapping]['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
+    report = Report.new
+    report = report.aggregate_for('example-models')
+    report = report.all
+
+    rows = report.rows
 
     expect(rows.size).to eq(1)
     expect(rows[0]['field1']).to eq(2)

data/spec/mongoid/report/summary_spec.rb

@@ -19,11 +19,12 @@ describe Mongoid::Report do
       end
       example = Report.new
 
-      rows = example.aggregate_for(klass)
-      rows = rows.all
+      report = example.aggregate_for(klass)
+      report = report.all
+      rows = report.rows
 
       expect(rows.count).to eq(2)
-      expect(rows.summary['field1']).to eq(3)
+      expect(report.summary['field1']).to eq(3)
     end
 
     it 'should support dynamic columns as well' do
@@ -47,17 +48,18 @@ describe Mongoid::Report do
       klass.create!(field1: 1)
       klass.create!(field1: 1)
 
-      example = Report.new
-      rows = example.aggregate_for('example-models')
-      rows = rows.all
+      report = Report.new
+      report = report.aggregate_for('example-models')
+      report = report.all
+      rows = report.rows
 
       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)
+      expect(report.summary.keys.size).to eq(2)
+      expect(report.summary['field1']).to eq(3)
+      expect(report.summary['new-field1']).to eq(30)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-report
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -82,6 +82,7 @@ files:
 - lib/mongoid/report/version.rb
 - mongoid-report.gemspec
 - spec/mongoid/report/aggregation_spec.rb
+- spec/mongoid/report/collection_spec.rb
 - spec/mongoid/report/column_spec.rb
 - spec/mongoid/report/config_spec.rb
 - spec/mongoid/report/queries_builder_spec.rb
@@ -117,6 +118,7 @@ specification_version: 4
 summary: Easily build mongoid reports using aggregation framework
 test_files:
 - spec/mongoid/report/aggregation_spec.rb
+- spec/mongoid/report/collection_spec.rb
 - spec/mongoid/report/column_spec.rb
 - spec/mongoid/report/config_spec.rb
 - spec/mongoid/report/queries_builder_spec.rb