mochigome 0.1.21 → 0.1.22

data/TODO

@@ -11,3 +11,4 @@
 - 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)
+- Some cancan joins must be allowed to double-back over already-joined tables (i.e. the troublesome SchoolStudent ability)

data/lib/mochigome_ver.rb

@@ -1,3 +1,3 @@
 module Mochigome
-  VERSION = "0.1.21"
+  VERSION = "0.1.22"
 end

data/lib/relation.rb

@@ -59,13 +59,13 @@ module Mochigome
       @models.reject{|n| best_path.include?(n)}.each do |n|
         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)
+          join_on_path extra_path
         end
       end
     end
 
     def join_on_path_thru(path)
-      full_path = @model_graph.path_thru(path).uniq
+      full_path = @model_graph.path_thru(path)
       if full_path
         join_on_path(full_path)
       else
@@ -74,16 +74,18 @@ module Mochigome
     end
 
     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|
-        if @models.include?(tgt)
-          if options[:force_condition]
+      begin
+        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|
+          if @models.include?(tgt)
             apply_condition(@model_graph.edge_condition(src, tgt))
+          else
+            add_join_link(src, tgt)
           end
-        else
-          add_join_link(src, tgt)
         end
+      rescue QueryError => e
+        raise QueryError.new("Error pathing #{path.map(&:name).inspect}: #{e}")
       end
     end
 
@@ -116,15 +118,22 @@ module Mochigome
 
     def apply_access_filter_func(func)
       @models.each do |m|
-        h = func.call(m)
-        h.delete(:join_paths).try :each do |path|
-          join_on_path path
-        end
-        if h[:condition]
-          apply_condition h.delete(:condition)
-        end
-        unless h.empty?
-          raise QueryError.new("Unknown assoc filter keys #{h.keys.inspect}")
+        begin
+          h = func.call(m)
+          h.delete(:join_paths).try :each do |path|
+            # FIXME: Eventually we need to support joins that
+            # double back, if only for CanCan stuff, so get rid of this
+            # uniq junk.
+            join_on_path_thru path.uniq
+          end
+          if h[:condition]
+            apply_condition h.delete(:condition)
+          end
+          unless h.empty?
+            raise QueryError.new("Unknown assoc filter keys #{h.keys.inspect}")
+          end
+        rescue QueryError => e
+          raise QueryError.new("Error checking access to #{m.name}: #{e}")
         end
       end
     end
@@ -137,7 +146,8 @@ module Mochigome
 
       @model_join_stack.push tgt
       begin
-        cond = @model_graph.edge_condition(src, tgt)
+        cond = @model_graph.edge_condition(src, tgt) or
+          raise QueryError.new("No direct link from #{src} to #{tgt}")
         join_to_expr_models(cond)
         @rel = @rel.join(tgt.arel_table, Arel::Nodes::InnerJoin).on(cond)
       ensure

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mochigome
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 1
-  - 21
-  version: 0.1.21
+  - 22
+  version: 0.1.22
 platform: ruby
 authors: 
 - David Mike Simon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-15 00:00:00 Z
+date: 2012-07-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement