neo4jr-simple 0.1.7 → 0.1.8

data/README.rdoc

@@ -38,6 +38,15 @@ Retrieve a Node:
      node = neo.getNodeById(1234)
    end
   
+Find a Node by some value you control:
+
+   Neo4jr::DB.execute do |neo|
+     # If you add a property 'identifier' to a node, the value can be used to retrieve the node by
+     # This can by an id or string but the value must be unique to this node
+     # e.g. node[:identifier] = user.id
+     node = neo.find_node_by_identifier(user.id)
+   end
+  
 Traverse Database from a node:
 
    Neo4jr::DB.execute do |neo|

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/neo4jr-simple.rb

@@ -3,24 +3,32 @@ $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
 include Java
 
 module Neo4jr
-  require 'jars/shell-1.0-b10.jar'
-  require 'jars/neo-1.0-b10.jar'
-  require 'jars/jta-1.1.jar'
-  require 'jars/graph-algo-0.2-20090815.182816-1.jar'
+
+  require 'jars/neo4j-kernel-1.0-rc.jar'
+  require 'jars/lucene-core-2.9.1.jar'
+  require 'jars/neo4j-index-1.0-b1.jar'
+  require 'jars/geronimo-jta_1.1_spec-1.1.1.jar'
+  require 'jars/jline-0.9.94.jar'
+  require 'jars/neo4j-commons-0.4.jar'
+  require 'jars/neo4j-remote-graphdb-0.5.jar'
+  require 'jars/neo4j-graph-algo-0.3-20100125.090624-8.jar'
 
   java_import java.lang.System
-  java_import org.neo4j.api.core.EmbeddedNeo
+  java_import org.neo4j.kernel.EmbeddedGraphDatabase
+  java_import org.neo4j.graphdb.DynamicRelationshipType
+  java_import org.neo4j.graphdb.Traverser
+  java_import org.neo4j.index.lucene.LuceneIndexService
   java_import org.neo4j.graphalgo.AllSimplePaths
   java_import org.neo4j.graphalgo.shortestpath.Dijkstra
   java_import org.neo4j.graphalgo.shortestpath.CostEvaluator
   java_import org.neo4j.graphalgo.shortestpath.std.IntegerEvaluator
   java_import org.neo4j.graphalgo.shortestpath.std.DoubleAdder
   java_import org.neo4j.graphalgo.shortestpath.std.DoubleComparator
-  java_import org.neo4j.api.core.DynamicRelationshipType
 end
 
 require 'neo4jr/configuration'
 require 'neo4jr/db'
+require 'neo4jr/indexer'
 require 'neo4jr/relationship_type'
 require 'neo4jr/embedded_neo_extension'
 require 'neo4jr/node_extension'
@@ -33,4 +41,5 @@ require 'neo4jr/stop_evaluator'
 require 'neo4jr/simple_cost_evaluator'
 require 'neo4jr/order'
 require 'neo4jr/direction'
+require 'neo4jr/path_rater'
 require 'neo4jr/cli'

data/lib/neo4jr/db.rb

@@ -1,12 +1,14 @@
 module Neo4jr
   class DB
+    
     class << self
       def instance
         @neo ||= begin
-          neo = EmbeddedNeo.new(Configuration.database_path)
+          neo = EmbeddedGraphDatabase.new(Configuration.database_path)
           at_exit do
             neo.shutdown
           end
+          Neo4jr::Indexer.use neo
           neo
         end
       end
@@ -34,7 +36,7 @@ module Neo4jr
       end
       
       def node_count
-        instance.getConfig().getNeoModule().getNodeManager().getNumberOfIdsInUse(org.neo4j.api.core.Node.java_class)
+        instance.getConfig().getNeoModule().getNodeManager().getNumberOfIdsInUse(org.neo4j.graphdb.Node.java_class)
       end
       
       def stats

data/lib/neo4jr/direction.rb

@@ -1,8 +1,8 @@
 module Neo4jr
   module Direction
-    OUTGOING = org.neo4j.api.core.Direction::OUTGOING
-    INCOMING = org.neo4j.api.core.Direction::INCOMING
-    BOTH     = org.neo4j.api.core.Direction::BOTH
+    OUTGOING = org.neo4j.graphdb.Direction::OUTGOING
+    INCOMING = org.neo4j.graphdb.Direction::INCOMING
+    BOTH     = org.neo4j.graphdb.Direction::BOTH
     
     def self.from_string(value)
       case value.upcase

data/lib/neo4jr/embedded_neo_extension.rb

@@ -1,4 +1,4 @@
-org.neo4j.api.core.EmbeddedNeo.java_class.ruby_class.class_eval do 
+org.neo4j.kernel.EmbeddedGraphDatabase.java_class.ruby_class.class_eval do 
   
   alias :orginalGetNodeById :getNodeById
   def getNodeById(id)
@@ -12,6 +12,9 @@ org.neo4j.api.core.EmbeddedNeo.java_class.ruby_class.class_eval do
     node
   end
   alias :create_node :createNode
-  
-  
+
+  def find_node_by_identifier(identifier_value)
+    Neo4jr::Indexer.find_node_by_identifier(identifier_value)
+  end
+    
 end

data/lib/neo4jr/indexer.rb

@@ -0,0 +1,37 @@
+module Neo4jr
+  class Indexer
+    RESERVED_IDENTIFIER_KEY = 'identifier'
+    
+    class << self
+      def use(service)
+        @indexer = LuceneIndexService.new(service)
+      end
+      
+      def enabled?
+        !@indexer.nil?
+      end
+      
+      def attempt_index(node, property_name, value)
+        @indexer.index(node, RESERVED_IDENTIFIER_KEY, value.to_s) if property_name == RESERVED_IDENTIFIER_KEY
+      end
+      
+      def find_node_by_identifier(identifier_value)
+        hits    = @indexer.getNodes(RESERVED_IDENTIFIER_KEY, identifier_value)
+        nodes   = hits.iterator
+        results = []
+        results << nodes.next while nodes.hasNext
+        if results.size > 1
+          results.sort!{|a, b| a.getId <=> b.getId}
+          results.each_with_index{|node, index| @indexer.removeIndex(node, RESERVED_IDENTIFIER_KEY, identifier_value) if index < results.size}
+        end
+        results.last
+      end
+    end    
+  end
+end
+
+# begin
+#   
+#   node = nodes.next
+# end while(nodes.hasNext)
+# return node

data/lib/neo4jr/int_array_iterator_extension.rb

@@ -1,7 +1,8 @@
-org.neo4j.impl.core.IntArrayIterator.java_class.ruby_class.class_eval do 
-
-  def hashify_objects
-    map{|object| object.to_hash }
-  end
-  
-end
+# org.neo4j.impl.core.IntArrayIterator.java_class.ruby_class.class_eval do 
+# org.neo4j.graphdb.IntArrayIterator.java_class.ruby_class.class_eval do 
+# 
+#   def hashify_objects
+#     map{|object| object.to_hash }
+#   end
+#   
+# end

data/lib/neo4jr/node_extension.rb

@@ -1,4 +1,4 @@
-org.neo4j.api.core.Node.java_class.ruby_class.class_eval do 
+org.neo4j.graphdb.Node.java_class.ruby_class.class_eval do 
   
   def id
     getId

data/lib/neo4jr/order.rb

@@ -1,7 +1,7 @@
 module Neo4jr
   # SEE: http://api.neo4j.org/current/org/neo4j/api/core/Traverser.Order.html
   class Order
-    BREADTH_FIRST = org.neo4j.api.core.Traverser::Order::BREADTH_FIRST
-    DEPTH_FIRST   = org.neo4j.api.core.Traverser::Order::DEPTH_FIRST
+    BREADTH_FIRST = org.neo4j.graphdb.Traverser::Order::BREADTH_FIRST
+    DEPTH_FIRST   = org.neo4j.graphdb.Traverser::Order::DEPTH_FIRST
   end
 end

data/lib/neo4jr/path_rater.rb

@@ -0,0 +1,13 @@
+module Neo4jr
+  module PathRater
+    def get_cost path, start_cost, cost_evaluator, cost_accumulator
+      cost = start_cost
+      previous = nil
+      path.each do |r|
+        cost = cost_accumulator.addCosts(cost, cost_evaluator.getCost(r, r.getEndNode == previous)) if r.kind_of? org.neo4j.api.core.Relationship
+        previous = r
+      end
+      cost
+    end
+  end
+end

data/lib/neo4jr/property_container_extension.rb

@@ -1,5 +1,5 @@
 # Extends the Node class with a hash style accessor methods to the node's properties
-org.neo4j.api.core.PropertyContainer.java_class.ruby_class.class_eval do 
+org.neo4j.graphdb.PropertyContainer.java_class.ruby_class.class_eval do 
   
   # Example:
   #    node[:name] #=> 'Matt'
@@ -12,6 +12,7 @@ org.neo4j.api.core.PropertyContainer.java_class.ruby_class.class_eval do
   #    node[:name] = 'Matt'
   #
   def []=(arg, value)
+    Neo4jr::Indexer.attempt_index(self, arg.to_s, value)
     set_property(arg.to_s, value)
   end
     

data/lib/neo4jr/relationship_extension.rb

@@ -1,4 +1,4 @@
-org.neo4j.api.core.Relationship.java_class.ruby_class.class_eval do 
+org.neo4j.graphdb.Relationship.java_class.ruby_class.class_eval do 
   
   def to_hash
     properties

data/lib/neo4jr/relationship_type.rb

@@ -1,6 +1,6 @@
 module Neo4jr
   class RelationshipType
-    include org.neo4j.api.core.RelationshipType
+    include org.neo4j.graphdb.RelationshipType
 
     @@names = {}
 
@@ -11,7 +11,7 @@ module Neo4jr
       end
       
       def instances(*names)
-        names.map{|name| instance(name)}.to_java(org.neo4j.api.core.RelationshipType)
+        names.map{|name| instance(name)}.to_java(org.neo4j.graphdb.RelationshipType)
       end
 
       def outgoing(type)
@@ -39,7 +39,7 @@ module Neo4jr
     end
     
     def to_a
-      [self].to_java(org.neo4j.api.core.RelationshipType)
+      [self].to_java(org.neo4j.graphdb.RelationshipType)
     end
 
     def name

data/lib/neo4jr/returnable_evaluator.rb

@@ -1,8 +1,8 @@
 module Neo4jr
   # SEE: http://api.neo4j.org/current/org/neo4j/api/core/ReturnableEvaluator.html
   class ReturnableEvaluator
-    ALL                = org.neo4j.api.core.ReturnableEvaluator.ALL
-    ALL_BUT_START_NODE = org.neo4j.api.core.ReturnableEvaluator.ALL_BUT_START_NODE
+    ALL                = org.neo4j.graphdb.ReturnableEvaluator.ALL
+    ALL_BUT_START_NODE = org.neo4j.graphdb.ReturnableEvaluator.ALL_BUT_START_NODE
     
     # Creates a new ReturnableEvaluator on the fly that delgates to the passed in block to use with the traverse method. 
     # The block should return either true or false

data/lib/neo4jr/stop_evaluator.rb

@@ -1,9 +1,9 @@
 module Neo4jr
   # SEE: http://api.neo4j.org/current/org/neo4j/api/core/StopEvaluator.html
   class StopEvaluator
-    DEPTH_ONE = org.neo4j.api.core.StopEvaluator::DEPTH_ONE
-    END_OF_GRAPH = org.neo4j.api.core.StopEvaluator::END_OF_GRAPH
-    END_OF_NETWORK = org.neo4j.api.core.StopEvaluator::END_OF_NETWORK
+    DEPTH_ONE      = org.neo4j.graphdb.StopEvaluator::DEPTH_ONE
+    END_OF_GRAPH   = org.neo4j.graphdb.StopEvaluator::END_OF_GRAPH
+    END_OF_NETWORK = org.neo4j.graphdb.StopEvaluator::END_OF_NETWORK
 
     # Creates a new StopEvaluator on the fly that delgates to the passed in block to use with the traverse method. 
     # The block should return either true or false

data/lib/neo4jr/traverser_extension.rb

@@ -1,4 +1,4 @@
-org.neo4j.api.core.Traverser.java_class.ruby_class.class_eval do
+org.neo4j.graphdb.Traverser.java_class.ruby_class.class_eval do
   def size
     self.map.size
   end

data/spec/db_spec.rb

@@ -1,6 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Neo4jr::DB do
+
   it 'should fail the transaction if an error happens and then propgate the original exception' do
     lambda{
       Neo4jr::DB.execute do |neo|
@@ -8,4 +9,18 @@ describe Neo4jr::DB do
       end
     }.should raise_error(SystemCallError)
   end
+  
+  it 'should retreive nodes by string' do
+    lambda{
+      Neo4jr::DB.getNodeById("0")
+    }.should_not raise_error    
+  end
+
+  it 'accepts a hash when creating a node' do
+    node_created = Neo4jr::DB.execute do |embedded_neo| 
+      embedded_neo.create_node(:a => 'b')
+    end
+    node_created[:a].should == 'b'
+  end
+  
 end

data/spec/indexer_spec.rb

@@ -0,0 +1,36 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Neo4jr::Indexer do
+  
+  it 'is always created when we just access a neo4j database' do
+    Neo4jr::DB.instance
+    Neo4jr::Indexer.should be_enabled
+  end
+  
+  it 'indexes and finds nodes using the indentifier' do
+    random_identifier = Object.new.object_id
+
+    node_created = Neo4jr::DB.execute do |neo| 
+      neo.createNode(:identifier => random_identifier)
+    end
+    
+    node_found = Neo4jr::DB.execute do |neo| 
+      neo.find_node_by_identifier(random_identifier)
+    end
+      
+    node_found.id.should == node_created.id
+  end
+  
+  it 'only allows one object to be indexed by indentifier' do
+    first_node = nil
+    last_node = nil
+    node_found = Neo4jr::DB.execute do |neo| 
+      first_node = neo.createNode(:identifier => 'asdf')
+      last_node = neo.createNode(:identifier => 'asdf')
+      last_node = neo.createNode(:identifier => 'asdf')
+      neo.find_node_by_identifier('asdf')
+    end    
+    last_node.id.should == node_found.id
+  end
+  
+end

data/spec/relationship_type_spec.rb

@@ -15,7 +15,7 @@ describe Neo4jr::RelationshipType do
   
   it 'can covert one relationship type to a java array so it can be used with the neo4j API' do
     relationship_type = Neo4jr::RelationshipType.instance('worked_in')
-    relationship_type.to_a.class.java_class.to_s.should == '[Lorg.neo4j.api.core.RelationshipType;'
+    relationship_type.to_a.class.java_class.to_s.should == '[Lorg.neo4j.graphdb.RelationshipType;'
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: neo4jr-simple
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
   - Matthew Deiters
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-19 00:00:00 -08:00
+date: 2010-01-26 00:00:00 -08:00
 default_executable: neosh
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -44,19 +44,26 @@ extra_rdoc_files:
 files: 
   - VERSION
   - bin/neosh
-  - lib/jars/graph-algo-0.2-20090815.182816-1.jar
-  - lib/jars/jta-1.1.jar
-  - lib/jars/neo-1.0-b10.jar
-  - lib/jars/shell-1.0-b10.jar
+  - lib/jars/geronimo-jta_1.1_spec-1.1.1.jar
+  - lib/jars/jline-0.9.94.jar
+  - lib/jars/lucene-core-2.9.1.jar
+  - lib/jars/neo4j-commons-0.4.jar
+  - lib/jars/neo4j-graph-algo-0.3-20100125.090624-8.jar
+  - lib/jars/neo4j-index-1.0-b1.jar
+  - lib/jars/neo4j-kernel-1.0-rc.jar
+  - lib/jars/neo4j-remote-graphdb-0.5.jar
+  - lib/jars/neo4j-shell-1.0-rc.jar
   - lib/neo4jr-simple.rb
   - lib/neo4jr/cli.rb
   - lib/neo4jr/configuration.rb
   - lib/neo4jr/db.rb
   - lib/neo4jr/direction.rb
   - lib/neo4jr/embedded_neo_extension.rb
+  - lib/neo4jr/indexer.rb
   - lib/neo4jr/int_array_iterator_extension.rb
   - lib/neo4jr/node_extension.rb
   - lib/neo4jr/order.rb
+  - lib/neo4jr/path_rater.rb
   - lib/neo4jr/property_container_extension.rb
   - lib/neo4jr/relationship_extension.rb
   - lib/neo4jr/relationship_type.rb
@@ -98,8 +105,8 @@ test_files:
   - VERSION
   - spec/db_spec.rb
   - spec/direction_spec.rb
-  - spec/embedded_neo_extension_spec.rb
   - spec/functional_example_spec.rb
+  - spec/indexer_spec.rb
   - spec/int_array_iterator_extension_spec.rb
   - spec/node_extension_spec.rb
   - spec/property_container_extension_spec.rb

data/spec/embedded_neo_extension_spec.rb

@@ -1,18 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe Neo4jr::EmbeddedNeo do
-
-  it 'should retreive nodes by string' do
-    lambda{
-      Neo4jr::DB.getNodeById("0")
-    }.should_not raise_error    
-  end
-
-  it 'accepts a hash when creating a node' do
-    node_created = Neo4jr::DB.execute do |embedded_neo| 
-      embedded_neo.create_node(:a => 'b')
-    end
-    node_created[:a].should == 'b'
-  end
-  
-end