neo4j 1.0.0-java → 1.1.0.beta.1-java

data/lib/neo4j/traversal/traverser.rb

@@ -57,7 +57,7 @@ module Neo4j
           when org.neo4j.graphdb.Direction::OUTGOING
             @from.create_relationship_to(other_node, @type)
           when org.neo4j.graphdb.Direction::INCOMING
-            other_node._java_node.create_relationship_to(@from, @type)
+            other_node.create_relationship_to(@from, @type)
           else
             raise "Only allowed to create outgoing or incoming relationships (not #@dir)"
         end
@@ -149,7 +149,7 @@ module Neo4j
       end
 
       def each
-        iterator.each { |i| yield i.wrapper }
+        @traversal_result == :paths ? iterator.each { |i| yield i } : 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.
@@ -157,6 +157,20 @@ module Neo4j
         iterator.each { |i| yield i }
       end
 
+      # Returns an enumerable of relationships instead of nodes
+      #
+      def rels
+        @traversal_result = :rels
+        self
+      end
+
+      # Returns an enumerable of relationships instead of nodes
+      #
+      def paths
+        @traversal_result = :paths
+        self
+      end
+
       def iterator
         unless @include_start_node
           if @filter_predicate
@@ -166,7 +180,14 @@ module Neo4j
           end
         end
         @td = @td.prune(org.neo4j.kernel.Traversal.pruneAfterDepth(@depth)) unless @depth == :all
-        @td.traverse(@from).nodes
+        if @traversal_result == :rels
+          @td.traverse(@from._java_node).relationships
+        elsif @traversal_result == :paths
+          @td.traverse(@from._java_node).iterator
+        else
+          @td.traverse(@from._java_node).nodes
+        end
+
       end
     end
   end

data/lib/neo4j/type_converters/type_converters.rb

@@ -50,12 +50,65 @@ module Neo4j
       end
     end
 
+
+    class BooleanConverter
+      class << self
+
+        def convert?(class_or_symbol)
+          :boolean == class_or_symbol
+        end
+
+        def to_java(value)
+          !!value && value != '0'
+        end
+
+        def to_ruby(value)
+          !!value && value != '0'
+        end
+      end
+    end
+
+
+    class FixnumConverter
+      class << self
+
+        def convert?(class_or_symbol)
+          Fixnum == class_or_symbol || :fixnum == class_or_symbol
+        end
+
+        def to_java(value)
+          value.to_i
+        end
+
+        def to_ruby(value)
+          value.to_i
+        end
+      end
+    end
+
+    class FloatConverter
+      class << self
+
+        def convert?(clazz_or_symbol)
+          Float == clazz_or_symbol || :float == clazz_or_symbol
+        end
+
+        def to_java(value)
+          value.to_f
+        end
+
+        def to_ruby(value)
+          value.to_f
+        end
+      end
+    end
+
     # Converts Date objects to Java long types. Must be timezone UTC.
     class DateConverter
       class << self
 
-        def convert?(clazz)
-          Date == clazz
+        def convert?(clazz_or_symbol)
+          Date == clazz_or_symbol || :date == clazz_or_symbol
         end
 
         def to_java(value)
@@ -74,8 +127,8 @@ module Neo4j
     class DateTimeConverter
       class << self
 
-        def convert?(clazz)
-          DateTime == clazz
+        def convert?(clazz_or_symbol)
+          DateTime == clazz_or_symbol || :datetime == clazz_or_symbol
         end
 
         # Converts the given DateTime (UTC) value to an Fixnum.
@@ -96,8 +149,8 @@ module Neo4j
     class TimeConverter
       class << self
 
-        def convert?(clazz)
-          Time == clazz
+        def convert?(clazz_or_symbol)
+          Time == clazz_or_symbol || :time == clazz_or_symbol
         end
 
         # Converts the given DateTime (UTC) value to an Fixnum.

data/lib/neo4j/version.rb

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

data/lib/neo4j.rb

@@ -13,9 +13,10 @@ require 'will_paginate/finders/base'
 
 require 'neo4j/jars/core/geronimo-jta_1.1_spec-1.1.1.jar'
 require 'neo4j/jars/core/lucene-core-3.0.3.jar'
-require 'neo4j/jars/core/neo4j-lucene-index-1.3.M03.jar'
-require 'neo4j/jars/core/neo4j-kernel-1.3.M03.jar'
-require 'neo4j/jars/ha/neo4j-management-1.3.M03.jar'
+require 'neo4j/jars/core/neo4j-lucene-index-1.3.jar'
+require 'neo4j/jars/core/neo4j-kernel-1.3.jar'
+require 'neo4j/jars/ha/neo4j-management-1.3.jar'
+require 'neo4j/jars/ha/neo4j-jmx-1.3.jar'
 
 module Neo4j
 
@@ -31,20 +32,21 @@ module Neo4j
   end
 
   def self.load_shell_jars
-    require 'neo4j/jars/ha/neo4j-shell-1.3.M03.jar'
+    require 'neo4j/jars/ha/neo4j-shell-1.3.jar'
   end
 
   def self.load_online_backup
-    require 'neo4j/jars/ha/neo4j-com-1.3.M03.jar'
-    require 'neo4j/jars/core/neo4j-backup-1.3.M03.jar'
+    require 'neo4j/jars/ha/neo4j-com-1.3.jar'
+    require 'neo4j/jars/core/neo4j-backup-1.3.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.3.jar'
     require 'neo4j/jars/ha/log4j-1.2.16.jar'
-    require 'neo4j/jars/ha/neo4j-ha-1.3.M03.jar'
-    require 'neo4j/jars/ha/neo4j-com-1.3.M03.jar'
+    require 'neo4j/jars/ha/neo4j-ha-1.3.jar'
+    require 'neo4j/jars/ha/neo4j-com-1.3.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'

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: neo4j
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.0.0
+  prerelease: 6
+  version: 1.1.0.beta.1
 platform: java
 authors: 
   - Andreas Ronge
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-02 00:00:00 +01:00
+date: 2011-04-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -128,29 +128,34 @@ files:
   - lib/neo4j/rails/timestamps.rb
   - lib/neo4j/rails/callbacks.rb
   - lib/neo4j/rails/tx_methods.rb
+  - lib/neo4j/rails/rel_persistence.rb
   - lib/neo4j/rails/finders.rb
-  - lib/neo4j/rails/relationships/mapper.rb
+  - lib/neo4j/rails/relationship.rb
+  - lib/neo4j/rails/relationships/rels_dsl.rb
+  - lib/neo4j/rails/relationships/node_dsl.rb
   - lib/neo4j/rails/relationships/relationships.rb
-  - lib/neo4j/rails/relationships/relationship.rb
+  - lib/neo4j/rails/relationships/storage.rb
   - lib/neo4j/rails/mapping/property.rb
+  - lib/neo4j/rails/validations/associated.rb
   - lib/neo4j/rails/validations/uniqueness.rb
   - lib/neo4j/rails/validations/non_nil.rb
   - lib/neo4j/jars/core/lucene-core-3.0.3.jar
-  - lib/neo4j/jars/core/neo4j-backup-1.3.M03.jar
-  - lib/neo4j/jars/core/neo4j-kernel-1.3.M03.jar
+  - lib/neo4j/jars/core/neo4j-backup-1.3.jar
   - lib/neo4j/jars/core/geronimo-jta_1.1_spec-1.1.1.jar
-  - lib/neo4j/jars/core/neo4j-graph-algo-1.3.M03.jar
-  - lib/neo4j/jars/core/neo4j-lucene-index-1.3.M03.jar
+  - lib/neo4j/jars/core/neo4j-lucene-index-1.3.jar
+  - lib/neo4j/jars/core/neo4j-graph-algo-1.3.jar
+  - lib/neo4j/jars/core/neo4j-kernel-1.3.jar
   - lib/neo4j/jars/core/neo4j-index-1.3-1.3.M01.jar
-  - lib/neo4j/jars/ha/neo4j-shell-1.3.M03.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/netty-3.2.1.Final.jar
   - lib/neo4j/jars/ha/log4j-1.2.16.jar
-  - lib/neo4j/jars/ha/neo4j-com-1.3.M03.jar
-  - lib/neo4j/jars/ha/neo4j-management-1.3.M03.jar
+  - lib/neo4j/jars/ha/neo4j-ha-1.3.jar
+  - lib/neo4j/jars/ha/neo4j-com-1.3.jar
+  - lib/neo4j/jars/ha/neo4j-management-1.3.jar
+  - lib/neo4j/jars/ha/neo4j-shell-1.3.jar
+  - lib/neo4j/jars/ha/neo4j-jmx-1.3.jar
   - lib/neo4j/jars/ha/org.apache.servicemix.bundles.jline-0.9.94_1.jar
-  - lib/neo4j/jars/ha/neo4j-ha-1.3.M03.jar
   - lib/neo4j/index/indexer.rb
   - lib/neo4j/index/lucene_query.rb
   - lib/neo4j/index/indexer_registry.rb
@@ -206,13 +211,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.1
 requirements: []
 
 rubyforge_project: neo4j
-rubygems_version: 1.5.0
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: A graph database for JRuby

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

@@ -1,103 +0,0 @@
-module Neo4j
-  module Rails
-    module Relationships
-
-      class Mapper #:nodoc:
-        attr_reader :dsl
-
-        def initialize(rel_type, dsl, node)
-          @rel_type      = rel_type
-          @relationships = []
-          @dsl           = dsl
-          @node          = node
-        end
-
-        def rel_type
-          (@dsl && @dsl.rel_type) || @rel_type
-        end
-
-        def direction
-          (@dsl && @dsl.direction) || :outgoing
-        end
-
-        def to_s #:nodoc:
-          "#{self.class} #{object_id} dir: #{direction} rel_type: #{@rel_type} wrapped #{@dsl}"
-        end
-        
-        def single_relationship(*)
-          use_persisted_rels? ? @dsl.single_relationship(@node) : @relationships.first
-        end
-
-        def all_relationships(*)
-          if use_persisted_rels?
-            @dsl.all_relationships(@node)
-          else
-            @relationships
-          end
-        end
-
-        def each_node(node, direction, &block)
-          if use_persisted_rels?
-            @dsl.each_node(node, direction, &block)
-          else
-            # TODO direction
-            @relationships.each do |rel|
-              block.call rel.end_node
-            end
-          end
-        end
-
-        def use_persisted_rels?
-          @relationships.empty? && @node.persisted?
-        end
-
-        def del_rel(rel)
-          @relationships.delete(rel)
-        end
-
-        def create_relationship_to(from, to)
-          @relationships << Relationship.new(@rel_type, from, to, self)
-        end
-        
-
-        def single_node(from)
-          if !@relationships.empty?
-            @relationships.first.end_node
-          else
-            @dsl.single_node(from) if @dsl && from.persisted?
-          end
-        end
-
-        def valid?
-          all_valid = true
-          !@relationships.each do |rel|
-            start_node = rel.start_node
-            end_node = rel.end_node
-
-            if !end_node.valid?
-              all_valid                = false
-              start_node.errors[@rel_type.to_sym] ||= []
-              start_node.errors[@rel_type.to_sym] << end_node.errors
-            end
-          end
-          all_valid
-        end
-
-        def persist
-          @relationships.each do |rel|
-            if @dsl
-              start_node = rel.start_node
-              end_node = rel.end_node
-
-              end_node.save!
-              @dsl.create_relationship_to(start_node, end_node)
-            else
-              rel.end_node.save!
-              rel.start_node.outgoing(@rel_type) << rel.end_node
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,30 +0,0 @@
-module Neo4j
-  module Rails
-    module Relationships
-
-      class Relationship
-        attr_reader :rel_type, :start_node, :end_node
-
-
-        def initialize(rel_type, start_node, end_node, decl)
-          @rel_type   = rel_type
-          @start_node = start_node
-          @end_node   = end_node
-          @decl       = decl
-        end
-
-        def del
-          @decl.del_rel(self)
-        end
-
-        def persist
-          @start_node._java
-        end
-
-        def to_s
-          "Rel [#{rel_type} start #{start_node} end #{end_node}]"
-        end
-      end
-    end
-  end
-end