neo4j 1.1.0.beta.2-java → 1.1.0.beta.3-java

data/CONTRIBUTORS

@@ -3,6 +3,7 @@ Maintainer:
 
 Contributors:
 
+* Joe Leaver
 * Junegunn Choi
 * Jay Adkisson 
 * Stephan Hagemann

data/lib/neo4j/rails/callbacks.rb

@@ -10,7 +10,7 @@ module Neo4j
 				
 				extend ActiveModel::Callbacks
 				
-				define_model_callbacks :create, :save, :update, :destroy
+				define_model_callbacks :create, :save, :update, :destroy, :validation
 			end
 			
 			def destroy_with_callbacks #:nodoc:

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

@@ -54,12 +54,39 @@ module Neo4j
 
         def find(*args, &block)
           return super(*args, &block) if block
-          node = args.first
-          enum = Enumerator.new(@storage, :each_rel, @dir)
-          if @dir == :incoming
-            enum.find{|r| r.start_node == node}
+          
+          case args.first
+            when :all, :first          
+              kind = args.shift
+              send(kind, *args)
+            when "0", 0
+              nil
+            else
+              if ((args.first.is_a?(Integer) || args.first.is_a?(String)) && args.first.to_i > 0)
+                find_by_id(*args)
+              else
+                first(*args)
+              end
+          end          
+        end
+
+        def all(*args)
+          unless args.empty?
+            enum = Enumerator.new(@storage, :each_node, @dir).find{|n| n == args.first}
           else
-            enum.find{|r| r.end_node == node}
+            enum = Enumerator.new(@storage, :each_node, @dir)
+          end
+        end
+
+        def first(*args)
+          if result = all(*args)
+            if result.respond_to?(:collect) #if it's enumerable, get the first result
+              result.first
+            else 
+              result
+            end
+          else
+            nil
           end
         end
 
@@ -89,9 +116,21 @@ module Neo4j
           size == 0 # TODO, performance: there are probably faster way of doing this
         end
 
+        def blank?
+          false unless size == 0
+        end
+
         def to_s
           "Node dir: #{@dir}, #{@storage}"
         end
+        
+        protected
+
+
+        def find_by_id(*args)
+          result = Enumerator.new(@storage, :each_node, @dir).find{|n| n.id.to_i == args.first.to_i}        
+        end
+   
       end
     end
   end

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

@@ -61,14 +61,47 @@ module Neo4j
 
         def find(*args, &block)
           return super(*args, &block) if block
-          node = args.first
-          if @dir == :incoming
-            find{|r| r.start_node == node}
+
+          case args.first
+            when :all, :first          
+              kind = args.shift
+              send(kind, *args)
+            when "0", 0
+              nil
+            else
+              if ((args.first.is_a?(Integer) || args.first.is_a?(String)) && args.first.to_i > 0)
+                find_by_id(*args)
+              else
+                first(*args)
+              end
+            end                             
+        end
+
+        def all(*args)
+          if args.first.class == Neo4j::Rails::Relationship #arg is a relationship
+            find_all{|r| r == args.first}
+          elsif ((args.first.is_a?(Integer) || args.first.is_a?(String)) && args.first.to_i > 0) #arg is an int
+            find_all{|r| r.start_node.id.to_i == args.first.to_i || r.end_node.id.to_i == args.first.to_i}
+          elsif node_in?(*args) #arg is a node
+            find_all{|r| r.start_node == args.first || r.end_node == args.first}
+          else #there either aren't any args, or we don't understand them
+            collect
+          end
+        end
+
+        def first(*args)
+          if result = all(*args)
+            if result.respond_to?(:collect) #if it's enumerable, get the first result
+              result.first
+            else 
+              result
+            end
           else
-            find{|r| r.end_node == node}
+            nil
           end
         end
 
+
         def [](index)
           i = 0
           each{|x| return x if i == index; i += 1}
@@ -85,6 +118,22 @@ module Neo4j
           "Rels dir: #{@dir}, #{@storage}"
         end
 
+        protected
+
+        def node_in?(*args)
+          # does it contain an string, which will be treated like a condition ?
+          if args.find { |a| a.class.superclass == Neo4j::Rails::Model }
+            return true 
+          else
+            return false
+          end
+        end
+
+        def find_by_id(*args)
+          find{|r| r.id.to_i == args.first.to_i}       
+        end
+
+
       end
     end
   end

data/lib/neo4j/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: neo4j
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.1.0.beta.2
+  version: 1.1.0.beta.3
 platform: java
 authors: 
   - Andreas Ronge
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 +02:00
+date: 2011-05-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency