mochigome 0.1.15 → 0.1.16

data/lib/mochigome_ver.rb

@@ -1,3 +1,3 @@
 module Mochigome
-  VERSION = "0.1.15"
+  VERSION = "0.1.16"
 end

data/lib/query.rb

@@ -86,6 +86,10 @@ module Mochigome
 
     private
 
+    def connection
+      ActiveRecord::Base.connection
+    end
+
     def create_node_tree(cond)
       root = DataNode.new(:report, @name)
       root.comment = <<-eos
@@ -100,8 +104,11 @@ module Mochigome
 
       r = @ids_rel.clone
       r.apply_condition(cond)
-      ids_table = @layer_types.first.connection.select_all(r.to_sql)
-      fill_layers(ids_table, {[] => root}, @layer_types)
+      ids_sql = r.to_sql
+      if ids_sql
+        ids_table = connection.select_all(ids_sql)
+        fill_layers(ids_table, {[] => root}, @layer_types)
+      end
 
       root
     end
@@ -153,7 +160,7 @@ module Mochigome
         rel_funcs.each do |rel_func|
           q = rel_func.call(cond)
           data_tree = {}
-          @layer_types.first.connection.select_all(q.to_sql).each do |row|
+          connection.select_all(q.to_sql).each do |row|
             group_values = row.keys.select{|k| k.start_with?("g")}.sort.map{|k| row[k]}
             data_values = row.keys.select{|k| k.start_with?("d")}.sort.map{|k| row[k]}
             if group_values.empty?

data/lib/relation.rb

@@ -13,34 +13,34 @@ module Mochigome
       @joins = []
 
       @spine_layers.map(&:to_real_model).uniq.each do |m|
-        if @rel
-          join_to_model(m)
-        else
-          @rel = @model_graph.relation_init(m)
-          @models.add m
-        end
+        join_to_model(m)
         @spine << m
       end
       @spine_layers.each{|m| select_model_id(m)}
     end
 
     def to_arel
-      @rel.clone
+      @rel.try(:clone)
     end
 
     def to_sql
-      @rel.to_sql
+      @rel.try(:to_sql)
     end
 
     def clone
       c = super
       c.instance_variable_set :@models, @models.clone
-      c.instance_variable_set :@rel, @rel.clone
+      c.instance_variable_set :@rel, @rel.clone if @rel
       c
     end
 
     def join_to_model(model)
       return if @models.include?(model)
+      unless @rel
+        @rel = @model_graph.relation_init(model)
+        @models.add model
+        return
+      end
 
       # Route to it in as few steps as possible, closer to spine end if tie.
       best_path = nil
@@ -84,6 +84,7 @@ module Mochigome
     end
 
     def select_model_id(m)
+      join_to_model(m)
       @rel = @rel.project(m.arel_primary_key.as("#{m.name}_id"))
     end
 

data/test/unit/query_test.rb

@@ -275,6 +275,18 @@ describe Mochigome::Query do
     assert_equal (2*@product_c.price).to_f.to_s, (data_node/1/0/0)['Gross'].to_f.to_s
   end
 
+  it "can collect aggregate data without any layers" do
+    q = Mochigome::Query.new(
+      [],
+      :aggregate_sources => [Product]
+    )
+
+    data_node = q.run
+    assert_equal Product.all.map(&:price).sum.to_s,
+      data_node["Products sum price"].to_s
+    assert_empty data_node.children
+  end
+
   it "can use a named aggregate data setting" do
     q = Mochigome::Query.new(
       [Owner],

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mochigome
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 1
-  - 15
-  version: 0.1.15
+  - 16
+  version: 0.1.16
 platform: ruby
 authors: 
 - David Mike Simon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-04 00:00:00 Z
+date: 2012-06-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement