neo4j 1.2.6-java → 2.0.0.alpha.3-java

data/lib/neo4j/to_java.rb

@@ -22,5 +22,10 @@ module Neo4j
         else raise "unknown direction '#{dir}', expects :outgoing, :incoming or :both"
       end
     end
+
+    def ensure_valid_props(hash)
+      hash ||= {}
+      Hash[ hash.each_pair.map{|k,v| [k.to_s, v]} ]
+    end
   end
 end

data/lib/neo4j/traversal/traverser.rb

@@ -31,7 +31,6 @@ module Neo4j
     class Traverser
       include Enumerable
       include ToJava
-      include Neo4j::Paginate
 
 
       def initialize(from, type = nil, dir=nil)
@@ -46,6 +45,44 @@ module Neo4j
         end
       end
 
+
+      # Sets traversing depth first.
+      #
+      # The <tt>pre_or_post</tt> parameter parameter can have two values: :pre or :post
+      # * :pre - Traversing depth first, visiting each node before visiting its child nodes (default)
+      # * :post -  Traversing depth first, visiting each node after visiting its child nodes.
+      #
+      def depth_first(pre_or_post = :pre)
+        case pre_or_post
+          when :pre then @td = @td.order(org.neo4j.kernel.Traversal.preorderDepthFirst())
+          when :post then @td = @td.order(org.neo4j.kernel.Traversal.postorderDepthFirst())
+          else raise "Unknown type #{pre_or_post}, should be :pre or :post"
+        end
+        self
+      end
+
+
+      # Sets traversing breadth first (default).
+      #
+      # This is the default ordering if none is defined.
+      # The <tt>pre_or_post</tt> parameter parameter can have two values: :pre or :post
+      # * :pre - Traversing breadth first, visiting each node before visiting its child nodes (default)
+      # * :post - Traversing breadth first, visiting each node after visiting its child nodes.
+      #
+      #	==== Note
+      # Please note that breadth first traversals have a higher memory overhead than depth first traversals.
+      # BranchSelectors carries state and hence needs to be uniquely instantiated for each traversal. Therefore it is supplied to the TraversalDescription through a BranchOrderingPolicy interface, which is a factory of BranchSelector instances.
+      #
+      def breadth_first(pre_or_post = :pre)
+        case pre_or_post
+          when :pre then @td = @td.order(org.neo4j.kernel.Traversal.preorderBreadthFirst())
+          when :post then @td = @td.order(org.neo4j.kernel.Traversal.postorderBreadthFirst())
+          else raise "Unknown type #{pre_or_post}, should be :pre or :post"
+        end
+        self
+      end
+
+
       def eval_paths(&eval_path_block)
         @td = @td.evaluator(Evaluator.new(&eval_path_block))
         self

data/lib/neo4j/type_converters/type_converters.rb

@@ -59,28 +59,72 @@ module Neo4j
         end
 
         def to_java(value)
+          return nil if value.nil?
           !!value && value != '0'
         end
 
         def to_ruby(value)
+          return nil if value.nil?
           !!value && value != '0'
         end
       end
     end
 
+    class SymbolConverter
+      class << self
+
+        def convert?(class_or_symbol)
+          :symbol == class_or_symbol || Symbol == class_or_symbol
+        end
+
+        def to_java(value)
+          return nil if value.nil?
+          value.to_s
+        end
+
+        def to_ruby(value)
+          return nil if value.nil?
+          value.to_sym
+        end
+      end
+    end
+
+
+    class StringConverter
+      class << self
+
+        def convert?(class_or_symbol)
+          [String, :string, :text].include? class_or_symbol
+        end
+
+        def to_java(value)
+          return nil if value.nil?
+          value.to_s
+        end
+
+        def to_ruby(value)
+          return nil if value.nil?
+          value.to_s
+        end
+      end
+    end
+
+
 
     class FixnumConverter
       class << self
 
         def convert?(class_or_symbol)
-          Fixnum == class_or_symbol || :fixnum == class_or_symbol
+          Fixnum == class_or_symbol || :fixnum == class_or_symbol || :numeric == class_or_symbol
         end
 
         def to_java(value)
+          return nil if value.nil?
           value.to_i
         end
 
         def to_ruby(value)
+          return nil if value.nil?
           value.to_i
         end
       end
@@ -94,10 +138,12 @@ module Neo4j
         end
 
         def to_java(value)
+          return nil if value.nil?
           value.to_f
         end
 
         def to_ruby(value)
+          return nil if value.nil?
           value.to_f
         end
       end
@@ -184,7 +230,10 @@ module Neo4j
       end
       
       # Always returns a converter that handles to_ruby or to_java
-      def converter(type = nil)
+      # if +enforce_type+ is set to false then it will raise in case of unknown type
+      # otherwise it will return the DevaultConverter.
+      def converter(type = nil, enforce_type = true)
+        return DefaultConverter unless type
         @converters ||= begin
           Neo4j::TypeConverters.constants.find_all do |c|
             Neo4j::TypeConverters.const_get(c).respond_to?(:convert?)
@@ -192,14 +241,16 @@ module Neo4j
             Neo4j::TypeConverters.const_get(c)
           end
         end
-        (type && @converters.find { |c| c.convert?(type) }) || DefaultConverter
+        found = @converters.find {|c| c.convert?(type) }
+        raise "The type #{type.inspect} is unknown. Use one of #{@converters.map{|c| c.name.demodulize.sub('Converter','') }.join(", ")} or create a custom type converter." if !found && enforce_type
+        found or DefaultConverter
       end
 
       # Converts the given value to a Java type by using the registered converters.
       # It just looks at the class of the given value unless an attribute name is given.
       # It will convert it if there is a converter registered (in Neo4j::Config) for this value.
-      def convert(value, attribute = nil, klass = nil)
-        converter(attribute_type(value, attribute, klass)).to_java(value)
+      def convert(value, attribute = nil, klass = nil, enforce_type = true)
+        converter(attribute_type(value, attribute, klass), enforce_type).to_java(value)
       end
 
       # Converts the given property (key, value) to Java if there is a type converter for given type.

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "1.2.6"
+  VERSION = "2.0.0.alpha.3"
 end

data/lib/neo4j.rb

@@ -10,56 +10,9 @@ require 'active_support/core_ext/class/inheritable_attributes'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_model'
 
-require 'will_paginate/collection'
-require 'will_paginate/finders/base'
-
 # core extensions
 require 'neo4j/core_ext/class/inheritable_attributes'
 
-# Jars
-
-require 'neo4j/jars/core/geronimo-jta_1.1_spec-1.1.1.jar'
-require 'neo4j/jars/core/lucene-core-3.1.0.jar'
-require 'neo4j/jars/core/neo4j-lucene-index-1.4.1.jar'
-require 'neo4j/jars/core/neo4j-kernel-1.4.1.jar'
-require 'neo4j/jars/ha/neo4j-management-1.4.1.jar'
-require 'neo4j/jars/ha/neo4j-jmx-1.4.1.jar'
-
-module Neo4j
-
-  def self.load_local_jars
-    # This is a temporary fix since the HA does not yet work with this JAR
-    # It will be solved in a future version of the Java Neo4j library.
-    if Neo4j.config[:online_backup_enabled]
-      Neo4j.load_online_backup
-    else
-      # backup and HA does not work with this JAR FILE
-      require 'neo4j/jars/core/neo4j-index-1.3-1.3.M01.jar'
-    end
-  end
-
-  def self.load_shell_jars
-    require 'neo4j/jars/ha/neo4j-shell-1.4.1.jar'
-  end
-
-  def self.load_online_backup
-    require 'neo4j/jars/ha/neo4j-com-1.4.1.jar'
-    require 'neo4j/jars/core/neo4j-backup-1.4.1.jar'
-    require 'neo4j/jars/ha/netty-3.2.1.Final.jar'
-    Neo4j.send(:const_set, :OnlineBackup, org.neo4j.backup.OnlineBackup)
-  end
-
-  def self.load_ha_jars
-    require 'neo4j/jars/core/neo4j-backup-1.4.1.jar'
-    require 'neo4j/jars/ha/log4j-1.2.16.jar'
-    require 'neo4j/jars/ha/neo4j-ha-1.4.1.jar'
-    require 'neo4j/jars/ha/neo4j-com-1.4.1.jar'
-    require 'neo4j/jars/ha/netty-3.2.1.Final.jar'
-    require 'neo4j/jars/ha/org.apache.servicemix.bundles.jline-0.9.94_1.jar'
-    # require 'neo4j/jars/ha/org.apache.servicemix.bundles.lucene-3.0.1_2.jar' # TODO IS THIS NEEDED ?
-    require 'neo4j/jars/ha/zookeeper-3.3.2.jar'
-  end
-end
 
 module Neo4j
   include Java
@@ -68,9 +21,10 @@ module Neo4j
   Enumerator = Enumerable::Enumerator unless defined? Enumerator
 end
 
+require 'neo4j-community'
 require 'neo4j/version'
 require 'neo4j/neo4j'
-require 'neo4j/paginate'
+require 'neo4j/paginated'
 require 'neo4j/node'
 require 'neo4j/relationship'
 require 'neo4j/relationship_set'
@@ -105,4 +59,4 @@ require 'neo4j/batch/batch'
 
 require 'orm_adapter/adapters/neo4j'
 
-require 'neo4j/identity_map'
+require 'neo4j/identity_map'

data/neo4j.gemspec

@@ -24,13 +24,13 @@ It comes included with the Apache Lucene document database.
 
   s.require_path = 'lib'
   s.files = Dir.glob("{bin,lib,config}/**/*") + %w(README.rdoc CHANGELOG CONTRIBUTORS Gemfile neo4j.gemspec)
-  s.executables = ['neo4j-shell', 'neo4j-jars']
+  s.executables = ['neo4j-shell', 'neo4j-jars', 'neo4j-upgrade']
   s.has_rdoc = true
   s.extra_rdoc_files = %w( README.rdoc )
   s.rdoc_options = ["--quiet", "--title", "Neo4j.rb", "--line-numbers", "--main", "README.rdoc", "--inline-source"]
 
   s.add_dependency('orm_adapter', ">= 0.0.3")
   s.add_dependency("activemodel", ">= 3.0.0")
-  s.add_dependency("will_paginate", ["3.0.pre4"])  # should be ~>3.0 but it's API has changed '
   s.add_dependency("railties", ">= 3.0.0")
+  s.add_dependency("neo4j-community", "1.6.0.alpha.6")
 end