mongoid-report 0.0.11 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjViNTY5ZjMxOWYzYWU5ZmY3NGNlMGJkZTVkMjFkZmY5ZGUxMTEyZA==
+    Y2Y4YTU4MzMzZmQ0MmRmYzNhYTMwZWM5MDViNDFhOTExMDJlYWMxNg==
   data.tar.gz: !binary |-
-    YjhiZDUzNWIwNGYxYWI3OGQ4MjJhMDRkYWFmNjVkMmZhNjBlZmY4Zg==
+    YzNkMDcxYjU1NjQ2ZGI5MjAwYzk2OGFlYWYzOGNmOTQyYjMzMjFiMg==
 SHA512:
   metadata.gz: !binary |-
-    MjFhMWU4YWI4YzExYzUyYmI3ZWM4Yzk5OGE3NGJlOWE0OTcyNjY4NmMwODRj
-    ZDQ0NWViMDk4MTk3MWZmODBkZmYwZGQzMjgzNjU4M2VjN2M5ZmQ1MWEwYTZl
-    MTBmMjhjMDIxYzJiNTJkMTAxNzVmYjM1MjUzOTBlMWE3YWU4OTA=
+    YjY5OTdjZGY5ODQ4MDRmMGZlMTVlMzUwMjM4NWQzOGMwZDAzODE3OWNiNGRk
+    MzBkMDMwOTZiMTgyZmYxZmZjZjliMmEwOTZjNTY1YjYyYzBhODk4YjE2ZGRh
+    NjZlYTAyNDRiNjA1NzE0MzY3MmUwZGQ5YTE0NTY0M2YxMTU5NzQ=
   data.tar.gz: !binary |-
-    Y2E4NzQzMDJkZGIyOTBmZDJkY2IyNWM3NmUyZGQ0Y2U5YWRiMDM4MGMzOTli
-    Mzg5MDRhZjUwNWVmZTZmMTNlZGY0MTM0N2Y2ZDM4MDI0ZjQ1MjE2ZWYzMjg3
-    ODdjMTA4NDBiMmM2MjhkMzhjZjI2MGM0ZWI0ZWViYjcwYTIyOGU=
+    M2FlNTYzNzJmOTZmNmY2ZTNmNDc3MTA3ODg2NzliNjNjMTFjZDA5MDVmZThj
+    YTAyZDY2ZTUyNWIzOGFjMGY5M2JiMjEzNTQ4ZTIwZmY1ZTUxZDY4NzA1NzAz
+    MDRlYjJlZTQ3ODViMTc1MGI1YzBhYWZhMjQ3YTU3YzBhYjQxNmE=

data/Gemfile.lock

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

data/README.md

@@ -89,6 +89,12 @@ Or install it yourself as:
 
     $ gem install mongoid-report
 
+## Contributors
+
+  @oivoodoo
+
+  @baltazore
+
 ## Contributing
 
 1. Fork it ( http://github.com/oivoodoo/mongoid-report/fork )

data/lib/mongoid/report.rb

@@ -29,7 +29,7 @@ module Mongoid
 
           # Now we have access to compiled queries to run it in aggregation
           # framework.
-          configuration[:queries] = @queries
+          configuration[:queries].concat(@queries)
         end
       end
       alias :initialize :initialize_report_module
@@ -59,6 +59,20 @@ module Mongoid
         proxy.instance_eval(&block)
       end
 
+      def filter(*fields)
+        define_report_method(*fields) do |_, report_name, options|
+          queries = self.settings_property(report_name, :queries)
+
+          options.each do |key, value|
+            value = value.call if value.respond_to?(:call)
+              queries
+                .concat([{
+                  '$match' => { key => value }
+                }])
+          end
+        end
+      end
+
       def group_by(*fields)
         define_report_method(*fields) do |groups, report_name, _|
           settings[report_name][:group_by] = groups
@@ -95,10 +109,12 @@ module Mongoid
 
         # We should always specify model to attach fields, groups
         collection = options.fetch(:for)
+        options.delete(:for)
 
         # If user didn't pass as option to name the report we are using
         # collection class as key for settings.
         attach_name = options.fetch(:attach_name) { collection }
+        options.delete(:attach_name)
 
         # We should always have for option
         initialize_settings_by(attach_name, collection)
@@ -114,6 +130,7 @@ module Mongoid
             for:       collection,
             fields:    {},
             group_by:  [],
+            queries:   [],
           }
         end
       end

data/lib/mongoid/report/attach_proxy.rb

@@ -24,6 +24,13 @@ module Mongoid
 
         context.group_by(*fields, group_options)
       end
+
+      def filter(*fields)
+        filter_options = fields.extract_options!
+        filter_options.merge!(options)
+
+        context.filter(*fields, filter_options)
+      end
     end
 
   end

data/lib/mongoid/report/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Report
-    VERSION = "0.0.11"
+    VERSION = "0.1.0"
   end
 end

data/spec/mongoid/report/aggregation_spec.rb

@@ -213,4 +213,76 @@ 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
+      scope = example.aggregate
+      scope = scope.all
+
+      rows = scope[Model]
+      expect(rows.size).to eq(1)
+      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
+      scope = example.aggregate
+      scope = scope.all
+
+      rows = scope['example-models']
+      expect(rows.size).to eq(1)
+      expect(rows[0]['field1']).to eq(1)
+    end
+
+    class Report17
+      include Mongoid::Report
+
+      report 'example' do
+        attach_to Model do
+          filter field2: 2,
+                 day: -> { 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
+      scope = example.aggregate
+      scope = scope.all
+
+      rows = scope['example-models']
+      expect(rows.size).to eq(1)
+      expect(rows[0]['field1']).to eq(1)
+    end
+  end
+
 end

data/spec/mongoid/report_spec.rb

@@ -87,4 +87,5 @@ describe Mongoid::Report do
       expect(Report10.fields(Model).values).to eq(['field-name'])
     end
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-report
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.1.0
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid