neo4jr-simple 0.1.3 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.5

data/lib/neo4jr/configuration.rb

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

data/lib/neo4jr/db.rb

@@ -3,8 +3,8 @@ module Neo4jr
     class << self
       def instance
         @neo ||= begin
-          neo = org.neo4j.api.core.EmbeddedNeo.new(Configuration.database_path)
-          neo.enable_remote_shell
+          neo = EmbeddedNeo.new(Configuration.database_path)
+          neo.enable_remote_shell if ENV['enable_neo_shell']
           at_exit do
             neo.shutdown
           end
@@ -13,18 +13,17 @@ module Neo4jr
       end
   
       def getNodeById(node_id)
-        n = nil
         execute do |neo|
-          n = neo.getNodeById(node_id)
+          neo.getNodeById(node_id)
         end
-        return n
       end
       
       def execute
         neo = instance
+        result = nil
         transaction = neo.beginTx();
         begin
-          yield neo
+          result = yield neo
           transaction.success
         rescue Exception => e
           transaction.failure
@@ -32,6 +31,7 @@ module Neo4jr
         ensure
           transaction.finish
         end
+        result
       end
       
       def node_count
@@ -39,15 +39,14 @@ module Neo4jr
       end
       
       def stats
-        info = ['== Database Stats ==']
-        info << "Path:  #{Configuration.database_path}"
-        info << "Nodes: #{node_count}"
-        info << '===================='
-        info.join("\n")
+        {
+          :path => Configuration.database_path,
+          :nodes => node_count
+        }
       end
       
       def to_s
-        stats
+        stats.inspect
       end      
     end
   end

data/lib/neo4jr/embedded_neo_extension.rb

@@ -0,0 +1,17 @@
+org.neo4j.api.core.EmbeddedNeo.java_class.ruby_class.class_eval do 
+  
+  alias :orginalGetNodeById :getNodeById
+  def getNodeById(id)
+    orginalGetNodeById(id.to_i)
+  end
+  
+  alias :orginalCreateNode :createNode
+  def createNode(hash = nil)
+    node = orginalCreateNode
+    node.update_properties(hash)
+    node
+  end
+  alias :create_node :createNode
+  
+  
+end

data/lib/neo4jr/int_array_iterator_extension.rb

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

data/lib/neo4jr/property_container_extension.rb

@@ -23,4 +23,16 @@ org.neo4j.api.core.PropertyContainer.java_class.ruby_class.class_eval do
     properties
   end
   
+  def update_properties(hash)
+    hash.each_pair do |key, value|
+      self[key] = convert(value) unless value.nil?
+    end unless hash.nil?
+  end
+  
+  private
+  def convert(value)
+    return value.to_s if value.is_a? Symbol
+    value
+  end
+  
 end

data/lib/neo4jr/relationship_type.rb

@@ -9,6 +9,10 @@ module Neo4jr
         return @@names[name] if @@names.include?(name)
         @@names[name] = RelationshipType.new(name)
       end
+      
+      def instances(*names)
+        names.map{|name| instance(name)}.to_java(org.neo4j.api.core.RelationshipType)
+      end
 
       def outgoing(type)
         covert_to_relationship_type(Neo4jr::Direction::OUTGOING, type)
@@ -33,13 +37,16 @@ module Neo4jr
     def to_s
       self.class.to_s + " name='#{@name}'"
     end
+    
+    def to_a
+      [self].to_java(org.neo4j.api.core.RelationshipType)
+    end
 
     def name
       @name
     end
 
     private
-
     def initialize(name)
       @name = name.to_s
       raise ArgumentError.new("Expect type of relationship to be a name of at least one character") if @name.empty?

data/lib/neo4jr-simple.rb

@@ -1,20 +1,27 @@
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
+
 include Java
 
 module Neo4jr
-  require 'jars/neo-1.0-b10.jar'
   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'
   
+  include_class 'java.lang.System'
+  
+  EmbeddedNeo    = org.neo4j.api.core.EmbeddedNeo
   AllSimplePaths = org.neo4j.graphalgo.AllSimplePaths
 end
 
 require 'neo4jr/configuration'
 require 'neo4jr/db'
 require 'neo4jr/relationship_type'
+require 'neo4jr/embedded_neo_extension'
 require 'neo4jr/node_extension'
 require 'neo4jr/relationship_extension'
 require 'neo4jr/property_container_extension'
+require 'neo4jr/int_array_iterator_extension'
 require 'neo4jr/traverser_extension'
 require 'neo4jr/returnable_evaluator'
 require 'neo4jr/stop_evaluator'

data/spec/embedded_neo_extension_spec.rb

@@ -0,0 +1,18 @@
+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

data/spec/int_array_iterator_extension_spec.rb

@@ -0,0 +1,5 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe 'IntArrayIterartor' do
+
+end

data/spec/node_extension_spec.rb

@@ -0,0 +1,5 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe 'node extension' do
+
+end

data/spec/property_container_extension_spec.rb

@@ -14,4 +14,15 @@ describe 'property container extension' do
       tom_hanks[:testing].should == '123'
     end
   end
+  
+  it 'mass updates properties from a hash' do
+    hash = {:a => :b}
+    node_created = Neo4jr::DB.execute do |neo|
+      node = neo.createNode
+      node.update_properties(hash)
+      node
+    end
+    node_created[:a].should == 'b'
+  end
+  
 end

data/spec/relationship_type_spec.rb

@@ -0,0 +1,21 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Neo4jr::RelationshipType do
+  
+  it 'converts a string into a RelationshipType' do
+    Neo4jr::RelationshipType.instance('worked_in').should be_is_a(Neo4jr::RelationshipType)
+  end
+
+  it 'converts multiople types into an typed array of RelationshipType' do
+    relationship_types = Neo4jr::RelationshipType.instances('worked_in', 'acted_in')
+    relationship_types.size.should == 2
+    relationship_types[0].should be_is_a(Neo4jr::RelationshipType)
+    relationship_types[1].should be_is_a(Neo4jr::RelationshipType)
+  end
+  
+  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;'
+  end
+  
+end

data/spec/spec_helper.rb

@@ -1,11 +1,11 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
 require 'neo4jr-simple'
 require 'spec'
 require 'spec/autorun'
 
 Neo4jr::Configuration.database_path = File.join(File.expand_path(File.dirname(__FILE__)), 'test-imdb-database')
-puts Neo4jr::DB
 
 Spec::Runner.configure do |config|
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: neo4jr-simple
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors: 
   - Matthew Deiters
@@ -32,12 +32,6 @@ extra_rdoc_files:
   - LICENSE
   - README.rdoc
 files: 
-  - .document
-  - .gitignore
-  - LICENSE
-  - README.rdoc
-  - Rakefile
-  - VERSION
   - bin/neosh
   - lib/jars/graph-algo-0.2-20090815.182816-1.jar
   - lib/jars/jta-1.1.jar
@@ -48,6 +42,8 @@ files:
   - lib/neo4jr/configuration.rb
   - lib/neo4jr/db.rb
   - lib/neo4jr/direction.rb
+  - lib/neo4jr/embedded_neo_extension.rb
+  - lib/neo4jr/int_array_iterator_extension.rb
   - lib/neo4jr/node_extension.rb
   - lib/neo4jr/order.rb
   - lib/neo4jr/property_container_extension.rb
@@ -57,38 +53,8 @@ files:
   - lib/neo4jr/stop_evaluator.rb
   - lib/neo4jr/traverser_extension.rb
   - lib/neo4jr/version.rb
-  - neo4jr-simple.gemspec
-  - spec/db_spec.rb
-  - spec/direction_spec.rb
-  - spec/functional_example_spec.rb
-  - spec/property_container_extension_spec.rb
-  - spec/returnable_evaluator_spec.rb
-  - spec/spec.opts
-  - spec/spec_helper.rb
-  - spec/stop_evaluator_spec.rb
-  - spec/test-imdb-database/active_tx_log
-  - spec/test-imdb-database/neostore
-  - spec/test-imdb-database/neostore.id
-  - spec/test-imdb-database/neostore.nodestore.db
-  - spec/test-imdb-database/neostore.nodestore.db.id
-  - spec/test-imdb-database/neostore.propertystore.db
-  - spec/test-imdb-database/neostore.propertystore.db.arrays
-  - spec/test-imdb-database/neostore.propertystore.db.arrays.id
-  - spec/test-imdb-database/neostore.propertystore.db.id
-  - spec/test-imdb-database/neostore.propertystore.db.index
-  - spec/test-imdb-database/neostore.propertystore.db.index.id
-  - spec/test-imdb-database/neostore.propertystore.db.index.keys
-  - spec/test-imdb-database/neostore.propertystore.db.index.keys.id
-  - spec/test-imdb-database/neostore.propertystore.db.strings
-  - spec/test-imdb-database/neostore.propertystore.db.strings.id
-  - spec/test-imdb-database/neostore.relationshipstore.db
-  - spec/test-imdb-database/neostore.relationshipstore.db.id
-  - spec/test-imdb-database/neostore.relationshiptypestore.db
-  - spec/test-imdb-database/neostore.relationshiptypestore.db.id
-  - spec/test-imdb-database/neostore.relationshiptypestore.db.names
-  - spec/test-imdb-database/neostore.relationshiptypestore.db.names.id
-  - spec/test-imdb-database/nioneo_logical.log.active
-  - spec/test-imdb-database/tm_tx_log.1
+  - LICENSE
+  - README.rdoc
 has_rdoc: true
 homepage: http://github.com/mdeiters/neo4jr-simple
 licenses: []
@@ -118,10 +84,16 @@ signing_key:
 specification_version: 3
 summary: A simple, ready to go JRuby wrapper for the Neo4j graph database engine.
 test_files: 
+  - VERSION
   - spec/db_spec.rb
   - spec/direction_spec.rb
+  - spec/embedded_neo_extension_spec.rb
   - spec/functional_example_spec.rb
+  - spec/int_array_iterator_extension_spec.rb
+  - spec/node_extension_spec.rb
   - spec/property_container_extension_spec.rb
+  - spec/relationship_type_spec.rb
   - spec/returnable_evaluator_spec.rb
+  - spec/spec.opts
   - spec/spec_helper.rb
   - spec/stop_evaluator_spec.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1,27 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-
-##Netbeans
-nbproject
-
-##Rubymine
-.idea

data/Rakefile

@@ -1,45 +0,0 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  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{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"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "neo4jr-simple #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/neo4jr-simple.gemspec

@@ -1,108 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{neo4jr-simple}
-  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-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"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "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/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",
-     "lib/neo4jr/traverser_extension.rb",
-     "lib/neo4jr/version.rb",
-     "neo4jr-simple.gemspec",
-     "spec/db_spec.rb",
-     "spec/direction_spec.rb",
-     "spec/functional_example_spec.rb",
-     "spec/property_container_extension_spec.rb",
-     "spec/returnable_evaluator_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/stop_evaluator_spec.rb",
-     "spec/test-imdb-database/active_tx_log",
-     "spec/test-imdb-database/neostore",
-     "spec/test-imdb-database/neostore.id",
-     "spec/test-imdb-database/neostore.nodestore.db",
-     "spec/test-imdb-database/neostore.nodestore.db.id",
-     "spec/test-imdb-database/neostore.propertystore.db",
-     "spec/test-imdb-database/neostore.propertystore.db.arrays",
-     "spec/test-imdb-database/neostore.propertystore.db.arrays.id",
-     "spec/test-imdb-database/neostore.propertystore.db.id",
-     "spec/test-imdb-database/neostore.propertystore.db.index",
-     "spec/test-imdb-database/neostore.propertystore.db.index.id",
-     "spec/test-imdb-database/neostore.propertystore.db.index.keys",
-     "spec/test-imdb-database/neostore.propertystore.db.index.keys.id",
-     "spec/test-imdb-database/neostore.propertystore.db.strings",
-     "spec/test-imdb-database/neostore.propertystore.db.strings.id",
-     "spec/test-imdb-database/neostore.relationshipstore.db",
-     "spec/test-imdb-database/neostore.relationshipstore.db.id",
-     "spec/test-imdb-database/neostore.relationshiptypestore.db",
-     "spec/test-imdb-database/neostore.relationshiptypestore.db.id",
-     "spec/test-imdb-database/neostore.relationshiptypestore.db.names",
-     "spec/test-imdb-database/neostore.relationshiptypestore.db.names.id",
-     "spec/test-imdb-database/nioneo_logical.log.active",
-     "spec/test-imdb-database/tm_tx_log.1"
-  ]
-  s.homepage = %q{http://github.com/mdeiters/neo4jr-simple}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  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/property_container_extension_spec.rb",
-     "spec/returnable_evaluator_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/stop_evaluator_spec.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-    else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-  end
-end
-

data/spec/test-imdb-database/active_tx_log

@@ -1 +0,0 @@
-tm_tx_log.1