neo4j-core 3.0.0.alpha.4 → 3.0.0.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7ad8a3566b38431c3fb2b4420b3918f32bb9fdf
-  data.tar.gz: 5e5e6af23ddd35f2b734f8e481f9fdd4a602ade4
+  metadata.gz: 0b8d26b2492ff2888f2c2606aeee0ce9255a1258
+  data.tar.gz: f7fc8825fd0e49e7fa76165fef2c9e2610cb206e
 SHA512:
-  metadata.gz: 1c27c255130a0cd822b5853913246e0a3b9d12e83ffd74d9793923b42611890ab053e872278daa8547623e550d1d9e45143ab7256505745b646e18ce9c5c675b
-  data.tar.gz: 527b493adbb69deee8f9ebb490e9dbf7f2e3d9d038024cd3cf0b76d715134534440960fd4b97a7ffda4045ad6c929ba9569cabae55d33e410f3b1c71880fdc4b
+  metadata.gz: 54c8b882ea08e8c2e9ea63a5c641e17d5ea84b247a1fb5c6b3b345bb7fb449ff03ee608a80639f82c2e57aa763a15286f94b29b2d895f9ec1eb0dc80fb2a9bde
+  data.tar.gz: 119921f81ce0918cc3273db1cccc89a50c5543024d2d0b80bacaeb36438541785579a293da8ca14839ecbd0dcfea6b44ba48958ca1ad4eb370883832ec443bb7

data/lib/neo4j/node.rb

@@ -1,16 +1,21 @@
 module Neo4j
 
-  # A module that allows plugins to register wrappers around Neo4j::Node objects
-  module Wrapper
-    # Used by Neo4j::NodeMixin to wrap nodes
-    def wrapper
-      self
-    end
-  end
-
   # The base class for both the Embedded and Server Neo4j Node
   # Notice this class is abstract and can't be instantiated
   class Node
+
+    # A module that allows plugins to register wrappers around Neo4j::Node objects
+    module Wrapper
+      # Used by Neo4j::NodeMixin to wrap nodes
+      def wrapper
+        self
+      end
+
+      def neo4j_obj
+        self
+      end
+    end
+
     include EntityEquality
     include Wrapper
     include PropertyContainer
@@ -123,6 +128,10 @@ module Neo4j
       raise 'not implemented'
     end
 
+    def _rel(spec = {})
+      raise 'not implemented'
+    end
+
     # Returns true or false if there is one or more relationships
     # Same as `!! #rel()`
     def rel?(spec = {})

data/lib/neo4j/relationship.rb

@@ -10,8 +10,17 @@ module Neo4j
   # i.e. start_node, end_node and other_node are guaranteed to always return valid, non-nil nodes.
   class Relationship
 
+    # A module that allows plugins to register wrappers around Neo4j::Node objects
+    module Wrapper
+      # Used by Neo4j::NodeMixin to wrap nodes
+      def wrapper
+        self
+      end
+    end
+
     include PropertyContainer
     include EntityEquality
+    include Wrapper
 
     # @abstract
     def start_node
@@ -65,6 +74,11 @@ module Neo4j
     # @return [Neo4j::Node] the other node wrapper
     # @see #_other_node
     def other_node(node)
+      _other_node(node.neo4j_obj).wrapper
+    end
+
+    # Same as #other_node but can return a none wrapped node
+    def _other_node(node)
       if node == start_node
         return end_node
       elsif node == end_node
@@ -74,6 +88,7 @@ module Neo4j
       end
     end
 
+
     class << self
       def load(neo_id, session = Neo4j::Session.current)
         session.load_relationship(neo_id)

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = "3.0.0.alpha.4"
+    VERSION = "3.0.0.alpha.5"
   end
 end

data/lib/neo4j-embedded/embedded_node.rb

@@ -9,7 +9,7 @@ module Neo4j::Embedded
     end
 
     def each(&block)
-      @node._rels(@match).each {|r| block.call(r)}
+      @node._rels(@match).each {|r| block.call(r.wrapper)}
     end
     tx_methods :each
 
@@ -70,7 +70,7 @@ module Neo4j::Embedded
           tx_methods :del
 
           def create_rel(type, other_node, props = nil)
-            rel = create_relationship_to(other_node, ToJava.type_to_java(type))
+            rel = create_relationship_to(other_node.neo4j_obj, ToJava.type_to_java(type))
             props.each_pair { |k, v| rel[k] = v } if props
             rel
           end
@@ -87,7 +87,7 @@ module Neo4j::Embedded
 
           def node(match={})
             rel = _rel(match)
-            rel && rel.other_node(self)
+            rel && rel.other_node(self).wrapper
           end
           tx_methods :node
 
@@ -148,8 +148,8 @@ module Neo4j::Embedded
           def class
             Neo4j::Node
           end
-          #include Neo4j::Core::Label
-          include Neo4j::Wrapper
+
+          include Neo4j::Node::Wrapper
         end
       end
     end

data/lib/neo4j-embedded/embedded_relationship.rb

@@ -6,9 +6,10 @@ module Neo4j::Embedded
         java_clazz.class_eval do
           include Neo4j::Embedded::Property
           include Neo4j::EntityEquality
+          include Neo4j::Relationship::Wrapper
           extend Neo4j::Core::TxMethods
 
-          alias_method :other_node, :getOtherNode
+          alias_method :_other_node, :getOtherNode
 
           def exist?
             !!graph_database.get_relationship_by_id(neo_id)
@@ -18,7 +19,7 @@ module Neo4j::Embedded
           tx_methods :exist?
 
           def start_node
-            getStartNode
+            getStartNode.wrapper
           end
           tx_methods :start_node
 
@@ -27,8 +28,12 @@ module Neo4j::Embedded
           end
           tx_methods :del
 
+          def other_node(n)
+            _other_node(n.neo4j_obj).wrapper
+          end
+
           def end_node
-            getEndNode
+            getEndNode.wrapper
           end
           tx_methods :end_node
 

data/lib/neo4j-server/cypher_node.rb

@@ -132,7 +132,7 @@ module Neo4j::Server
       r.data.map do |rel|
         next if r.uncommited? ? rel['row'].first.nil? : rel.first.nil?
         id = r.uncommited? ? rel['row'].first : rel.first
-        clazz.new(@session, id)
+        clazz.new(@session, id).wrapper
       end.compact
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.4
+  version: 3.0.0.alpha.5
 platform: ruby
 authors:
 - Andreas Ronge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-28 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty