neo4j-core 0.0.10-java → 0.0.11-java

data/README.rdoc

@@ -10,6 +10,7 @@ The Neo4j module is public and the Neo4j::Core(::*) are internal modules.
 == Documentation
 
 * {YARD}[http://rdoc.info/github/andreasronge/neo4j-core/file/README.rdoc]
+* {Neo4j.rb Wiki}[https://github.com/andreasronge/neo4j/wiki/]
 
 == The public API
 

data/lib/neo4j-core/cypher/cypher.rb

@@ -311,6 +311,7 @@ module Neo4j
 
         def initialize(nodes, expressions)
           super("n", expressions)
+
           @nodes = nodes.map { |n| n.respond_to?(:neo_id) ? n.neo_id : n }
         end
 
@@ -451,23 +452,25 @@ module Neo4j
       class OrderBy < Expression
         def initialize(expressions)
           super(expressions, :order_by)
+          @orders = []
         end
 
         def asc(props)
-          @asc ||= []
-          @asc += props
+          @orders << [:asc, props]
         end
 
         def desc(props)
-          @desc ||= []
-          @desc += props
+          @orders << [:desc, props]
         end
 
         def to_s
-          s = []
-          s << @asc.map { |p| p.var_name }.join(",") if @asc
-          s << @desc.map { |p| p.var_name.to_s + " DESC" }.join(",") if @desc
-          s.join(',')
+          @orders.map do |pair|
+            if pair[0] == :asc
+              pair[1].map(&:var_name).join(', ')
+            else
+              pair[1].map(&:var_name).join(', ') + " DESC"
+            end
+          end.join(', ')
         end
       end
 
@@ -681,6 +684,7 @@ module Neo4j
         attr_reader :expressions
 
         def initialize(expressions, variables)
+          variables ||= []
           @var_name = "v#{variables.size}"
           variables << self
           @variables = variables

data/lib/neo4j-core/cypher/result_wrapper.rb

@@ -1,12 +1,21 @@
 module Neo4j
   module Core
     module Cypher
-      # Wraps the Cypher query result
-      # Loads the wrapper if possible and use symbol as keys.
+      # Wraps the Cypher query result.
+      # Loads the node and relationships wrapper if possible and use symbol as column keys.
+      # @notice The result is a once forward read only Enumerable, work if you need to read the result twice - use #to_a
+      #
+      # @example
+      #   result = Neo4j.query(@a, @b){|a,b| node(a,b).as(:n)}
+      #   r = @query_result.to_a # can only loop once
+      #   r.size.should == 2
+      #   r.first.should include(:n)
+      #   r[0][:n].neo_id.should == @a.neo_id
+      #   r[1][:n].neo_id.should == @b.neo_id
       class ResultWrapper
         include Enumerable
 
-        # @return the original result from the Neo4j Cypher Engine
+        # @return the original result from the Neo4j Cypher Engine, once forward read only !
         attr_reader :source
 
         def initialize(source)
@@ -23,7 +32,7 @@ module Neo4j
           @source.each { |row| yield map(row) }
         end
 
-        # Maps each row
+        # Maps each row so that we can use symbols for column names.
         # @private
         def map(row)
           out = {} # move to a real hash!

data/lib/neo4j-core/rels/traverser.rb

@@ -26,9 +26,7 @@ module Neo4j
 
         # Implements the Ruby Enumerable mixin
         def each
-          iter = iterator
-          while (iter.has_next())
-            rel = iter.next
+          iterator.each do |rel|
             yield rel.wrapper if match_between?(rel)
           end
         end

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

data/lib/neo4j/cypher.rb

@@ -23,7 +23,21 @@ module Neo4j
     def initialize(*args, &dsl_block)
       @expressions = []
       @variables = []
-      res = self.instance_exec(*args, &dsl_block)
+      to_dsl_args = args.map do |a|
+        case
+          when a.is_a?(Array) && a.first.respond_to?(:_java_node)
+            StartNode.new(a, @expressions)
+          when a.is_a?(Array) && a.first.respond_to?(:_java_rel)
+            StartRel.new(a, @expressions)
+          when a.respond_to?(:_java_node)
+            StartNode.new([a], @expressions)
+          when a.respond_to?(:_java_rel)
+            StartRel.new([a], @expressions)
+          else
+            a
+        end
+      end
+      res = self.instance_exec(*to_dsl_args, &dsl_block)
       unless res.kind_of?(Return)
         res.respond_to?(:to_a) ? ret(*res) : ret(res)
       end

data/lib/neo4j/neo4j.rb

@@ -97,6 +97,10 @@ module Neo4j
     #  q.first[:n] #=> the @node
     #  q.columns.first => :n
     #
+    # @example Using an array of nodes
+    #  # same as - two_nodes=node(Neo4j.ref_node.neo_id, node_b.neo_id), b = node(b.neo_id)
+    #  q = Neo4j.query([Neo4j.ref_node, node_b], node_c){|two_nodes, b| two_nodes <=> b; b}
+    #
     # @example With an string
     #  q = Neo4j._query("START n=node(42) RETURN n")
     #  q.first(:n) #=> the @node

metadata

@@ -2,7 +2,7 @@
 name: neo4j-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.10
+  version: 0.0.11
 platform: java
 authors: 
   - Andreas Ronge
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-17 00:00:00 Z
+date: 2012-04-19 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: neo4j-community