mochigome 0.1.10 → 0.1.11

data/lib/mochigome.rb

@@ -1,5 +1,6 @@
 require 'mochigome_ver'
 require 'exceptions'
+require 'ordered_set'
 require 'model_extensions'
 require 'model_graph'
 require 'data_node'

data/lib/mochigome_ver.rb

@@ -1,3 +1,3 @@
 module Mochigome
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

data/lib/model_extensions.rb

@@ -155,8 +155,9 @@ module Mochigome
       @model = model
       @options = {}
       @options[:fields] = []
-      @options[:custom_subgroup_exprs] = {}
-      @options[:custom_assocs] = {}
+      @options[:custom_subgroup_exprs] = ActiveSupport::OrderedHash.new
+      @options[:custom_assocs] = ActiveSupport::OrderedHash.new
+      @options[:ignore_assocs] = Set.new
     end
 
     def type_name(n)
@@ -205,6 +206,11 @@ module Mochigome
     def custom_association(tgt_cls, expr)
       @options[:custom_assocs][tgt_cls] = expr
     end
+
+    # TODO: Unit test for this feature
+    def ignore_assoc(name)
+      @options[:ignore_assocs].add name.to_sym
+    end
   end
 
   class AggregationSettings

data/lib/model_graph.rb

@@ -10,7 +10,12 @@ module Mochigome
     def initialize
       @graphed_models = Set.new
       @table_to_model = {}
-      @assoc_graph = RGL::DirectedAdjacencyGraph.new
+      @assoc_graph = RGL::DirectedAdjacencyGraph.new(OrderedSet)
+      # TODO Also maybe need to do this with hashes used internally in traversal
+      @assoc_graph.instance_variable_set( # Make path choice more predictable
+        :@vertice_dict,
+        ActiveSupport::OrderedHash.new
+      )
       @edge_conditions = {}
       @shortest_paths = {}
     end
@@ -98,8 +103,15 @@ module Mochigome
           @table_to_model[model.table_name] = model
         end
 
+        ignore_assocs = []
+        if model.acts_as_mochigome_focus?
+          ignore_assocs = model.mochigome_focus_settings.options[:ignore_assocs]
+        end
+
         model.reflections.
         reject{|name, assoc| assoc.through_reflection}.
+        reject{|name, assoc| ignore_assocs.include? name}.
+        to_a.sort{|a,b| a.first.to_s <=> b.first.to_s}.
         each do |name, assoc|
           # TODO: What about self associations?
           # TODO: What about associations to the same model on different keys?
@@ -117,6 +129,7 @@ module Mochigome
 
         if model.acts_as_mochigome_focus?
           model.mochigome_focus_settings.options[:custom_assocs].each do |t,e|
+            next if ignore_assocs.include?(t.to_s.to_sym)
             cond = e.call(model.arel_table, t.arel_table)
             [[model, t], [t, model]]. each do |edge|
               @assoc_graph.add_edge(*edge)
@@ -129,6 +142,12 @@ module Mochigome
       end
 
       added_models.each do |model|
+        # FIXME: Un-DRY, this is a C&P from above
+        ignore_assocs = []
+        if model.acts_as_mochigome_focus?
+          ignore_assocs = model.mochigome_focus_settings.options[:ignore_assocs]
+        end
+
         next unless @assoc_graph.has_vertex?(model)
         path_tree = @assoc_graph.bfs_search_tree_from(model).reverse
         path_tree.depth_first_search do |tgt_model|
@@ -143,6 +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}.
+        to_a.sort{|a,b| a.first.to_s <=> b.first.to_s}.
         each do |name, assoc|
           begin
             foreign_model = assoc.klass

data/lib/ordered_set.rb

@@ -0,0 +1,11 @@
+module Mochigome
+  private
+
+  # From http://stackoverflow.com/a/8451605/351149
+   class OrderedSet < Set
+    def initialize enum = nil, &block
+      @hash = ActiveSupport::OrderedHash.new
+      super
+    end
+  end
+end

data/lib/relation.rb

@@ -8,6 +8,7 @@ module Mochigome
       @model_graph = ModelGraph.new
       @spine_layers = layers
       @models = Set.new
+      @model_join_stack = []
       @spine = []
       @joins = []
 
@@ -43,7 +44,7 @@ module Mochigome
 
       # Route to it in as few steps as possible, closer to spine end if tie.
       best_path = nil
-      (@spine.reverse + (@models.to_a - @spine)).each do |link_model|
+      (@spine.reverse + (@models.to_a - @spine).sort{|a,b| a.name <=> b.name}).each do |link_model|
         path = @model_graph.path_thru([link_model, model])
         if path && (best_path.nil? || path.size < best_path.size)
           best_path = path
@@ -127,15 +128,24 @@ module Mochigome
     def add_join_link(src, tgt)
       raise QueryError.new("Can't join from #{src}, not available") unless
         @models.include?(src)
-      @models.add tgt
-      cond = @model_graph.edge_condition(src, tgt)
-      join_to_expr_models(cond)
-      @rel = @rel.join(tgt.arel_table, Arel::Nodes::InnerJoin).on(cond)
+
+      @model_join_stack.push tgt
+      begin
+        cond = @model_graph.edge_condition(src, tgt)
+        join_to_expr_models(cond)
+        @rel = @rel.join(tgt.arel_table, Arel::Nodes::InnerJoin).on(cond)
+      ensure
+        @model_join_stack.pop
+      end
+
       @joins << [src, tgt]
+      @models.add tgt
     end
 
     def join_to_expr_models(expr)
-      @model_graph.expr_models(expr).each{|m| join_to_model(m)}
+      @model_graph.expr_models(expr).each do |m|
+        join_to_model(m) unless @model_join_stack.include?(m)
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mochigome
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - David Mike Simon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-17 00:00:00 Z
+date: 2012-05-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -112,6 +112,7 @@ files:
 - lib/mochigome_ver.rb
 - lib/model_extensions.rb
 - lib/model_graph.rb
+- lib/ordered_set.rb
 - lib/query.rb
 - lib/relation.rb
 - lib/subgroup_model.rb