neo4j-cypher 1.0.0 → 1.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4ab6db292610780f4016937d4872254f49424496
+  data.tar.gz: 7cb2c9c1fb21c70686fef80d3b8c268740f94843
+SHA512:
+  metadata.gz: 54514ebfad0fbce0db6b8016fdded8d78f63873dc9dcee0d8fde59e0d77735844ea1217ca12c180d82149c2f7a12d8841d30c75f2a0ffa3538e3edfc46dc80b2
+  data.tar.gz: f7286c628777fc15f810b8176eaa6e1011e3545f33f2b3654a6dc90b15a8c07e4abb798d3b25428a479b211e54c7d7302a8e3a503ef10c618eb32fbab6279115

data/Gemfile

@@ -1,4 +1,4 @@
-source :gemcutter
+source 'https://rubygems.org'
 
 gemspec
 

data/README.rdoc

@@ -5,7 +5,8 @@ The JRuby neo4j-core gem's cypher dsl has been moved to this gem.
 
 == Docs
 
-* {Neo4j Wiki Cypher}[https://github.com/andreasronge/neo4j/wiki/Neo4j%3A%3ACypher]
+* {The Cypher DSL docs}[https://github.com/andreasronge/neo4j/wiki/Neo4j%3A%3ACypher]
+* {Blog: The Cypher Ruby DSL}[http://www.jayway.com/2012/10/04/the-cypher-ruby-dsl-for-the-neo4j-graph-database/]
 * {Neo4j Cypher Docs}[http://docs.neo4j.org/chunked/stable/]
 * RSpecs (100% test coverage)
 

data/lib/neo4j-cypher/clause.rb

@@ -5,10 +5,10 @@ module Neo4j
     # Does expect a #clause method when included
     module Clause
 
-      ORDER = [:start, :match, :create, :where, :with, :foreach, :set, :delete, :return, :order_by, :skip, :limit]
+      ORDER = [:start, :match, :create, :where, :with, :foreach, :set, :delete, :remove, :return, :order_by, :skip, :limit]
       NAME = {:start => 'START', :create => 'CREATE', :match => 'MATCH', :where => "WHERE", :with => 'WITH',
               :return => 'RETURN', :order_by => 'ORDER BY', :skip => 'SKIP', :limit => 'LIMIT', :set => 'SET',
-              :delete => 'DELETE', :foreach => 'FOREACH'}
+              :remove => 'REMOVE', :delete => 'DELETE', :foreach => 'FOREACH'}
 
       attr_accessor :clause_type, :clause_list, :eval_context, :expr, :insert_order
 

data/lib/neo4j-cypher/clause_list.rb

@@ -108,9 +108,9 @@ module Neo4j
 
       def prefix_for_depth_2
         if include?(:match) && include?(:where)
-          [:set, :delete, :create, :where]
+          [:set, :delete, :create, :remove, :where]
         else
-          [:set, :delete, :create]
+          [:set, :delete, :create, :remove]
         end
 
       end

data/lib/neo4j-cypher/context.rb

@@ -297,6 +297,16 @@ module Neo4j
           self
         end
 
+        def set_label(*labels)
+          Label.new(clause_list, clause, labels, :set)
+          self
+        end
+
+        def del_label(*labels)
+          Label.new(clause_list, clause, labels, :remove)
+          self
+        end
+
         def del
           Delete.new(clause_list, clause)
           self

data/lib/neo4j-cypher/create.rb

@@ -1,6 +1,20 @@
 module Neo4j
   module Cypher
 
+    class Label
+      include Clause
+
+      def initialize(clause_list, var, labels, clause_type)
+        super(clause_list, clause_type)
+        @var = var
+        @labels = labels
+      end
+
+      def to_cypher
+        "#{@var.var_name.to_s} :#{@labels.map(&:to_s).join(':')}"
+      end
+    end
+
     class Delete
       include Clause
 
@@ -19,9 +33,10 @@ module Neo4j
     class Create
       include Clause
 
-      def initialize(clause_list, props)
+      def initialize(clause_list, props, labels=nil)
         super(clause_list, :create, EvalContext)
-        @props = props
+        @props = props unless props && props.empty?
+        @labels = labels unless labels && labels.empty?
       end
 
       def as_create_path?
@@ -37,10 +52,12 @@ module Neo4j
       end
 
       def to_cypher
+        label_suffix = @labels && ":" + @labels.map{|name| "`#{name.to_s}`"}.join(':')
+
         without_parantheses = if @props
-                                "#{var_name} #{to_prop_string(@props)}"
+                                "#{var_name}#{label_suffix} #{to_prop_string(@props)}"
                               else
-                                var_name
+                                "#{var_name}#{label_suffix}"
                               end
 
         as_create_path? ? without_parantheses : "(#{without_parantheses})"

data/lib/neo4j-cypher/node_var.rb

@@ -47,9 +47,9 @@ module Neo4j
           super
         end
 
-        def new(props = nil)
+        def new(props = nil, *labels)
           clause.clause_list.delete(clause)
-          Create.new(clause_list, props).eval_context
+          Create.new(clause_list, props, labels).eval_context
         end
 
         def [](p)

data/lib/neo4j-cypher/result_wrapper.rb

@@ -13,6 +13,8 @@ module Neo4j
     #   r[0][:n].neo_id.should == @a.neo_id
     #   r[1][:n].neo_id.should == @b.neo_id
     class ResultWrapper
+      class ResultsAlreadyConsumedException < Exception; end;
+
       include Enumerable
 
       # @return the original result from the Neo4j Cypher Engine, once forward read only !
@@ -20,6 +22,7 @@ module Neo4j
 
       def initialize(source)
         @source = source
+        @unread = true
       end
 
       # @return [Array<Symbol>] the columns in the query result
@@ -29,12 +32,20 @@ module Neo4j
 
       # for the Enumerable contract
       def each
-        @source.each { |row| yield map(row) }
+        raise ResultsAlreadyConsumedException unless @unread
+
+        if block_given?
+          @unread = false
+          @source.each { |row| yield symbolize_row_keys(row) }
+        else
+          Enumerator.new(self)
+        end
       end
 
+      private
+
       # Maps each row so that we can use symbols for column names.
-      # @private
-      def map(row)
+      def symbolize_row_keys(row)
         out = {} # move to a real hash!
         row.each do |key, value|
           out[key.to_sym] = value.respond_to?(:wrapper) ? value.wrapper : value

data/lib/neo4j-cypher/root.rb

@@ -14,6 +14,8 @@ module Neo4j
           return if clause_list.include?(:return)
           return if clause_list.include?(:with)
           return if clause_list.include?(:delete)
+          return if clause_list.include?(:set)
+          return if clause_list.include?(:remove)
         end
         create_returns(result)
       end

data/lib/neo4j-cypher/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Cypher
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

metadata

@@ -1,22 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-cypher
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.0.1
 platform: ruby
 authors:
 - Andreas Ronge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies: []
-description: ! 'This gem is used in the JRuby neo4j gem but should work on any Ruby
-  implementation since it simply
-
+description: |
+  This gem is used in the JRuby neo4j gem but should work on any Ruby implementation since it simply
   translate a Ruby block (the dsl) to a cypher string.
-
-'
 email: andreas.ronge@gmail.com
 executables: []
 extensions: []
@@ -53,6 +49,7 @@ files:
 - neo4j-cypher.gemspec
 homepage: http://github.com/andreasronge/neo4j-cypher/tree
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --quiet
@@ -65,24 +62,19 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2728689632116511744
 requirements: []
 rubyforge_project: neo4j-cypher
-rubygems_version: 1.8.24
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Ruby DSL for Cypher - the Neo4j Graph Query Language
 test_files: []