mochigome 0.1.3 → 0.1.4

data/TODO

@@ -1,6 +1,5 @@
 - Still need some way to filter queries by weird stuff (i.e. EffectivelyDatedAssociation, or to filter AttendanceRecords by the dates on the Sessions that they belong_to)
-  - Maybe can do this by adjusting the EffectivelyDated module so that when included it calls a hook on Mochigome that describes the possible filter on the effectively dated object (i.e. SectionRoster) as an SQL snippet referencing "SectionRoster" typed entries of the effective dates table.
-- Do as few queries as possible to accomplish stuff; this also encourages app to rely on SQL's 'IN' syntax and magical grouping/joining abilities to make aggregation easier
 - Replace all the TODOs and FIXMEs with whatever they're asking for (additional checks, use of ordered indifferent hashes instead of arrays of hashes, etc.)
 - If there is more than one association from model A to model B and they're both focusable, pick the one with no conditions. If all the associations have conditions, complain and require that the correct association be manually specified (where "correct" might mean none of them should be valid)
   - Alternately, always ignore conditional associations unless they're specifically provided to Mochigome by the model
+- Named subsets of different fields and agg fields on a single model

data/lib/mochigome_ver.rb

@@ -1,3 +1,3 @@
 module Mochigome
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/model_graph.rb

@@ -56,19 +56,14 @@ module Mochigome
         real_tgt = tgt.to_real_model
         unless real_src == real_tgt
           seg = @shortest_paths[[real_src,real_tgt]]
-          unless seg
-            raise QueryError.new("No path: #{real_src.name} to #{real_tgt.name}")
-          end
+          return nil unless seg
           path.concat seg.take(seg.size-1).drop(1)
         end
         path << tgt
       end
-      unless path.uniq.size == path.size
-        raise QueryError.new(
-          "Path thru #{models.map(&:name).join('-')} doubles back: " +
-          path.map(&:name).join('-')
-        )
-      end
+
+      # Don't return any paths that double back
+      return nil unless path.uniq.size == path.size
       path
     end
 

data/lib/query.rb

@@ -240,7 +240,12 @@ module Mochigome
     end
 
     def join_on_path_thru(path)
-      join_on_path(@model_graph.path_thru(path).uniq)
+      full_path = @model_graph.path_thru(path).uniq
+      if full_path
+        join_on_path(full_path)
+      else
+        raise QueryError.new("Cannot route thru #{path.map(&:name).inspect}")
+      end
     end
 
     def join_on_path(path)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mochigome
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - David Mike Simon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-17 00:00:00 Z
+date: 2012-04-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement