mochigome 0.2.4 → 0.2.5

data/lib/mochigome_ver.rb

@@ -1,3 +1,3 @@
 module Mochigome
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/model_graph.rb

@@ -23,7 +23,11 @@ module Mochigome
     # Take an expression and return a Set of all models it references
     def expr_models(e)
       r = Set.new
-      [:expr, :left, :right].each do |m|
+      if e.is_a?(Array)
+        e.each{|sub_e| r += expr_models(sub_e)}
+        return r
+      end
+      [:expr, :left, :right, :expressions].each do |m|
         r += expr_models(e.send(m)) if e.respond_to?(m)
       end
       if e.respond_to?(:relation)

data/lib/query.rb

@@ -37,6 +37,7 @@ module Mochigome
         aggregate_sources = as_hash
       end
 
+      agg_only_lines = []
       aggregate_sources.each do |path, aggs|
         models_path = path.drop(1) # Remove the :report symbol at the start
         tgt_line = @lines.find do |line|
@@ -47,8 +48,23 @@ module Mochigome
         end
         aggs.each do |a|
           tgt_line.add_aggregate_source(models_path.size, a)
+          if tgt_line.layer_path != models_path
+            # FIXME Copy&paste from add_aggregate_source
+            if a.is_a?(Array) then
+              focus_model = a.select{|e| e.is_a?(Class)}.first
+              data_model = a.select{|e| e.is_a?(Class)}.last
+            else
+              focus_model = data_model = a
+            end
+
+            line = QueryLine.new(models_path, access_filter)
+            line.ids_rel.join_on_path_thru([focus_model, data_model])
+            line.ids_rel.apply_condition data_model.arel_primary_key.not_eq(nil)
+            agg_only_lines << line
+          end
         end
       end
+      @lines += agg_only_lines
     end
 
     def run(cond = nil)

data/test/unit/query_test.rb

@@ -457,6 +457,21 @@ describe Mochigome::Query do
       (data_node/0/0)['Gross'].to_f.to_s
   end
 
+  it "shows aggregate data for mid-layer-tree models with no leaf model results" do
+    q = Mochigome::Query.new(
+      [Product, Category],
+      :aggregate_sources => {
+        [:report, Product] => [Sale]
+      }
+    )
+    dn = q.run
+    assert_equal 5, dn.children.size
+    assert_equal "Product A", (dn/0).name
+    assert_equal "Product E", (dn/4).name
+    assert_empty (dn/4).children
+    assert_equal 1, (dn/4)["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: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - David Mike Simon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-29 00:00:00 Z
+date: 2012-11-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement