neo4j 1.0.0.beta.27-java → 1.0.0.beta.28-java

data/lib/neo4j/to_java.rb

@@ -28,17 +28,3 @@ module Neo4j
     end
   end
 end
-
-
-org.neo4j.kernel.impl.core.IntArrayIterator.class_eval do
-  def each_wrapped
-    while(hasNext())
-      yield self.next().wrapper
-    end
-  end
-
-  def wrapped
-    Enumerator.new(self, :each_wrapped)
-  end
-
-end

data/lib/neo4j/traversal/filter_predicate.rb

@@ -0,0 +1,25 @@
+module Neo4j
+  module Traversal
+    class FilterPredicate # :nodoc:
+      include org.neo4j.helpers.Predicate
+      def initialize
+        @procs = []
+      end
+
+      def add(proc)
+        @procs << proc
+      end
+
+      def include_start_node
+        @include_start_node = true
+      end
+
+      def accept(path)
+        return false if @include_start_node && path.length == 0
+        # find the first filter which returns false
+        # if not found then we will accept this path
+        @procs.find {|p| !p.call(path)}.nil?
+      end
+    end
+  end
+end

data/lib/neo4j/traversal/prune_evaluator.rb

@@ -0,0 +1,14 @@
+module Neo4j
+  module Traversal
+    class PruneEvaluator  # :nodoc:
+      include org.neo4j.graphdb.traversal.PruneEvaluator
+      def initialize(proc)
+        @proc = proc
+      end
+
+      def prune_after(path)
+        @proc.call(path)
+      end
+    end
+  end
+end

data/lib/neo4j/traversal/rel_expander.rb

@@ -0,0 +1,31 @@
+module Neo4j
+  module Traversal
+    class RelExpander
+      include org.neo4j.graphdb.RelationshipExpander
+
+      attr_accessor :reversed
+
+      def initialize(&block)
+        @block = block
+        @reverse = false
+      end
+
+      def self.create_pair(&block)
+        normal = RelExpander.new(&block)
+        reversed = RelExpander.new(&block)
+        normal.reversed = reversed
+        reversed.reversed = normal
+        reversed.reverse!
+        normal
+      end
+
+      def expand(node)
+        @block.arity == 1 ? @block.call(node) : @block.call(node, @reverse)
+      end
+
+      def reverse!
+        @reverse = true
+      end
+    end
+  end
+end

data/lib/neo4j/traversal/traversal.rb

@@ -0,0 +1,90 @@
+require 'neo4j/traversal/filter_predicate'
+require 'neo4j/traversal/prune_evaluator'
+require 'neo4j/traversal/rel_expander'
+require 'neo4j/traversal/traverser'
+
+module Neo4j
+  module Traversal
+    include ToJava
+
+    # A more powerful alternative of #outgoing, #incoming and #both method.
+    # You can use this method for example to only traverse nodes based on properties on the relationships
+    #
+    # ==== Example
+    #
+    #   some_node.expand { |n| n._rels.find_all { |r| r[:age] > 5 } }.depth(:all).to_a
+    #
+    # The above traverse all relationships with a property of age > 5
+    #
+    def expand(&expander)
+      Traverser.new(self).expander(&expander)
+    end
+
+
+    # Returns the outgoing nodes for this node.
+    #
+    # ==== Returns
+    # a Neo4j::NodeTraverser which can be used to further specify which nodes should be included
+    # in traversal by using the <tt>depth</tt>, <tt>filter</tt> and <tt>prune</tt> methods.
+    #
+    # ==== Examples
+    #   # Find all my friends (nodes of depth 1 of type <tt>friends</tt>)
+    #   me.outgoing(:friends).each {|friend| puts friend[:name]}
+    #
+    #   # Find all my friends and their friends (nodes of depth 1 of type <tt>friends</tt>)
+    #   # me.outgoing(:friends).depth(2).each {|friend| puts friend[:name]}
+    #
+    #   # Find all my friends and include my self in the result
+    #   me.outgoing(:friends).depth(4).include_start_node.each {...}
+    #
+    #   # Find all my friends friends friends, etc. at any depth
+    #   me.outgoing(:friends).depth(:all).each {...}
+    #
+    #   # Find all my friends friends but do not include my friends (only depth == 2)
+    #   me.outgoing(:friends).depth(2).filter{|path| path.length == 2}
+    #
+    #   # Find all my friends but 'cut off' some parts of the traversal path
+    #   me.outgoing(:friends).depth(42).prune(|path| an_expression_using_path_returning_true_false }
+    #
+    #   # Find all my friends and work colleges
+    #   me.outgoing(:friends).outgoing(:work).each {...}
+    #
+    # Of course all the methods <tt>outgoing</tt>, <tt>incoming</tt>, <tt>both</tt>, <tt>depth</tt>, <tt>include_start_node</tt>, <tt>filter</tt>, and <tt>prune</tt> can be combined.
+    #
+    def outgoing(type)
+      if type
+        Traverser.new(self).outgoing(type)
+      else
+        raise "Not implemented getting all types of outgoing relationship. Specify a relationship type"
+      end
+    end
+
+
+    # Returns the incoming nodes of given type(s).
+    #
+    # See #outgoing
+    #
+    def incoming(type)
+      if type
+        Traverser.new(self).incoming(type)
+      else
+        raise "Not implemented getting all types of incoming relationship. Specify a relationship type"
+      end
+    end
+
+    # Returns both incoming and outgoing nodes of given types(s)
+    #
+    # If a type is not given then it will return all types of relationships.
+    #
+    # See #outgoing
+    #
+    def both(type=nil)
+      if type
+        Traverser.new(self).both(type)
+      else
+        Traverser.new(self) # default is both
+      end
+    end
+
+  end
+end

data/lib/neo4j/traversal/traverser.rb

@@ -0,0 +1,173 @@
+module Neo4j
+
+  module Traversal
+
+    class Traverser
+      include Enumerable
+      include ToJava
+      include WillPaginate::Finders::Base
+
+
+      def initialize(from, type = nil, dir=nil)
+        @from = from
+        @depth = 1
+        if type.nil? || dir.nil?
+          @td = org.neo4j.kernel.impl.traversal.TraversalDescriptionImpl.new.breadth_first()
+        else
+          @type = type_to_java(type)
+          @dir = dir_to_java(dir)
+          @td = org.neo4j.kernel.impl.traversal.TraversalDescriptionImpl.new.breadth_first().relationships(@type, @dir)
+        end
+      end
+
+
+      def to_s
+        "NodeTraverser [from: #{@from.neo_id} depth: #{@depth} type: #{@type} dir:#{@dir}"
+      end
+
+
+      def wp_query(options, pager, args, &block) #:nodoc:
+        page = pager.current_page || 1
+        per_page = pager.per_page
+        to = per_page * page
+        from = to - per_page
+        i = 0
+        res = []
+        iterator.each do |node|
+          res << node.wrapper if i >= from
+          i += 1
+          break if i >= to
+        end
+        pager.replace res
+        pager.total_entries ||= count
+      end
+
+      def <<(other_node)
+        new(other_node)
+        self
+      end
+
+      # Returns an real ruby array.
+      def to_ary
+        self.to_a
+      end
+
+      def new(other_node)
+        case @dir
+          when org.neo4j.graphdb.Direction::OUTGOING
+            @from.create_relationship_to(other_node, @type)
+          when org.neo4j.graphdb.Direction::INCOMING
+            other_node._java_node.create_relationship_to(@from, @type)
+          else
+            raise "Only allowed to create outgoing or incoming relationships (not #@dir)"
+        end
+      end
+
+      def both(type)
+        @type = type_to_java(type) if type
+        @dir = dir_to_java(:both)
+        @td = @td.relationships(type_to_java(type), @dir)
+        self
+      end
+
+      def expander(&expander)
+        @td = @td.expand(RelExpander.create_pair(&expander))
+        self
+      end
+
+      def outgoing(type)
+        @type = type_to_java(type) if type
+        @dir = dir_to_java(:outgoing)
+        @td = @td.relationships(type_to_java(type), @dir)
+        self
+      end
+
+      def incoming(type)
+        @type = type_to_java(type) if type
+        @dir = dir_to_java(:incoming)
+        @td = @td.relationships(type_to_java(type), @dir)
+        self
+      end
+
+      def filter_method(name, &proc)
+        # add method name
+        singelton = class << self;
+          self;
+        end
+        singelton.send(:define_method, name) { filter &proc }
+        self
+      end
+
+      def functions_method(func, rule_node, rule_name)
+        singelton = class << self;
+          self;
+        end
+        singelton.send(:define_method, func.class.function_name) do |*args|
+          function_id = args.empty? ? "_classname" : args[0]
+          function = rule_node.find_function(rule_name, func.class.function_name, function_id)
+          function.value(rule_node.rule_node, rule_name)
+        end
+        self
+      end
+
+      def prune(&block)
+        @td = @td.prune(PruneEvaluator.new(block))
+        self
+      end
+
+      def filter(&block)
+        # we keep a reference to filter predicate since only one filter is allowed and we might want to modify it
+        @filter_predicate ||= FilterPredicate.new
+        @filter_predicate.add(block)
+        @td = @td.filter(@filter_predicate)
+        self
+      end
+
+      # Sets depth, if :all then it will traverse any depth
+      def depth(d)
+        @depth = d
+        self
+      end
+
+      def include_start_node
+        @include_start_node = true
+        self
+      end
+
+      def size
+        to_a.size
+      end
+
+      alias_method :length, :size
+
+      def [](index)
+        each_with_index { |node, i| break node if index == i }
+      end
+
+      def empty?
+        first == nil
+      end
+
+      def each
+        iterator.each { |i| yield i.wrapper }
+      end
+
+      # Same as #each but does not wrap each node in a Ruby class, yields the Java Neo4j Node instance instead.
+      def each_raw
+        iterator.each { |i| yield i }
+      end
+
+      def iterator
+        unless @include_start_node
+          if @filter_predicate
+            @filter_predicate.include_start_node
+          else
+            @td = @td.filter(org.neo4j.kernel.Traversal.return_all_but_start_node)
+          end
+        end
+        @td = @td.prune(org.neo4j.kernel.Traversal.pruneAfterDepth(@depth)) unless @depth == :all
+        @td.traverse(@from).nodes
+      end
+    end
+  end
+end

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "1.0.0.beta.27"
+  VERSION = "1.0.0.beta.28"
 end

data/lib/test.rb~

@@ -0,0 +1,2 @@
+require 'neo4j'
+

data/neo4j.gemspec

@@ -1,15 +1,17 @@
 lib = File.expand_path('../lib/', __FILE__)
 $:.unshift lib unless $:.include?(lib)
- 
+
 require 'neo4j/version'
 
 
 Gem::Specification.new do |s|
-  s.name = "neo4j"
-  s.version = Neo4j::VERSION
+  s.name     = "neo4j"
+  s.version  = Neo4j::VERSION
   s.platform = 'java'
-  s.authors = "Andreas Ronge"
-  s.email = 'andreas.ronge@gmail.com'
+  s.required_ruby_version = ">= 1.8.7"
+
+  s.authors  = "Andreas Ronge"
+  s.email    = 'andreas.ronge@gmail.com'
   s.homepage = "http://github.com/andreasronge/neo4j/tree"
   s.rubyforge_project = 'neo4j'
   s.summary = "A graph database for JRuby"
@@ -17,17 +19,16 @@ Gem::Specification.new do |s|
 You can think of Neo4j as a high-performance graph engine with all the features of a mature and robust database.
 The programmer works with an object-oriented, flexible network structure rather than with strict and static tables — yet enjoys all the benefits of a fully transactional, enterprise-strength database.
 It comes included with the Apache Lucene document database.
-EOF
+  EOF
 
   s.require_path = 'lib'
-  s.files        = Dir.glob("{bin,lib,config}/**/*") + %w(README.rdoc CHANGELOG CONTRIBUTORS Gemfile neo4j.gemspec)
-#  s.bindir = 'bin'
+  s.files = Dir.glob("{bin,lib,config}/**/*") + %w(README.rdoc CHANGELOG CONTRIBUTORS Gemfile neo4j.gemspec)
   s.executables = 'neo4j-shell'
   s.has_rdoc = true
   s.extra_rdoc_files = %w( README.rdoc )
   s.rdoc_options = ["--quiet", "--title", "Neo4j.rb", "--line-numbers", "--main", "README.rdoc", "--inline-source"]
-  s.required_ruby_version = ">= 1.8.7"
-  s.add_dependency('orm_adapter',">= 0.0.3")
+
+  s.add_dependency('orm_adapter', ">= 0.0.3")
   s.add_dependency("activemodel", ">= 3.0.0")
   s.add_dependency("will_paginate", ["~>3.0.pre"])
   s.add_dependency("railties", ">= 3.0.0")

metadata

@@ -2,7 +2,7 @@
 name: neo4j
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.0.0.beta.27
+  version: 1.0.0.beta.28
 platform: java
 authors: 
   - Andreas Ronge
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 +01:00
+date: 2011-02-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -72,6 +72,7 @@ files:
   - bin/neo4j-shell~
   - lib/neo4j.rb
   - lib/Gemfile~
+  - lib/test.rb~
   - lib/config2.yml~
   - lib/perf.rb~
   - lib/generators/neo4j.rb
@@ -80,40 +81,46 @@ files:
   - lib/orm_adapter/adapters/neo4j.rb
   - lib/neo4j/event_handler.rb
   - lib/neo4j/model.rb
-  - lib/neo4j/migrations.rb
-  - lib/neo4j/type_converters.rb
-  - lib/neo4j/node_traverser.rb
-  - lib/neo4j/relationship_traverser.rb
   - lib/neo4j/config.rb
-  - lib/neo4j/algo.rb
   - lib/neo4j/transaction.rb
   - lib/neo4j/neo4j.rb
   - lib/neo4j/node.rb
-  - lib/neo4j/node_mixin.rb
-  - lib/neo4j/property.rb
-  - lib/neo4j/relationship_mixin.rb
   - lib/neo4j/load.rb
   - lib/neo4j/database.rb
   - lib/neo4j/version.rb
-  - lib/neo4j/node_relationship.rb
   - lib/neo4j/equal.rb
   - lib/neo4j/relationship.rb
   - lib/neo4j/to_java.rb
+  - lib/neo4j/algo/algo.rb
+  - lib/neo4j/has_list/mapping.rb
+  - lib/neo4j/has_list/class_methods.rb
+  - lib/neo4j/has_list/has_list.rb
+  - lib/neo4j/property/property.rb
+  - lib/neo4j/property/class_methods.rb
+  - lib/neo4j/traversal/rel_expander.rb
+  - lib/neo4j/traversal/filter_predicate.rb
+  - lib/neo4j/traversal/prune_evaluator.rb
+  - lib/neo4j/traversal/traversal.rb
+  - lib/neo4j/traversal/traverser.rb
+  - lib/neo4j/relationship_mixin/relationship_mixin.rb
+  - lib/neo4j/relationship_mixin/class_methods.rb
+  - lib/neo4j/type_converters/type_converters.rb
   - lib/neo4j/migrations/migrations.rb
-  - lib/neo4j/migrations/migration_mixin.rb
-  - lib/neo4j/migrations/lazy_migration_mixin.rb
+  - lib/neo4j/migrations/lazy_node_mixin.rb
   - lib/neo4j/migrations/extensions.rb
+  - lib/neo4j/migrations/node_mixin.rb
   - lib/neo4j/migrations/migration.rb
-  - lib/neo4j/migrations/global_migration.rb
-  - lib/neo4j/functions/function.rb
-  - lib/neo4j/functions/count.rb
-  - lib/neo4j/functions/sum.rb
+  - lib/neo4j/migrations/class_methods.rb
+  - lib/neo4j/migrations/ref_node_wrapper.rb
+  - lib/neo4j/rels/traverser.rb
+  - lib/neo4j/rels/rels.rb
   - lib/neo4j/rails/attributes.rb
   - lib/neo4j/rails/model.rb
   - lib/neo4j/rails/validations.rb
   - lib/neo4j/rails/persistence.rb
   - lib/neo4j/rails/serialization.rb
   - lib/neo4j/rails/railtie.rb
+  - lib/neo4j/rails/rails.rb
   - lib/neo4j/rails/lucene_connection_closer.rb
   - lib/neo4j/rails/transaction.rb
   - lib/neo4j/rails/timestamps.rb
@@ -127,37 +134,41 @@ files:
   - lib/neo4j/rails/validations/uniqueness.rb
   - lib/neo4j/rails/validations/non_nil.rb
   - lib/neo4j/jars/core/lucene-core-3.0.3.jar
-  - lib/neo4j/jars/core/neo4j-index-1.3-SNAPSHOT.jar
+  - lib/neo4j/jars/core/neo4j-kernel-1.3-1.3.M01.jar
+  - lib/neo4j/jars/core/neo4j-lucene-index-0.5-1.3.M01.jar
   - lib/neo4j/jars/core/geronimo-jta_1.1_spec-1.1.1.jar
-  - lib/neo4j/jars/core/neo4j-lucene-index-0.5-SNAPSHOT.jar
-  - lib/neo4j/jars/core/neo4j-graph-algo-0.8-SNAPSHOT.jar
-  - lib/neo4j/jars/core/neo4j-kernel-1.3-SNAPSHOT.jar
+  - lib/neo4j/jars/core/neo4j-graph-algo-0.8-1.3.M01.jar
+  - lib/neo4j/jars/core/neo4j-index-1.3-1.3.M01.jar
+  - lib/neo4j/jars/ha/neo4j-management-1.3-1.3.M01.jar
   - lib/neo4j/jars/ha/org.apache.servicemix.bundles.lucene-3.0.1_2.jar
   - lib/neo4j/jars/ha/zookeeper-3.3.2.jar
-  - lib/neo4j/jars/ha/neo4j-management-1.3-SNAPSHOT.jar
+  - lib/neo4j/jars/ha/neo4j-shell-1.3-1.3.M01.jar
   - lib/neo4j/jars/ha/netty-3.2.1.Final.jar
+  - lib/neo4j/jars/ha/neo4j-ha-0.6-1.3.M01.jar
   - lib/neo4j/jars/ha/log4j-1.2.16.jar
-  - lib/neo4j/jars/ha/neo4j-shell-1.3-SNAPSHOT.jar
   - lib/neo4j/jars/ha/org.apache.servicemix.bundles.jline-0.9.94_1.jar
-  - lib/neo4j/jars/ha/neo4j-ha-0.6-SNAPSHOT.jar
-  - lib/neo4j/mapping/rule.rb
-  - lib/neo4j/mapping/decl_relationship_dsl.rb
-  - lib/neo4j/mapping/rule_node.rb
-  - lib/neo4j/mapping/node_mixin.rb
-  - lib/neo4j/mapping/has_n.rb
-  - lib/neo4j/mapping/relationship_mixin.rb
-  - lib/neo4j/mapping/has_list.rb
-  - lib/neo4j/mapping/class_methods/rule.rb
-  - lib/neo4j/mapping/class_methods/list.rb
-  - lib/neo4j/mapping/class_methods/init_node.rb
-  - lib/neo4j/mapping/class_methods/property.rb
-  - lib/neo4j/mapping/class_methods/init_rel.rb
-  - lib/neo4j/mapping/class_methods/relationship.rb
   - lib/neo4j/index/indexer.rb
   - lib/neo4j/index/lucene_query.rb
   - lib/neo4j/index/indexer_registry.rb
   - lib/neo4j/index/class_methods.rb
   - lib/neo4j/index/index.rb
+  - lib/neo4j/batch/inserter.rb
+  - lib/neo4j/batch/indexer.rb
+  - lib/neo4j/batch/batch.rb
+  - lib/neo4j/has_n/decl_relationship_dsl.rb
+  - lib/neo4j/has_n/has_n.rb
+  - lib/neo4j/has_n/mapping.rb
+  - lib/neo4j/has_n/class_methods.rb
+  - lib/neo4j/node_mixin/node_mixin.rb
+  - lib/neo4j/node_mixin/class_methods.rb
+  - lib/neo4j/rule/rule.rb
+  - lib/neo4j/rule/rule_node.rb
+  - lib/neo4j/rule/class_methods.rb
+  - lib/neo4j/rule/rule_event_listener.rb
+  - lib/neo4j/rule/functions/function.rb
+  - lib/neo4j/rule/functions/count.rb
+  - lib/neo4j/rule/functions/sum.rb
+  - lib/neo4j/rule/functions/functions.rb
   - config/locales/en.yml
   - config/neo4j/config.yml
   - README.rdoc