neo4j 1.0.0.beta.22-java → 1.0.0.beta.23-java

data/lib/neo4j.rb

@@ -11,6 +11,8 @@ require 'neo4j/jars/neo4j-lucene-index-0.2-1.2.M04.jar'
 require 'neo4j/jars/geronimo-jta_1.1_spec-1.1.1.jar'
 require 'neo4j/jars/lucene-core-3.0.2.jar'
 
+require 'will_paginate/collection'
+require 'will_paginate/finders/base'
 require 'neo4j/to_java'
 require 'neo4j/version'
 require 'neo4j/equal'

data/lib/neo4j/index/class_methods.rb

@@ -5,6 +5,22 @@ module Neo4j
 
       extend Forwardable
 
+      def wp_query(options, pager, args, &block) #:nodoc:
+        params            = {} 
+        params[:page]     = pager.current_page
+        params[:per_page] = pager.per_page
+        query               = if args.empty?
+                              find(options, params, &block)
+                            else
+                              args << params.merge(options)
+                              find(*args, &block)
+                            end
+
+        pager.replace [*query]
+        pager.total_entries = query.size
+      end
+
+
       ##
       # See Neo4j::Index::Indexer#index
       # Forwards to the indexer that should be used.

data/lib/neo4j/index/indexer.rb

@@ -90,7 +90,6 @@ module Neo4j
           conf.delete :via # avoid endless recursion
           via_indexer.index(field, conf)
         else
-#          raise "Already defined an (via?) index on #{field}, Using the same index for from two classes ? Check index :#{field}, :via => :#{@indexer_for}" if @field_types[field.to_s]
           @field_types[field.to_s] = conf[:type] || :exact
         end
       end
@@ -238,7 +237,12 @@ module Neo4j
         @decl_props ||= @indexer_for.respond_to?(:_decl_props) && @indexer_for._decl_props
 
         index = index_for_type(params[:type] || :exact)
-        query = (params[:wrapped].nil? || params[:wrapped]) ? LuceneQuery.new(index, @decl_props, query) : index.query(query)
+        if query.is_a?(Hash) && (query.include?(:conditions) || query.include?(:sort))
+          params.merge! query.except(:conditions)
+          query.delete(:sort)
+          query = query.delete(:conditions) if query.include?(:conditions)
+        end
+        query = (params[:wrapped].nil? || params[:wrapped]) ? LuceneQuery.new(index, @decl_props, query, params) : index.query(query)
 
         if block_given?
           begin

data/lib/neo4j/index/lucene_query.rb

@@ -37,17 +37,45 @@ module Neo4j
     #
     class LuceneQuery
       include Enumerable
+      include WillPaginate::Finders::Base
       attr_accessor :left_and_query, :left_or_query
-      
-      def initialize(index, decl_props, query)
-        @index = index
-        @query = query
+
+      def initialize(index, decl_props, query, params={})
+        @index      = index
+        @query      = query
         @decl_props = decl_props
+        @params     = params
+
+        if params.include?(:sort)
+          @order = {}
+          params[:sort].each_pair { |k, v| @order[k] = (v == :desc) }
+        end
+      end
+
+      def wp_query(options, pager, args, &block) #:nodoc:
+        @params[:page]     = pager.current_page
+        @params[:per_page] = pager.per_page
+        pager.replace [*self]
+        pager.total_entries = size
       end
 
       # Since we include the Ruby Enumerable mixin we need this method.
       def each
-        hits.each { |n| yield n.wrapper }
+        if @params.include?(:per_page)
+          # paginate the result, used by the will_paginate gem
+          page     = @params[:page] || 1
+          per_page = @params[:per_page]
+          to       = per_page * page
+          from     = to - per_page
+          i        = 0
+          hits.each do |node|
+            yield node.wrapper if i >= from
+            i += 1
+            break if i >= to
+          end
+        else
+          hits.each { |n| yield n.wrapper }
+        end
       end
 
       # Close hits
@@ -71,7 +99,7 @@ module Neo4j
       # Does simply loop all search items till the n'th is found.
       #
       def [](index)
-        each_with_index {|node,i| break node if index == i}
+        each_with_index { |node, i| break node if index == i }
       end
 
       # Returns the number of search hits
@@ -90,25 +118,30 @@ module Neo4j
         raise "Expected a symbol. Syntax for range queries example: index(:weight).between(a,b)" unless Symbol === @query
         raise "Can't only do range queries on Neo4j::NodeMixin, Neo4j::Model, Neo4j::RelationshipMixin" unless @decl_props
         # check that we perform a range query on the same values as we have declared with the property :key, :type => ...
-        type   = @decl_props[@query] && @decl_props[@query][:type]
+        type = @decl_props[@query] && @decl_props[@query][:type]
         raise "find(#{@query}).between(#{lower}, #{upper}): #{lower} not a #{type}" if type && !type === lower.class
         raise "find(#{@query}).between(#{lower}, #{upper}): #{upper} not a #{type}" if type && !type === upper.class
 
         # Make it possible to convert those values
-        lower  = TypeConverters.convert(lower)
-        upper  = TypeConverters.convert(upper)
-
-        @query = case lower
-                   when Fixnum
-                     org.apache.lucene.search.NumericRangeQuery.new_long_range(@query.to_s, lower, upper, lower_incusive, upper_inclusive)
-                   when Float
-                     org.apache.lucene.search.NumericRangeQuery.new_double_range(@query.to_s, lower, upper, lower_incusive, upper_inclusive)
-                   else
-                     org.apache.lucene.search.TermRangeQuery.new(@query.to_s, lower, upper, lower_incusive, upper_inclusive)
-                 end
+        @query = range_query(@query, lower, upper, lower_incusive, upper_inclusive)
         self
       end
 
+      def range_query(field, lower, upper, lower_incusive, upper_inclusive)
+        lower = TypeConverters.convert(lower)
+        upper = TypeConverters.convert(upper)
+
+        case lower
+          when Fixnum
+            org.apache.lucene.search.NumericRangeQuery.new_long_range(field.to_s, lower, upper, lower_incusive, upper_inclusive)
+          when Float
+            org.apache.lucene.search.NumericRangeQuery.new_double_range(field.to_s, lower, upper, lower_incusive, upper_inclusive)
+          else
+            org.apache.lucene.search.TermRangeQuery.new(field.to_s, lower, upper, lower_incusive, upper_inclusive)
+        end
+      end
+
+
       # Create a compound lucene query.
       #
       # ==== Parameters
@@ -119,7 +152,7 @@ module Neo4j
       #  Person.find(:name=>'kalle').and(:age => 3)
       #
       def and(query2)
-        new_query = LuceneQuery.new(@index, @decl_props, query2)
+        new_query                = LuceneQuery.new(@index, @decl_props, query2)
         new_query.left_and_query = self
         new_query
       end
@@ -145,7 +178,7 @@ module Neo4j
         and_query
       end
 
-      def build_sort_query(query)  #:nodoc:
+      def build_sort_query(query) #:nodoc:
         java_sort_fields = @order.keys.inject([]) do |memo, field|
           decl_type = @decl_props && @decl_props[field] && @decl_props[field][:type]
           type      = case
@@ -162,19 +195,28 @@ module Neo4j
         org.neo4j.index.impl.lucene.QueryContext.new(query).sort(sort)
       end
 
-      def build_hash_query(query)  #:nodoc:
-        and_query  = org.apache.lucene.search.BooleanQuery.new
+      def build_hash_query(query) #:nodoc:
+        and_query = org.apache.lucene.search.BooleanQuery.new
 
         query.each_pair do |key, value|
-          raise "Only String values valid in find(hash) got :#{key} => #{value} which is not a String" if !value.is_a?(String) && @decl_props[key] && @decl_props[key][:type] != String
-          term = org.apache.lucene.index.Term.new(key.to_s, value.to_s)
-          term_query = org.apache.lucene.search.TermQuery.new(term)
-          and_query.add(term_query, org.apache.lucene.search.BooleanClause::Occur::MUST)
+          type = @decl_props[key.to_sym] && @decl_props[key.to_sym][:type]
+          if !type.nil? && type != String
+            if Range === value
+              and_query.add(range_query(key, value.first, value.last, true, !value.exclude_end?), org.apache.lucene.search.BooleanClause::Occur::MUST)
+            else
+              and_query.add(range_query(key, value, value, true, true), org.apache.lucene.search.BooleanClause::Occur::MUST)
+            end
+          else
+            conv_value = type ? TypeConverters.convert(value) : value.to_s
+            term       = org.apache.lucene.index.Term.new(key.to_s, conv_value)
+            term_query = org.apache.lucene.search.TermQuery.new(term)
+            and_query.add(term_query, org.apache.lucene.search.BooleanClause::Occur::MUST)
+          end
         end
         and_query
       end
-      
-      def build_query  #:nodoc:
+
+      def build_query #:nodoc:
         query = @query
         query = build_hash_query(query) if Hash === query
         query = build_and_query(query) if @left_and_query
@@ -182,7 +224,7 @@ module Neo4j
         query
       end
 
-      def perform_query  #:nodoc:
+      def perform_query #:nodoc:
         @index.query(build_query)
       end
     end

data/lib/neo4j/mapping/decl_relationship_dsl.rb

@@ -51,11 +51,11 @@ module Neo4j::Mapping
       @has_one
     end
 
-    def each_node(node, direction, &block) #:nodoc:
+    def each_node(node, direction, raw = false, &block) #:nodoc:
       type = type_to_java(rel_type)
       dir  = dir_to_java(direction)
       node._java_node.getRelationships(type, dir).each do |rel|
-        other = rel.getOtherNode(node).wrapper
+        other = raw ? rel.getOtherNode(node) : rel.getOtherNode(node).wrapper
         block.call other
       end
     end

data/lib/neo4j/mapping/has_list.rb

@@ -34,6 +34,8 @@ module Neo4j
     class HasList
       include Enumerable
       include ToJava
+      include WillPaginate::Finders::Base
+      
 
       def initialize(node, name)
         @time_line = org.neo4j.index.timeline.Timeline.new(name, node._java_node, true, Neo4j.started_db.graph)
@@ -102,12 +104,29 @@ module Neo4j
       #  person.feeds.each {|node| node}
       #
       def each
-        @time_line.all_nodes.iterator.each { |node|
+        @time_line.all_nodes.iterator.each do |node|
           if @raw then
             yield node
           else
             yield node.wrapper
-          end }
+          end
+        end
+      end
+
+      def wp_query(options, pager, args, &block) #:nodoc:
+        @raw = true
+        page = pager.current_page || 1
+        to   = pager.per_page * page
+        from = to - pager.per_page
+        i    = 0
+        res  = []
+        each do |node|
+          res << node.wrapper if i >= from
+          i += 1
+          break if i >= to
+        end
+        pager.replace res
+        pager.total_entries ||= size
       end
 
       # If called then it will only return the raw java nodes and not the Ruby wrappers using the Neo4j::NodeMixin

data/lib/neo4j/mapping/has_n.rb

@@ -12,6 +12,8 @@ module Neo4j
     #
     class HasN
       include Enumerable
+      include WillPaginate::Finders::Base
+      
       include ToJava
 
       def initialize(node, dsl) # :nodoc:
@@ -46,6 +48,25 @@ module Neo4j
         @dsl.each_node(@node, @direction, &block)
       end
 
+      # returns none wrapped nodes, you may get better performance using this method
+      def _each(&block)
+        @dsl.each_node(@node, @direction, true, &block)
+      end
+
+      def wp_query(options, pager, args, &block) #:nodoc:
+         page     = pager.current_page || 1
+         to       = pager.per_page * page
+         from     = to - pager.per_page
+         i        = 0
+         res      = []
+         _each do |node|
+           res << node.wrapper if i >= from
+           i += 1
+           break if i >= to
+         end
+         pager.replace res
+         pager.total_entries ||= self.size  # TODO, this could be very slow to do
+       end
 
       # Returns true if there are no node in this type of relationship
       def empty?

data/lib/neo4j/mapping/node_mixin.rb

@@ -95,6 +95,7 @@ module Neo4j::Mapping
       c.extend ClassMethods::Rule
       c.extend ClassMethods::List
       c.extend Neo4j::Index::ClassMethods
+      c.extend WillPaginate::Finders::Base
 
       def c.inherited(subclass)
         # inherit the index properties

data/lib/neo4j/node_traverser.rb

@@ -37,6 +37,8 @@ module Neo4j
   class NodeTraverser
     include Enumerable
     include ToJava
+    include WillPaginate::Finders::Base
+
 
     def initialize(from, type = nil, dir=nil)
       @from  = from
@@ -55,6 +57,23 @@ module Neo4j
       "NodeTraverser [from: #{@from.neo_id} depth: #{@depth} type: #{@type} dir:#{@dir}"
     end
 
+
+    def wp_query(options, pager, args, &block) #:nodoc:
+      page     = pager.current_page || 1
+      per_page = pager.per_page
+      to       = per_page * page
+      from     = to - per_page
+      i        = 0
+      res      = []
+      iterator.each do |node|
+        res << node.wrapper if i >= from
+        i += 1
+        break if i >= to
+      end
+      pager.replace res
+      pager.total_entries ||= size  # TODO, this could be very slow to do
+    end
+
     def <<(other_node)
       new(other_node)
       self

data/lib/neo4j/rails/finders.rb

@@ -1,17 +1,17 @@
 module Neo4j
-	module Rails
-		module Finders
-			extend ActiveSupport::Concern
-			
-			included do
-				rule :_all
-			end
-			
-			module ClassMethods
-				# overwrite the index method to add find_by_xxx class methods
-				def index(*args)
-					field = args.first
-					module_eval <<-RUBY, __FILE__, __LINE__
+  module Rails
+    module Finders
+      extend ActiveSupport::Concern
+
+      included do
+        rule :_all
+      end
+
+      module ClassMethods
+        # overwrite the index method to add find_by_xxx class methods
+        def index(*args)
+          field = args.first
+          module_eval <<-RUBY, __FILE__, __LINE__
 						def self.all_by_#{field}(value)
 							find_with_indexer("#{field}: \\"\#{value}\\"")
 						end
@@ -19,13 +19,13 @@ module Neo4j
 						def self.find_by_#{field}(value)
 							all_by_#{field}(value).first
 						end
-					RUBY
-					
-					super
-				end
-				
-				# load an id or array of ids from the database
-				def load(*ids)
+          RUBY
+
+          super
+        end
+
+        # load an id or array of ids from the database
+        def load(*ids)
           result = ids.map { |id| Neo4j::Node.load(id) }
           if ids.length == 1
             result.first
@@ -33,102 +33,103 @@ module Neo4j
             result
           end
         end
-        
-				# Behave like the ActiveRecord query interface
-				
-				# Handle Model.find(params[:id])
-				
-				# Model.find
-				# Model.find(:first)
-				
-				# Model.find("1")
-				# Model.find(1)
-				
-				# Model.find("name: test")
-				# Model.find(:name => "test")
-				
-				# Model.find(:first, "name: test")
-				# Model.find(:first, { :name => "test" })
-				
-				# Model.find(:first, :conditions => "name: test")
-				# Model.find(:first, :conditions => { :name => "test" })
-				
-				# Model.find(:all, "name: test")
-				# Model.find(:all, { :name => "test" })
-				
-				# Model.find(:all, :conditions => "name: test")
-				# Model.find(:all, :conditions => { :name => "test" })
+
+        # Behave like the ActiveRecord query interface
+        #
+        # === Example
+        #
+        #   Handle Model.find(params[:id])
+        #   Model.find
+        #   Model.find(:first)
+        #   Model.find("1")
+        #   Model.find(1)
+        #   Model.find("name: test")
+        #   Model.find(:name => "test")
+        #   Model.find(:first, "name: test")
+        #   Model.find(:first, { :name => "test" })
+        #   Model.find(:first, :conditions => "name: test")
+        #   Model.find(:first, :conditions => { :name => "test" })
+        #   Model.find(:all, "name: test")
+        #   Model.find(:all, { :name => "test" })
+        #   Model.find(:all, :conditions => "name: test")
+        #   Model.find(:all, :conditions => { :name => "test" })
+        #
         def find(*args)
-        	case args.first
-        	when :all, :first
-        		kind = args.shift
-        		send(kind, *args)
-        	else
-        		find_with_ids(*args) or first(*args)
-        	end
+          case args.first
+            when :all, :first
+              kind = args.shift
+              send(kind, *args)
+            else
+              find_with_ids(*args) or first(*args)
+          end
         end
-        
-				def all(*args)
-					args = normalize_args(*args)
-					if args.empty?
-						# use the _all rule to recover all the stored instances of this node
-						_all
-					else
-						# handle the special case of a search by id
-						if args.first.is_a?(Hash) && args.first[:id]
-							[find_with_ids(args.first[:id])].flatten
-						else
-							find_with_indexer(*args)
-						end
-					end
-				end
-				
-				def first(*args)
-					all(*args).first
-				end
-				
-				def last(*args)
-					a = all(*args)
-					a.empty? ? nil : a[a.size - 1]
-				end
-				
-				def count
-					all.size
-				end
-				
-				protected
-				def find_with_ids(*args)
-					if ((args.first.is_a?(String) || args.first.is_a?(Integer)) && args.first.to_i > 0)
-						load(*args.map { |p| p.to_i })
-					end
-				end
-				
-				def find_with_indexer(*args)
-					hits = _indexer.find(*args)
-					# We need to save this so that the Rack Neo4j::Rails:LuceneConnection::Closer can close it
-					Thread.current[:neo4j_lucene_connection] ||= []
-					Thread.current[:neo4j_lucene_connection] << hits
-					hits
-				end
-				
-				def normalize_args(*args)
-					options = args.extract_options!
-					
-					if options.present?
-						
-						# TODO: Handle order
-						options.delete(:order)
-						
-						if options[:conditions]
-							args << options[:conditions] if options[:conditions].present?
-						else
-							args << options if options.present?
-						end
-					end
-					args
-				end
+
+        def all(*args)
+          if !conditions_in?(*args)
+            # use the _all rule to recover all the stored instances of this node
+            _all
+          else
+            # handle the special case of a search by id
+            ids = ids_in(args.first)
+            if ids
+              [find_with_ids(ids)].flatten
+            else
+              find_with_indexer(*args)
+            end
+          end
+        end
+
+        def first(*args)
+          all(*args).first
+        end
+
+        def last(*args)
+          a = all(*args)
+          a.empty? ? nil : a[a.size - 1]
+        end
+
+        def count
+          all.size
+        end
+
+        protected
+
+        def ids_in(arg)
+          return nil unless arg.is_a?(Hash)
+          arg[:conditions].present? ? arg[:conditions][:id] : arg[:id]
+        end
+
+
+        def conditions_in?(*args)
+          return false if args.empty?
+
+          # does it contain an string, which will be treated like a condition ?
+          return true if args.find { |a| a.is_a?(String) }
+
+          # does it contain an empty conditions param ?
+          hash = args.find { |a| a.is_a?(Hash) }
+          return false if hash.include?(:conditions) && hash[:conditions].empty?
+
+          # does it contain only paging or sorting params ?
+          !hash.except(:sort, :page, :per_page).empty?
+        end
+
+        def find_with_ids(*args)
+          if ((args.first.is_a?(String) || args.first.is_a?(Integer)) && args.first.to_i > 0)
+            load(*args.map { |p| p.to_i })
+          end
+        end
+
+        def find_with_indexer(*args)
+          hits                                     = _indexer.find(*args)
+          # We need to save this so that the Rack Neo4j::Rails:LuceneConnection::Closer can close it
+          Thread.current[:neo4j_lucene_connection] ||= []
+          Thread.current[:neo4j_lucene_connection] << hits
+          hits
+        end
+
       end
-		end
-	end
+    end
+  end
 end
 

data/lib/neo4j/version.rb

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

data/lib/tmp/neo4j/messages.log

@@ -132,3 +132,45 @@ Thu Nov 25 14:38:03 CET 2010: Closed log tmp/neo4j/lucene/lucene.log
 Thu Nov 25 14:38:03 CET 2010: NeoStore closed
 Thu Nov 25 14:38:03 CET 2010: Closed log tmp/neo4j/lucene-fulltext/lucene.log
 Thu Nov 25 14:38:03 CET 2010: TM shutting down
+Thu Dec 02 10:15:07 CET 2010: Opened [tmp/neo4j/nioneo_logical.log.1] clean empty log, version=0
+Thu Dec 02 10:15:07 CET 2010: Opened [tmp/neo4j/lucene/lucene.log.1] clean empty log, version=0
+Thu Dec 02 10:15:07 CET 2010: Opened [tmp/neo4j/lucene-fulltext/lucene.log.1] clean empty log, version=0
+Thu Dec 02 10:15:07 CET 2010: Opened [/home/andreas/projects/neo4j/lib/tmp/neo4j/index/lucene.log.1] clean empty log, version=0
+Thu Dec 02 10:15:07 CET 2010: Extension org.neo4j.graphdb.index.IndexProvider[lucene] initialized ok
+Thu Dec 02 10:15:07 CET 2010: TM opening log: tmp/neo4j/tm_tx_log.1
+Thu Dec 02 10:15:07 CET 2010: --- CONFIGURATION START ---
+Thu Dec 02 10:15:07 CET 2010: Physical mem: 4017MB, Heap size: 483MB
+Thu Dec 02 10:15:07 CET 2010: Kernel version: Neo4j - Graph Database Kernel 1.2-1.2.M04
+Thu Dec 02 10:15:07 CET 2010: Operating System: Linux; version: 2.6.32-26-generic-pae; arch: i386
+Thu Dec 02 10:15:07 CET 2010: VM Name: Java HotSpot(TM) Client VM
+Thu Dec 02 10:15:07 CET 2010: VM Vendor: Sun Microsystems Inc.
+Thu Dec 02 10:15:07 CET 2010: VM Version: 17.1-b03
+Thu Dec 02 10:15:07 CET 2010: Boot Class Path: /usr/lib/jvm/java-6-sun-1.6.0.22/jre/lib/resources.jar:/usr/lib/jvm/java-6-sun-1.6.0.22/jre/lib/rt.jar:/usr/lib/jvm/java-6-sun-1.6.0.22/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-6-sun-1.6.0.22/jre/lib/jsse.jar:/usr/lib/jvm/java-6-sun-1.6.0.22/jre/lib/jce.jar:/usr/lib/jvm/java-6-sun-1.6.0.22/jre/lib/charsets.jar:/usr/lib/jvm/java-6-sun-1.6.0.22/jre/classes:/home/andreas/.rvm/rubies/jruby-1.5.5/lib/jruby.jar
+Thu Dec 02 10:15:07 CET 2010: Class Path: :
+Thu Dec 02 10:15:07 CET 2010: Library Path: /usr/lib/jvm/java-6-sun-1.6.0.22/jre/lib/i386/client:/usr/lib/jvm/java-6-sun-1.6.0.22/jre/lib/i386:/usr/lib/jvm/java-6-sun-1.6.0.22/jre/../lib/i386:/usr/java/packages/lib/i386:/lib:/usr/lib
+Thu Dec 02 10:15:07 CET 2010: Garbage Collector: Copy: [Eden Space, Survivor Space]
+Thu Dec 02 10:15:07 CET 2010: Garbage Collector: MarkSweepCompact: [Eden Space, Survivor Space, Tenured Gen, Perm Gen, Perm Gen [shared-ro], Perm Gen [shared-rw]]
+Thu Dec 02 10:15:07 CET 2010: VM Arguments: [-Djruby.memory.max=500m, -Djruby.stack.max=1024k, -Xmx500m, -Xss1024k, -Djffi.boot.library.path=/home/andreas/.rvm/rubies/jruby-1.5.5/lib/native/i386-Linux:/home/andreas/.rvm/rubies/jruby-1.5.5/lib/native/ppc-Linux:/home/andreas/.rvm/rubies/jruby-1.5.5/lib/native/x86_64-Linux, -Xbootclasspath/a:/home/andreas/.rvm/rubies/jruby-1.5.5/lib/jruby.jar, -Djruby.home=/home/andreas/.rvm/rubies/jruby-1.5.5, -Djruby.lib=/home/andreas/.rvm/rubies/jruby-1.5.5/lib, -Djruby.script=jruby, -Djruby.shell=/bin/sh]
+Thu Dec 02 10:15:07 CET 2010: 
+Thu Dec 02 10:15:07 CET 2010: create=true
+Thu Dec 02 10:15:07 CET 2010: dir=tmp/neo4j/lucene-fulltext
+Thu Dec 02 10:15:07 CET 2010: logical_log=tmp/neo4j/nioneo_logical.log
+Thu Dec 02 10:15:07 CET 2010: neo_store=tmp/neo4j/neostore
+Thu Dec 02 10:15:07 CET 2010: neostore.nodestore.db.mapped_memory=20M
+Thu Dec 02 10:15:07 CET 2010: neostore.propertystore.db.arrays.mapped_memory=130M
+Thu Dec 02 10:15:07 CET 2010: neostore.propertystore.db.index.keys.mapped_memory=1M
+Thu Dec 02 10:15:07 CET 2010: neostore.propertystore.db.index.mapped_memory=1M
+Thu Dec 02 10:15:07 CET 2010: neostore.propertystore.db.mapped_memory=90M
+Thu Dec 02 10:15:07 CET 2010: neostore.propertystore.db.strings.mapped_memory=130M
+Thu Dec 02 10:15:07 CET 2010: neostore.relationshipstore.db.mapped_memory=100M
+Thu Dec 02 10:15:07 CET 2010: rebuild_idgenerators_fast=true
+Thu Dec 02 10:15:07 CET 2010: store_dir=tmp/neo4j
+Thu Dec 02 10:15:07 CET 2010: --- CONFIGURATION END ---
+Thu Dec 02 10:15:07 CET 2010: Extension org.neo4j.graphdb.index.IndexProvider[lucene] loaded ok
+Thu Dec 02 11:54:16 CET 2010: Closed log tmp/neo4j/nioneo_logical.log
+Thu Dec 02 11:54:16 CET 2010: NeoStore closed
+Thu Dec 02 11:54:16 CET 2010: Closed log /home/andreas/projects/neo4j/lib/tmp/neo4j/index/lucene.log
+Thu Dec 02 11:54:16 CET 2010: Closed log tmp/neo4j/lucene/lucene.log
+Thu Dec 02 11:54:16 CET 2010: NeoStore closed
+Thu Dec 02 11:54:16 CET 2010: Closed log tmp/neo4j/lucene-fulltext/lucene.log
+Thu Dec 02 11:54:16 CET 2010: TM shutting down

data/neo4j.gemspec

@@ -27,5 +27,6 @@ EOF
   s.required_ruby_version = ">= 1.8.7"
   s.add_dependency('orm_adapter',">= 0.0.3")
   s.add_dependency("activemodel", ">= 3.0.0")
+  s.add_dependency("will_paginate", ["~>3.0.pre"])
   s.add_dependency("railties", ">= 3.0.0")
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
     - 0
     - 0
     - beta
-    - 22
-  version: 1.0.0.beta.22
+    - 23
+  version: 1.0.0.beta.23
 platform: java
 authors: 
   - Andreas Ronge
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-25 00:00:00 +01:00
+date: 2010-12-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -48,9 +48,23 @@ dependencies:
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
-    name: railties
+    name: will_paginate
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 3
+              - 0
+              - pre
+            version: 3.0.pre
+    type: :runtime
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: railties
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
@@ -60,7 +74,7 @@ dependencies:
               - 0
             version: 3.0.0
     type: :runtime
-    version_requirements: *id003
+    version_requirements: *id004
 description: "You can think of Neo4j as a high-performance graph engine with all the features of a mature and robust database.\n\
   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"
@@ -96,6 +110,7 @@ files:
   - 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
@@ -105,6 +120,13 @@ files:
   - 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/Person-exact/segments.gen
+  - lib/tmp/neo4j/index/lucene/node/Person-exact/_1.cfs
+  - lib/tmp/neo4j/index/lucene/node/Person-exact/_0.cfs
+  - lib/tmp/neo4j/index/lucene/node/Person-exact/segments_3
+  - lib/tmp/neo4j/index/lucene/node/Thing-exact/segments.gen
+  - lib/tmp/neo4j/index/lucene/node/Thing-exact/segments_2
+  - lib/tmp/neo4j/index/lucene/node/Thing-exact/_0.cfs
   - lib/tmp/neo4j/lucene/lucene-store.db
   - lib/tmp/neo4j/lucene/lucene.log.active
   - lib/neo4j/event_handler.rb