mongoid-report 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2Y4YTU4MzMzZmQ0MmRmYzNhYTMwZWM5MDViNDFhOTExMDJlYWMxNg==
+    N2Y0NzI2YzMwYTk3NTljY2VkODkzZjcxYjYyNmM2YzZmYmVlMDdmNw==
   data.tar.gz: !binary |-
-    YzNkMDcxYjU1NjQ2ZGI5MjAwYzk2OGFlYWYzOGNmOTQyYjMzMjFiMg==
+    NWZkNWZlYWMxNzJkYWRkZDkzMWY4MmYxYzZkYmNmMzk5MTIwNWJjZg==
 SHA512:
   metadata.gz: !binary |-
-    YjY5OTdjZGY5ODQ4MDRmMGZlMTVlMzUwMjM4NWQzOGMwZDAzODE3OWNiNGRk
-    MzBkMDMwOTZiMTgyZmYxZmZjZjliMmEwOTZjNTY1YjYyYzBhODk4YjE2ZGRh
-    NjZlYTAyNDRiNjA1NzE0MzY3MmUwZGQ5YTE0NTY0M2YxMTU5NzQ=
+    ZWZjNjg4NWFlOWFjZWQ0ZmNhODVlYmViYzA1Njg3ZDAwYjhlMDI4YWEwMDM1
+    YTg5NTQ1MDAxNjk5MmI2ZTRhNzkwOTkwNTdmNGU5ZTdkZGRhZTE0OGUwNGQw
+    N2Y4NjMxYjY4ZmYyNTdjZWY1NzYxZGYwMGEyNDc4NjNiNzE1ZDY=
   data.tar.gz: !binary |-
-    M2FlNTYzNzJmOTZmNmY2ZTNmNDc3MTA3ODg2NzliNjNjMTFjZDA5MDVmZThj
-    YTAyZDY2ZTUyNWIzOGFjMGY5M2JiMjEzNTQ4ZTIwZmY1ZTUxZDY4NzA1NzAz
-    MDRlYjJlZTQ3ODViMTc1MGI1YzBhYWZhMjQ3YTU3YzBhYjQxNmE=
+    MjcxNzZkZTBhNzEzZDQ1MmNkNDJiMWU1Yjg5NGM0MTA2OWNhMmQ0ZTlhYWEx
+    YjhiNTdhN2ViNDRjYTY1M2E0YjI3Y2EzMTA5OTBiZGU3ZjI2M2IzYTgwZjcw
+    YjIwOWI1ZWM4ZWY2YjA1NDQ2YmMwN2NjMTAyZmMxYWYwMmZmNmM=

data/Gemfile.lock

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

data/lib/mongoid/report/scope.rb

@@ -19,11 +19,25 @@ module Mongoid
 
       def all
         self.yield unless yielded?
+        queries = compile_queries
         Collection.new(klass.collection.aggregate(queries), fields)
       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
+            end
+          end
+
+          query
+        end
+      end
+
       def yielded?
         @yielded
       end

data/lib/mongoid/report/version.rb

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

data/lib/mongoid/report.rb

@@ -64,11 +64,10 @@ module Mongoid
           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 }
-                }])
+            queries
+              .concat([{
+                '$match' => { key => value }
+              }])
           end
         end
       end

data/spec/mongoid/report/aggregation_spec.rb

@@ -264,7 +264,7 @@ describe Mongoid::Report do
       report 'example' do
         attach_to Model do
           filter field2: 2,
-                 day: -> { Date.parse("20-12-2004").mongoize }
+                 day: ->(context) { Date.parse("20-12-2004").mongoize }
           aggregation_field :field1
         end
       end
@@ -283,6 +283,38 @@ describe Mongoid::Report do
       expect(rows.size).to eq(1)
       expect(rows[0]['field1']).to eq(1)
     end
+
+    class Report18
+      include Mongoid::Report
+
+      def values
+        [1, 2]
+      end
+
+      report 'example' do
+        attach_to Model do
+          group_by :day
+          filter field2: ->(context) { { '$in' => context.values } }
+          aggregation_field :field1
+        end
+      end
+    end
+
+    it 'creates filter in report scope' 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: today     , field1: 3 , field2: 4)
+
+      example = Report18.new
+      scope = example.aggregate
+      scope = scope.all
+
+      rows = scope['example-models']
+      expect(rows.size).to eq(2)
+      expect(rows[0]['field1']).to eq(1)
+      expect(rows[1]['field1']).to eq(2)
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-report
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Alexandr Korsak