mongoid-report 0.1.9 → 0.2.0

data/spec/mongoid/report_spec.rb

@@ -5,8 +5,9 @@ describe Mongoid::Report do
   describe '.column' do
     let(:report_klass) do
       Class.new do
+        def self.name ; 'report-klass' ; end
         include Mongoid::Report
-        column :field1, for: Model
+        column :field1, collection: Model
       end
     end
 
@@ -15,15 +16,16 @@ describe Mongoid::Report do
     end
 
     it 'defines aggregation field for specific model to make queries' do
-      fields = report_klass.fields(Model)
-      expect(fields).to eq({ 'field1' => 'field1' })
+      fields = report_klass.settings['report-klass'][:reports]['models'][:fields]
+      expect(fields).to eq(['field1'])
     end
   end
 
- describe '.attach_to' do
+  describe '.attach_to' do
     let(:report_klass) do
       Class.new do
         include Mongoid::Report
+        def self.name ; 'report-klass' ; end
         attach_to Model do
           column :field1
         end
@@ -35,8 +37,8 @@ describe Mongoid::Report do
     end
 
     it 'defines field in terms of attached model' do
-      fields = report_klass.fields(Model)
-      expect(fields).to eq({ 'field1' => 'field1' })
+      fields = report_klass.settings['report-klass'][:reports]['models'][:fields]
+      expect(fields).to eq(['field1'])
     end
   end
 
@@ -44,8 +46,9 @@ describe Mongoid::Report do
     let(:report_klass1) do
       Class.new do
         include Mongoid::Report
-        group_by :day, for: Model
-        column :field1, for: Model
+        def self.name ; 'report-klass' ; end
+        group_by :day, collection: Model
+        column :field1, collection: Model
       end
     end
 
@@ -54,13 +57,14 @@ describe Mongoid::Report do
     end
 
     it 'stores group by settings under report class' do
-      group_by_settings = report_klass1.settings[Model][:group_by]
-      expect(group_by_settings).to eq(['day'])
+      settings = report_klass1.settings['report-klass'][:reports]['models'][:group_by]
+      expect(settings).to eq(['day'])
     end
 
     let(:report_klass2) do
       Class.new do
         include Mongoid::Report
+        def self.name ; 'report-klass' ; end
         attach_to Model do
           group_by :day
           column :field1
@@ -69,8 +73,8 @@ describe Mongoid::Report do
     end
 
     it 'defines groups in terms of attached model' do
-      groups = report_klass2.groups(Model)
-      expect(groups).to eq(['day'])
+      settings = report_klass2.settings['report-klass'][:reports]['models'][:group_by]
+      expect(settings).to eq(['day'])
     end
   end
 
@@ -78,6 +82,7 @@ describe Mongoid::Report do
     let(:report_klass) do
       Class.new do
         include Mongoid::Report
+        def self.name ; 'report-klass' ; end
         attach_to Model, as: 'example1' do
           column :field1
         end
@@ -85,7 +90,7 @@ describe Mongoid::Report do
     end
 
     it 'creates settings with "as" name' do
-      expect(report_klass.settings).to have_key('example1')
+      expect(report_klass.settings['report-klass'][:reports]).to have_key('example1')
     end
   end
 
@@ -106,45 +111,33 @@ describe Mongoid::Report do
     end
 
     it 'creates settings with report-<attached-model-name' do
-      expect(report_klass.settings).to have_key('example-model1')
-      expect(report_klass.settings).to have_key("example-#{Model.collection.name}")
+      reports = report_klass.settings['example'][:reports].keys
+      expect(reports).to include('model1')
+      expect(reports).to include('models')
     end
   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
-
-    it 'creates settings with report-<attached-model-name' do
-      expect(report_klass.fields(Model).keys).to eq(['field1'])
-      expect(report_klass.fields(Model).values).to eq(['field-name'])
-    end
-  end
-
-
   describe 'two report classes' do
     it 'should have different settings' do
-      ReportKlass1 = Class.new do
+      report_klass1 = Class.new do
         include Mongoid::Report
+        def self.name ; 'report-klass1' ; end
 
         attach_to Model do
           column :field1
         end
       end
 
-      ReportKlass2 = Class.new do
+      report_klass2 = Class.new do
         include Mongoid::Report
+        def self.name ; 'report-klass2' ; end
 
         attach_to Model do
           column :field2
         end
       end
 
-      expect(ReportKlass1.settings).not_to eq(ReportKlass2.settings)
+      expect(report_klass1.settings).not_to eq(report_klass2.settings)
     end
 
     class ReportKlass
@@ -164,7 +157,38 @@ describe Mongoid::Report do
     end
 
     it 'should have different settings for inherited classes' do
-      expect(ReportKlass1.fields(Model)).not_to eq(ReportKlass2.fields(Model))
+      settings1 = ReportKlass1.settings['ReportKlass1'][:reports]['models']
+      settings2 = ReportKlass2.settings['ReportKlass2'][:reports]['models']
+      expect(settings1).not_to eq(settings2)
+    end
+  end
+
+  describe 'empty matchs' do
+    it 'should work fine with passed empty match value' do
+      report_klass = Class.new do
+        include Mongoid::Report
+
+        report 'example' do
+          attach_to 'models' do
+            match field1: {}
+            match field2: 1
+            match field3: { '$in' => [1,2,3] }
+            column :field1, :field2, :field3
+          end
+        end
+      end
+
+      Model.create(field1: 1, field2: 2, field3: 1)
+      Model.create(field1: 1, field2: 1, field3: 2)
+      Model.create(field1: 1, field2: 1, field3: 4)
+
+      report = report_klass.new
+      scope = report.aggregate_for('example', 'models').all
+
+      expect(scope.rows.size).to eq(1)
+      expect(scope.rows[0]['field1']).to eq(1)
+      expect(scope.rows[0]['field2']).to eq(1)
+      expect(scope.rows[0]['field3']).to eq(2)
     end
   end
 end

data/spec/spec_helper.rb

@@ -16,6 +16,8 @@ RSpec.configure do |config|
 
   config.mock_with :rspec
 
+  config.filter_run_excluding long: true unless ENV['ALL']
+
   config.after(:each) do
     Mongoid.purge!
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-report
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -73,8 +73,13 @@ files:
 - Rakefile
 - lib/mongoid/report.rb
 - lib/mongoid/report/attach_proxy.rb
+- lib/mongoid/report/batches.rb
 - lib/mongoid/report/collection.rb
+- lib/mongoid/report/collections.rb
 - lib/mongoid/report/config.rb
+- lib/mongoid/report/input.rb
+- lib/mongoid/report/merger.rb
+- lib/mongoid/report/output.rb
 - lib/mongoid/report/queries_builder.rb
 - lib/mongoid/report/report_proxy.rb
 - lib/mongoid/report/scope.rb
@@ -82,9 +87,14 @@ files:
 - lib/mongoid/report/version.rb
 - mongoid-report.gemspec
 - spec/mongoid/report/aggregation_spec.rb
+- spec/mongoid/report/attach_to_spec.rb
 - spec/mongoid/report/collection_spec.rb
 - spec/mongoid/report/column_spec.rb
 - spec/mongoid/report/config_spec.rb
+- spec/mongoid/report/dynamic_attach_to_spec.rb
+- spec/mongoid/report/integration_spec.rb
+- spec/mongoid/report/module_configuration_spec.rb
+- spec/mongoid/report/out_spec.rb
 - spec/mongoid/report/queries_builder_spec.rb
 - spec/mongoid/report/set_spec.rb
 - spec/mongoid/report/summary_spec.rb
@@ -118,9 +128,14 @@ specification_version: 4
 summary: Easily build mongoid reports using aggregation framework
 test_files:
 - spec/mongoid/report/aggregation_spec.rb
+- spec/mongoid/report/attach_to_spec.rb
 - spec/mongoid/report/collection_spec.rb
 - spec/mongoid/report/column_spec.rb
 - spec/mongoid/report/config_spec.rb
+- spec/mongoid/report/dynamic_attach_to_spec.rb
+- spec/mongoid/report/integration_spec.rb
+- spec/mongoid/report/module_configuration_spec.rb
+- spec/mongoid/report/out_spec.rb
 - spec/mongoid/report/queries_builder_spec.rb
 - spec/mongoid/report/set_spec.rb
 - spec/mongoid/report/summary_spec.rb