mochigome 0.1.7 → 0.1.8

data/lib/mochigome_ver.rb

@@ -1,3 +1,3 @@
 module Mochigome
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/model_extensions.rb

@@ -75,7 +75,7 @@ module Mochigome
         end
 
         if assoc.options[:as]
-          # FIXME Can we assume that this is the polymorphic type field?
+          # FIXME Can we really assume that this is the polymorphic type field?
           cond = cond.and(ftable["#{assoc.options[:as]}_type"].eq(model.name))
         end
 
@@ -156,6 +156,7 @@ module Mochigome
       @options = {}
       @options[:fields] = []
       @options[:custom_subgroup_exprs] = {}
+      @options[:custom_assocs] = {}
     end
 
     def type_name(n)
@@ -200,6 +201,10 @@ module Mochigome
     def custom_subgroup_expression(name, expr)
       @options[:custom_subgroup_exprs][name] = expr
     end
+
+    def custom_association(tgt_cls, expr)
+      @options[:custom_assocs][tgt_cls] = expr
+    end
   end
 
   class AggregationSettings
@@ -284,6 +289,12 @@ module Mochigome
     :sum => lambda{|a| a.sum}
   }
 
+  AGG_FUNC_DEFAULTS = {
+    :count => 0,
+    :distinct => 0,
+    :sum => 0
+  }
+
   # Given an object, tries to coerce it into a proc that takes a node
   # and returns an expression node to collect some aggregate data from it.
   def self.aggregation_proc(obj)
@@ -330,9 +341,15 @@ module Mochigome
       raise ModelSetupError.new "Wrong # of components for agg: #{obj.inspect}"
     end
 
-    {
+    r = {
       :agg_proc => aggregation_proc(vals[0]),
       :value_proc => value_proc(vals[1])
     }.merge(vals[2] || {})
+
+    if AGG_FUNC_DEFAULTS.has_key?(vals[0])
+      r[:default] = AGG_FUNC_DEFAULTS[vals[0]]
+    end
+
+    r
   end
 end

data/lib/model_graph.rb

@@ -114,6 +114,18 @@ module Mochigome
           @assoc_graph.add_edge(*edge)
           @edge_conditions[edge] = model.assoc_condition(name)
         end
+
+        if model.acts_as_mochigome_focus?
+          model.mochigome_focus_settings.options[:custom_assocs].each do |t,e|
+            cond = e.call(model.arel_table, t.arel_table)
+            [[model, t], [t, model]]. each do |edge|
+              @assoc_graph.add_edge(*edge)
+              # This deliberately allows custom assocs to overwrite normal ones
+              @edge_conditions[edge] = cond
+            end
+            added_models << t unless added_models.include?(t)
+          end
+        end
       end
 
       added_models.each do |model|

data/test/app_root/app/models/widget.rb

@@ -0,0 +1,7 @@
+class Widget < ActiveRecord::Base
+  acts_as_mochigome_focus do |f|
+    f.name lambda {|r| "Widget #{r.number}"}
+  end
+
+  validates_presence_of :number
+end

data/test/app_root/app/models/widget_divisor.rb

@@ -0,0 +1,12 @@
+class WidgetDivisor < ActiveRecord::Base
+  acts_as_mochigome_focus do |f|
+    f.name lambda {|r| "Divisor #{r.divisor}"}
+    f.custom_association Widget, lambda {|src_tbl,tgt_tbl|
+      # Argh, arel doesn't provide easy access to the modulus operator
+      ((tgt_tbl[:number]/src_tbl[:divisor])*src_tbl[:divisor]).
+        eq(tgt_tbl[:number])
+    }
+  end
+
+  validates_presence_of :divisor
+end

data/test/app_root/db/migrate/20110817163830_create_tables.rb

@@ -51,6 +51,14 @@ class CreateTables < ActiveRecord::Migration
       t.string :foo
       t.string :bar
     end
+
+    # These models are for testing custom associations
+    create_table :widgets do |t|
+      t.integer :number
+    end
+    create_table :widget_divisors do |t|
+      t.integer :divisor
+    end
   end
 
   def self.down

data/test/unit/query_test.rb

@@ -38,6 +38,14 @@ describe Mochigome::Query do
     ].each do |sp, n|
       n.times{create(:sale, :store_product => sp)}
     end
+
+    (1..5).each do |div_num|
+      WidgetDivisor.create(:divisor => div_num)
+    end
+
+    (1..25).each do |num|
+      Widget.create(:number => num)
+    end
   end
 
   after do
@@ -47,6 +55,8 @@ describe Mochigome::Query do
     Store.delete_all
     StoreProduct.delete_all
     Sale.delete_all
+    WidgetDivisor.delete_all
+    Widget.delete_all
   end
 
   # Convenience functions to check DataNode output validity
@@ -544,4 +554,37 @@ describe Mochigome::Query do
     assert_equal 0, (dn/0)['Gross']
     assert_equal 0, (dn/0/0)['Gross']
   end
+
+  it "assumes 0 as a default value for appropriate simple aggregations" do
+    Sale.destroy_all
+    q = Mochigome::Query.new(
+      [Store, Product],
+      :aggregate_sources => [[Product, Sale]]
+    )
+    dn = q.run
+    assert_equal 3, dn.children.size
+    assert_equal 0, dn['Sales count']
+    assert_equal 0, (dn/0)['Sales count']
+    assert_equal 0, (dn/0/0)['Sales count']
+  end
+
+  it "can use custom associations to link records" do
+    q = Mochigome::Query.new([WidgetDivisor, Widget])
+    dn = q.run
+    assert_equal "Divisor 1", (dn/0).name
+    assert_equal 25, (dn/0).children.size
+    assert_equal "Divisor 2", (dn/1).name
+    assert_equal 12, (dn/1).children.size
+    assert_equal "Divisor 5", (dn/4).name
+    assert_equal 5, (dn/4).children.size
+  end
+
+  it "can follow custom associations in reverse" do
+    q = Mochigome::Query.new([Widget, WidgetDivisor])
+    dn = q.run
+    assert_equal "Widget 1", (dn/0).name
+    assert_equal 1, (dn/0).children.size
+    assert_equal "Widget 6", (dn/5).name
+    assert_equal 3, (dn/5).children.size
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mochigome
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - David Mike Simon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-02 00:00:00 Z
+date: 2012-05-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -124,6 +124,8 @@ files:
 - test/app_root/app/models/sale.rb
 - test/app_root/app/models/store.rb
 - test/app_root/app/models/store_product.rb
+- test/app_root/app/models/widget.rb
+- test/app_root/app/models/widget_divisor.rb
 - test/app_root/app/transforms/report.fo.via-html.xslt.haml
 - test/app_root/app/transforms/report.html.xslt.haml
 - test/app_root/app/views/layouts/application.html.haml