mochigome 0.1.16 → 0.1.17

data/TODO

@@ -8,3 +8,6 @@
 - Better handling of nil in subgroup fields
 - Handle has_and_belongs_to_many correctly
 - Deal with ignore_assoc properly in both directions and when we see :through assocs
+- Refuse to do huge reports (ids_table more than a few thousand rows) beacuse user probably just screwed up the grouping
+- Allow row counts that skip layers (i.e. a school count report on School$region, SchoolDetail$comp_shelter should have a top-level box that summarizes the # of schools that do and do not have competency shelters)
+- Some kind of on-write caching feature for records that would be expensive to fully re-aggregate every time (i.e. AttendanceRecord)

data/lib/mochigome_ver.rb

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

data/lib/model_graph.rb

@@ -110,7 +110,7 @@ module Mochigome
 
         model.reflections.
         reject{|name, assoc| assoc.through_reflection}.
-        reject{|name, assoc| ignore_assocs.include? name}.
+        reject{|name, assoc| ignore_assocs.include? name.to_sym}.
         to_a.sort{|a,b| a.first.to_s <=> b.first.to_s}.
         each do |name, assoc|
           # TODO: What about self associations?
@@ -162,7 +162,8 @@ module Mochigome
         # Use through reflections as a hint for preferred indirect paths
         model.reflections.
         select{|name, assoc| assoc.through_reflection}.
-        reject{|name, assoc| ignore_assocs.include? name}.
+        reject{|name, assoc| ignore_assocs.include? name.to_sym}.
+        reject{|name, assoc| ignore_assocs.include? assoc.through_reflection.name.to_sym}.
         to_a.sort{|a,b| a.first.to_s <=> b.first.to_s}.
         each do |name, assoc|
           begin

data/lib/relation.rb

@@ -54,14 +54,12 @@ module Mochigome
       raise QueryError.new("No path to #{model}") unless best_path
       join_on_path(best_path)
 
-      # Also use the conditions of any other direct assoc to the target
-      # TODO: Or maybe any other assoc that's equal length?
+      # Also use the conditions of any other path that's at least that short
       # TODO: Write a test that requires the below code to work
       @models.reject{|n| best_path.include?(n)}.each do |n|
-        cond = @model_graph.edge_condition(n, model)
-        if cond
-          join_to_expr_models(cond)
-          @rel = @rel.where(cond)
+        extra_path = @model_graph.path_thru([n, model])
+        if extra_path && extra_path.size <= best_path.size
+          join_on_path(extra_path, :force_condition => true)
         end
       end
     end
@@ -75,11 +73,17 @@ module Mochigome
       end
     end
 
-    def join_on_path(path)
+    def join_on_path(path, options = {})
       path = path.map(&:to_real_model).uniq
       join_to_model path.first
       (0..(path.size-2)).map{|i| [path[i], path[i+1]]}.each do |src, tgt|
-        add_join_link(src, tgt) unless @models.include?(tgt)
+        if @models.include?(tgt)
+          if options[:force_condition]
+            apply_condition(@model_graph.edge_condition(src, tgt))
+          end
+        else
+          add_join_link(src, tgt)
+        end
       end
     end
 

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

@@ -3,8 +3,10 @@ class WidgetDivisor < ActiveRecord::Base
     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])
+      (src_tbl[:divisor]*Arel::Nodes::NamedFunction.new(
+        "ROUND",
+        [(tgt_tbl[:number]/src_tbl[:divisor]) - 0.5]
+      )).eq(tgt_tbl[:number])
     }
   end
 

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

@@ -2,7 +2,7 @@ class CreateTables < ActiveRecord::Migration
   def self.up
     create_table :products do |t|
       t.string :name
-      t.decimal :price
+      t.decimal :price, :precision => 10, :scale => 2
       t.integer :category_id
       t.timestamps
     end

data/test/unit/query_test.rb

@@ -282,8 +282,8 @@ describe Mochigome::Query do
     )
 
     data_node = q.run
-    assert_equal Product.all.map(&:price).sum.to_s,
-      data_node["Products sum price"].to_s
+    assert_equal Product.all.map(&:price).sum.to_f.to_s,
+      data_node["Products sum price"].to_f.to_s
     assert_empty data_node.children
   end
 

metadata

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