neo4j 1.2.6-java → 1.3.0-java

data/lib/neo4j/index/index.rb

@@ -19,7 +19,8 @@ module Neo4j
     # Neo4j::Index::ClassMethods::index
     #
     def add_index(field, value=self[field])
-      self.class.add_index(wrapped_entity, field.to_s, value)
+      converted_value = Neo4j::TypeConverters.convert(value, field, self.class)
+      self.class.add_index(wrapped_entity, field.to_s, converted_value)
     end
 
     # Removes an index on the given property.

data/lib/neo4j/index/indexer.rb

@@ -2,6 +2,7 @@ module Neo4j
   module Index
     class Indexer
       attr_reader :indexer_for, :field_types, :via_relationships, :entity_type, :parent_indexers, :via_relationships
+      alias_method :index_types, :field_types  # public method accessible from node.index_types
 
       def initialize(clazz, type) #:nodoc:
         # part of the unique name of the index
@@ -155,7 +156,7 @@ module Neo4j
       end
 
       def update_single_index_on(node, field, old_val, new_val) #:nodoc:
-        if @field_types.include?(field)
+        if @field_types.has_key?(field)
           rm_index(node, field, old_val) if old_val
           add_index(node, field, new_val) if new_val
         end
@@ -322,7 +323,7 @@ module Neo4j
       def index_names
         @index_names ||= Hash.new do |hash, index_type|
           default_filename = index_prefix + @indexer_for.to_s.gsub('::', '_')
-          hash.fetch(index_type) {"#{default_filename}-#{index_type}"}
+          hash.fetch(index_type) {"#{default_filename}_#{index_type}"}
         end
       end
 

data/lib/neo4j/index/indexer_registry.rb

@@ -10,7 +10,7 @@ module Neo4j
         def create_for(this_clazz, using_other_clazz, type)
           @@indexers                  ||= {}
           index                       = Indexer.new(this_clazz, type)
-          index.inherit_fields_from(@@indexers[using_other_clazz.to_s])
+          index.inherit_fields_from(@@indexers[using_other_clazz.to_s]) if @@indexers[using_other_clazz.to_s]
           @@indexers[this_clazz.to_s] = index
         end
 

data/lib/neo4j/neo4j.rb

@@ -71,6 +71,22 @@ module Neo4j
       Neo4j::Config
     end
 
+    # Executes a Cypher Query
+    # Check the neo4j http://docs.neo4j.org/chunked/milestone/cypher-query-lang.html
+    # Returns an enumerable of hash values.
+    #
+    # === Usage
+    #
+    #  q = Neo4j.query("START n=node({node}) RETURN n", 'node' => @node.neo_id)
+    #  q.first['n'] #=> the @node
+    #  q.columns.first => 'n'
+    #
+    def query(query, params = {})
+      engine = org.neo4j.cypher.javacompat.ExecutionEngine.new(db)
+      engine.execute(query, params)
+    end
+
+
     # Returns the logger used by neo4j.
     # If not specified (with Neo4j.logger=) it will use the standard Ruby logger.
     # You can change standard logger threshold by configuration :logger_level.

data/lib/neo4j/node_mixin/node_mixin.rb

@@ -80,7 +80,7 @@ module Neo4j
     def _java_entity
       @_java_node
     end
-    
+
     # Trigger rules.
     # You don't normally need to call this method (except in Migration) since
     # it will be triggered automatically by the Neo4j::Rule::Rule
@@ -131,7 +131,7 @@ module Neo4j
         super
       end
 
-      c.node_indexer c
+      c.node_indexer c unless c == Neo4j::Rails::Model
     end
   end
 end

data/lib/neo4j/rails/attributes.rb

@@ -201,8 +201,8 @@ module Neo4j
       # Known properties are either in the @properties, the declared
       # properties or the property keys for the persisted node
       def property?(name)
-        @properties.keys.include?(name) ||
-            self.class._decl_props.map { |k| k.to_s }.include?(name) ||
+        @properties.has_key?(name) ||
+            self.class._decl_props.has_key?(name) ||
             begin
               persisted? && super
             rescue org.neo4j.graphdb.NotFoundException
@@ -216,9 +216,13 @@ module Neo4j
       def attribute?(name)
         name[0] != ?_ && property?(name)
       end
-      
+
       def _classname
-        self[:_classname]
+        self.class.to_s
+      end
+
+      def _classname=(value)
+        write_local_property_without_type_conversion("_classname",value)
       end
 
       # To get ActiveModel::Dirty to work, we need to be able to call undeclared
@@ -248,7 +252,7 @@ module Neo4j
 
       # Wrap the setter in a conversion from Ruby to Java
       def write_local_property_with_type_conversion(property, value)
-        self.send("#{property}_before_type_cast=", value) if respond_to?("#{property}_before_type_cast=")
+        @properties_before_type_cast[property.to_sym]=value if self.class._decl_props.has_key? property.to_sym
         write_local_property_without_type_conversion(property, Neo4j::TypeConverters.to_java(self.class, property, value))
       end
     end

data/lib/neo4j/rails/compositions.rb

@@ -206,6 +206,14 @@ module Neo4j
         #               :constructor => Proc.new { |ip| IPAddr.new(ip, Socket::AF_INET) },
         #               :converter => Proc.new { |ip| ip.is_a?(Integer) ? IPAddr.new(ip, Socket::AF_INET) : IPAddr.new(ip.to_s) }
         #
+        def is_composed_property?(property)
+          composed_properties.contains(property)
+        end
+
+        def composed_properties
+          @composed_properties ||= java.util.HashSet.new
+        end
+
         def composed_of(part_id, options = {})
           options.assert_valid_keys(:class_name, :mapping, :allow_nil, :constructor, :converter)
 
@@ -216,7 +224,7 @@ module Neo4j
           allow_nil   = options[:allow_nil]   || false
           constructor = options[:constructor] || :new
           converter   = options[:converter]
-
+          composed_properties.add(name.to_sym)
           reader_method(name, class_name, mapping, allow_nil, constructor)
           writer_method(name, class_name, mapping, allow_nil, converter)
         end

data/lib/neo4j/rails/mapping/property.rb

@@ -106,10 +106,10 @@ module Neo4j
 
           # Handles options for the property
           #
-          # Set the property type 				:type => Time
-          # Set a default  								:default => "default"
-          # Property must be there  			:null => false
-          # Property has a length limit  	:limit => 128
+          # Set the property type         :type => Time
+          # Set a default                  :default => "default"
+          # Property must be there        :null => false
+          # Property has a length limit    :limit => 128
           def property(*args)
             options = args.extract_options!
             args.each do |property_sym|
@@ -132,39 +132,41 @@ module Neo4j
               validates(property, :non_nil => true, :on => :create)
               validates(property, :non_nil => true, :on => :update)
             end
-						validates(property, :length => { :maximum => options[:limit] }) if options[:limit]
-					end
-
-					def define_property_methods_for(property, options)
-						unless method_defined?(property)
-							class_eval <<-RUBY, __FILE__, __LINE__
-								def #{property}
-									send(:[], "#{property}")
-								end
+            validates(property, :length => { :maximum => options[:limit] }) if options[:limit]
+          end
+
+          def define_property_methods_for(property, options)
+            unless method_defined?(property)
+              class_eval <<-RUBY, __FILE__, __LINE__
+                def #{property}
+                  send(:[], "#{property}")
+                end
               RUBY
             end
 
             unless method_defined?("#{property}=".to_sym)
               class_eval <<-RUBY, __FILE__, __LINE__
-								def #{property}=(value)
-									send(:[]=, "#{property}", value)
-								end
-							RUBY
-						end
-					end
+                def #{property}=(value)
+                  send(:[]=, "#{property}", value)
+                end
+              RUBY
+            end
+          end
 
           def define_property_before_type_cast_methods_for(property, options)
             property_before_type_cast = "#{property}_before_type_cast"
             class_eval <<-RUBY, __FILE__, __LINE__
-              attr_writer :#{property_before_type_cast}
+              def #{property_before_type_cast}=(value)
+                @properties_before_type_cast[:#{property}]=value
+              end
 
               def #{property_before_type_cast}
-                instance_variable_defined?(:@#{property_before_type_cast}) ? @#{property_before_type_cast} : self.#{property}
+                @properties_before_type_cast.has_key?(:#{property}) ? @properties_before_type_cast[:#{property}] : self.#{property}
               end
             RUBY
           end
-				end
-			end
-		end
-	end
+        end
+      end
+    end
+  end
 end

data/lib/neo4j/rails/model.rb

@@ -48,6 +48,7 @@ module Neo4j
 
       # Initialize a Node with a set of properties (or empty if nothing is passed)
       def initialize(attributes = {})
+        @properties_before_type_cast=java.util.HashMap.new
         reset_attributes
         clear_relationships
         self.attributes = attributes if attributes.is_a?(Hash)

data/lib/neo4j/rails/persistence.rb

@@ -1,62 +1,62 @@
 module Neo4j
-	module Rails
-		module Persistence
-			extend ActiveSupport::Concern
-
-			included do
-				extend TxMethods
-				tx_methods :destroy, :create, :update, :update_nested_attributes, :delete, :update_attributes, :update_attributes!
-			end
-
-			# Persist the object to the database.  Validations and Callbacks are included
-			# by default but validation can be disabled by passing :validate => false
-			# to #save.
+  module Rails
+    module Persistence
+      extend ActiveSupport::Concern
+
+      included do
+        extend TxMethods
+        tx_methods :destroy, :create, :update, :update_nested_attributes, :delete, :update_attributes, :update_attributes!
+      end
+
+      # Persist the object to the database.  Validations and Callbacks are included
+      # by default but validation can be disabled by passing :validate => false
+      # to #save.
       def save(*)
-      	create_or_update
+        create_or_update
       end
 
       # Persist the object to the database.  Validations and Callbacks are included
-			# by default but validation can be disabled by passing :validate => false
-			# to #save!.
-			#
-			# Raises a RecordInvalidError if there is a problem during save.
+      # by default but validation can be disabled by passing :validate => false
+      # to #save!.
+      #
+      # Raises a RecordInvalidError if there is a problem during save.
       def save!(*args)
-				unless save(*args)
-					raise RecordInvalidError.new(self)
-				end
-			end
-
-			# Updates a single attribute and saves the record.
-			# This is especially useful for boolean flags on existing records. Also note that
-			#
-			# * Validation is skipped.
-			# * Callbacks are invoked.
-			# * Updates all the attributes that are dirty in this object.
-			#
-			def update_attribute(name, value)
-				respond_to?("#{name}=") ? send("#{name}=", value) : self[name] = value
-				save(:validate => false)
-			end
-
-			# Removes the node from Neo4j and freezes the object.
-			def destroy
-				delete
-				freeze
-			end
-
-			# Same as #destroy but doesn't run destroy callbacks and doesn't freeze
-			# the object
-			def delete
-				del unless new_record?
-				set_deleted_properties
-			end
-
-			# Returns true if the object was destroyed.
-			def destroyed?()
+        unless save(*args)
+          raise RecordInvalidError.new(self)
+        end
+      end
+
+      # Updates a single attribute and saves the record.
+      # This is especially useful for boolean flags on existing records. Also note that
+      #
+      # * Validation is skipped.
+      # * Callbacks are invoked.
+      # * Updates all the attributes that are dirty in this object.
+      #
+      def update_attribute(name, value)
+        respond_to?("#{name}=") ? send("#{name}=", value) : self[name] = value
+        save(:validate => false)
+      end
+
+      # Removes the node from Neo4j and freezes the object.
+      def destroy
+        delete
+        freeze
+      end
+
+      # Same as #destroy but doesn't run destroy callbacks and doesn't freeze
+      # the object
+      def delete
+        del unless new_record?
+        set_deleted_properties
+      end
+
+      # Returns true if the object was destroyed.
+      def destroyed?()
         @_deleted || Neo4j::Node._load(id).nil?
       end
 
-			# Updates this resource with all the attributes from the passed-in Hash and requests that the record be saved.
+      # 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)
         self.attributes = attributes
@@ -95,9 +95,9 @@ module Neo4j
       alias :new? :new_record?
 
       # Freeze the properties hash.
-			def freeze
-				@properties.freeze; self
-			end
+      def freeze
+        @properties.freeze; self
+      end
 
       # Returns +true+ if the properties hash has been frozen.
       def frozen?
@@ -162,7 +162,7 @@ module Neo4j
       end
 
       def init_on_create(*)
-        self["_classname"] = self.class.to_s
+        self._classname = self.class.to_s
         write_default_attributes
         write_changed_attributes
         write_changed_relationships
@@ -262,7 +262,7 @@ module Neo4j
           super(@record.errors.full_messages.join(", "))
         end
       end
-		end
-	end
+    end
+  end
 end
 

data/lib/neo4j/rails/rel_persistence.rb

@@ -161,7 +161,7 @@ module Neo4j
           Neo4j::IdentityMap.add(@_java_rel, self)
           init_on_create
           clear_changes
-        end unless @end_node.nil?
+        end unless @end_node.nil? or @start_node.nil?
         true
       end
 

data/lib/neo4j/rails/relationship.rb

@@ -21,7 +21,8 @@ module Neo4j
 
       # Initialize a Node with a set of properties (or empty if nothing is passed)
       def initialize(*args)
-        @type = args[0]
+        @properties_before_type_cast=java.util.HashMap.new
+        @type = args[0].to_s
         self.start_node = args[1]
         self.end_node = args[2]
         attributes = args[3]
@@ -39,11 +40,15 @@ module Neo4j
 
 
       alias_method :get_other_node, :other_node # so it looks like the java version
-      
+
+      def rel_type
+        persisted? ?  _java_entity.rel_type : @type
+      end
+
       def to_s
         "id: #{self.object_id}  start_node: #{start_node.id} end_node: #{end_node.id} type:#{@type}"
       end
-      
+
       def id
         _java_rel.nil? || neo_id.nil? ? nil : neo_id.to_s
       end
@@ -111,7 +116,7 @@ module Neo4j
         def _all
           _indexer.find(:_classname => self)
         end
-        
+
         def load(*ids) # TODO Copied from finders.rb
           result = ids.map { |id| entity_load(id) }
           if ids.length == 1