mongoid-report 0.1.3 → 0.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTcxMTUyOWNhZWVmNjVhOWY1MGRkMDhhYTQ2YTI5YTY4YzE5NzhlOA==
+    NDE4Y2Y5ODExNDhkNTdmMWNlNzIwMTg1MWU0OTcwYWJlZTg0YTIzYw==
   data.tar.gz: !binary |-
-    YWQ1YTZjMTMwZjJkMzU0MjE5ZGZlMDNlNDdhNzdiZmM5MjE0YTM1Yw==
+    NzBhN2ZiY2RhMDhjOTcwZDA2ZjBkNjQ4NDEzN2I2MDZhNmVhZjZhOQ==
 SHA512:
   metadata.gz: !binary |-
-    YzAxMjg1Yjc4MDQyZjU3MTJiNTJhNzhiMmY4N2U5YTA3NGJkZGQwZDc4Yjll
-    MzMzZjdjNzZjYjI4N2UyNGJmMWRkZTUzZTA2MzEwZDY0MDI0NDgwZDU0MzEw
-    ZjEyZmFkM2ViMzNhMDMyYjI2YTVmY2FiMzRiZjJjYzI5YjRkMTk=
+    MzY3ZDQ5ZTI2YjJmNmE4OWU2Y2JmZWRkMTkzMzYwNmQ0NzJlNGFjNGI3OTY4
+    Mzc3MjBiNGE3ZjRiMTJjZDY3Nzk1NWFlNzBkMmM4YjA4YzM3MWM3NDQzMDhk
+    MWRiMTRhMzNkZDg1NDk3ZjUxOTdiMDAxZWZkNmNiMGU0ZGZiOWY=
   data.tar.gz: !binary |-
-    NGMzZTJiYWQ4OGZmODRkYjhjNTBmYmQwNTZmNDNhM2M2ZTdkYTVkMGRlMGVl
-    OTcwYjVmZGNjODkyZDE4YTc2YjJmMDhiMmJiODg3ZDI2ODdhZjUzOTZkM2Vj
-    ZjY5ZTliYzdlMDY4MDExMmRlMmE3NTVlZDI0ODFiZTdiZGY0NzI=
+    M2NkYmJlYTU0YjcyZmRhODE3OTY5Yjg0Y2MzMmRhYzU0NTc5YmVkZTc0M2Zh
+    OWE4MWJjNWY5YjZkMjZkMGZmZGVkZTBkZjIwNzVjM2E4M2FhZTE1MjViYzhk
+    NTAzYTU5NGJhYjY4MGRkYjA3ZTc5YmQ3NjdiOGFlZWRiZjk5OTc=

data/Gemfile.lock

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

data/lib/mongoid/report/collection.rb

@@ -4,12 +4,18 @@ module Mongoid
   module Report
 
     class Collection < SimpleDelegator
-      def initialize(rows, fields, columns)
+      def initialize(context, rows, fields, columns)
+        @context = context
         @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)
+
+        # Collection should behave like Array using delegator method.
         super(rows)
-        compile_dynamic_fields(columns)
       end
 
       def summary
@@ -24,11 +30,13 @@ module Mongoid
 
       private
 
-      def compile_dynamic_fields(columns)
-        self.each do |row|
+      def compile_dynamic_fields(rows, columns)
+        rows.map do |row|
           @columns.each do |name, function|
-            row[name] = function.call(row)
+            row[name] = function.call(@context, row)
           end
+
+          row.with_indifferent_access
         end
       end
     end

data/lib/mongoid/report/config.rb

@@ -0,0 +1,11 @@
+module Mongoid
+  module Report
+
+    class Config
+      class_attribute :use_threads_on_aggregate
+
+      self.use_threads_on_aggregate = false
+    end
+
+  end
+end

data/lib/mongoid/report/queries_builder.rb

@@ -13,13 +13,7 @@ module Mongoid
       private
 
       def groups
-        @group_by ||= begin
-          if settings[:group_by].size == 0
-            [:_id]
-          else
-            settings[:group_by]
-          end
-        end
+        @group_by ||= settings.fetch(:group_by, [])
       end
 
       def fields

data/lib/mongoid/report/scope.rb

@@ -19,23 +19,32 @@ module Mongoid
 
       def all
         self.yield unless yielded?
-        queries = compile_queries
-        Collection.new(klass.collection.aggregate(queries), fields, columns)
+
+        aggregation_queries = compile_queries
+        rows = klass.collection.aggregate(aggregation_queries)
+
+        Collection.new(context, rows, fields, columns)
       end
 
       private
 
       def compile_queries
-        queries.dup.map do |query|
-          query.each do |function_name, values|
-            values.each do |name, value|
-              value = value.call(context) if value.respond_to?(:call)
-              query[function_name][name] = value
+        compiled = queries.map do |query|
+          next query unless query.has_key?("$match")
+
+          query.deep_dup.tap do |new_query|
+            new_query.each do |function_name, values|
+              values.each do |name, value|
+                if value.respond_to?(:call)
+                  value = value.call(context)
+                end
+                new_query[function_name][name] = value
+              end
             end
           end
-
-          query
         end
+
+        compiled
       end
 
       def yielded?
@@ -47,17 +56,17 @@ module Mongoid
       end
 
       def klass
-        context.class.settings_property(report_name, :for)
+        context.report_module_settings[report_name][:for]
       end
 
       def fields
         # We need to use here only output field names it could be different
         # than defined colunms, Example: field1: 'report-field-name'
-        context.class.settings_property(report_name, :fields).values
+        context.report_module_settings[report_name][:fields].values
       end
 
       def columns
-        context.class.settings_property(report_name, :columns)
+        context.report_module_settings[report_name][:columns]
       end
     end
 

data/lib/mongoid/report/scope_collection.rb

@@ -1,7 +1,14 @@
+require 'thread'
+
 module Mongoid
   module Report
 
     ScopeCollection = Struct.new(:context) do
+      def initialize(context)
+        @mutex = Mutex.new
+        super
+      end
+
       def scopes
         @scopes ||= modules.map do |key|
           Scope.new(context, key)
@@ -23,9 +30,22 @@ module Mongoid
       end
 
       def all
-        scopes.inject({}) do |hash, scope|
-          hash[scope.report_name] = scope.all
-          hash
+        {}.tap do |hash|
+          if Mongoid::Report::Config.use_threads_on_aggregate
+            scopes.map do |scope|
+              Thread.new do
+                rows = scope.all
+
+                @mutex.synchronize do
+                  hash[scope.report_name] = rows
+                end
+              end
+            end.map(&:join)
+          else
+            scopes.each do |scope|
+              hash[scope.report_name] = scope.all
+            end
+          end
         end
       end
 

data/lib/mongoid/report/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Report
-    VERSION = "0.1.3"
+    VERSION = "0.1.5"
   end
 end

data/lib/mongoid/report.rb

@@ -1,6 +1,7 @@
 require 'active_support/concern'
 require 'active_support/core_ext/class/attribute'
 
+require_relative 'report/config'
 require_relative 'report/queries_builder'
 require_relative 'report/attach_proxy'
 require_relative 'report/collection'
@@ -19,8 +20,20 @@ module Mongoid
 
       self.settings = {}
 
+      def self.inherited(subclass)
+        subclass.settings = self.settings.dup
+      end
+
+      # Variable for copying internal class settings to the instance because of
+      # possible modifications in case of using filters with lambda
+      # expressions.
+      attr_reader :report_module_settings
+
       def initialize_report_module
-        self.class.settings.each do |klass, configuration|
+        # Lets store settings under created instance.
+        @report_module_settings = self.class.settings.dup
+
+        @report_module_settings.each do |klass, configuration|
           builder = QueriesBuilder.new(configuration)
 
           # Prepare group queries depends on the configuration in the included
@@ -35,7 +48,7 @@ module Mongoid
       alias :initialize :initialize_report_module
 
       def queries(klass)
-        self.class.settings[klass][:queries]
+        report_module_settings[klass][:queries]
       end
 
       # We should pass here mongoid document
@@ -140,6 +153,7 @@ module Mongoid
             fields:    ActiveSupport::OrderedHash.new,
             group_by:  [],
             queries:   [],
+            compiled:  false,
             columns:   ActiveSupport::OrderedHash.new,
           }
         end

data/spec/mongoid/report/aggregation_spec.rb

@@ -7,19 +7,25 @@ describe Mongoid::Report do
   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)
-      instance3 = klass.create!(day: yesterday , field1: 1)
+    it 'aggregates fields by app' do
+      Report = Class.new do
+        include Mongoid::Report
 
-      example = Report2.new
+        attach_to Model do
+          aggregation_field :field1
+        end
+      end
+
+      klass.create!(field1: 1)
+      klass.create!(field1: 1)
+      klass.create!(field1: 1)
+
+      example = Report.new
       rows = example.aggregate_for(klass)
       rows = rows.all
 
-      expect(rows.size).to eq(3)
-      expect(rows[0]['field1']).to eq(1)
-      expect(rows[1]['field1']).to eq(1)
-      expect(rows[2]['field1']).to eq(1)
+      expect(rows.size).to eq(1)
+      expect(rows[0]['field1']).to eq(3)
     end
 
     it 'aggregates field by defined field of the mode' do

data/spec/mongoid/report/column_spec.rb

@@ -13,7 +13,7 @@ describe Mongoid::Report do
         attach_to Model do
           group_by :day
           aggregation_field :field1
-          column 'dynamic-field1' => ->(row) { row['field1'] * 10 }
+          column 'dynamic-field1' => ->(context, row) { row['field1'] * 10 }
         end
       end
     end

data/spec/mongoid/report/config_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe Mongoid::Report::Config do
+  it 'allows to set aggregation threads' do
+    expect(Mongoid::Report::Config.use_threads_on_aggregate).to eq(false)
+    Mongoid::Report::Config.use_threads_on_aggregate = true
+    expect(Mongoid::Report::Config.use_threads_on_aggregate).to eq(true)
+  end
+end

data/spec/mongoid/report/queries_builder_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Mongoid::Report::QueriesBuilder do
 
   describe '.queries' do
-    it 'builds queries for aggregation using default group _id field' do
+    it 'builds queries for aggregation' do
       queries = Report1.new.queries(Model)
       expect(queries.size).to eq(3)
       expect(queries[0]).to eq(
@@ -13,12 +13,12 @@ describe Mongoid::Report::QueriesBuilder do
         })
       expect(queries[1]).to eq(
         '$group' => {
-          :_id    => { :_id => '$_id' },
+          :_id    => { },
           :field1 => { '$sum'  => '$field1' },
         })
       expect(queries[2]).to eq(
         '$project' => {
-          :_id    => '$_id',
+          :_id    => 0,
           :field1 => '$field1',
         })
     end

data/spec/mongoid/report/summary_spec.rb

@@ -20,6 +20,30 @@ describe Mongoid::Report do
       expect(rows.summary[:field1]).to eq(3)
       expect(rows.summary['field1']).to eq(3)
     end
+
+    it 'should support dynamic columns as well' do
+      Report = Class.new do
+        include Mongoid::Report
+
+        report 'example' do
+          attach_to Model do
+            aggregation_field :field1
+            column 'new-field1' => ->(context, row) { row['field1'] * 10 }
+          end
+        end
+      end
+
+      klass.create!(field1: 1)
+      klass.create!(field1: 1)
+      klass.create!(field1: 1)
+
+      example = Report.new
+      rows = example.aggregate_for('example-models')
+      rows = rows.all
+
+      expect(rows[0]['field1']).to eq(3)
+      expect(rows[0]['new-field1']).to eq(30)
+    end
   end
 
 end

data/spec/mongoid/report/threads_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+require 'benchmark'
+
+describe Mongoid::Report do
+  let(:klass) { Model }
+
+  it 'aggregates fields by app in threads' do
+    Report = Class.new do
+      include Mongoid::Report
+
+      attach_to Model, as: 'field1-aggregation' do
+        aggregation_field :field1
+      end
+
+      attach_to Model, as: 'field2-aggregation' do
+        aggregation_field :field2
+      end
+    end
+
+    30000.times { klass.create!(field1: 1, field2: 1) }
+
+    report = Report.new
+    scoped = report.aggregate
+
+    Mongoid::Report::Config.use_threads_on_aggregate = true
+    time1 = Benchmark.measure do
+      rows = scoped.all
+    end
+
+    Mongoid::Report::Config.use_threads_on_aggregate = false
+    time2 = Benchmark.measure do
+      rows = scoped.all
+    end
+
+    puts time2
+    puts time1
+
+    time2.real.should > time1.real
+  end
+end

data/spec/mongoid/report_spec.rb

@@ -88,4 +88,46 @@ describe Mongoid::Report do
     end
   end
 
+
+  describe 'two report classes' do
+    it 'should have different settings' do
+      ReportKlass1 = Class.new do
+        include Mongoid::Report
+
+        attach_to Model do
+          aggregation_field :field1
+        end
+      end
+
+      ReportKlass2 = Class.new do
+        include Mongoid::Report
+
+        attach_to Model do
+          aggregation_field :field2
+        end
+      end
+
+      expect(ReportKlass1.settings).not_to eq(ReportKlass2.settings)
+    end
+
+    class ReportKlass
+      include Mongoid::Report
+    end
+
+    class ReportKlass1 < ReportKlass
+      attach_to Model do
+        aggregation_field :field1
+      end
+    end
+
+    class ReportKlass2 < ReportKlass
+      attach_to Model do
+        aggregation_field :field2
+      end
+    end
+
+    it 'should have different settings for inherited classes' do
+      expect(ReportKlass1.fields(Model)).not_to eq(ReportKlass2.fields(Model))
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-report
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -74,6 +74,7 @@ files:
 - lib/mongoid/report.rb
 - lib/mongoid/report/attach_proxy.rb
 - lib/mongoid/report/collection.rb
+- lib/mongoid/report/config.rb
 - lib/mongoid/report/queries_builder.rb
 - lib/mongoid/report/report_proxy.rb
 - lib/mongoid/report/scope.rb
@@ -82,8 +83,10 @@ files:
 - mongoid-report.gemspec
 - spec/mongoid/report/aggregation_spec.rb
 - spec/mongoid/report/column_spec.rb
+- spec/mongoid/report/config_spec.rb
 - spec/mongoid/report/queries_builder_spec.rb
 - spec/mongoid/report/summary_spec.rb
+- spec/mongoid/report/threads_spec.rb
 - spec/mongoid/report_spec.rb
 - spec/spec_helper.rb
 - spec/support/models.rb
@@ -114,8 +117,10 @@ summary: Easily build mongoid reports using aggregation framework
 test_files:
 - spec/mongoid/report/aggregation_spec.rb
 - spec/mongoid/report/column_spec.rb
+- spec/mongoid/report/config_spec.rb
 - spec/mongoid/report/queries_builder_spec.rb
 - spec/mongoid/report/summary_spec.rb
+- spec/mongoid/report/threads_spec.rb
 - spec/mongoid/report_spec.rb
 - spec/spec_helper.rb
 - spec/support/models.rb