mongoid-report 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mzk5ZjE1YTRjNTNkZjRmOWVlMzM1OTJjMjExZWQ3NjljOTk5NTY5Mw==
+    MGI5NjU2YTI3ZTI0MmIxYzA0ZTRiYTQ4ZDhiZGNmY2FiZDRhMmViMg==
   data.tar.gz: !binary |-
-    ZmU3YWU2NDBiN2I4NDZlMjViZGM0MTljNGY2NGIxYmNkZWExN2ViNA==
+    MDY0ODA4ZGM4MWI0NzViOTljMTQ2ZTYwNjNjYWU3NTlkY2Q3MDMxMg==
 SHA512:
   metadata.gz: !binary |-
-    YmY2NTA3ZGZjNjY4ZTU3NmNiZGQ1MGIzM2U4YWNhM2FkMWQ5YTA4NWZhMzll
-    N2JjM2VmNmNjYmFhMjEyYTI4ZGY4MDRkNTk2YzQ3NTI0Y2IxNDk4MTUyODY4
-    OTY2ZjAzNGMxZjkwOWRmNmIzYjA3MGY3ZTE3MjY2MTg3OWJiZWY=
+    ZmI4YWEzNzIwMDM0MTdjODBmZDFlNjAyYTliMTliZmVmYTA1NDcwMWJhY2Jj
+    N2IzYzY4M2UzYzNkNWQ2OTYwY2FlYWE2NGY4ZTQ3YmU0NjQyMGY0Njc4NTdk
+    ZTJkZjQ5MTQ4YTc3NTViMzVhMTQ4MjU4NGRmYTY3Y2U4ZjgyMWQ=
   data.tar.gz: !binary |-
-    YzM2ZTZmZWFlODA4NjI1MTIzYTY0NDk5YzkyM2EwNDQ3ZWYwNmQ0MTY4ZGI2
-    NjUxZjQzZDg5ZmU3NDU3ZWU4OWIxMWZjZGU5YmRjMmJhMTgyYzNiNTJjNjBj
-    NDQ5YWZjNGNkOTU1MDBlMTEyNjE2N2U4ODIzNDJjYmQ0YjJiZTA=
+    NzUxMGQzNzNjZjU5Yzk0ZWViNWFlNWU0MTI2YWUwOGE3MDk5YzM4ZjZjZjEw
+    YjU2ODU0ZTRlN2MzNWY3MTYzNDE4YTg1ZjdjZjM2ZGQ3MGE3NDQ2NzY4ZWZh
+    YTRmNTExYmMwNTk2ZjhmMjFkNGFkMmQwZDBjOTI4Mzk0NGQ2NGQ=

data/Gemfile.lock

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

data/lib/mongoid/report/report_proxy.rb

@@ -0,0 +1,15 @@
+module Mongoid
+  module Report
+
+    ReportProxy = Struct.new(:context, :name) do
+      def attach_to(model, options = {}, &block)
+        as = options.fetch(:as) { model.collection.name }
+
+        options.merge!(as: "#{name}-#{as}") if as
+
+        context.attach_to(model, options, &block)
+      end
+    end
+
+  end
+end

data/lib/mongoid/report/version.rb

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

data/lib/mongoid/report.rb

@@ -6,6 +6,7 @@ require_relative 'report/attach_proxy'
 require_relative 'report/collection'
 require_relative 'report/scope'
 require_relative 'report/scope_collection'
+require_relative 'report/report_proxy'
 
 module Mongoid
   module Report
@@ -67,6 +68,11 @@ module Mongoid
         end
       end
 
+      def report(name, &block)
+        proxy = ReportProxy.new(self, name)
+        proxy.instance_eval(&block)
+      end
+
       def fields(collection)
         settings_property(collection, :fields)
       end

data/spec/mongoid/report/aggregation_spec.rb

@@ -121,6 +121,51 @@ describe Mongoid::Report do
       expect(rows[1]['field2']).to eq(2)
       expect(rows[1]['day']).to eq(yesterday)
     end
+
+    class Report8
+      include Mongoid::Report
+
+      report 'example' do
+        attach_to Model, as: 'model1' do
+          group_by :day
+          aggregation_field :field1
+        end
+
+        attach_to Model, as: 'model2' do
+          group_by :day
+          aggregation_field :field2
+        end
+      end
+    end
+
+    it 'should still aggregate with combined report' 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 = Report8.new
+      scope = example.aggregate
+      scope
+        .query('$match' => { :day  => { '$gte' => yesterday.mongoize, '$lte' => today.mongoize } })
+        .yield
+        .query('$sort' => { day: -1 })
+      scope = scope.all
+
+      rows = scope['example-model1']
+      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['example-model2']
+      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,4 +68,25 @@ describe Mongoid::Report do
       expect(Report6.settings).to have_key('example1')
     end
   end
+
+  class Report7
+    include Mongoid::Report
+
+    report 'example' do
+      attach_to Model, as: 'model1' do
+        aggregation_field :field1
+      end
+
+      attach_to Model do
+        aggregation_field :field1
+      end
+    end
+  end
+
+  describe '.report' do
+    it 'creates settings with report-<attached-model-name' do
+      expect(Report7.settings).to have_key('example-model1')
+      expect(Report7.settings).to have_key("example-#{Model.collection.name}")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-report
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -73,6 +73,7 @@ files:
 - lib/mongoid/report/attach_proxy.rb
 - lib/mongoid/report/collection.rb
 - lib/mongoid/report/queries_builder.rb
+- lib/mongoid/report/report_proxy.rb
 - lib/mongoid/report/scope.rb
 - lib/mongoid/report/scope_collection.rb
 - lib/mongoid/report/version.rb