mongoid-report 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTc1MDVkMjAwOGQ1MTRlM2E0NWQ2ZDk4ODE4MjllZjEzZGRmYWJhMA==
+    Mzk5ZjE1YTRjNTNkZjRmOWVlMzM1OTJjMjExZWQ3NjljOTk5NTY5Mw==
   data.tar.gz: !binary |-
-    ZDc5ZDViNjhhZmFkZTQ1MzBiZWYwYzVmNTVhYzUzYTM3ZDBjNGYxNg==
+    ZmU3YWU2NDBiN2I4NDZlMjViZGM0MTljNGY2NGIxYmNkZWExN2ViNA==
 SHA512:
   metadata.gz: !binary |-
-    NzZjMTZiYjc4NDJjOWRkM2VmYjg3NDYwZWUxNWY1MzNhNTg4NzFlODczYTkz
-    ZTdiYmEzYjUxMzNhY2Q5OWYyNTY4NTIzMjZiOTljNjI2ZWYwZDBkMmVhM2Qw
-    MWY1ZjBmY2YxNWI2Y2Y2ZjJlNWNjYjJiMjhmOGJmMDVkZjhlNDA=
+    YmY2NTA3ZGZjNjY4ZTU3NmNiZGQ1MGIzM2U4YWNhM2FkMWQ5YTA4NWZhMzll
+    N2JjM2VmNmNjYmFhMjEyYTI4ZGY4MDRkNTk2YzQ3NTI0Y2IxNDk4MTUyODY4
+    OTY2ZjAzNGMxZjkwOWRmNmIzYjA3MGY3ZTE3MjY2MTg3OWJiZWY=
   data.tar.gz: !binary |-
-    ODMzNGM5YmRlMzhlODVhMWI0MDE4MWEwMzdjMjkwMWI4MGJlNDU5NWY2OWJi
-    ODlkMTA2Y2MwMjk4YmJiNzkwMTRiNTBhN2E2Yjg4OWMwYWVjMzU0YTI3ZGFl
-    N2I1OTMyNjEyMDJlMjc2NzJhNTkyNTY4Yjk4NzQzZTAyMjA0MDM=
+    YzM2ZTZmZWFlODA4NjI1MTIzYTY0NDk5YzkyM2EwNDQ3ZWYwNmQ0MTY4ZGI2
+    NjUxZjQzZDg5ZmU3NDU3ZWU4OWIxMWZjZGU5YmRjMmJhMTgyYzNiNTJjNjBj
+    NDQ5YWZjNGNkOTU1MDBlMTEyNjE2N2U4ODIzNDJjYmQ0YjJiZTA=

data/Gemfile.lock

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

data/lib/mongoid/report/scope_collection.rb

@@ -0,0 +1,40 @@
+module Mongoid
+  module Report
+
+    ScopeCollection = Struct.new(:context) do
+      def scopes
+        @scopes ||= modules.map do |key|
+          Scope.new(context, key)
+        end
+      end
+
+      def query(conditions = {})
+        scopes.each do |scope|
+          scope.query(conditions)
+        end
+        self
+      end
+
+      def yield
+        scopes.each do |scope|
+          scope.yield
+        end
+        self
+      end
+
+      def all
+        scopes.inject({}) do |hash, scope|
+          hash[scope.report_name] = scope.all
+          hash
+        end
+      end
+
+      private
+
+      def modules
+        context.settings.keys
+      end
+    end
+
+  end
+end

data/lib/mongoid/report/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Report
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/lib/mongoid/report.rb

@@ -5,6 +5,7 @@ require_relative 'report/queries_builder'
 require_relative 'report/attach_proxy'
 require_relative 'report/collection'
 require_relative 'report/scope'
+require_relative 'report/scope_collection'
 
 module Mongoid
   module Report
@@ -40,6 +41,10 @@ module Mongoid
       def aggregate_for(report_name)
         Scope.new(self, report_name)
       end
+
+      def aggregate
+        ScopeCollection.new(self)
+      end
     end
 
     module ClassMethods

data/spec/mongoid/report/aggregation_spec.rb

@@ -1,11 +1,12 @@
 require 'spec_helper'
 
 describe Mongoid::Report do
-  describe '.aggregate_for' do
-    let(:klass) { Model }
-    let(:yesterday) { Date.parse("19-12-2004") }
-    let(:today) { Date.parse("20-12-2004") }
+  let(:klass) { Model }
+  let(:yesterday) { Date.parse("19-12-2004") }
+  let(:today) { Date.parse("20-12-2004") }
+  let(:two_days_ago) { Date.parse("18-12-2004") }
 
+  describe '.aggregate_for' do
     it 'aggregates fields by default group _id as well' do
       instance1 = klass.create!(day: today     , field1: 1)
       instance2 = klass.create!(day: today     , field1: 1)
@@ -38,8 +39,6 @@ describe Mongoid::Report do
       expect(rows[1]['day']).to eq(today)
     end
 
-    let(:two_days_ago) { Date.parse("18-12-2004") }
-
     it 'wraps group query by extra match queries' do
       klass.create(day: today        , field1: 1 , field2: 2)
       klass.create(day: today        , field1: 1 , field2: 2)
@@ -78,4 +77,50 @@ describe Mongoid::Report do
       expect(rows[0]['day']).to eq(today)
     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)
+      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 = Report7.new
+      scope = example.aggregate
+      scope
+        .query('$match' => { :day  => { '$gte' => yesterday.mongoize, '$lte' => today.mongoize } })
+        .yield
+        .query('$sort' => { day: -1 })
+      scope = scope.all
+
+      rows = scope['example1']
+      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']
+      expect(rows.size).to eq(2)
+      expect(rows[0]['field2']).to eq(4)
+      expect(rows[0]['day']).to eq(today)
+      expect(rows[1]['field2']).to eq(2)
+      expect(rows[1]['day']).to eq(yesterday)
+    end
+  end
+
 end

data/spec/mongoid/report_spec.rb

@@ -68,5 +68,4 @@ describe Mongoid::Report do
       expect(Report6.settings).to have_key('example1')
     end
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-report
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Alexandr Korsak
@@ -74,6 +74,7 @@ files:
 - lib/mongoid/report/collection.rb
 - lib/mongoid/report/queries_builder.rb
 - lib/mongoid/report/scope.rb
+- lib/mongoid/report/scope_collection.rb
 - lib/mongoid/report/version.rb
 - mongoid-report.gemspec
 - spec/mongoid/report/aggregation_spec.rb