neo4j 1.3.0-java → 1.3.1-java

data/CHANGELOG

@@ -1,3 +1,17 @@
+ == 1.3.1 / 2011-12-14
+* Make all relationships visible in Rails callback (rspecs #87, Dmytrii Nagirniak) [#211]
+* Enable travis to build JRuby 1.9 (pull #87, Dmytrii Nagirniak) [#214]
+* Support for composite lucene queries with OR and NOT (pull #89, Deepak N)
+* Enforce the correct converter on a property type when the type is given (pull #86, Dmytrii Nagirniak)
+* Development: make it easier to run RSpecs and guard (pull #85, Dmytrii Nagirniak)
+* Added ability to disable observer (pull #84, Dmytrii Nagirniak)
+* Fixing multiple assignment of has_one assocaition (pull #83 Deepak N)
+* Accept association_id for has_one assocations (pull #82, Deepak N)
+* Upgrade to 1.6.M01 Neo4j java jars [#209]
+* Defer warning message 'Unknown outgoing relationship' (pull #81, Vivek Prahlad)
+* Added string converter, e.g. property :name, :type => String  (pull #80, Dmytrii Nagirniak)
+* Added symbol converter e.g. property :status, :type => Symbol (pull #79, Dmytrii Nagirniak) [#205]
+
  == 1.3.0 / 2011-12-06
 * Added neo4j-upgrade script to rename lucene index files and upgrade to 1.5 [#197]
 * Expose Neo4j::NodeMixin#index_types returning available indices (useful for Cypher queries) [#194]

data/CONTRIBUTORS

@@ -2,6 +2,7 @@ Maintainer:
   Andreas Ronge <andreas dot ronge at gmail dot com>
 
 Contributors:
+* Dmytrii Nagirniak
 * Marcio Toshio
 * Kalyan Akella
 * Vivek Prahlad

data/Gemfile

@@ -8,6 +8,13 @@ group 'test' do
   gem "horo", ">= 1.0.2"
   gem "rspec", "= 2.6.0"
 
+  gem 'guard'
+  gem 'ruby_gntp', :require => false # GrowlNotify for Mac
+  gem 'rb-inotify', :require => false
+  gem 'rb-fsevent', :require => false
+  gem 'rb-fchange', :require => false
+  gem "guard-rspec"
+
   # use this version for rspec-rails-matchers which work with latest RSpec (Rspec => RSpec)
   gem "rspec-rails-matchers", :git => 'git://github.com/afcapel/rspec-rails-matchers.git'
 

data/README.rdoc

@@ -126,17 +126,20 @@ Notice that you can always access the lower layers if you want to do some more a
 
 === Project information
 * {GitHub}[http://github.com/andreasronge/neo4j/tree/master]
-* {Lighthouse Issue Tracking}[http://neo4j.lighthouseapp.com]
+* {Issue Tracking}[https://github.com/andreasronge/neo4j/issues]
 * {Twitter}[http://twitter.com/ronge]
-* IRC -  #neo4j @ irc.freenode.net
 * {Mailing list, neo4jrb@googlegroups.com}[http://groups.google.com/group/neo4jrb]
+* {Read only, old lighthouse issues}[http://neo4j.lighthouseapp.com]
 
 === Contributing
 
+{<img src="https://secure.travis-ci.org/andreasronge/neo4j.png" />}[http://travis-ci.org/andreasronge/neo4j]
+
+{Development configuration}[http://neo4j.rubyforge.org/guides/index.html#development-and-testing-configuration]
+
 Have you found a bug, need help or have a patch ?
 Just clone neo4j.rb and send me a pull request or email me.
 Do you need help - send me an email (andreas.ronge at gmail dot com).
-Please also check/add issues at lighthouse, http://neo4j.lighthouseapp.com
 
 === License
 * Neo4j.rb - MIT, see the LICENSE file http://github.com/andreasronge/neo4j/tree/master/LICENSE.

data/lib/neo4j.rb

@@ -20,15 +20,15 @@ require 'neo4j/core_ext/class/inheritable_attributes'
 
 require 'neo4j/jars/core/geronimo-jta_1.1_spec-1.1.1.jar'
 require 'neo4j/jars/core/lucene-core-3.1.0.jar'
-require 'neo4j/jars/core/neo4j-cypher-1.5.jar'
-require 'neo4j/jars/core/neo4j-kernel-1.5.jar'
-require 'neo4j/jars/core/neo4j-lucene-index-1.5.jar'
-require 'neo4j/jars/core/neo4j-jmx-1.5.jar'
-require 'neo4j/jars/core/neo4j-udc-1.5.jar'
+require 'neo4j/jars/core/neo4j-cypher-1.6.M01.jar'
+require 'neo4j/jars/core/neo4j-kernel-1.6.M01.jar'
+require 'neo4j/jars/core/neo4j-lucene-index-1.6.M01.jar'
+require 'neo4j/jars/core/neo4j-jmx-1.6.M01.jar'
+require 'neo4j/jars/core/neo4j-udc-1.6.M01.jar'
 require 'neo4j/jars/core/org.apache.servicemix.bundles.jline-0.9.94_1.jar'
 require 'neo4j/jars/core/scala-library-2.9.0-1.jar'
-require 'neo4j/jars/core/server-api-1.5.jar'
-require 'neo4j/jars/ha/neo4j-management-1.5.jar'
+require 'neo4j/jars/core/server-api-1.6.M01.jar'
+require 'neo4j/jars/ha/neo4j-management-1.6.M01.jar'
 
 module Neo4j
 
@@ -39,20 +39,20 @@ module Neo4j
   end
 
   def self.load_shell_jars
-    require 'neo4j/jars/core/neo4j-shell-1.5.jar'
+    require 'neo4j/jars/core/neo4j-shell-1.6.M01.jar'
   end
 
   def self.load_online_backup
-    require 'neo4j/jars/ha/neo4j-com-1.5.jar'
-    require 'neo4j/jars/ha/neo4j-backup-1.5.jar'
+    require 'neo4j/jars/ha/neo4j-com-1.6.M01.jar'
+    require 'neo4j/jars/ha/neo4j-backup-1.6.M01.jar'
     require 'neo4j/jars/ha/org.apache.servicemix.bundles.netty-3.2.5.Final_1.jar'
     Neo4j.send(:const_set, :OnlineBackup, org.neo4j.backup.OnlineBackup)
   end
 
   def self.load_ha_jars
-    require 'neo4j/jars/ha/neo4j-backup-1.5.jar'
-    require 'neo4j/jars/ha/neo4j-com-1.5.jar'
-    require 'neo4j/jars/ha/neo4j-ha-1.5.jar'
+    require 'neo4j/jars/ha/neo4j-backup-1.6.M01.jar'
+    require 'neo4j/jars/ha/neo4j-com-1.6.M01.jar'
+    require 'neo4j/jars/ha/neo4j-ha-1.6.M01.jar'
     require 'neo4j/jars/ha/log4j-1.2.16.jar'
     require 'neo4j/jars/ha/org.apache.servicemix.bundles.netty-3.2.5.Final_1.jar'
     require 'neo4j/jars/ha/slf4j-api-1.6.1.jar'

data/lib/neo4j/algo/algo.rb

@@ -1,7 +1,7 @@
 # external neo4j dependencies
 require 'neo4j/to_java'
-require 'neo4j/jars/core/neo4j-graph-algo-1.5.jar'
-require 'neo4j/jars/core/neo4j-graph-matching-1.5.jar'
+require 'neo4j/jars/core/neo4j-graph-algo-1.6.M01.jar'
+require 'neo4j/jars/core/neo4j-graph-matching-1.6.M01.jar'
 
 module Neo4j
 

data/lib/neo4j/database.rb

@@ -106,7 +106,7 @@ module Neo4j
     # Returns true if the neo4j db was started in read only mode.
     # This can occur if the database was locked (it was already one instance running).
     def read_only?
-      @graph.isReadOnly
+      @graph.java_class == org.neo4j.kernel.EmbeddedGraphDatabase
     end
 
     # check if the database is locked. A neo4j database is locked when the database is running.

data/lib/neo4j/has_n/decl_relationship_dsl.rb

@@ -63,7 +63,7 @@ module Neo4j
       def java_dir
         dir_to_java(@dir)
       end
-      
+
       def each_node(node, &block) #:nodoc:
         node._java_node.getRelationships(java_rel_type, java_dir).each do |rel|
           block.call(rel.getOtherNode(node).wrapper)
@@ -194,12 +194,7 @@ module Neo4j
           # handle specified (prefixed) relationship, e.g. has_n(:known_by).from(clazz, :type)
           @rel_type = "#{@target_class}##{args[1]}"
           @target_class = args[0]
-          other_class_dsl = @target_class._decl_rels[args[1]]
-          if other_class_dsl
-            @relationship = other_class_dsl.relationship_class
-          else
-            Neo4j.logger.warn "Unknown outgoing relationship #{args[1]} on #{@target_class}"
-          end
+          @relationship_name = args[1]
         elsif (Symbol === args[0])
           # handle unspecified (unprefixed) relationship, e.g. has_n(:known_by).from(:type)
           @rel_type = args[0]
@@ -235,7 +230,15 @@ module Neo4j
       end
 
       def relationship_class # :nodoc:
-        @relationship 
+        if !@relationship_name.nil? && @relationship.nil?
+          other_class_dsl = @target_class._decl_rels[@relationship_name]
+          if other_class_dsl
+            @relationship = other_class_dsl.relationship_class
+          else
+            Neo4j.logger.warn "Unknown outgoing relationship #{@relationship_name} on #{@target_class}"
+          end
+        end
+        @relationship
       end
     end
   end

data/lib/neo4j/identity_map.rb

@@ -1,6 +1,3 @@
-# https://github.com/rails/rails/blob/master/activerecord/lib/active_record/identity_map.rb
-# https://github.com/rails/rails/pull/76
-
 module Neo4j
 
   # = Neo4j Identity Map

data/lib/neo4j/index/lucene_query.rb

@@ -38,7 +38,7 @@ module Neo4j
     class LuceneQuery
       include Enumerable
       include WillPaginate::Finders::Base
-      attr_accessor :left_and_query, :left_or_query
+      attr_accessor :left_and_query, :left_or_query, :right_not_query
 
       def initialize(index, decl_props, query, params={})
         @index      = index
@@ -156,9 +156,33 @@ module Neo4j
       #  Person.find(:name=>'kalle').and(:age => 3)
       #
       def and(query2)
-        new_query                = LuceneQuery.new(@index, @decl_props, query2)
-        new_query.left_and_query = self
-        new_query
+        LuceneQuery.new(@index, @decl_props, query2).tap { |new_query| new_query.left_and_query = self }
+      end
+
+      # Create an OR lucene query.
+      #
+      # ==== Parameters
+      # query2 :: the query that should be OR together
+      #
+      # ==== Example
+      #
+      #  Person.find(:name=>'kalle').or(:age => 3)
+      #
+      def or(query2)
+        LuceneQuery.new(@index, @decl_props, query2).tap { |new_query| new_query.left_or_query = self }
+      end
+
+      # Create a NOT lucene query.
+      #
+      # ==== Parameters
+      # query2 :: the query that should exclude matching results
+      #
+      # ==== Example
+      #
+      #  Person.find(:age => 3).not(:name=>'kalle')
+      #
+      def not(query2)
+        LuceneQuery.new(@index, @decl_props, query2).tap { |new_query| new_query.right_not_query = self }
       end
 
 
@@ -175,11 +199,26 @@ module Neo4j
       end
 
       def build_and_query(query) #:nodoc:
-        left_query = @left_and_query.build_query
-        and_query  = org.apache.lucene.search.BooleanQuery.new
-        and_query.add(left_query, org.apache.lucene.search.BooleanClause::Occur::MUST)
-        and_query.add(query, org.apache.lucene.search.BooleanClause::Occur::MUST)
-        and_query
+        build_composite_query(@left_and_query.build_query, query, org.apache.lucene.search.BooleanClause::Occur::MUST)
+      end
+
+      def build_or_query(query) #:nodoc:
+        build_composite_query(@left_or_query.build_query, query, org.apache.lucene.search.BooleanClause::Occur::SHOULD)
+      end
+
+      def build_not_query(query) #:nodoc:
+        right_query = @right_not_query.build_query
+        composite_query  = org.apache.lucene.search.BooleanQuery.new
+        composite_query.add(query, org.apache.lucene.search.BooleanClause::Occur::MUST_NOT)
+        composite_query.add(right_query, org.apache.lucene.search.BooleanClause::Occur::MUST)
+        composite_query
+      end
+
+      def build_composite_query(left_query, right_query, opeartor) #:nodoc:
+        composite_query  = org.apache.lucene.search.BooleanQuery.new
+        composite_query.add(left_query, opeartor)
+        composite_query.add(right_query, opeartor)
+        composite_query
       end
 
       def build_sort_query(query) #:nodoc:
@@ -224,6 +263,8 @@ module Neo4j
         query = @query
         query = build_hash_query(query) if Hash === query
         query = build_and_query(query) if @left_and_query
+        query = build_or_query(query) if @left_or_query
+        query = build_not_query(query) if @right_not_query
         query = build_sort_query(query) if @order
         query
       end

data/lib/neo4j/rails/accept_id.rb

@@ -0,0 +1,66 @@
+module Neo4j::Rails
+  # Allows accepting id for association objjects. For example
+  # class Book < Neo4j::Model
+  #   has_one(:author).to(Author)
+  #   accepts_id_for :author
+  # end
+  #
+  # This would add a author_id getter and setter on Book. You could use
+  # book = Book.new(:name => 'Graph DBs', :author_id => 11)
+  # book.author_id # 11
+  # book.author_id = 13
+  # TODO: Support for has_n associations
+  module AcceptId
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      # Adds association_id getter and setter for one or more has_one associations
+      #
+      # @example
+      # class Book < Neo4j::Model
+      #   has_one(:author).to(Author)
+      #   has_one(:publisher).to(Publisher)
+      #   accepts_id_for :author, :publisher
+      # end
+      def accepts_id_for(*association_names)
+        association_names.each do |association_name|
+          define_association_id_getter(association_name)
+          define_association_id_setter(association_name)
+          accepts_id_associations << association_name
+        end
+      end
+
+      # Check if model accepsts id for its association
+      # @example
+      # Book.accepts_id_for?(:author) => true
+      # Book.accepts_id_for?(:genre) => false
+      def accepts_id_for?(association_name)
+        accepts_id_associations.include?(association_name)
+      end
+
+      def accepts_id_associations #nodoc
+        @accepts_id_associations ||= []
+      end
+
+      protected
+      def define_association_id_getter(association_name)
+        class_eval %Q{
+          def #{association_name}_id
+            association_object = self.#{association_name}
+            association_object.present? ? association_object.id : nil
+          end
+        }, __FILE__, __LINE__
+      end
+
+      def define_association_id_setter(association_name)
+        class_eval %Q{
+          def #{association_name}_id=(id)
+            relation_target_class = self.class._decl_rels[:#{association_name}].target_class
+            association_class =  relation_target_class <= self.class ?  Neo4j::Model : relation_target_class
+            self.#{association_name} = id.present? ? association_class.find(id) : nil
+          end
+        }, __FILE__, __LINE__
+      end
+    end
+  end
+end

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

@@ -55,8 +55,7 @@ module Neo4j
                 def #{rel_type}=(other)
                     dsl = _decl_rels_for(:'#{rel_type}')
                     storage = _create_or_get_storage_for_decl_rels(dsl)
-                    rel = storage.single_relationship(dsl.dir)
-                    rel && rel.destroy
+                    storage.destroy_single_relationship(dsl.dir)
                     storage.create_relationship_to(other, dsl.dir)
                 end
               RUBY

data/lib/neo4j/rails/model.rb

@@ -270,6 +270,7 @@ module Neo4j
       include Finders # ActiveRecord style find
       include Relationships # for none persisted relationships
       include Compositions
+      include AcceptId
     end
   end
 end

data/lib/neo4j/rails/observer.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/class/attribute_accessors'
+
 module Neo4j
   module Rails
     # Observer classes respond to life cycle callbacks to implement trigger-like
@@ -86,11 +88,26 @@ module Neo4j
     # In order to activate an observer, list it in the +config.neo4j.observers+
     # configuration setting in your +config/application.rb+ file.
     #
-    #   config.neo4j.observers = :comment_observer, :signup_observer
+    #   config.neo4j.observers = [:comment_observer, :signup_observer]
     #
     # Observers will not be invoked unless you define them in your
     # application configuration.
     #
+    # During testing you may want (and probably should) to disable all the observers.
+    # Most of the time you don't want any kind of emails to be sent when creating objects.
+    # This should improve the speed of your tests and isolate the models and observer logic.
+    #
+    # For example, the following will disable the observers in RSpec:
+    #
+    #   config.before(:each) { Neo4j::Rails::Observer.disable_observers }
+    #
+    # But if you do want to run a particular observer(s) as part of the test,
+    # you can temporarily enable it:
+    #
+    #   Neo4j::Rails::Observer.with_observers(:user_recorder, :account_observer) do
+    #     # Any code here will work with observers enabled
+    #   end
+    #
     # == Loading
     #
     # Observers register themselves with the model class that they observe,
@@ -113,6 +130,48 @@ module Neo4j
         super and observed_descendants.each { |klass| add_observer!(klass) }
       end
 
+      cattr_accessor :default_observers_enabled, :observers_enabled
+
+      # TODO: Add docs
+      class << self
+        # Enables all observers (default behavior)
+        def enable_observers
+          self.default_observers_enabled = true
+        end
+
+        # Disables all observers
+        def disable_observers
+          self.default_observers_enabled = false
+        end
+
+        # Run a block with a specific set of observers enabled
+        def with_observers(*observer_syms)
+          self.observers_enabled = Array(observer_syms).map do |o|
+            o.respond_to?(:instance) ? o.instance : o.to_s.classify.constantize.instance
+          end
+          yield
+        ensure
+          self.observers_enabled = []
+        end
+
+        # Determines whether an observer is enabled.  Either:
+        # - All observers are enabled OR
+        # - The observer is in the whitelist
+        def observer_enabled?(observer)
+          default_observers_enabled or self.observers_enabled.include?(observer)
+        end
+      end
+
+
+      # Determines whether this observer should be run
+      def observer_enabled?
+        self.class.observer_enabled?(self)
+      end
+
+      # By default, enable all observers
+      enable_observers
+      self.observers_enabled = []
+
       protected
 
       # Get all the child observers.
@@ -149,7 +208,7 @@ module Neo4j
             callback_meth = :"_notify_#{observer_name}_for_#{callback}"
             unless klass.respond_to?(callback_meth)
               klass.send(:define_method, callback_meth) do |&block|
-                observer.send(callback, self, &block)
+                observer.send(callback, self, &block) if observer.observer_enabled?
               end
               klass.send(callback, callback_meth)
             end

data/lib/neo4j/rails/persistence.rb

@@ -190,7 +190,7 @@ module Neo4j
       # Ensure any defaults are stored in the DB
       def write_default_attributes
         attribute_defaults.each do |attribute, value|
-          write_attribute(attribute, Neo4j::TypeConverters.convert(value, attribute, self.class)) unless changed_attributes.has_key?(attribute) || _java_node.has_property?(attribute)
+          write_attribute(attribute, Neo4j::TypeConverters.convert(value, attribute, self.class, false)) unless changed_attributes.has_key?(attribute) || _java_node.has_property?(attribute)
         end
       end
 

data/lib/neo4j/rails/rails.rb

@@ -11,6 +11,7 @@ require 'neo4j/rails/validations'
 require 'neo4j/rails/callbacks'
 require 'neo4j/rails/observer'
 require 'neo4j/rails/compositions'
+require 'neo4j/rails/accept_id'
 require 'neo4j/rails/timestamps'
 require 'neo4j/rails/serialization'
 require 'neo4j/rails/attributes'

data/lib/neo4j/rails/rel_persistence.rb

@@ -151,16 +151,19 @@ module Neo4j
       def create()
         begin
           # prevent calling create twice
-          @start_node.rm_outgoing_rel(type, self)
-          @end_node.rm_incoming_rel(type, self)
+          @start_node.add_unpersisted_outgoing_rel(type, self)
+          @end_node.add_unpersisted_incoming_rel(type, self)
 
-          _persist_start_node
-          _persist_end_node
+          return unless _persist_start_node && _persist_end_node
 
           @_java_rel = Neo4j::Relationship.new(type, start_node, end_node)
           Neo4j::IdentityMap.add(@_java_rel, self)
           init_on_create
           clear_changes
+
+          @start_node.rm_unpersisted_outgoing_rel(type, self)
+          @end_node.rm_unpersisted_incoming_rel(type, self)
+
         end unless @end_node.nil? or @start_node.nil?
         true
       end
@@ -170,18 +173,14 @@ module Neo4j
       end
 
       def _persist_start_node
-        unless @start_node.persisted? || @start_node.save
-          # not sure if this can happen - probably a bug
-          raise "Can't save start_node #{@start_node} id #{@start_node.id}"
-        end
+        (!@start_node.persisted? || @start_node.relationships_changed?) ? @start_node.save : true
       end
 
       def _persist_end_node
-        unless @end_node.persisted? || @end_node.save
-          raise "Can't save end_node #{@end_node} id #{@end_node.id}"
-        end
+        (!@end_node.persisted? || @end_node.relationships_changed?) ? @end_node.save : true
       end
 
+
       def init_on_create(*)
         #self["_classname"] = self.class.to_s
         write_default_attributes

data/lib/neo4j/rails/relationships/node_dsl.rb

@@ -185,7 +185,11 @@ module Neo4j
         def to_s
           "Node dir: #{@dir}, #{@storage}"
         end
-        
+
+        def rel_changed?
+          @storage.persisted?
+        end
+
         protected
 
 

data/lib/neo4j/rails/relationships/relationships.rb

@@ -30,6 +30,9 @@ module Neo4j
         @_relationships[decl_rels.rel_type.to_sym] ||= Storage.new(self, decl_rels.rel_type, decl_rels)
       end
 
+      def _storage_for(rel_type) #:nodoc:
+        @_relationships[rel_type.to_sym]
+      end
 
       # If the node is persisted and it does not have any unsaved relationship it returns a Neo4j::NodeTraverser.
       # Otherwise it will return a NodesDSL which behaves like the Neo4j::NodeTraverser except that it does not
@@ -90,6 +93,37 @@ module Neo4j
         _create_or_get_storage(rel_type).rm_outgoing_rel(rel)
       end
 
+      def rm_outgoing_rel(rel_type, rel) #:nodoc:
+        _create_or_get_storage(rel_type).rm_outgoing_rel(rel)
+      end
+
+      def add_unpersisted_incoming_rel(rel_type, rel) #:nodoc
+        storage = _storage_for(rel_type)
+        # move the relationship since we are now about to store the relationship
+        storage.add_unpersisted_incoming_rel(rel)
+        storage.rm_incoming_rel(rel)
+      end
+
+      def add_unpersisted_outgoing_rel(rel_type, rel) #:nodoc
+        storage = _storage_for(rel_type)
+        # move the relationship since we are now about to store the relationship
+        storage.add_unpersisted_outgoing_rel(rel)
+        storage.rm_outgoing_rel(rel)
+      end
+
+      def rm_unpersisted_outgoing_rel(rel_type, rel)  #:nodoc
+        if (storage = _storage_for(rel_type))
+          storage.rm_unpersisted_outgoing_rel(rel)
+        end
+      end
+
+      def rm_unpersisted_incoming_rel(rel_type, rel)  #:nodoc
+        if (storage = _storage_for(rel_type))
+          storage.rm_unpersisted_incoming_rel(rel)
+        end
+      end
+
+
     end
   end
 end

data/lib/neo4j/rails/relationships/storage.rb

@@ -20,17 +20,21 @@ module Neo4j
         end
 
         def to_s #:nodoc:
-          "Storage #{object_id} node: #{@node.id} rel_type: #{@rel_type} outgoing #{@outgoing_rels.size} incoming #{@incoming_rels.size}"
+          "Storage #{object_id} node: #{@node.id} rel_type: #{@rel_type} outgoing #{@outgoing_rels.size}/#{@unpersisted_outgoing_rels && @unpersisted_outgoing_rels.size} incoming #{@incoming_rels.size}/#{@unpersisted_incoming_rels && @unpersisted_incoming_rels.size}"
         end
 
         def clear_unpersisted
           @outgoing_rels.clear
           @incoming_rels.clear
+          @unpersisted_outgoing_rels = nil
+          @unpersisted_incoming_rels = nil
         end
 
         def remove_from_identity_map
           @outgoing_rels.each {|r| Neo4j::IdentityMap.remove(r._java_rel)}
           @incoming_rels.each {|r| Neo4j::IdentityMap.remove(r._java_rel)}
+          @unpersisted_outgoing_rels = nil
+          @unpersisted_incoming_rels = nil
         end
 
         def size(dir)
@@ -57,9 +61,9 @@ module Neo4j
         def relationships(dir)
           case dir
             when :outgoing
-              @outgoing_rels
+              @unpersisted_outgoing_rels || @outgoing_rels
             when :incoming
-              @incoming_rels
+              @unpersisted_incoming_rels || @incoming_rels
             when :both
               @incoming_rels + @outgoing_rels
           end
@@ -122,6 +126,11 @@ module Neo4j
           end
         end
 
+        def destroy_single_relationship(dir)
+          rel = single_relationship(dir)
+          rel && rel.destroy && relationships(dir).delete(rel)
+        end
+
         def all_relationships(dir)
           Enumerator.new(self, :each_rel, dir)
         end
@@ -155,6 +164,18 @@ module Neo4j
           @outgoing_rels << rel
         end
 
+        # Makes the given relationship available in callbacks
+        def add_unpersisted_incoming_rel(rel)
+          @unpersisted_incoming_rels ||= []
+          @unpersisted_incoming_rels << rel
+        end
+
+        # Makes the given relationship available in callbacks
+        def add_unpersisted_outgoing_rel(rel)
+          @unpersisted_outgoing_rels ||= []
+          @unpersisted_outgoing_rels << rel
+        end
+
         def rm_incoming_rel(rel)
           @incoming_rels.delete(rel)
         end
@@ -163,6 +184,16 @@ module Neo4j
           @outgoing_rels.delete(rel)
         end
 
+        def rm_unpersisted_incoming_rel(rel)
+          @unpersisted_incoming_rels.delete(rel)
+          @unpersisted_incoming_rels = nil if @unpersisted_incoming_rels.empty?
+        end
+
+        def rm_unpersisted_outgoing_rel(rel)
+          @unpersisted_outgoing_rels.delete(rel)
+          @unpersisted_outgoing_rels = nil if @unpersisted_outgoing_rels.empty?
+        end
+
         def persisted?
           @outgoing_rels.empty? && @incoming_rels.empty?
         end
@@ -174,14 +205,12 @@ module Neo4j
           [@outgoing_rels, @incoming_rels, @persisted_related_nodes, @persisted_node_to_relationships, @persisted_relationships].each{|c| c.clear}
 
           out_rels.each do |rel|
-            rel.end_node.rm_incoming_rel(@rel_type.to_sym, rel) if rel.end_node
             success = rel.persisted? || rel.save
             # don't think this can happen - just in case, TODO
             raise "Can't save outgoing #{rel}, validation errors ? #{rel.errors.inspect}" unless success
           end
 
           in_rels.each do |rel|
-            rel.start_node.rm_outgoing_rel(@rel_type.to_sym, rel) if rel.start_node
             success = rel.persisted? || rel.save
             # don't think this can happen - just in case, TODO
             raise "Can't save incoming #{rel}, validation errors ? #{rel.errors.inspect}" unless success

data/lib/neo4j/type_converters/type_converters.rb

@@ -68,6 +68,46 @@ module Neo4j
       end
     end
 
+    class SymbolConverter
+      class << self
+
+        def convert?(class_or_symbol)
+          :symbol == class_or_symbol || Symbol == class_or_symbol
+        end
+
+        def to_java(value)
+          return nil unless value
+          value.to_s
+        end
+
+        def to_ruby(value)
+          return nil unless value
+          value.to_sym
+        end
+      end
+    end
+
+
+    class StringConverter
+      class << self
+
+        def convert?(class_or_symbol)
+          [String, :string, :text].include? class_or_symbol
+        end
+
+        def to_java(value)
+          return nil unless value
+          value.to_s
+        end
+
+        def to_ruby(value)
+          return nil unless value
+          value.to_s
+        end
+      end
+    end
+
+
 
     class FixnumConverter
       class << self
@@ -184,7 +224,10 @@ module Neo4j
       end
       
       # Always returns a converter that handles to_ruby or to_java
-      def converter(type = nil)
+      # if +enforce_type+ is set to false then it will raise in case of unknown type
+      # otherwise it will return the DevaultConverter.
+      def converter(type = nil, enforce_type = true)
+        return DefaultConverter unless type
         @converters ||= begin
           Neo4j::TypeConverters.constants.find_all do |c|
             Neo4j::TypeConverters.const_get(c).respond_to?(:convert?)
@@ -192,14 +235,16 @@ module Neo4j
             Neo4j::TypeConverters.const_get(c)
           end
         end
-        (type && @converters.find { |c| c.convert?(type) }) || DefaultConverter
+        found = @converters.find {|c| c.convert?(type) }
+        raise "The type #{type.inspect} is unknown. Use one of #{@converters.map{|c| c.name.demodulize.sub('Converter','') }.join(", ")} or create a custom type converter." if !found && enforce_type
+        found or DefaultConverter
       end
 
       # Converts the given value to a Java type by using the registered converters.
       # It just looks at the class of the given value unless an attribute name is given.
       # It will convert it if there is a converter registered (in Neo4j::Config) for this value.
-      def convert(value, attribute = nil, klass = nil)
-        converter(attribute_type(value, attribute, klass)).to_java(value)
+      def convert(value, attribute = nil, klass = nil, enforce_type = true)
+        converter(attribute_type(value, attribute, klass), enforce_type).to_java(value)
       end
 
       # Converts the given property (key, value) to Java if there is a type converter for given type.

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: neo4j
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.0
+  version: 1.3.1
 platform: java
 authors: 
   - Andreas Ronge
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-06 00:00:00 Z
+date: 2011-12-14 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: orm_adapter
@@ -137,6 +137,7 @@ files:
   - lib/neo4j/rails/timestamps.rb
   - lib/neo4j/rails/callbacks.rb
   - lib/neo4j/rails/tx_methods.rb
+  - lib/neo4j/rails/accept_id.rb
   - lib/neo4j/rails/rel_persistence.rb
   - lib/neo4j/rails/finders.rb
   - lib/neo4j/rails/relationship.rb
@@ -150,29 +151,30 @@ files:
   - lib/neo4j/rails/validations/associated.rb
   - lib/neo4j/rails/validations/uniqueness.rb
   - lib/neo4j/rails/validations/non_nil.rb
-  - lib/neo4j/jars/core/neo4j-kernel-1.5.jar
-  - lib/neo4j/jars/core/server-api-1.5.jar
+  - lib/neo4j/jars/neo4j-community-1.6.M01.jar
+  - lib/neo4j/jars/core/neo4j-graph-matching-1.6.M01.jar
+  - lib/neo4j/jars/core/neo4j-community-1.6.M01.jar
+  - lib/neo4j/jars/core/neo4j-kernel-1.6.M01.jar
+  - lib/neo4j/jars/core/server-api-1.6.M01.jar
   - lib/neo4j/jars/core/geronimo-jta_1.1_spec-1.1.1.jar
-  - lib/neo4j/jars/core/neo4j-graph-matching-1.5.jar
-  - lib/neo4j/jars/core/neo4j-shell-1.5.jar
-  - lib/neo4j/jars/core/neo4j-lucene-index-1.5.jar
+  - lib/neo4j/jars/core/neo4j-lucene-index-1.6.M01.jar
+  - lib/neo4j/jars/core/neo4j-jmx-1.6.M01.jar
   - lib/neo4j/jars/core/scala-library-2.9.0-1.jar
+  - lib/neo4j/jars/core/neo4j-cypher-1.6.M01.jar
   - lib/neo4j/jars/core/lucene-core-3.1.0.jar
-  - lib/neo4j/jars/core/neo4j-graph-algo-1.5.jar
-  - lib/neo4j/jars/core/neo4j-udc-1.5.jar
-  - lib/neo4j/jars/core/neo4j-community-1.5.jar
-  - lib/neo4j/jars/core/neo4j-cypher-1.5.jar
+  - lib/neo4j/jars/core/neo4j-graph-algo-1.6.M01.jar
   - lib/neo4j/jars/core/org.apache.servicemix.bundles.jline-0.9.94_1.jar
-  - lib/neo4j/jars/core/neo4j-jmx-1.5.jar
-  - lib/neo4j/jars/ha/neo4j-ha-1.5.jar
+  - lib/neo4j/jars/core/neo4j-shell-1.6.M01.jar
+  - lib/neo4j/jars/core/neo4j-udc-1.6.M01.jar
   - lib/neo4j/jars/ha/slf4j-api-1.6.1.jar
-  - lib/neo4j/jars/ha/neo4j-management-1.5.jar
-  - lib/neo4j/jars/ha/neo4j-com-1.5.jar
-  - lib/neo4j/jars/ha/neo4j-enterprise-1.5.jar
+  - lib/neo4j/jars/ha/neo4j-backup-1.6.M01.jar
   - lib/neo4j/jars/ha/zookeeper-3.3.2.jar
   - lib/neo4j/jars/ha/org.apache.servicemix.bundles.netty-3.2.5.Final_1.jar
   - lib/neo4j/jars/ha/log4j-1.2.16.jar
-  - lib/neo4j/jars/ha/neo4j-backup-1.5.jar
+  - lib/neo4j/jars/ha/neo4j-enterprise-1.6.M01.jar
+  - lib/neo4j/jars/ha/neo4j-ha-1.6.M01.jar
+  - lib/neo4j/jars/ha/neo4j-management-1.6.M01.jar
+  - lib/neo4j/jars/ha/neo4j-com-1.6.M01.jar
   - lib/neo4j/index/indexer.rb
   - lib/neo4j/index/lucene_query.rb
   - lib/neo4j/index/indexer_registry.rb