mochigome 0.1.18 → 0.1.19

data/lib/mochigome_ver.rb

@@ -1,3 +1,3 @@
 module Mochigome
-  VERSION = "0.1.18"
+  VERSION = "0.1.19"
 end

data/lib/model_graph.rb

@@ -27,8 +27,23 @@ module Mochigome
         r += expr_models(e.send(m)) if e.respond_to?(m)
       end
       if e.respond_to?(:relation)
-        model = @table_to_model[e.relation.name] or
-          raise ModelSetupError.new("Table lookup error: #{e.relation.name}")
+        model = nil
+        begin
+          model = @table_to_model[e.relation.name] or
+            raise ModelSetupError.new("Table lookup error: #{e.relation.name}")
+        rescue ModelSetupError
+          Dir.glob(RAILS_ROOT + '/app/models/*.rb').each do |path|
+            clsname = File.basename(path).sub(/\.rb$/, "").classify
+            require File.expand_path(path) unless Object.const_defined?(clsname)
+          end
+          Object.subclasses_of(ActiveRecord::Base).each do |m|
+            if m.table_name == e.relation.name
+              model = m
+              break
+            end
+          end
+          raise unless model
+        end
         r.add model
       end
       r

data/lib/query.rb

@@ -107,16 +107,18 @@ module Mochigome
       end
       root.comment.gsub!(/(\n|^) +/, "\\1")
 
-      r = @ids_rel.clone
-      r.apply_condition(cond)
-      ids_sql = r.to_sql
-      if ids_sql
-        ids_table = connection.select_all(ids_sql).map do |row|
-          row.each do |k,v|
-            row[k] = denilify(v)
+      unless @layer_types.empty?
+        r = @ids_rel.clone
+        r.apply_condition(cond)
+        ids_sql = r.to_sql
+        if ids_sql
+          ids_table = connection.select_all(ids_sql).map do |row|
+            row.each do |k,v|
+              row[k] = denilify(v)
+            end
           end
+          fill_layers(ids_table, {[] => root}, @layer_types)
         end
-        fill_layers(ids_table, {[] => root}, @layer_types)
       end
 
       root

data/test/unit/query_test.rb

@@ -287,6 +287,18 @@ describe Mochigome::Query do
     assert_empty data_node.children
   end
 
+  it "can collect filtered aggregate data without any layers" do
+    q = Mochigome::Query.new(
+      [],
+      :aggregate_sources => [Product]
+    )
+
+    data_node = q.run(@store_x)
+    assert_equal [@product_a, @product_c].map(&:price).sum.to_f.to_s,
+      data_node["Products sum price"].to_f.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: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 1
-  - 18
-  version: 0.1.18
+  - 19
+  version: 0.1.19
 platform: ruby
 authors: 
 - David Mike Simon