mochigome 0.0.5 → 0.0.6

data/lib/mochigome_ver.rb

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

data/lib/query.rb

@@ -37,24 +37,32 @@ module Mochigome
         # the access filter.
         focus_rel = self.class.relation_over_path(@layers_path)
 
-        # TODO: Properly handle focus model that is not in layer types list
-        key_path = @layers_path.take_while{|m| m != focus_model} + [focus_model]
-        key_cols = key_path.map{|m|
-          Arel::Table.new(m.table_name)[m.primary_key]
-        }
-
         @aggregate_rels[focus_model] = {}
         data_models.each do |data_model|
           f2d_path = self.class.path_thru([focus_model, data_model]) #TODO: Handle nil here
           agg_path = nil
+          key_path = nil
           f2d_path.reverse.each do |link_model|
+            remainder = f2d_path.drop_while{|m| m != link_model}
             if @layers_path.include?(link_model)
-              agg_path = f2d_path.drop_while{|m| m != link_model}
+              agg_path = remainder
+              key_path = @layers_path.take(@layers_path.index(focus_model)+1)
               break
+            else
+              # Route it from the closest layer model
+              @layers_path.each_with_index do |layer, i|
+                p = self.class.path_thru([layer, link_model]) + remainder.drop(1)
+                if agg_path.nil? || p.size <= agg_path.size
+                  agg_path = p
+                  key_path = @layers_path.take(i+1)
+                end
+              end
             end
           end
-          # TODO: Properly handle focus model that is not in layer types list
-          fail unless agg_path
+
+          key_cols = key_path.map{|m|
+            Arel::Table.new(m.table_name)[m.primary_key]
+          }
 
           agg_data_rel = self.class.relation_over_path(agg_path, focus_rel.dup)
           agg_data_rel = access_filtered_relation(agg_data_rel, @layers_path + agg_path)

data/test/unit/query_test.rb

@@ -212,8 +212,22 @@ describe Mochigome::Query do
       [Owner, Store, Product],
       :aggregate_sources => [[Product, Sale]]
     )
+    data_node = q.run
+
+    assert_equal "Jane's Store (North)", (data_node/1/0).name
+    assert_equal 11, (data_node/1/0)['Sales count']
 
-    tbl = Arel::Table.new(Owner.table_name)
+    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 "goes farther than layer list to include aggregate focus" do
+    q = Mochigome::Query.new(
+      [Owner, Store],
+      :aggregate_sources => [[Product, Sale]]
+    )
     data_node = q.run
 
     assert_equal "Jane's Store (North)", (data_node/1/0).name
@@ -225,6 +239,20 @@ describe Mochigome::Query do
     assert_equal 24, data_node['Sales count']
   end
 
+  it "does not collect aggregate data for layers below focus" do
+    q = Mochigome::Query.new(
+      [Owner, Store, Product, Category],
+      :aggregate_sources => [[Product, Sale]]
+    )
+    data_node = q.run
+
+    assert_equal "Product", (data_node/0/0/0)[:internal_type]
+    refute_nil (data_node/0/0/0)['Sales count']
+
+    assert_equal "Category", (data_node/0/0/0/0)[:internal_type]
+    assert_nil (data_node/0/0/0/0)['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: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - David Mike Simon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-03 00:00:00 Z
+date: 2012-03-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement