neo4j 1.0.0.beta.2 → 1.0.0.beta.3

data/lib/neo4j/database.rb

@@ -8,18 +8,21 @@ module Neo4j
 
 
     def start
-      @running = true
       @graph = org.neo4j.kernel.EmbeddedGraphDatabase.new(Config[:storage_path])
       @lucene = org.neo4j.index.impl.lucene.LuceneIndexProvider.new(@graph)
       @graph.register_transaction_event_handler(@event_handler)
+      @running = true
       @event_handler.neo4j_started(self)
+      at_exit { shutdown }
     end
 
     def shutdown
-      @running = false
-      @graph.unregister_transaction_event_handler(@event_handler)
-      @event_handler.neo4j_shutdown(self)
+      if @running
+        @graph.unregister_transaction_event_handler(@event_handler)
+        @event_handler.neo4j_shutdown(self)
+      end
       @graph.shutdown
+      @running = false
     end
 
     def running?

data/lib/neo4j/index.rb

@@ -56,9 +56,29 @@ module Neo4j
       end
 
       def hits
-        @hits ||= @index.query(@query)
+        @hits ||= perform_query
       end
 
+      def desc(*fields)
+        @order = fields.inject(@order || {}){|memo, field| memo[field] = true; memo}
+        self
+      end
+
+      def asc(*fields)
+        @order = fields.inject(@order || {}){|memo, field| memo[field] = false; memo}
+        self
+      end
+
+      def perform_query
+        if @order
+          java_sort_fields = @order.keys.inject([]) do |memo, field|
+            memo << org.apache.lucene.search.SortField.new(field.to_s, org.apache.lucene.search.SortField::STRING, @order[field])
+          end
+          sort = org.apache.lucene.search.Sort.new(*java_sort_fields)
+          @query = org.neo4j.index.impl.lucene.QueryContext.new(@query).sort(sort)
+        end
+        @index.query(@query)
+      end
     end
 
     class Indexer

data/lib/neo4j/version.rb

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

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
     - 0
     - 0
     - beta
-    - 2
-  version: 1.0.0.beta.2
+    - 3
+  version: 1.0.0.beta.3
 platform: ruby
 authors: 
   - Andreas Ronge
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 +02:00
+date: 2010-09-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency