neo4j 1.0.0.beta.17 → 1.0.0.beta.18

data/lib/neo4j/mapping/decl_relationship_dsl.rb

@@ -107,14 +107,14 @@ module Neo4j::Mapping
     end
 
     def create_relationship_to(node, other)
-      dsl = incoming? ? incoming_dsl : self
-
-      # If the are creating an incoming relationship we need to swap incoming and outgoing nodes
-      if @direction == :outgoing
-        from, to = node, other
-      else
-        from, to = other, node
-      end
+    	if incoming?
+    		# If we are creating an incoming relationship, we need to swap incoming and outgoing nodes
+    		dsl = incoming_dsl
+    		from, to = other, node
+    	else
+    		dsl = self
+    		from, to = node, other
+    	end
 
       java_type = type_to_java(dsl.namespace_type)
 

data/lib/neo4j/mapping/has_n.rb

@@ -2,7 +2,13 @@ module Neo4j
   module Mapping
 
     # Enables creating and traversal of nodes.
+    #
     # Includes the Enumerable Mixin.
+    # The Neo4j::Mapping::ClassMethods::Relationship#has_n and Neo4j::Mapping::ClassMethods::Relationship#one
+    # methods returns an object of this type.
+    #
+    # ==== See Also
+    # Neo4j::Mapping::ClassMethods::Relationship
     #
     class HasN
       include Enumerable
@@ -68,7 +74,11 @@ module Neo4j
       # self
       #
       def <<(other)
-        @dsl.create_relationship_to(@node, other)
+      	if @direction == :incoming && @dsl.direction == :outgoing
+      		@dsl.create_relationship_to(other, @node)
+      	else
+      		@dsl.create_relationship_to(@node, other)
+      	end
         self
       end
     end

data/lib/neo4j/mapping/node_mixin.rb

@@ -1,5 +1,24 @@
 module Neo4j::Mapping
 
+  # This Mixin is used to wrap Neo4j Java Nodes in Ruby objects.
+  # It includes the Neo4j::Index module and forwards a number of method to the raw Java node which
+  # intern includes a number of mixins, see below.
+  #
+  # === Instance Mixins
+  # * Neo4j::Index
+  # * Neo4j::Property
+  # * Neo4j::NodeRelationship
+  # * Neo4j::Equal
+  # * Neo4j::Index
+  #
+  # === Class Mixins
+  # * Neo4j::Mapping::ClassMethods::Root
+  # * Neo4j::Mapping::ClassMethods::Property
+  # * Neo4j::Mapping::ClassMethods::InitNode
+  # * Neo4j::Mapping::ClassMethods::Relationship
+  # * Neo4j::Mapping::ClassMethods::Rule
+  # * Neo4j::Index::ClassMethods
+  #
   module NodeMixin
     extend Forwardable
     include Neo4j::Index
@@ -22,6 +41,7 @@ module Neo4j::Mapping
 
 
     # Creates a new node and initialize with given properties.
+    # You can override this to provide your own initialization.
     #
     def init_on_create(*args) # :nodoc:
       self[:_classname] = self.class.to_s

data/lib/neo4j/neo4j.rb

@@ -1,8 +1,16 @@
+# = Neo4j
+#
+# The Neo4j modules is used to interact with an Neo4j Database instance.
+# You can for example start and stop an instance and list all the nodes that exist in the database.
+#
+# === Starting and Stopping Neo4j
+# You don't normally need to start the Neo4j database since it will be automatically started when needed.
+# Before the database is started you should configure where the database is stored, see Neo4j::Config.
+#
 module Neo4j
 
   class << self
-
-
+    
     # Start Neo4j using the default database.
     # This is usally not required since the database will be started automatically when it is used.
     #
@@ -31,9 +39,10 @@ module Neo4j
 
 
     # Returns an unstarted db instance
-    # this is typically used for configuring the database, which must sometimes
+    #
+    # This is typically used for configuring the database, which must sometimes
     # be done before the database is started
-    # if the database was already started an excetion will be raised
+    # if the database was already started an exception will be raised
     def unstarted_db
       @db ||= Database.new
       raise "database was already started" if @db.running?
@@ -46,10 +55,18 @@ module Neo4j
     end
 
 
+    # Stops this database
+    # There are Ruby hooks that will do this automatically for you.
+    #
     def shutdown(this_db = @db)
       this_db.shutdown if this_db
     end
 
+    # Returns the reference node, which is a "starting point" in the node space.
+    #
+    # Usually, a client attaches relationships to this node that leads into various parts of the node space.
+    # For more information about common node space organizational patterns, see the design guide at http://wiki.neo4j.org/content/Design_Guide
+    #
     def ref_node(this_db = self.started_db)
       this_db.graph.reference_node
     end
@@ -59,11 +76,13 @@ module Neo4j
       Enumerator.new(this_db, :each_node)
     end
 
-    # Same as #all_nodes but does not return wrapped nodes.
+    # Same as #all_nodes but does not return wrapped nodes but instead raw java node objects.
     def _all_nodes(this_db = self.started_db)
       Enumerator.new(this_db, :_each_node)
     end
 
+    # Returns the Neo4j::EventHandler
+    #
     def event_handler(this_db = default_db)
       this_db.event_handler
     end

data/lib/neo4j/node.rb

@@ -58,7 +58,7 @@ module Neo4j
   # * Neo4j::Index::ClassMethods lucene index class methods, like find
   # * Neo4j::Load - methods for loading a node
   #
-  # See also the Neo4j::NodeMixin if you want to wrap a node with your own Ruby class.
+  # See also the Neo4j::NodeMixin (Neo4j::Mapping::NodeMixin) if you want to wrap a node with your own Ruby class.
   #
   class Node
     extend Neo4j::Index::ClassMethods

data/lib/neo4j/property.rb

@@ -73,7 +73,7 @@ module Neo4j
     end
 
     # Sets the property of this node.
-    # Property keys are always strings. Valid property value types are the primitives(<tt>String</tt>, <tt>Fixnum</tt>, <tt>Float</tt>, <tt>Boolean</tt>), and arrays of those primitives.
+    # Property keys are always strings. Valid property value types are the primitives(<tt>String</tt>, <tt>Fixnum</tt>, <tt>Float</tt>, <tt>Boolean</tt>).
     #
     def []=(key, value)
       k = key.to_s

data/lib/neo4j/rails/model.rb

@@ -57,7 +57,6 @@ module Neo4j
         persisted? ? [:id] : nil
       end
 
-
       # enables ActiveModel::Dirty and Validation
       def method_missing(method_id, *args, &block)
         if !self.class.attribute_methods_generated?
@@ -101,7 +100,6 @@ module Neo4j
         end
       end
 
-
       # Updates this resource with all the attributes from the passed-in Hash and requests that the record be saved.
       # If saving fails because the resource is invalid then false will be returned.
       def update_attributes(attributes)
@@ -161,12 +159,6 @@ module Neo4j
         end
       end
 
-      def delete
-        super
-        @_deleted = true
-        @_persisted = false
-      end
-
       def save
         _run_save_callbacks do
           if create_or_update_node
@@ -208,13 +200,12 @@ module Neo4j
         @previously_changed = changes
         @changed_attributes.clear
       end
-
+      
       def reload(options = nil)
-        clear_changes
-        attributes = self.class.load(self.id.to_s).attributes
-        self
+				clear_changes
+				reload_from_database or set_deleted_properties and return self
       end
-
+      
       def save!
         raise RecordInvalidError.new(self) unless save
       end
@@ -234,14 +225,19 @@ module Neo4j
       
       alias :new_record? :new?
 
-      def del
-        @_deleted = true
-        super
+      def ==(other)
+      	new? ? self.__id__ == other.__id__ : @_java_node == (other)
       end
 
-      def destroy
-        _run_update_callbacks { del }
+      def del_with_wrapper
+        _run_destroy_callbacks do 
+        	del_without_wrapper
+        	set_deleted_properties
+				end
       end
+      
+      alias_method_chain :del, :wrapper
+      alias :destroy :del_with_wrapper
 
       def destroyed?()
         @_deleted
@@ -265,24 +261,24 @@ module Neo4j
           wrapped
         end
 
-	      # Behave like ActiveModel
+        # Behave like ActiveModel
         def all_with_args(*args)
-          if args.empty?
-            all_without_args
-          else
-            hits                                     = find_without_checking_for_id(*args)
-            # We need to save this so that the Rack Neo4j::Rails:LuceneConnection::Closer can close it
-            Thread.current[:neo4j_lucene_connection] ||= []
-            Thread.current[:neo4j_lucene_connection] << hits
-            hits
-          end
+					if args.empty?
+						all_without_args
+					else
+						hits = find_without_checking_for_id(*args)
+						# We need to save this so that the Rack Neo4j::Rails:LuceneConnection::Closer can close it
+						Thread.current[:neo4j_lucene_connection] ||= []
+						Thread.current[:neo4j_lucene_connection] << hits
+						hits
+					end
         end
-
+	
         alias_method_chain :all, :args
         
         # Handle Model.find(params[:id])
         def find_with_checking_for_id(*args)
-          if args.length == 1 && String === args[0] && args[0].to_i != 0
+        	if args.length == 1 && String === args[0] && args[0].to_i != 0
             load(*args)
           else
             all_with_args(*args).first
@@ -300,7 +296,6 @@ module Neo4j
           end
         end
 
-
         alias_method :_orig_create, :create
 
         def create(*args)
@@ -308,12 +303,11 @@ module Neo4j
         end
 
         def create!(*args)
-          new(*args).tap { |o| o.save! }
+        	new(*args).tap { |o| o.save! }
         end
 
         tx_methods :create, :create!
 
-
         def transaction(&block)
           Neo4j::Rails::Transaction.run &block
         end
@@ -347,10 +341,20 @@ module Neo4j
             tx_methods("#{association_name}_attributes=")
           end
         end
-
       end
-
+      
+      private
+      def reload_from_database
+      	if reloaded = self.class.load(self.id.to_s)
+					attributes = reloaded.attributes
+				end
+			end
+			
+      def set_deleted_properties
+      	@_deleted = true
+				@_persisted = false
+				@_java_node = Neo4j::Rails::Value.new(self)
+			end
     end
-
   end
 end

data/lib/neo4j/rails/properties.rb

@@ -0,0 +1,29 @@
+module Neo4j
+	module Rails
+    # provide some properties before we have a real node or relationship
+		module Properties # :nodoc:
+			include Neo4j::Property
+			
+			# override Neo4j::Property#props
+			def props
+				@props ||= {}
+			end
+			
+			def has_property?(key)
+				!props[key].nil?
+			end
+			
+			def set_property(key,value)
+				props[key] = value
+			end
+	
+			def get_property(key)
+				props[key]
+			end
+	
+			def remove_property(key)
+				props.delete(key)
+			end
+		end
+	end
+end

data/lib/neo4j/rails/value.rb

@@ -1,25 +1,18 @@
 module Neo4j::Rails
 
   class Value
-    include Neo4j::Property
+    include Properties
     include org.neo4j.graphdb.Node
 
     def initialize(wrapper)
       @wrapper = wrapper
-      @props = {}
       @outgoing_rels = {}  # a hash of all relationship with key type
     end
 
-    # override Neo4j::Property#props
-    def props
-      @props
-    end
-
     def getId
       nil
     end
 
-
     def create_relationship_to(other_java_node, java_type)
       outgoing(java_type.name).new(other_java_node)
     end
@@ -36,23 +29,6 @@ module Neo4j::Rails
       outgoing.rels
     end
 
-    # Pretend this object is a Java Node
-    def has_property?(key)
-      !@props[key].nil?
-    end
-
-    def set_property(key,value)
-      @props[key] = value
-    end
-
-    def get_property(key)
-      @props[key]
-    end
-
-    def remove_property(key)
-      @props.delete(key)
-    end
-
     def wrapper
       @wrapper
     end
@@ -64,10 +40,11 @@ module Neo4j::Rails
     def save_nested(root_node)
       valid = true
       @outgoing_rels.each_pair do |type, rel|
-        rel.each do |new_node|
-          wrapper = new_node.respond_to?(:wrapper) ? new_node.wrapper : new_node
+        rel.each_with_index do |new_node, i|
+        	wrapper = new_node.respond_to?(:wrapper) ? new_node.wrapper : new_node
           if wrapper.save
-            root_node.outgoing(type) << wrapper
+            new_rel = Neo4j::Relationship.new(type.to_sym, root_node, wrapper)
+            rel.rels[i].props.each_pair { |property, value| new_rel[property] = value }
           else
             valid = false
           end
@@ -82,7 +59,9 @@ module Neo4j::Rails
     end
 
     class Relationship
-      include org.neo4j.graphdb.Relationship
+    	include org.neo4j.graphdb.Relationship
+      include Properties
+      
       attr_reader :end_node, :start_node
 
       def initialize(from, to)

data/lib/neo4j/transaction.rb

@@ -15,7 +15,6 @@ module Neo4j
     #  # modify something
     #  tx.success
     #  tx.finish
-
     def self.new(instance = Neo4j.started_db)
       instance.begin_tx
     end

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "1.0.0.beta.17"
+  VERSION = "1.0.0.beta.18"
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
     - 0
     - 0
     - beta
-    - 17
-  version: 1.0.0.beta.17
+    - 18
+  version: 1.0.0.beta.18
 platform: ruby
 authors: 
   - Andreas Ronge
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 +01:00
+date: 2010-11-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -59,6 +59,9 @@ extra_rdoc_files:
   - README.rdoc
 files: 
   - lib/neo4j.rb
+  - lib/generators/neo4j.rb
+  - lib/generators/neo4j/model/model_generator.rb
+  - lib/generators/neo4j/model/templates/model.rb
   - lib/neo4j/event_handler.rb
   - lib/neo4j/model.rb
   - lib/neo4j/node_traverser.rb
@@ -82,6 +85,7 @@ files:
   - lib/neo4j/rails/lucene_connection_closer.rb
   - lib/neo4j/rails/transaction.rb
   - lib/neo4j/rails/tx_methods.rb
+  - lib/neo4j/rails/properties.rb
   - lib/neo4j/rails/value.rb
   - lib/neo4j/rails/validations/uniqueness.rb
   - lib/neo4j/jars/lucene-core-3.0.1.jar
@@ -96,13 +100,12 @@ files:
   - lib/neo4j/mapping/class_methods/rule.rb
   - lib/neo4j/mapping/class_methods/init_node.rb
   - lib/neo4j/mapping/class_methods/property.rb
-  - lib/neo4j/mapping/class_methods/index.rb
   - lib/neo4j/mapping/class_methods/root.rb
   - lib/neo4j/mapping/class_methods/init_rel.rb
   - lib/neo4j/mapping/class_methods/relationship.rb
   - lib/neo4j/index/index_registry.rb
-  - lib/neo4j/index/wrapped_query.rb
   - lib/neo4j/index/indexer.rb
+  - lib/neo4j/index/lucene_query.rb
   - lib/neo4j/index/class_methods.rb
   - lib/neo4j/index/index.rb
   - README.rdoc