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

data/lib/neo4j/node_traverser.rb

@@ -203,6 +203,11 @@ module Neo4j
       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

data/lib/neo4j/rails/finders.rb

@@ -4,7 +4,7 @@ module Neo4j
       extend ActiveSupport::Concern
 
       included do
-        rule :_all, :functions => Neo4j::Functions::Count.new
+        rule(:_all, :functions => Neo4j::Functions::Count.new)
       end
 
       module ClassMethods
@@ -92,11 +92,19 @@ module Neo4j
           all.size
         end
 
+        # Call this method if you are using Neo4j::Rails::Model outside rails
+        # This method is automatically called by rails to close all lucene connections.
+        def close_lucene_connections
+          Thread.current[:neo4j_lucene_connection].each {|hits| hits.close} if Thread.current[:neo4j_lucene_connection]
+          Thread.current[:neo4j_lucene_connection] = nil
+        end
+
         protected
 
         def ids_in(arg)
           return nil unless arg.is_a?(Hash)
-          arg[:conditions].present? ? arg[:conditions][:id] : arg[:id]
+          condition = arg[:conditions].present? ? arg[:conditions] : arg
+          condition.is_a?(Hash) && condition[:id]
         end
 
 
@@ -127,7 +135,6 @@ module Neo4j
           Thread.current[:neo4j_lucene_connection] << hits
           hits
         end
-
       end
     end
   end

data/lib/neo4j/rails/lucene_connection_closer.rb

@@ -8,8 +8,7 @@ module Neo4j
       def call(env)
         @app.call(env)
       ensure
-        Thread.current[:neo4j_lucene_connection].each {|hits| hits.close} if Thread.current[:neo4j_lucene_connection]
-        Thread.current[:neo4j_lucene_connection] = nil
+        Neo4j::Rails::Model.close_lucene_connections
       end
     end
   end

data/lib/neo4j/rails/mapping/property.rb

@@ -23,7 +23,7 @@ module Neo4j
 						_decl_props[property] = options
 						handle_property_options_for(property, options)
 						define_property_methods_for(property, options)
-						_decl_props[property][:defined] = true
+						_decl_props[property][:defined] = true  # TODO is this needed ?
 					end
 					
 					def handle_property_options_for(property, options)

data/lib/neo4j/rails/model.rb

@@ -7,7 +7,7 @@ module Neo4j
       def initialize(attributes = {})
       	reset_attributes
         clear_relationships
-        self.attributes = attributes
+        self.attributes = attributes if attributes.is_a?(Hash)
       end
 
       def id

data/lib/neo4j/rails/persistence.rb

@@ -146,11 +146,7 @@ module Neo4j
 
       def create
         node = Neo4j::Node.new
-        #unless _java_node.save_nested(node)
-        #	Neo4j::Rails::Transaction.fail
-        #	false
-        #else
-        init_on_load(node)
+        @_java_node = node
         init_on_create
         clear_changes
         clear_relationships

data/lib/neo4j/rails/relationships/relationships.rb

@@ -25,7 +25,7 @@ module Neo4j
         end
       end
 
-      
+
       def write_changed_relationships #:nodoc:
         @relationships.each_value do |mapper|
           mapper.persist
@@ -38,11 +38,7 @@ module Neo4j
 
       def _decl_rels_for(type) #:nodoc:
         dsl = super
-        if false && persisted?
-          dsl
-        else
-          @relationships[type] ||= Mapper.new(type, dsl, self)
-        end
+        @relationships[type] ||= Mapper.new(type, dsl, self)
       end
 
 
@@ -51,12 +47,19 @@ module Neo4j
       end
 
 
-      # See, Neo4j::NodeRelationship#outgoing
-      # Creates or traverse relationships in memory without communicating with the neo4j database.
+      # If the node is persisted it returns a Neo4j::NodeTraverser
+      # otherwise create a new object which will handle creating new relationships in memory.
+      # If not persisted the traversal method like prune, expand, filter etc. will not be available
+      #
+      # See, Neo4j::NodeRelationship#outgoing (when node is persisted) which returns a Neo4j::NodeTraverser
       #
       def outgoing(rel_type)
-        dsl = _decl_rels_for(rel_type)
-        OutgoingRelationship.new(self, dsl)
+        if persisted?
+          super
+        else
+          dsl = _decl_rels_for(rel_type)
+          OutgoingRelationship.new(self, dsl)
+        end
       end
     end
   end

data/lib/neo4j/version.rb

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

data/lib/perf.rb~

@@ -0,0 +1,36 @@
+require "rubygems"
+require "bundler/setup"
+require 'fileutils'
+require 'neo4j'
+
+#FileUtils.rm_rf Neo4j::Config[:storage_path]
+
+
+class FooNode < Neo4j::Model
+  property :user_id
+  index :user_id
+  has_n(:contacts)
+  def to_s
+    "FooNode #{user_id}"
+  end
+end
+
+node1 = FooNode.create(:user_id => 1)
+
+for x in 1..5 do
+for node_id in 2..2700
+#  node = FooNode.create(:user_id => node_id)
+#  node.contacts << node1
+#  node.save!
+
+  found = FooNode.find_by_user_id(node_id)
+  puts "Found #{found}"
+#  Neo4j::Transaction.run do
+#    found.del
+#  end
+  Neo4j::Rails::Model.close_lucene_connections
+#  puts "node_id=#{node_id} #{node.contacts.include?(node1)}" #if (node_id % 50) == 2
+end
+end
+puts "FINISHED"
+Neo4j.shutdown

data/neo4j.gemspec

@@ -20,10 +20,12 @@ It comes included with the Apache Lucene document database.
 EOF
 
   s.require_path = 'lib'
-  s.files        = Dir.glob("{bin,lib}/**/*") + %w(README.rdoc CHANGELOG CONTRIBUTORS Gemfile neo4j.gemspec)
+  s.files        = Dir.glob("{bin,lib,config}/**/*") + %w(README.rdoc CHANGELOG CONTRIBUTORS Gemfile neo4j.gemspec)
+#  s.bindir = 'bin'
+  s.executables = 'neo4j-shell'
   s.has_rdoc = true
   s.extra_rdoc_files = %w( README.rdoc )
-  s.rdoc_options = ["--quiet", "--title", "Neo4j.rb", "--opname", "index.html", "--line-numbers", "--main", "README.rdoc", "--inline-source"]
+  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("activemodel", ">= 3.0.0")

metadata

@@ -1,14 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: neo4j
 version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-    - 1
-    - 0
-    - 0
-    - beta
-    - 26
-  version: 1.0.0.beta.26
+  prerelease: 6
+  version: 1.0.0.beta.27
 platform: java
 authors: 
   - Andreas Ronge
@@ -16,20 +10,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-05 00:00:00 +01:00
+date: 2011-01-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: orm_adapter
     prerelease: false
     requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 0
-              - 3
             version: 0.0.3
     type: :runtime
     version_requirements: *id001
@@ -37,13 +28,10 @@ dependencies:
     name: activemodel
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 3
-              - 0
-              - 0
             version: 3.0.0
     type: :runtime
     version_requirements: *id002
@@ -51,13 +39,10 @@ dependencies:
     name: will_paginate
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            segments: 
-              - 3
-              - 0
-              - pre
             version: 3.0.pre
     type: :runtime
     version_requirements: *id003
@@ -65,13 +50,10 @@ dependencies:
     name: railties
     prerelease: false
     requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 3
-              - 0
-              - 0
             version: 3.0.0
     type: :runtime
     version_requirements: *id004
@@ -79,54 +61,26 @@ description: "You can think of Neo4j as a high-performance graph engine with all
   The programmer works with an object-oriented, flexible network structure rather than with strict and static tables \xE2\x80\x94 yet enjoys all the benefits of a fully transactional, enterprise-strength database.\n\
   It comes included with the Apache Lucene document database.\n"
 email: andreas.ronge@gmail.com
-executables: []
-
+executables: 
+  - neo4j-shell
 extensions: []
 
 extra_rdoc_files: 
   - README.rdoc
 files: 
+  - bin/neo4j-shell
+  - bin/neo4j-shell~
   - lib/neo4j.rb
+  - lib/Gemfile~
+  - lib/config2.yml~
+  - lib/perf.rb~
   - lib/generators/neo4j.rb
   - lib/generators/neo4j/model/model_generator.rb
   - lib/generators/neo4j/model/templates/model.erb
   - lib/orm_adapter/adapters/neo4j.rb
-  - lib/tmp/neo4j/neostore.relationshiptypestore.db.names
-  - lib/tmp/neo4j/neostore.id
-  - lib/tmp/neo4j/neostore.relationshiptypestore.db.names.id
-  - lib/tmp/neo4j/neostore.nodestore.db.id
-  - lib/tmp/neo4j/neostore.propertystore.db.index
-  - lib/tmp/neo4j/neostore.propertystore.db.strings.id
-  - lib/tmp/neo4j/nioneo_logical.log.active
-  - lib/tmp/neo4j/neostore.propertystore.db.strings
-  - lib/tmp/neo4j/neostore.relationshiptypestore.db.id
-  - lib/tmp/neo4j/neostore
-  - lib/tmp/neo4j/neostore.nodestore.db
-  - lib/tmp/neo4j/neostore.propertystore.db.index.keys.id
-  - lib/tmp/neo4j/neostore.propertystore.db.arrays.id
-  - lib/tmp/neo4j/messages.log
-  - lib/tmp/neo4j/neostore.relationshipstore.db.id
-  - lib/tmp/neo4j/neostore.propertystore.db.arrays
-  - lib/tmp/neo4j/neostore.relationshipstore.db
-  - lib/tmp/neo4j/neostore.propertystore.db.index.id
-  - lib/tmp/neo4j/neostore.propertystore.db.id
-  - lib/tmp/neo4j/index.db
-  - lib/tmp/neo4j/neostore.propertystore.db
-  - lib/tmp/neo4j/tm_tx_log.1
-  - lib/tmp/neo4j/neostore.relationshiptypestore.db
-  - lib/tmp/neo4j/active_tx_log
-  - lib/tmp/neo4j/neostore.propertystore.db.index.keys
-  - lib/tmp/neo4j/lucene-fulltext/lucene-store.db
-  - lib/tmp/neo4j/lucene-fulltext/lucene.log.active
-  - lib/tmp/neo4j/index/lucene-store.db
-  - lib/tmp/neo4j/index/lucene.log.active
-  - lib/tmp/neo4j/index/lucene/node/Network-exact/segments.gen
-  - lib/tmp/neo4j/index/lucene/node/Network-exact/segments_2
-  - lib/tmp/neo4j/index/lucene/node/Network-exact/_0.cfs
-  - lib/tmp/neo4j/lucene/lucene-store.db
-  - lib/tmp/neo4j/lucene/lucene.log.active
   - 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
@@ -145,6 +99,12 @@ files:
   - lib/neo4j/equal.rb
   - lib/neo4j/relationship.rb
   - lib/neo4j/to_java.rb
+  - lib/neo4j/migrations/migrations.rb
+  - lib/neo4j/migrations/migration_mixin.rb
+  - lib/neo4j/migrations/lazy_migration_mixin.rb
+  - lib/neo4j/migrations/extensions.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
@@ -166,12 +126,20 @@ files:
   - lib/neo4j/rails/mapping/property.rb
   - lib/neo4j/rails/validations/uniqueness.rb
   - lib/neo4j/rails/validations/non_nil.rb
-  - lib/neo4j/jars/neo4j-graph-algo-0.7-1.2.jar
-  - lib/neo4j/jars/neo4j-lucene-index-0.2-1.2.jar
-  - lib/neo4j/jars/geronimo-jta_1.1_spec-1.1.1.jar
-  - lib/neo4j/jars/lucene-core-3.0.2.jar
-  - lib/neo4j/jars/neo4j-kernel-1.2-1.2.jar
-  - lib/neo4j/jars/neo4j-index-1.2-1.2.jar
+  - lib/neo4j/jars/core/lucene-core-3.0.3.jar
+  - lib/neo4j/jars/core/neo4j-index-1.3-SNAPSHOT.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/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/netty-3.2.1.Final.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
@@ -190,6 +158,8 @@ files:
   - lib/neo4j/index/indexer_registry.rb
   - lib/neo4j/index/class_methods.rb
   - lib/neo4j/index/index.rb
+  - config/locales/en.yml
+  - config/neo4j/config.yml
   - README.rdoc
   - CHANGELOG
   - CONTRIBUTORS
@@ -204,8 +174,6 @@ rdoc_options:
   - --quiet
   - --title
   - Neo4j.rb
-  - --opname
-  - index.html
   - --line-numbers
   - --main
   - README.rdoc
@@ -213,27 +181,21 @@ rdoc_options:
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-          - 1
-          - 8
-          - 7
         version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        segments: 
-          - 1
-          - 3
-          - 1
         version: 1.3.1
 requirements: []
 
 rubyforge_project: neo4j
-rubygems_version: 1.3.6
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: A graph database for JRuby

data/lib/tmp/neo4j/active_tx_log

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