neo4j 1.0.0.beta.12 → 1.0.0.beta.13

data/lib/neo4j/mapping/class_methods/relationship.rb

@@ -64,14 +64,18 @@ module Neo4j::Mapping
         clazz = self
         module_eval(%Q{def #{rel_type}=(value)
                   dsl = #{clazz}._decl_rels[:'#{rel_type.to_s}']
-                  rel = dsl.single_relationship(self)
+                  dir = dsl.direction
+                  dsl = dsl.incoming? ? dsl.incoming_dsl(self) : dsl
+                  rel = dsl.single_relationship(self, dir)
                   rel.del unless rel.nil?
                   dsl.create_relationship_to(self, value)
               end}, __FILE__, __LINE__)
 
         module_eval(%Q{def #{rel_type}
                   dsl = #{clazz}._decl_rels[:'#{rel_type.to_s}']
-                  dsl.single_relationship(self)
+                  dir = dsl.direction
+                  dsl = dsl.incoming? ? dsl.incoming_dsl(self) : dsl
+                  dsl.single_relationship(self, dir)
               end}, __FILE__, __LINE__)
 
         # TODO

data/lib/neo4j/mapping/decl_relationship_dsl.rb

@@ -85,11 +85,23 @@ module Neo4j::Mapping
       end
     end
 
-    def single_relationship(node)
+    def incoming?
+      @direction == :incoming
+    end
+
+    def incoming_dsl(node)
+      # which class specifies the incoming DSL ?
+      clazz = to_class || node.class
+      dsl = clazz._decl_rels[to_type]
+      raise "Unspecified outgoing relationship '#{to_type}' for incoming relationship '#{rel_id}' on class #{clazz}" if dsl.nil?
+      dsl
+    end
+
+    def single_relationship(node, dir)
       type = type_to_java(namespace_type)
-      dir  = dir_to_java(@direction)
+      dir  = dir_to_java(dir)
       rel = node._java_node.getSingleRelationship(type, dir)
-      rel.nil? ? nil : rel.end_node.wrapper
+      rel.nil? ? nil : rel.other_node(node).wrapper
     end
 
     def create_relationship_to(node, other)

data/lib/neo4j/mapping/has_n.rb

@@ -11,15 +11,7 @@ module Neo4j
       def initialize(node, dsl) # :nodoc:
         @node = node
         @direction = dsl.direction
-        # returns the other DSL if it exists otherwise use this DSL for specifying incoming relationships
-        if @direction == :outgoing
-          @dsl = dsl
-        else
-          # which class specifies the incoming DSL ?
-          clazz = dsl.to_class || node.class
-          @dsl = clazz._decl_rels[dsl.to_type]
-          raise "Unspecified outgoing relationship '#{dsl.to_type}' for incoming relationship '#{dsl.rel_id}' on class #{clazz}" if @dsl.nil?
-        end
+        @dsl = @direction == :outgoing ? dsl : dsl.incoming_dsl(node)
       end
 
       def to_s

data/lib/neo4j/rails/model.rb

@@ -137,7 +137,6 @@ module Neo4j
           # Check if we want to destroy not found nodes (e.g. {..., :_destroy => '1' } ?
           destroy = attr[:_destroy] && attr[:_destroy] != '0'
 
-          puts "FOUND #{found}"
           if found
             if destroy
               found.destroy if allow_destroy

data/lib/neo4j/rails/value.rb

@@ -67,7 +67,6 @@ module Neo4j::Rails
         rel.each do |new_node|
           wrapper = new_node.respond_to?(:wrapper) ? new_node.wrapper : new_node
           if wrapper.save
-            puts "NEW RELATIONSHIP OF TYPE #{type} from #{root_node} to #{new_node}"
             root_node.outgoing(type) << wrapper
           else
             valid = false
@@ -90,9 +89,11 @@ module Neo4j::Rails
         self
       end
 
-      def getOtherNode(other)
+      def other_node(other)
         other == @end_node ? @start_node : @end_node
       end
+
+      alias_method :getOtherNode, :other_node
     end
 
 

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "1.0.0.beta.12"
+  VERSION = "1.0.0.beta.13"
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
     - 0
     - 0
     - beta
-    - 12
-  version: 1.0.0.beta.12
+    - 13
+  version: 1.0.0.beta.13
 platform: ruby
 authors: 
   - Andreas Ronge