Implementing through_any key for has_many

neo4jrb · Jul 13, 2014 · a23c638 · a23c638
1 parent 7b36175
commit a23c638
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/lib/neo4j/active_node/has_n.rb b/lib/neo4j/active_node/has_n.rb
@@ -108,12 +108,13 @@ def #{rel_type}
       end
 
       def has_many(name, options = {})
-        to, from, through = options.values_at(:to, :from, :through)
+        to, from, through, through_any = options.values_at(:to, :from, :through, :through_any)
         raise ArgumentError, "Must specify either :to or :from" if not (to || from)
         raise ArgumentError, "Cannot specify both :to and :from" if to && from
 
         target_class = to || from
         direction = to ? :outbound : :inbound
+        through_any ||= false
 
         # TODO: auto-set through when missing
 
@@ -122,12 +123,12 @@ def has_many(name, options = {})
 
         module_eval(%Q{
           def #{name}
-            Neo4j::ActiveNode::Query::QueryProxy.new(#{target_class.name}, start_object: self, relationship: #{through.inspect}, direction: #{direction.inspect})
+            Neo4j::ActiveNode::Query::QueryProxy.new(#{target_class.name}, start_object: self, through_any: #{through_any}, relationship: #{through.inspect}, direction: #{direction.inspect})
           end}, __FILE__, __LINE__)
 
         instance_eval(%Q{
           def #{name}
-            Neo4j::ActiveNode::Query::QueryProxy.new(#{target_class.name}, query_proxy: self.query_proxy, relationship: #{through.inspect}, direction: #{direction.inspect})
+            Neo4j::ActiveNode::Query::QueryProxy.new(#{target_class.name}, query_proxy: self.query_proxy, through_any: #{through_any}, relationship: #{through.inspect}, direction: #{direction.inspect})
           end}, __FILE__, __LINE__)
 
       end

diff --git a/lib/neo4j/active_node/query/query_proxy.rb b/lib/neo4j/active_node/query/query_proxy.rb
@@ -114,11 +114,12 @@ def add_links(links)
 
         def association_arrow
           if @association_options
+            relationship = @association_options[:through_any] ? '' : "[:#{@association_options[:relationship]}]"
             case direction = @association_options[:direction].to_sym
               when :outbound
-                "-[:#{@association_options[:relationship]}]->"
+                "-#{relationship}->"
               when :inbound
-                "<-[:#{@association_options[:relationship]}]-"
+                "<-#{relationship}-"
               else
                 raise ArgumentError, "Invalid relationship direction: #{direction}"
             end