mochigome 0.0.4 → 0.0.5

data/lib/mochigome_ver.rb

@@ -1,3 +1,3 @@
 module Mochigome
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/query.rb

@@ -72,7 +72,7 @@ module Mochigome
               d_cols.each_with_index do |col, i|
                 d_rel.project(col.as("g#{i}")).group(col)
               end
-              d_rel.where(cond)
+              d_rel.where(cond) if cond
 
               a_rel = Arel::SelectManager.new(
                 Arel::Table.engine,

data/test/unit/query_test.rb

@@ -207,6 +207,24 @@ describe Mochigome::Query do
     assert_equal 24, data_node['Sales count']
   end
 
+  it "collects aggregate data on layers above the focus when given no condition" do
+    q = Mochigome::Query.new(
+      [Owner, Store, Product],
+      :aggregate_sources => [[Product, Sale]]
+    )
+
+    tbl = Arel::Table.new(Owner.table_name)
+    data_node = q.run
+
+    assert_equal "Jane's Store (North)", (data_node/1/0).name
+    assert_equal 11, (data_node/1/0)['Sales count']
+
+    assert_equal "Jane Doe", (data_node/1).name
+    assert_equal 16, (data_node/1)['Sales count']
+
+    assert_equal 24, data_node['Sales count']
+  end
+
   it "can do conditional counts" do
     q = Mochigome::Query.new(
       [Category],

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mochigome
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - David Mike Simon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-02 00:00:00 Z
+date: 2012-03-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement