neo4j 1.0.0.beta.16 → 1.0.0.beta.17

data/CONTRIBUTORS

@@ -2,6 +2,7 @@ Maintainer:
   Andreas Ronge <andreas dot ronge at gmail dot com>
 
 Contributors:
+* Ben Jackson
 * Martin Kleppmann
 * Peter Neubauer
 * Jan-Felix Wittmann

data/Gemfile

@@ -10,3 +10,7 @@ group 'test' do
   gem "rspec", ">= 2.0.0"
   gem "rspec-rails-matchers", ">= 0.2.1"
 end
+
+gem 'ruby-debug-base19' if RUBY_VERSION.include? "1.9"
+gem 'ruby-debug-base' if RUBY_VERSION.include? "1.8"
+gem "ruby-debug-ide"

data/README.rdoc

@@ -76,15 +76,15 @@ Example of using Neo4j with Rails 3 (ActiveModel)
 
     email_regex = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
 
-    validates :email, :presence => true,:format   => { :with => email_regex }
-    validates :email, :uniqueness => true, :unless => :pending_account?
-    accepts_nested_attributes_for :avatar, :allow_destroy => true
-
     property :email
     index :email
 
     has_one(:avatar).to(Avator)
 
+    validates :email, :presence => true,:format   => { :with => email_regex }
+    validates :email, :uniqueness => true, :unless => :pending_account?
+    accepts_nested_attributes_for :avatar, :allow_destroy => true
+
     ...
   end
 

data/lib/neo4j.rb

@@ -5,10 +5,11 @@ require 'forwardable'
 require 'time'
 require 'date'
 
-require 'neo4j/jars/neo4j-kernel-1.1.1.jar'
+require 'neo4j/jars/neo4j-index-1.2-1.2.M02.jar'
+require 'neo4j/jars/neo4j-kernel-1.2-1.2.M02.jar'
+require 'neo4j/jars/neo4j-lucene-index-0.2-1.2.M02.jar'
 require 'neo4j/jars/geronimo-jta_1.1_spec-1.1.1.jar'
 require 'neo4j/jars/lucene-core-3.0.1.jar'
-require 'neo4j/jars/neo4j-lucene-index-0.1-20101002.153213-102.jar'
 require 'neo4j/to_java'
 require 'neo4j/version'
 require 'neo4j/equal'

data/lib/neo4j/config.rb

@@ -17,8 +17,8 @@ module Neo4j
         @defaults ||= {
           :storage_path => 'tmp/neo4j',
           :lucene => {
-                  :fulltext => org.neo4j.index.impl.lucene.LuceneIndexProvider::FULLTEXT_CONFIG,
-                  :exact => org.neo4j.index.impl.lucene.LuceneIndexProvider::EXACT_CONFIG}
+                  :fulltext =>  {"provider" => "lucene", "type" => "fulltext" },
+                  :exact =>  {"provider" => "lucene", "type" => "exact" }}
         }
       end
 

data/lib/neo4j/database.rb

@@ -9,7 +9,7 @@ module Neo4j
 
     def start
       @graph = org.neo4j.kernel.EmbeddedGraphDatabase.new(Config[:storage_path])
-      @lucene = org.neo4j.index.impl.lucene.LuceneIndexProvider.new(@graph)
+      @lucene =  @graph.index #org.neo4j.index.impl.lucene.LuceneIndexProvider.new
       @graph.register_transaction_event_handler(@event_handler)
       @running = true
       @event_handler.neo4j_started(self)
@@ -18,12 +18,6 @@ module Neo4j
 
     def shutdown
       if @running
-        # since we might keep a reference to indexes we must clear them so
-        # that we can start neo4j with a fresh new lucene indexes
-        Neo4j::Transaction.run do
-          Neo4j::Index::IndexerRegistry.clear_all_indexes
-        end
-
         @graph.unregister_transaction_event_handler(@event_handler)
         @event_handler.neo4j_shutdown(self)
         @graph.shutdown

data/lib/neo4j/index/class_methods.rb

@@ -18,7 +18,7 @@ module Neo4j
       # :singleton-method: find
 
 
-      def_delegators :@_indexer, :index, :find, :index?, :index_type?, :clear_index_type, :rm_index_type, :add_index, :rm_index, :index_type_for, :index_name
+      def_delegators :@_indexer, :index, :find, :index?, :index_type?, :delete_index_type, :rm_field_type, :add_index, :rm_index, :index_type_for, :index_name
 
 
       # Sets which indexer should be used for the given node class.

data/lib/neo4j/index/index_registry.rb

@@ -3,14 +3,14 @@ module Neo4j
     class IndexerRegistry #:nodoc:
       class << self
 
-        def clear_all_indexes
-          @@indexers.values.each {|i| i.clear_index_type}
+        def delete_all_indexes
+          @@indexers.values.each {|i| i.delete_index_type}
         end
 
         def create_for(this_clazz, using_other_clazz, type)
-          @@indexers ||= {}
-	  index = Indexer.new(this_clazz, type)
-	  index.inherit_fields_from(@@indexers[using_other_clazz.to_s])
+          @@indexers                  ||= {}
+          index                       = Indexer.new(this_clazz, type)
+          index.inherit_fields_from(@@indexers[using_other_clazz.to_s])
           @@indexers[this_clazz.to_s] = index
         end
 

data/lib/neo4j/index/indexer.rb

@@ -156,12 +156,14 @@ module Neo4j
       end
 
       # clears the index, if no type is provided clear all types of indexes
-      def clear_index_type(type=nil)
+      def delete_index_type(type=nil)
         if type
           #raise "can't clear index of type '#{type}' since it does not exist ([#{@field_types.values.join(',')}] exists)" unless index_type?(type)
-          @indexes[type] && @indexes[type].clear
+          @indexes[type] && @indexes[type].delete
+          @indexes[type] = nil
         else
-          @indexes.each_value { |index| index.clear }
+          @indexes.each_value { |index| index.delete }
+          @indexes.clear
         end
       end
 
@@ -171,7 +173,7 @@ module Neo4j
         @indexes.clear
       end
 
-      def rm_index_type(type=nil)
+      def rm_field_type(type=nil)
         if type
           @field_types.delete_if { |k, v| v == type }
         else
@@ -198,9 +200,9 @@ module Neo4j
         db=Neo4j.started_db
         index_config = lucene_config(type)
         if @type == :node
-          db.lucene.node_index("#{@indexer_for}-#{type}", index_config)
+          db.lucene.for_nodes("#{@indexer_for}-#{type}", index_config)
         else
-          db.lucene.relationship_index("#{@indexer_for}-#{type}", index_config)
+          db.lucene.for_relationships("#{@indexer_for}-#{type}", index_config)
         end
       end
 

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "1.0.0.beta.16"
+  VERSION = "1.0.0.beta.17"
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
     - 0
     - 0
     - beta
-    - 16
-  version: 1.0.0.beta.16
+    - 17
+  version: 1.0.0.beta.17
 platform: ruby
 authors: 
   - Andreas Ronge
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-28 00:00:00 +02:00
+date: 2010-11-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -86,8 +86,9 @@ files:
   - lib/neo4j/rails/validations/uniqueness.rb
   - lib/neo4j/jars/lucene-core-3.0.1.jar
   - lib/neo4j/jars/geronimo-jta_1.1_spec-1.1.1.jar
-  - lib/neo4j/jars/neo4j-kernel-1.1.1.jar
-  - lib/neo4j/jars/neo4j-lucene-index-0.1-20101002.153213-102.jar
+  - lib/neo4j/jars/neo4j-lucene-index-0.2-1.2.M02.jar
+  - lib/neo4j/jars/neo4j-kernel-1.2-1.2.M02.jar
+  - lib/neo4j/jars/neo4j-index-1.2-1.2.M02.jar
   - lib/neo4j/mapping/decl_relationship_dsl.rb
   - lib/neo4j/mapping/node_mixin.rb
   - lib/neo4j/mapping/has_n.rb