mongoid-report 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2Y0NzI2YzMwYTk3NTljY2VkODkzZjcxYjYyNmM2YzZmYmVlMDdmNw==
+    NjBjODE4ODliYjQ0ZDQzZDQ3MzRjNjZmMWUyM2FmOTU5ZDVlNzRjZg==
   data.tar.gz: !binary |-
-    NWZkNWZlYWMxNzJkYWRkZDkzMWY4MmYxYzZkYmNmMzk5MTIwNWJjZg==
+    Y2U2ZGQxYjVhZjAyZDcxYzY4ZTdmMTJhNWFiMmY5YWE5OTY4M2RjNQ==
 SHA512:
   metadata.gz: !binary |-
-    ZWZjNjg4NWFlOWFjZWQ0ZmNhODVlYmViYzA1Njg3ZDAwYjhlMDI4YWEwMDM1
-    YTg5NTQ1MDAxNjk5MmI2ZTRhNzkwOTkwNTdmNGU5ZTdkZGRhZTE0OGUwNGQw
-    N2Y4NjMxYjY4ZmYyNTdjZWY1NzYxZGYwMGEyNDc4NjNiNzE1ZDY=
+    MDQ3MDBmNmY2YWNlMDFmOGJjY2JiYTJhNjZiYzkxYTQ0Yzg0ZjZmYWUyMDFj
+    MzE1YmUxOTBkMDNkZjQ3MGVmN2I0MzVjOWMyMzNjMWQ2NGYwZTJjZjE5Mjdh
+    OWZmODY0MGRkZGZiZWJiYTkxZmZkNzk4ZGQ0ZDFjMjlhZWU3MjM=
   data.tar.gz: !binary |-
-    MjcxNzZkZTBhNzEzZDQ1MmNkNDJiMWU1Yjg5NGM0MTA2OWNhMmQ0ZTlhYWEx
-    YjhiNTdhN2ViNDRjYTY1M2E0YjI3Y2EzMTA5OTBiZGU3ZjI2M2IzYTgwZjcw
-    YjIwOWI1ZWM4ZWY2YjA1NDQ2YmMwN2NjMTAyZmMxYWYwMmZmNmM=
+    Zjk0OTJmOTk1NjQyNDEyMTdkMDViZWI3MjQxNTgwMjJiNDA5NDc5ZDI4YTBl
+    ZjI1ODU0ZjgwOThmM2ZkOGMxYzU5ZjRjNDUzYTFiNzg3NjYyOGVmNWEyY2Vk
+    MzMxZDhkNjI1YzJiZjZiNzQzZTQ0NDNlYmRkYzI4YjM5ZDFjOWE=

data/.drone.yml

@@ -0,0 +1,16 @@
+image: bradrydzewski/ruby:1.9.3
+script:
+  - gem install bundler --no-ri --no-rdoc
+  - bundle install
+  - bundle exec rake default
+services:
+  - mongodb
+notify:
+  email:
+    recipients:
+      - alex.korsak@gmail.com
+  flowdock:
+    flow_token: $FLOW_TOKEN
+    on_started: true
+    on_success: true
+    on_failure: true

data/Gemfile

@@ -9,4 +9,7 @@ end
 group :development, :test do
   gem 'pry'
   gem 'pry-debugger'
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-bundler'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongoid-report (0.1.1)
+    mongoid-report (0.1.2)
       mongoid (> 3.0.1)
 
 GEM
@@ -14,6 +14,11 @@ GEM
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     builder (3.0.4)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
     coderay (1.1.0)
     columnize (0.3.6)
     debugger (1.6.6)
@@ -23,7 +28,27 @@ GEM
     debugger-linecache (1.2.0)
     debugger-ruby_core_source (1.3.2)
     diff-lcs (1.2.5)
+    ffi (1.9.3)
+    formatador (0.2.4)
+    guard (2.6.0)
+      formatador (>= 0.2.4)
+      listen (~> 2.7)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-bundler (2.0.0)
+      bundler (~> 1.0)
+      guard (~> 2.2)
+    guard-rspec (4.2.8)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
     i18n (0.6.9)
+    listen (2.7.1)
+      celluloid (>= 0.15.2)
+      celluloid-io (>= 0.15.0)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.5)
     method_source (0.8.2)
     mongoid (3.1.6)
       activemodel (~> 3.2)
@@ -32,6 +57,7 @@ GEM
       tzinfo (~> 0.3.29)
     moped (1.5.2)
     multi_json (1.10.1)
+    nio4r (1.0.0)
     origin (1.1.0)
     pry (0.9.12.6)
       coderay (~> 1.0)
@@ -41,6 +67,9 @@ GEM
       debugger (~> 1.3)
       pry (~> 0.9.10)
     rake (10.3.2)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
+      ffi (>= 0.5.0)
     rspec (3.0.0)
       rspec-core (~> 3.0.0)
       rspec-expectations (~> 3.0.0)
@@ -54,6 +83,8 @@ GEM
       rspec-support (~> 3.0.0)
     rspec-support (3.0.0)
     slop (3.5.0)
+    thor (0.19.1)
+    timers (1.1.0)
     tzinfo (0.3.39)
 
 PLATFORMS
@@ -61,6 +92,9 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.5)
+  guard
+  guard-bundler
+  guard-rspec
   mongoid-report!
   pry
   pry-debugger

data/Guardfile

@@ -0,0 +1,14 @@
+guard 'rspec', :cli => '--format documentation', :version => 2, :all_after_pass => false, :keep_failed => false do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^spec/.+\.rb$})
+  watch(%r{^spec/support/.+\.rb$})
+  watch(%r{^lib/(.+)\.rb$})                   { "spec" }
+  watch(%r{^lib/mongoid/(.+)\.rb$}) { "spec" }
+  watch(%r{^lib/mongoid/report/(.+)\.rb$}) { "spec" }
+  watch('spec/spec_helper.rb')                { "spec" }
+end
+
+guard 'bundler' do
+  watch('Gemfile')
+  watch(/^.+\.gemspec/)
+end

data/lib/mongoid/report/attach_proxy.rb

@@ -12,24 +12,27 @@ module Mongoid
       end
 
       def aggregation_field(*fields)
-        field_options = fields.extract_options!
-        field_options.merge!(options)
-
-        context.aggregation_field(*fields, field_options)
+        proxy_options = fields.extract_options!
+        proxy_options.merge!(options)
+        context.aggregation_field(*fields, proxy_options)
       end
 
       def group_by(*fields)
-        group_options = fields.extract_options!
-        group_options.merge!(options)
-
-        context.group_by(*fields, group_options)
+        proxy_options = fields.extract_options!
+        proxy_options.merge!(options)
+        context.group_by(*fields, proxy_options)
       end
 
       def filter(*fields)
-        filter_options = fields.extract_options!
-        filter_options.merge!(options)
+        proxy_options = fields.extract_options!
+        proxy_options.merge!(options)
+        context.filter(*fields, proxy_options)
+      end
 
-        context.filter(*fields, filter_options)
+      def column(*fields)
+        proxy_options = fields.extract_options!
+        proxy_options.merge!(options)
+        context.column(*fields, proxy_options)
       end
     end
 

data/lib/mongoid/report/collection.rb

@@ -4,10 +4,12 @@ module Mongoid
   module Report
 
     class Collection < SimpleDelegator
-      def initialize(rows, fields)
-        @rows   = rows
-        @fields = fields
+      def initialize(rows, fields, columns)
+        @rows    = rows
+        @fields  = fields
+        @columns = columns
         super(rows)
+        compile_dynamic_fields(columns)
       end
 
       def summary
@@ -19,6 +21,16 @@ module Mongoid
           summary
         end
       end
+
+      private
+
+      def compile_dynamic_fields(columns)
+        self.each do |row|
+          @columns.each do |name, function|
+            row[name] = function.call(row)
+          end
+        end
+      end
     end
 
   end

data/lib/mongoid/report/report_proxy.rb

@@ -5,7 +5,7 @@ module Mongoid
       def attach_to(model, options = {}, &block)
         as = options.fetch(:as) { model.collection.name }
 
-        options.merge!(as: "#{name}-#{as}") if as
+        options.merge!(as: "#{name}-#{as}")
 
         context.attach_to(model, options, &block)
       end

data/lib/mongoid/report/scope.rb

@@ -20,7 +20,7 @@ module Mongoid
       def all
         self.yield unless yielded?
         queries = compile_queries
-        Collection.new(klass.collection.aggregate(queries), fields)
+        Collection.new(klass.collection.aggregate(queries), fields, columns)
       end
 
       private
@@ -55,6 +55,10 @@ module Mongoid
         # than defined colunms, Example: field1: 'report-field-name'
         context.class.settings_property(report_name, :fields).values
       end
+
+      def columns
+        context.class.settings_property(report_name, :columns)
+      end
     end
 
   end

data/lib/mongoid/report/version.rb

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

data/lib/mongoid/report.rb

@@ -87,6 +87,16 @@ module Mongoid
         end
       end
 
+      def column(*fields)
+        # Because of representing fields as hash instead of columns we should
+        # have the last variable as columns.
+        define_report_method(*fields) do |_, report_name, columns|
+          columns.each do |name, function|
+            add_column(report_name, name, function)
+          end
+        end
+      end
+
       def fields(collection)
         settings_property(collection, :fields, {})
       end
@@ -127,9 +137,10 @@ module Mongoid
         settings[attach_name] ||= settings.fetch(attach_name) do
           {
             for:       collection,
-            fields:    {},
+            fields:    ActiveSupport::OrderedHash.new,
             group_by:  [],
             queries:   [],
+            columns:   ActiveSupport::OrderedHash.new,
           }
         end
       end
@@ -138,6 +149,10 @@ module Mongoid
         settings[attach_name][:fields][field] = name
       end
 
+      def add_column(attach_name, name, function)
+        settings[attach_name][:columns][name] = function
+      end
+
     end
 
   end

data/spec/mongoid/report/column_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe Mongoid::Report do
+  let(:klass) { Model }
+  let(:yesterday) { Date.parse("19-12-2004") }
+  let(:today) { Date.parse("20-12-2004") }
+  let(:two_days_ago) { Date.parse("18-12-2004") }
+  let(:report_klass) do
+    Class.new do
+      include Mongoid::Report
+
+      report 'example' do
+        attach_to Model do
+          group_by :day
+          aggregation_field :field1
+          column 'dynamic-field1' => ->(row) { row['field1'] * 10 }
+        end
+      end
+    end
+  end
+
+  it 'calculates dynamic field for each row in the report' do
+    klass.create(day: today     , field1: 1)
+    klass.create(day: yesterday , field1: 1)
+    klass.create(day: today     , field1: 1)
+
+    example = report_klass.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[0]['dynamic-field1']).to eq(10)
+    expect(rows[1]['field1']).to eq(2)
+    expect(rows[1]['dynamic-field1']).to eq(20)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-report
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Alexandr Korsak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -59,6 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .drone.yml
 - .gitignore
 - .rspec
 - .ruby-version
@@ -66,6 +67,7 @@ files:
 - .vimrc
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -79,6 +81,7 @@ files:
 - lib/mongoid/report/version.rb
 - mongoid-report.gemspec
 - spec/mongoid/report/aggregation_spec.rb
+- spec/mongoid/report/column_spec.rb
 - spec/mongoid/report/queries_builder_spec.rb
 - spec/mongoid/report/summary_spec.rb
 - spec/mongoid/report_spec.rb
@@ -110,6 +113,7 @@ specification_version: 4
 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/queries_builder_spec.rb
 - spec/mongoid/report/summary_spec.rb
 - spec/mongoid/report_spec.rb