neo4jr-simple 0.1.0 → 0.1.3

data/.gitignore

@@ -19,3 +19,9 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+
+##Netbeans
+nbproject
+
+##Rubymine
+.idea

data/README.rdoc

@@ -21,8 +21,9 @@ A simple, ready to go JRuby wrapper for the Neo4j graph database engine which pr
 
 == Getting Started
 
+* {gem install neo4jr-simple} [http://gemcutter.org/gems/neo4jr-simple]
+* {Neo4j API Docs} [http://api.neo4j.org/current/org/neo4j/api/core/package-summary.html]
 * functional_example_spec includes examples of basic operations in neo4j like creating, retrieving and updating nodes along with simple traversal examples.
-* Neo4j API: http://api.neo4j.org/current/org/neo4j/api/core/package-summary.html
 
 Basic Node creation:
 
@@ -47,12 +48,14 @@ Traverse Database from a node:
      return_when   = Neo4jr::ReturnableEvaluator::ALL
      relationships = Neo4jr::RelationshipType.outgoing(:acted_in)
      
-     traverser = philip_seymour_hoffman.traverse(order, stop_when, return_when, relationships_of_type)
+     traverser = philip_seymour_hoffman.traverse(order, stop_when, return_when, relationships)
      traverser.each do |node|
        #...
      end
    end
 
+Use command line shell to query and modify the graph:
+  neosh -path <path_to_neo_db>
 
 == Contributors
 
@@ -61,7 +64,9 @@ Traverse Database from a node:
 * GitHub   : https://github.com/mdeiters
 * LinkedIn : http://www.linkedin.com/in/matthewdeiters
 * Blog     : http://www.theagiledeveloper.com
-  
-== Copyright
+
+====Heinrich Klobuczek
+* GitHub   : https://github.com/klobuczek
+* LinkedIn : http://www.linkedin.com/pub/heinrich-klobuczek/0/a71/39b
 
 Copyright (c) 2009 Matthew Deiters. See LICENSE for details.

data/Rakefile

@@ -6,7 +6,7 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "neo4jr-simple"
     gem.summary = %Q{A simple, ready to go JRuby wrapper for the Neo4j graph database engine.}
-    gem.description = %Q{Nothing more then Neo4j and Ruby goodness}
+    gem.description = %Q{A simple, ready to go JRuby wrapper for the Neo4j graph database engine. Nothing more then Neo4j and Ruby goodness}
     gem.email = "matthew_deiters@mckinsey.com"
     gem.homepage = "http://github.com/mdeiters/neo4jr-simple"
     gem.authors = ["Matthew Deiters"]

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.3

data/bin/neosh

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+$LOAD_PATH << File.expand_path(File.dirname(__FILE__) + "/../lib")
+require 'neo4jr-simple.rb'
+
+
+Neo4jr::CLI.execute(ARGV)

data/lib/neo4jr/cli.rb

@@ -0,0 +1,8 @@
+module Neo4jr
+  class CLI
+    def self.execute arguments=[]
+        org.neo4j.util.shell.StartClient.main arguments.to_java(:String)
+    end
+  end
+end
+

data/lib/neo4jr/configuration.rb

@@ -2,7 +2,7 @@ module Neo4jr
   class Configuration
     class << self
       def database_path
-        @database_path ||= 'tmp-neo4j-db'
+        @database_path ||= Dir.mktmpdir #Dir.tmpdir + '/tmp-neo4j-db'
       end
     
       def database_path=(value)

data/lib/neo4jr/db.rb

@@ -4,6 +4,7 @@ module Neo4jr
       def instance
         @neo ||= begin
           neo = org.neo4j.api.core.EmbeddedNeo.new(Configuration.database_path)
+          neo.enable_remote_shell
           at_exit do
             neo.shutdown
           end

data/lib/neo4jr/direction.rb

@@ -3,5 +3,13 @@ module Neo4jr
     OUTGOING = org.neo4j.api.core.Direction::OUTGOING
     INCOMING = org.neo4j.api.core.Direction::INCOMING
     BOTH     = org.neo4j.api.core.Direction::BOTH
+    
+    def self.from_string(value)
+      case value.upcase
+        when 'BOTH': return BOTH
+        when 'OUTGOING': return OUTGOING
+        when 'INCOMING': return INCOMING
+      end
+    end
   end
 end

data/lib/neo4jr/node_extension.rb

@@ -1,22 +1,12 @@
-# Extends the Node class with a hash style accessor methods to the node's properties
-org.neo4j.api.core.Node.java_class.ruby_class.class_eval do
+org.neo4j.api.core.Node.java_class.ruby_class.class_eval do 
   
   def id
     getId
   end
-  
-  # Example:
-  #    node[:name] #=> 'Matt'
-  #
-  def [](arg)
-    get_property(arg.to_s)
-  end
-  
-  # Example:
-  #    node[:name] = 'Matt'
-  #
-  def []=(arg, value)
-    set_property(arg.to_s, value)
+
+  def to_hash
+    extra_values = {:node_id => self.getId, :kind => 'Node'}
+    properties.merge extra_values
   end
-  
-end
+
+end

data/lib/neo4jr/property_container_extension.rb

@@ -0,0 +1,26 @@
+# 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 
+  
+  # Example:
+  #    node[:name] #=> 'Matt'
+  #
+  def [](arg)
+    get_property(arg.to_s)
+  end
+  
+  # Example:
+  #    node[:name] = 'Matt'
+  #
+  def []=(arg, value)
+    set_property(arg.to_s, value)
+  end
+    
+  def properties
+    properties = {}
+    propertyKeys.each do |property|
+      properties[property] = self[property]
+    end
+    properties
+  end
+  
+end

data/lib/neo4jr/relationship_extension.rb

@@ -0,0 +1,10 @@
+org.neo4j.api.core.Relationship.java_class.ruby_class.class_eval do 
+  
+  def to_hash
+    extra_values = {:node_id => self.getId, :kind => 'Relationship'}
+    extra_values['type'] = self.getType.name
+    extra_values['to'] = self.getEndNode.id
+    properties.merge extra_values
+  end
+
+end

data/lib/neo4jr/returnable_evaluator.rb

@@ -24,6 +24,13 @@ module Neo4jr
       end
       instance
     end
+    
+    def self.everything
+      self.when do |position|
+        true
+      end
+    end
+    
   end
   
   Return = ReturnableEvaluator

data/lib/neo4jr/version.rb

@@ -1,3 +1,3 @@
 module Neo4jr
-  VERSION = File.read('VERSION') unless defined?(Neo4jr::VERSION)
+  VERSION = File.read(File.expand_path(File.dirname(__FILE__) + "/../../VERSION")) unless defined?(Neo4jr::VERSION)
 end

data/lib/neo4jr-simple.rb

@@ -1,18 +1,24 @@
 include Java
 
-module Neo4j
-  require 'jars/neo-1.0-b9.jar'
-  require 'jars/shell-1.0-b9.jar'
-  require 'jars/jta-1_1.jar'
+module Neo4jr
+  require 'jars/neo-1.0-b10.jar'
+  require 'jars/shell-1.0-b10.jar'
+  require 'jars/jta-1.1.jar'
+  require 'jars/graph-algo-0.2-20090815.182816-1.jar'
+  
+  AllSimplePaths = org.neo4j.graphalgo.AllSimplePaths
 end
 
 require 'neo4jr/configuration'
 require 'neo4jr/db'
 require 'neo4jr/relationship_type'
 require 'neo4jr/node_extension'
+require 'neo4jr/relationship_extension'
+require 'neo4jr/property_container_extension'
 require 'neo4jr/traverser_extension'
 require 'neo4jr/returnable_evaluator'
 require 'neo4jr/stop_evaluator'
 require 'neo4jr/order'
 require 'neo4jr/direction'
-require 'neo4jr/version'
+require 'neo4jr/version'
+require 'neo4jr/cli'

data/neo4jr-simple.gemspec

@@ -5,13 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{neo4jr-simple}
-  s.version = "0.1.0"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew Deiters"]
-  s.date = %q{2009-12-18}
-  s.description = %q{Nothing more then Neo4j and Ruby goodness}
+  s.date = %q{2009-12-23}
+  s.default_executable = %q{neosh}
+  s.description = %q{A simple, ready to go JRuby wrapper for the Neo4j graph database engine. Nothing more then Neo4j and Ruby goodness}
   s.email = %q{matthew_deiters@mckinsey.com}
+  s.executables = ["neosh"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -23,15 +25,20 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
-     "lib/jars/jta-1_1.jar",
-     "lib/jars/neo-1.0-b9.jar",
-     "lib/jars/shell-1.0-b9.jar",
+     "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/neo4jr-simple.rb",
+     "lib/neo4jr/cli.rb",
      "lib/neo4jr/configuration.rb",
      "lib/neo4jr/db.rb",
      "lib/neo4jr/direction.rb",
      "lib/neo4jr/node_extension.rb",
      "lib/neo4jr/order.rb",
+     "lib/neo4jr/property_container_extension.rb",
+     "lib/neo4jr/relationship_extension.rb",
      "lib/neo4jr/relationship_type.rb",
      "lib/neo4jr/returnable_evaluator.rb",
      "lib/neo4jr/stop_evaluator.rb",
@@ -39,8 +46,9 @@ Gem::Specification.new do |s|
      "lib/neo4jr/version.rb",
      "neo4jr-simple.gemspec",
      "spec/db_spec.rb",
+     "spec/direction_spec.rb",
      "spec/functional_example_spec.rb",
-     "spec/node_extension_spec.rb",
+     "spec/property_container_extension_spec.rb",
      "spec/returnable_evaluator_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
@@ -76,8 +84,9 @@ Gem::Specification.new do |s|
   s.summary = %q{A simple, ready to go JRuby wrapper for the Neo4j graph database engine.}
   s.test_files = [
     "spec/db_spec.rb",
+     "spec/direction_spec.rb",
      "spec/functional_example_spec.rb",
-     "spec/node_extension_spec.rb",
+     "spec/property_container_extension_spec.rb",
      "spec/returnable_evaluator_spec.rb",
      "spec/spec_helper.rb",
      "spec/stop_evaluator_spec.rb"

data/spec/direction_spec.rb

@@ -0,0 +1,7 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Neo4jr::Direction do
+  it 'can convert from string to type' do
+    Neo4jr::Direction.from_string('both').should == Neo4jr::Direction::BOTH
+  end
+end

data/spec/functional_example_spec.rb

@@ -10,28 +10,24 @@ describe "Neo4j Working Examples" do
     end
   end
   
-  describe 'cruding a node' do
-    let(:node_id) do
-      node_id = nil
-      Neo4jr::DB.execute do |neo|
-        node = neo.createNode
-        node[:name] = 'Deiters, Matt'
-        node_id = node.getId
-      end
-      node_id
+  it 'cruds nodes' do
+    node_id = nil
+    #CREATES
+    Neo4jr::DB.execute do |neo|
+      node = neo.createNode
+      node[:name] = 'Deiters, Matt'
+      node_id = node.getId
     end
-    
-    after :each do
-      Neo4jr::DB.execute do |neo|
-        node = neo.getNodeById(node_id)
-        node.delete
-      end
+
+    #UPDATES
+    node = Neo4jr::DB.getNodeById(node_id)
+    node[:name].should == 'Deiters, Matt'
+
+    #DELETES
+    Neo4jr::DB.execute do |neo|
+      node = neo.getNodeById(node_id)
+      node.delete
     end
-    
-    it 'can later read the node' do
-      node = Neo4jr::DB.getNodeById(node_id)
-      node[:name].should == 'Deiters, Matt'
-    end  
   end
   
   it 'can traverse a node using the raw API' do

data/spec/{node_extension_spec.rb → property_container_extension_spec.rb}

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe 'node extension' do
+describe 'property container extension' do
 
   it "adds [] read accessor method for properties" do
     tom_hanks = Neo4jr::DB.instance.getNodeById(893)
@@ -14,5 +14,4 @@ describe 'node extension' do
       tom_hanks[:testing].should == '123'
     end
   end
-  
 end

data/spec/spec_helper.rb

@@ -9,7 +9,4 @@ puts Neo4jr::DB
 
 Spec::Runner.configure do |config|
   
-end
-
-
-
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: neo4jr-simple
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors: 
   - Matthew Deiters
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-18 00:00:00 -08:00
-default_executable: 
+date: 2009-12-23 00:00:00 -08:00
+default_executable: neosh
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rspec
@@ -22,10 +22,10 @@ dependencies:
           - !ruby/object:Gem::Version 
             version: 1.2.9
       version: 
-description: Nothing more then Neo4j and Ruby goodness
+description: A simple, ready to go JRuby wrapper for the Neo4j graph database engine. Nothing more then Neo4j and Ruby goodness
 email: matthew_deiters@mckinsey.com
-executables: []
-
+executables: 
+  - neosh
 extensions: []
 
 extra_rdoc_files: 
@@ -38,15 +38,20 @@ files:
   - README.rdoc
   - Rakefile
   - VERSION
-  - lib/jars/jta-1_1.jar
-  - lib/jars/neo-1.0-b9.jar
-  - lib/jars/shell-1.0-b9.jar
+  - 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/neo4jr-simple.rb
+  - lib/neo4jr/cli.rb
   - lib/neo4jr/configuration.rb
   - lib/neo4jr/db.rb
   - lib/neo4jr/direction.rb
   - lib/neo4jr/node_extension.rb
   - lib/neo4jr/order.rb
+  - lib/neo4jr/property_container_extension.rb
+  - lib/neo4jr/relationship_extension.rb
   - lib/neo4jr/relationship_type.rb
   - lib/neo4jr/returnable_evaluator.rb
   - lib/neo4jr/stop_evaluator.rb
@@ -54,8 +59,9 @@ files:
   - lib/neo4jr/version.rb
   - neo4jr-simple.gemspec
   - spec/db_spec.rb
+  - spec/direction_spec.rb
   - spec/functional_example_spec.rb
-  - spec/node_extension_spec.rb
+  - spec/property_container_extension_spec.rb
   - spec/returnable_evaluator_spec.rb
   - spec/spec.opts
   - spec/spec_helper.rb
@@ -113,8 +119,9 @@ specification_version: 3
 summary: A simple, ready to go JRuby wrapper for the Neo4j graph database engine.
 test_files: 
   - spec/db_spec.rb
+  - spec/direction_spec.rb
   - spec/functional_example_spec.rb
-  - spec/node_extension_spec.rb
+  - spec/property_container_extension_spec.rb
   - spec/returnable_evaluator_spec.rb
   - spec/spec_helper.rb
   - spec/stop_evaluator_spec.rb