mochigome 0.2.0 → 0.2.1

data/lib/mochigome_ver.rb

@@ -1,3 +1,3 @@
 module Mochigome
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/query.rb

@@ -60,12 +60,21 @@ module Mochigome
 
     def self.tree_root_to_leaf_paths(t)
       if t.is_a?(Hash)
+        unless t.size == 1 && t.keys.first.acts_as_mochigome_focus?
+          raise QueryError.new "Invalid layer tree hash #{t}"
+        end
         t.map{|k, v|
           tree_root_to_leaf_paths(v).map{|p| [k] + p}
         }.flatten(1)
       elsif t.is_a?(Array)
+        unless t.all?{|e| e.is_a?(Hash) || e.acts_as_mochigome_focus?}
+          raise QueryError.new "Invalid layer tree array #{t}"
+        end
         t.map{|v| tree_root_to_leaf_paths(v)}.flatten(1)
       else
+        unless t.acts_as_mochigome_focus?
+          raise QueryError.new "Invalid layer tree element #{t}"
+        end
         [[t]]
       end
     end
@@ -117,18 +126,17 @@ module Mochigome
 
     def create_root_node
       root = DataNode.new(:report, @name)
-      root.comment = <<-eos
-        Mochigome Version: #{Mochigome::VERSION}
-        Report Generated: #{Time.now}
-        eos
-        # FIXME Show layers and joins for all lines individually
-        #Layers: #{@layer_types.map(&:name).join(" => ")}
-        #eos
-        #@ids_rel.joins.each do |src, tgt|
-        #  root.comment += "Join: #{src.name} -> #{tgt.name}\n"
-        #end
-        root.comment.gsub!(/(\n|^) +/, "\\1")
-        return root
+      root.comment = "Mochigome Version: #{Mochigome::VERSION}\n"
+      root.comment += "Report Generated: #{Time.now}\n"
+      @lines.each_with_index do |line, i|
+        root.comment += "Query Line #{i+1}:\n"
+        root.comment += "  #{line.layer_types.map(&:name).join("=>")}\n"
+        root.comment += "  Join Paths:\n"
+        line.ids_rel.join_path_descriptions.each do |d|
+          root.comment += "    #{d}\n"
+        end
+      end
+      return root
     end
   end
 

data/lib/relation.rb

@@ -2,7 +2,7 @@ module Mochigome
   private
 
   class Relation
-    attr_reader :joins, :spine_layers
+    attr_reader :spine_layers, :join_path_descriptions
 
     def initialize(layers)
       @model_graph = ModelGraph.new
@@ -10,7 +10,7 @@ module Mochigome
       @models = Set.new
       @model_join_stack = []
       @spine = []
-      @joins = []
+      @join_path_descriptions = []
 
       @spine_layers.map(&:to_real_model).uniq.each do |m|
         join_to_model(m)
@@ -54,12 +54,14 @@ module Mochigome
       raise QueryError.new("No path to #{model}") unless best_path
       join_on_path(best_path)
 
-      # Also use the conditions of any other path that's at least that short
+      # Also use the conditions of any other unique path
       # TODO: Write a test that requires the below code to work
       @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
+        if extra_path
+          unless best_path.all?{|m| extra_path.include?(m)}
+            join_on_path extra_path
+          end
         end
       end
     end
@@ -77,13 +79,17 @@ module Mochigome
       begin
         path = path.map(&:to_real_model).uniq
         join_to_model path.first
+        join_descrips = [path.first.name]
         (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))
+            join_descrips << "*#{tgt.name}"
           else
             add_join_link(src, tgt)
+            join_descrips << tgt.name
           end
         end
+        @join_path_descriptions << join_descrips.join("->")
       rescue QueryError => e
         raise QueryError.new("Error pathing #{path.map(&:name).inspect}: #{e}")
       end
@@ -154,7 +160,6 @@ module Mochigome
         @model_join_stack.pop
       end
 
-      @joins << [src, tgt]
       @models.add tgt
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mochigome
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - David Mike Simon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-24 00:00:00 Z
+date: 2012-09-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement