neo4j 1.0.0-java → 1.1.0.beta.1-java

data/CONTRIBUTORS

@@ -3,6 +3,7 @@ Maintainer:
 
 Contributors:
 
+* Junegunn Choi
 * Jay Adkisson 
 * Stephan Hagemann
 * Bobby Calderwood

data/Gemfile

@@ -9,6 +9,7 @@ group 'test' do
   gem "rspec", ">= 2.0.0"
   gem "rspec-rails-matchers", ">= 0.2.1"
   gem "test-unit"
+  gem 'rcov'
 end
 
 #gem 'ruby-debug-base19' if RUBY_VERSION.include? "1.9"

data/README.rdoc

@@ -12,6 +12,7 @@ It uses two powerful and mature Java libraries:
 === Documentation
 
 * {Guides and API}[http://neo4j.rubyforge.org/guides/index.html]
+* {Blog: Neo4j and Rails 3}[http://blog.jayway.com/2011/03/02/neo4j-rb-1-0-0-and-rails-3/]
 
 === Why Neo4j.rb or a Graph Database ?
 

data/lib/neo4j/algo/algo.rb

@@ -1,6 +1,6 @@
 # external neo4j dependencies
 require 'neo4j/to_java'
-require 'neo4j/jars/core/neo4j-graph-algo-1.3.M03.jar'
+require 'neo4j/jars/core/neo4j-graph-algo-1.3.jar'
 
 module Neo4j
 
@@ -162,14 +162,14 @@ module Neo4j
       self
     end
 
-    # Specifies that nodes should be returned from as result (this is default)
+    # Specifies that nodes should be returned from as result
     # See also #rels
     def nodes
       @path_finder_method = :nodes
       self
     end
 
-    # Specifies that relationships should be returned from as result (this is default)
+    # Specifies that relationships should be returned from as result
     # See also #nodes
     #
     def rels
@@ -184,8 +184,8 @@ module Neo4j
     end
 
     def each(&block) #:nodoc:
-      if @single
-        execute_algo.send(@path_finder_method || :nodes).each &block
+      if @single && @path_finder_method
+        execute_algo.send(@path_finder_method).each &block
       else
         execute_algo.each &block
       end

data/lib/neo4j/database.rb

@@ -110,7 +110,7 @@ module Neo4j
 
 
     def management(jmx_clazz) #:nodoc:
-      @neo4j_manager ||= org.neo4j.management.Neo4jManager.new(@graph.get_management_bean(org.neo4j.management.Kernel.java_class))
+      @neo4j_manager ||= org.neo4j.management.Neo4jManager.new(@graph.get_management_bean(org.neo4j.jmx.Kernel.java_class))
       @neo4j_manager.getBean(jmx_clazz.java_class)
     end
 

data/lib/neo4j/has_n/class_methods.rb

@@ -47,7 +47,7 @@ module Neo4j
       # * This method returns Neo4j::HasN::DeclRelationshipDsl
       # * The generated has_n method returns a Neo4j::HasN::Mapping object
       #
-      def has_n(rel_type, params = {})
+      def has_n(rel_type)
         clazz = self
         module_eval(%Q{
                 def #{rel_type}
@@ -67,7 +67,7 @@ module Neo4j
             _decl_rels[:#{rel_type}].rel_type.to_s
           end}, __FILE__, __LINE__)
 
-        _decl_rels[rel_type.to_sym] = DeclRelationshipDsl.new(rel_type, false, clazz, params)
+        _decl_rels[rel_type.to_sym] = DeclRelationshipDsl.new(rel_type, false, clazz)
       end
 
 
@@ -92,7 +92,7 @@ module Neo4j
       #
       # Neo4j::HasN::DeclRelationshipDsl
       #
-      def has_one(rel_type, params = {})
+      def has_one(rel_type)
         clazz = self
         module_eval(%Q{def #{rel_type}=(value)
                   dsl = _decl_rels_for(:#{rel_type})
@@ -107,12 +107,11 @@ module Neo4j
               end}, __FILE__, __LINE__)
 
         module_eval(%Q{def #{rel_type}_rel
-                  # TODO - use the class variable instance since we don't want to use none persisted rails relationships
-                  dsl = #{clazz}._decl_rels[:'#{rel_type.to_s}']
+                  dsl = _decl_rels_for(:#{rel_type})
                   dsl.single_relationship(self)
                end}, __FILE__, __LINE__)
 
-        _decl_rels[rel_type.to_sym] = DeclRelationshipDsl.new(rel_type, true, clazz, params)
+        _decl_rels[rel_type.to_sym] = DeclRelationshipDsl.new(rel_type, true, clazz)
       end
 
     end

data/lib/neo4j/has_n/decl_relationship_dsl.rb

@@ -34,10 +34,10 @@ module Neo4j
     class DeclRelationshipDsl
       include Neo4j::ToJava
 
-      attr_reader :target_class, :direction, :rel_type
+      attr_reader :target_class, :dir, :rel_type
 
-      def initialize(method_id, has_one, target_class, params)
-        @direction = :outgoing
+      def initialize(method_id, has_one, target_class)
+        @dir = :outgoing
         @method_id = method_id
         @has_one = has_one
         @rel_type = method_id
@@ -45,24 +45,39 @@ module Neo4j
       end
 
       def to_s
-        "DeclRelationshipDsl #{object_id} dir: #{@direction} rel_id: #{@method_id}, rel_type: #{@rel_type}, target_class:#{@target_class} rel_class:#{@relationship}"
+        "DeclRelationshipDsl #{object_id} dir: #{@dir} rel_id: #{@method_id}, rel_type: #{@rel_type}, target_class:#{@target_class} rel_class:#{@relationship}"
       end
 
       def has_one?
         @has_one
       end
 
-      def each_node(node, direction, raw = false, &block) #:nodoc:
-        type = type_to_java(rel_type)
-        dir = dir_to_java(direction)
-        node._java_node.getRelationships(type, dir).each do |rel|
-          other = raw ? rel.getOtherNode(node) : rel.getOtherNode(node).wrapper
-          block.call other
+      def has_n?
+        !@has_one
+      end
+
+      def java_rel_type
+        type_to_java(@rel_type)
+      end
+
+      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)
+        end
+      end
+
+      def _each_node(node, &block) #:nodoc:
+        node._java_node.getRelationships(java_rel_type, java_dir).each do |rel|
+          block.call rel.getOtherNode(node)
         end
       end
 
       def incoming? #:nodoc:
-        @direction == :incoming
+        @dir == :incoming
       end
 
       def single_node(node) #:nodoc:
@@ -71,24 +86,20 @@ module Neo4j
       end
 
       def single_relationship(node) #:nodoc:
-        node._java_node.rel(direction, rel_type)
+        node._java_node.rel(dir, rel_type)
       end
 
       def _all_relationships(node) #:nodoc:
-        type = type_to_java(rel_type)
-        dir = dir_to_java(direction)
-        node._java_node.getRelationships(type, dir)
+        node._java_node.getRelationships(java_rel_type, java_dir)
       end
 
       def all_relationships(node) #:nodoc:
-        Neo4j::Rels::Traverser.new(node._java_node, [rel_type], direction)
+        Neo4j::Rels::Traverser.new(node._java_node, [rel_type], dir)
       end
 
       def create_relationship_to(node, other) # :nodoc:
         from, to = incoming? ? [other, node] : [node, other]
-        java_type = type_to_java(rel_type)
-
-        rel = from._java_node.create_relationship_to(to._java_node, java_type)
+        rel = from._java_node.create_relationship_to(to._java_node, java_rel_type)
         rel[:_classname] = relationship_class.to_s if relationship_class
         rel.wrapper
       end
@@ -122,7 +133,7 @@ module Neo4j
       #   folder.files << FolderNode.new
       #
       def to(target)
-        @direction = :outgoing
+        @dir = :outgoing
 
         if (Class === target)
           # handle e.g. has_n(:friends).to(class)
@@ -174,7 +185,7 @@ module Neo4j
       #
       #
       def from(*args)
-        @direction = :incoming
+        @dir = :incoming
 
         if (args.size > 1)
           # handle specified (prefixed) relationship, e.g. has_n(:known_by).from(clazz, :type)

data/lib/neo4j/has_n/mapping.rb

@@ -22,12 +22,11 @@ module Neo4j
 
       def initialize(node, dsl) # :nodoc:
         @node = node
-        @direction = dsl.direction
         @dsl = dsl
       end
 
       def to_s
-        "HasN::Mapping [#@direction, id: #{@node.neo_id} type: #{@dsl && @dsl.rel_type} dsl:#{@dsl}]"
+        "HasN::Mapping [#{@dsl.dir}, id: #{@node.neo_id} type: #{@dsl && @dsl.rel_type} dsl:#{@dsl}]"
       end
 
       def size
@@ -43,7 +42,7 @@ module Neo4j
         nil # out of index
       end
 
-      # Pretend we are an array - this is neccessarly for Rails actionpack/actionview/formhelper to work with this
+      # Pretend we are an array - this is necessarily for Rails actionpack/actionview/formhelper to work with this
       def is_a?(type)
         # ActionView requires this for nested attributes to work
         return true if Array == type
@@ -52,12 +51,12 @@ module Neo4j
 
       # Required by the Enumerable mixin.
       def each(&block)
-        @dsl.each_node(@node, @direction, &block)
+        @dsl.each_node(@node, &block)
       end
 
       # returns none wrapped nodes, you may get better performance using this method
       def _each(&block)
-        @dsl.each_node(@node, @direction, true, &block)
+        @dsl._each_node(@node, &block)
       end
 
       # Returns an real ruby array.

data/lib/neo4j/index/indexer.rb

@@ -68,8 +68,8 @@ module Neo4j
       # Example:
       #   class Person
       #     include Neo4j::NodeMixin
-      #     property :weight, :type => Float
-      #     index :weight
+      #     property :height, :weight, :type => Float
+      #     index :height, :weight
       #   end
       #
       # Supported values for <tt>:type</tt> is <tt>String</tt>, <tt>Float</tt>, <tt>Date</tt>, <tt>DateTime</tt> and <tt>Fixnum</tt>
@@ -78,19 +78,23 @@ module Neo4j
       # * See Neo4j::Index::LuceneQuery
       # * See #find
       #
-      def index(field, conf = {})
-        if conf[:via]
-          rel_dsl = @indexer_for._decl_rels[conf[:via]]
-          raise "No relationship defined for '#{conf[:via]}'. Check class '#{@indexer_for}': index :#{field}, via=>:#{conf[:via]} <-- error. Define it with a has_one or has_n" unless rel_dsl
-          raise "Only incoming relationship are possible to define index on. Check class '#{@indexer_for}': index :#{field}, via=>:#{conf[:via]}" unless rel_dsl.incoming?
-          via_indexer               = rel_dsl.target_class._indexer
-
-          field                     = field.to_s
-          @via_relationships[field] = rel_dsl
-          conf.delete :via # avoid endless recursion
-          via_indexer.index(field, conf)
-        else
-          @field_types[field.to_s] = conf[:type] || :exact
+      def index(*args)
+        conf = args.last.kind_of?(Hash) ? args.pop : {}
+        conf_no_via = conf.reject { |k,v| k == :via } # avoid endless recursion
+
+        args.uniq.each do | field |
+          if conf[:via]
+            rel_dsl = @indexer_for._decl_rels[conf[:via]]
+            raise "No relationship defined for '#{conf[:via]}'. Check class '#{@indexer_for}': index :#{field}, via=>:#{conf[:via]} <-- error. Define it with a has_one or has_n" unless rel_dsl
+            raise "Only incoming relationship are possible to define index on. Check class '#{@indexer_for}': index :#{field}, via=>:#{conf[:via]}" unless rel_dsl.incoming?
+            via_indexer               = rel_dsl.target_class._indexer
+
+            field                     = field.to_s
+            @via_relationships[field] = rel_dsl
+            via_indexer.index(field, conf_no_via) 
+          else
+            @field_types[field.to_s] = conf[:type] || :exact
+          end
         end
       end
 
@@ -197,9 +201,9 @@ module Neo4j
         return value unless type
 
         if String != type
-          org.neo4j.index.impl.lucene.ValueContext.new(value).indexNumeric
+          org.neo4j.index.lucene.ValueContext.new(value).indexNumeric
         else
-          org.neo4j.index.impl.lucene.ValueContext.new(value)
+          org.neo4j.index.lucene.ValueContext.new(value)
         end
       end
 

data/lib/neo4j/index/indexer_registry.rb

@@ -26,6 +26,7 @@ module Neo4j
         def on_property_changed(node, field, old_val, new_val)
           classname = node['_classname'] || node.class.to_s
           indexer = find_by_class(classname)
+
           indexer && indexer.update_index_on(node, field, old_val, new_val)
         end
 

data/lib/neo4j/index/lucene_query.rb

@@ -196,7 +196,7 @@ module Neo4j
           memo << org.apache.lucene.search.SortField.new(field.to_s, type, @order[field])
         end
         sort             = org.apache.lucene.search.Sort.new(*java_sort_fields)
-        org.neo4j.index.impl.lucene.QueryContext.new(query).sort(sort)
+        org.neo4j.index.lucene.QueryContext.new(query).sort(sort)
       end
 
       def build_hash_query(query) #:nodoc:

data/lib/neo4j/neo4j.rb

@@ -147,7 +147,7 @@ module Neo4j
     # jmx_clazz :: http://api.neo4j.org/current/org/neo4j/management/package-summary.html
     # this_db :: default currently runnig instance or a newly started neo4j db instance
     #
-    def management(jmx_clazz = org.neo4j.management.Primitives, this_db = self.started_db)
+    def management(jmx_clazz = org.neo4j.jmx.Primitives, this_db = self.started_db)
       this_db.management(jmx_clazz)
     end
 

data/lib/neo4j/node.rb

@@ -151,13 +151,12 @@ module Neo4j
       #
       def load(node_id, db = Neo4j.started_db)
         node = _load(node_id, db)
-        return nil if node.nil?
-        node.wrapper
+        node && node.wrapper
       end
 
       # Same as load but does not return the node as a wrapped Ruby object.
       #
-      def _load(node_id, db)
+      def _load(node_id, db = Neo4j.started_db)
         return nil if node_id.nil?
         db.graph.get_node_by_id(node_id.to_i)
       rescue java.lang.IllegalStateException

data/lib/neo4j/node_mixin/node_mixin.rb

@@ -76,6 +76,11 @@ module Neo4j
       @_java_node
     end
 
+    # same as _java_node - so that we can use the same method for both relationships and nodes
+    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

data/lib/neo4j/property/class_methods.rb

@@ -40,18 +40,14 @@ module Neo4j
       # :to_java in the Neo4j::TypeConverters module.
       #
       def property(*props)
-        if props.size == 2 and props[1].kind_of?(Hash)
-          props[1].each_pair do |key, value|
-            pname = props[0].to_sym
-            _decl_props[pname] ||= {}
-            _decl_props[pname][key] = value
-          end
-          props = props[0..0]
-        end
+        options = props.last.kind_of?(Hash) ? props.pop : {}
 
-        props.each do |prop|
+        props.uniq.each do |prop|
           pname = prop.to_sym
           _decl_props[pname] ||= {}
+          options.each do |key, value|
+            _decl_props[pname][key] = value
+          end
 
           define_method(pname) do
             Neo4j::TypeConverters.to_ruby(self.class, pname, self[pname])
@@ -80,4 +76,4 @@ module Neo4j
       end
     end
   end
-end
+end

data/lib/neo4j/property/property.rb

@@ -99,8 +99,6 @@ module Neo4j
             set_property(k, value.to_java(:boolean))
           when Fixnum
             set_property(k, value.to_java(:long))
-          when Boolean
-            set_property(k, value.to_java(:boolean))
           else
             raise "Not allowed to store array with value #{value[0]} type #{value[0].class}"
         end

data/lib/neo4j/rails/attributes.rb

@@ -50,7 +50,7 @@ module Neo4j
         if @properties.has_key?(key)
           @properties[key]
         else
-          @properties[key] = (persisted? && _java_node.has_property?(key)) ? read_attribute(key) : attribute_defaults[key]
+          @properties[key] = (persisted? && _java_entity.has_property?(key)) ? read_attribute(key) : attribute_defaults[key]
         end
       end
 
@@ -88,8 +88,8 @@ module Neo4j
         callstack.each do |name, values_with_empty_parameters|
           begin
             # (self.class.reflect_on_aggregation(name.to_sym) || column_for_attribute(name)).klass
-            klass = self.class._decl_props[name.to_sym][:type]
-            raise "Not a multiparameter attribute, missing :type on property #{name} for #{self.class}" unless klass
+            decl_type = self.class._decl_props[name.to_sym][:type]
+            raise "Not a multiparameter attribute, missing :type on property #{name} for #{self.class}" unless decl_type
 
             # in order to allow a date to be set without a year, we must keep the empty values.
             values = values_with_empty_parameters.reject { |v| v.nil? }
@@ -98,17 +98,19 @@ module Neo4j
               send(name + "=", nil)
             else
 
-              value = if Time == klass
+              value = if :time == decl_type
                 instantiate_time_object(name, values)
-              elsif Date == klass
+              elsif :date == decl_type
                 begin
                   values = values_with_empty_parameters.collect do |v| v.nil? ? 1 : v end
                   Date.new(*values)
                 rescue ArgumentError => ex # if Date.new raises an exception on an invalid date
                   instantiate_time_object(name, values).to_date # we instantiate Time object and convert it back to a date thus using Time's logic in handling invalid dates
                 end
+              elsif :datetime == decl_type
+                DateTime.new(*values)
               else
-                klass.new(*values)
+                raise "Unknown type #{decl_type}"
               end
 
               send(name + "=", value)
@@ -185,7 +187,7 @@ module Neo4j
       # attributes or the property keys for the persisted node.
       def property_names
         keys = @properties.keys + self.class._decl_props.keys.map { |k| k.to_s }
-        keys += _java_node.property_keys.to_a if persisted?
+        keys += _java_entity.property_keys.to_a if persisted?
         keys.flatten.uniq
       end
 
@@ -202,7 +204,7 @@ module Neo4j
         @properties.keys.include?(name) ||
             self.class._decl_props.map { |k| k.to_s }.include?(name) ||
             begin
-              super
+              persisted? && super
             rescue org.neo4j.graphdb.NotFoundException
               set_deleted_properties
               nil

data/lib/neo4j/rails/callbacks.rb

@@ -1,6 +1,6 @@
 module Neo4j
 	module Rails
-		module Callbacks
+		module Callbacks #:nodoc:
 			extend ActiveSupport::Concern
 			
 			included do

data/lib/neo4j/rails/finders.rb

@@ -37,7 +37,7 @@ module Neo4j
 
         # load an id or array of ids from the database
         def load(*ids)
-          result = ids.map { |id| Neo4j::Node.load(id) }
+          result = ids.map { |id| entity_load(id) }
           if ids.length == 1
             result.first
           else

data/lib/neo4j/rails/lucene_connection_closer.rb

@@ -1,6 +1,6 @@
 module Neo4j
   module Rails
-    class LuceneConnectionCloser
+    class LuceneConnectionCloser  #:nodoc:
       def initialize(app)
         @app = app
       end
@@ -14,5 +14,3 @@ module Neo4j
   end
 
 end
-
-Thread.current