neo4j-core 3.0.0.alpha.12 → 3.0.0.alpha.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 996e8bf0524717f822fd3b4817ae67de19a1fc4a
-  data.tar.gz: 0dd0cce3404ead0e0f9dfa292949e2a352891ae6
+  metadata.gz: 0891328716d7d33fe34f80594d6eb556f1fc9dea
+  data.tar.gz: 392ae0f4c6f87c7b8427b73b19174ad4e2c1a3b8
 SHA512:
-  metadata.gz: 288a4758d5ef9cd416ca964305ee1bd024c6b6632167138a3af5bcebbbb652df68ae7c2b081d8122632a4b1423d98c30304bffccc97fdaaf3ec5bb7bab1a2c2a
-  data.tar.gz: 40de5b9275d65d987b7784754822991cf417a4f964adea529b2df94c31e926bcb0e47c0f88ee31f0ac0d0a7389013267d0bcc3e3910c8f2fc7fa8863756e7b1b
+  metadata.gz: 28bc9d2ae875b076be3804f0302dd98d2f16d9f06b814aed395ca30c018cf5439880a0c8954ea62e3b2cc6f6a6446bd965fd0e05cc369db823a17c69850f6144
+  data.tar.gz: 8b7ea7e28e2bb8ef5f4cec71c18e40bef87de52bf01d9b6f3a762fba6dc9f688f7b35067f5005e7280a0e0e454fb0ebdc0d31dd01185868983e4ad9ef1727527

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'neo4j-cypher', '~> 1.0.1'
-
+gem 'zip'
 
 #gem 'neo4j-advanced',   '>= 1.8.1', '< 2.0', :require => false
 #gem 'neo4j-enterprise', '>= 1.8.1', '< 2.0', :require => false

data/README.md

@@ -55,6 +55,16 @@ No need to start the server since it is embedded.
 
 ## Neo4j-core API, v3.0
 
+### API Documentation
+
+* [Neo4j::Node](http://www.rubydoc.info/github/andreasronge/neo4j-core/Neo4j/Node)
+* [Neo4j::Relationship](http://www.rubydoc.info/github/andreasronge/neo4j-core/Neo4j/Relationship)
+* [Neo4j::Session](http://www.rubydoc.info/github/andreasronge/neo4j-core/Neo4j/Session)
+* [Neo4j::Label](http://www.rubydoc.info/github/andreasronge/neo4j-core/Neo4j/Label)
+
+See also [Neo4j Docs](http://docs.neo4j.org/)
+
+
 ### Database Session
 
 There are currently two available types of session, one for connecting to a neo4j server

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = "3.0.0.alpha.12"
+    VERSION = "3.0.0.alpha.13"
   end
 end

data/lib/neo4j-embedded/embedded_node.rb

@@ -62,6 +62,39 @@ module Neo4j::Embedded
 
           alias_method :_labels, :getLabels
 
+          def _java_label(label_name)
+            Java::OrgNeo4jGraphdb.DynamicLabel.label(label_name)
+          end
+
+
+          def _add_label(*label_name)
+            label_name.each do |name|
+              addLabel(_java_label(name))
+            end
+          end
+
+          alias_method :add_label, :_add_label
+          tx_methods :add_label
+
+          def _remove_label(*label_name)
+            label_name.each do |name|
+              removeLabel(_java_label(name))
+            end
+          end
+
+          alias_method :remove_label, :_remove_label
+          tx_methods :remove_label
+
+          def set_label(*label_names)
+            label_as_symbols = label_names.map(&:to_sym)
+            to_keep = labels & label_as_symbols
+            to_remove = labels - to_keep
+            _remove_label(*to_remove)
+            to_add = label_as_symbols - to_keep
+            _add_label(*to_add)
+          end
+          tx_methods :set_label
+
           def del
             _rels.each { |r| r.del }
             delete

data/lib/neo4j-server/cypher_node.rb

@@ -84,6 +84,34 @@ module Neo4j::Server
       r.map(&:to_sym)
     end
 
+    def _cypher_label_list(labels)
+      ':' + labels.map{|label| "`#{label}`"}.join(':')
+    end
+
+    def add_label(*labels)
+      @session._query_or_fail("START n=node(#{neo_id}) SET n #{_cypher_label_list(labels)}")
+    end
+
+    def remove_label(*labels)
+      @session._query_or_fail("START n=node(#{neo_id}) REMOVE n #{_cypher_label_list(labels)}")
+    end
+
+    def set_label(*label_names)
+      label_as_symbols = label_names.map(&:to_sym)
+      to_keep = labels & label_as_symbols
+      to_remove = labels - to_keep
+      to_set = label_as_symbols - to_keep
+
+      # no change ?
+      return if to_set.empty? && to_remove.empty?
+
+      q = "START n=node(#{neo_id})"
+      q += " SET n #{_cypher_label_list(to_set)}" unless to_set.empty?
+      q += " REMOVE n #{_cypher_label_list(to_remove)}" unless to_remove.empty?
+
+      @session._query_or_fail(q)
+    end
+
     # (see Neo4j::Node#del)
     def del
       @session._query_or_fail("START n = node(#{neo_id}) MATCH n-[r]-() DELETE r")

data/lib/neo4j-server/cypher_response.rb

@@ -28,9 +28,11 @@ module Neo4j::Server
 
       def each()
         data.each do |row|
+          hash = {}
           row.each_with_index do |row, i|
-            yield columns[i].to_sym => row
+            hash[columns[i].to_sym] = row
           end
+          yield hash
         end
       end
     end
@@ -110,4 +112,4 @@ module Neo4j::Server
       cr
     end
   end
-end
+end

data/lib/neo4j/label.rb

@@ -1,4 +1,7 @@
 module Neo4j
+  # A label is a named graph construct that is used to group nodes.
+  # See Neo4j::Node how to create and delete nodes
+  # @see http://docs.neo4j.org/chunked/milestone/graphdb-neo4j-labels.html
   class Label
 
     # @abstract

data/lib/neo4j/node.rb

@@ -92,6 +92,17 @@ module Neo4j
       raise 'not implemented'
     end
 
+    # Sets label on the node. Any old labels will be removed
+    def set_label(*labels)
+      raise 'not implemented'
+    end
+
+    # Removes given labels
+    def remove_label(*labels)
+      raise 'not implemented'
+    end
+
+    #
     # @return all labels on the node
     def labels()
       raise 'not implemented'

data/lib/neo4j/tasks/neo4j_server.rb

@@ -1,28 +1,43 @@
 # borrowed from architect4r
 require 'os'
+require 'httparty'
+require 'zip'
 
 namespace :neo4j do
-  desc "Install Neo4j"
+
+  def download_neo4j(file)
+    if OS::Underlying.windows? then
+      file_name = "neo4j.zip"
+      download_url = "http://dist.neo4j.org/neo4j-#{file}-windows.zip"
+    else
+      file_name = "neo4j-unix.tar.gz"
+      download_url = "http://dist.neo4j.org/neo4j-#{file}-unix.tar.gz"
+    end
+
+    unless File.exist?(file_name)
+      df = File.open(file_name, 'wb')
+      begin
+        df << HTTParty.get(download_url)
+      ensure
+        df.close()
+      end
+    end
+    file_name
+  end
+
+  desc "Install Neo4j, example neo4j:install[community,2.0.3]"
   task :install, :edition, :version do |t, args|
     args.with_defaults(:edition => "community")
 
     file = args[:version] ? "#{args[:edition]}-#{args[:version]}" : "#{args[:edition]}"
     puts "Installing Neo4j-#{file}"
+
+    downloaded_file = download_neo4j file
     
     if OS::Underlying.windows?
-      # Download Neo4j
-      unless File.exist?('neo4j.zip')
-        df = File.open('neo4j.zip', 'wb')
-        begin
-          df << HTTParty.get("http://dist.neo4j.org/neo4j-#{file}-windows.zip")
-        ensure
-          df.close()
-        end
-      end
-
       # Extract and move to neo4j directory
       unless File.exist?('neo4j')
-        Zip::ZipFile.open('neo4j.zip') do |zip_file|
+        Zip::ZipFile.open(downloaded_file) do |zip_file|
           zip_file.each do |f|
            f_path=File.join(".", f.name)
            FileUtils.mkdir_p(File.dirname(f_path))
@@ -34,6 +49,7 @@ namespace :neo4j do
           end
         end
         FileUtils.mv "neo4j-#{file}", "neo4j"
+        FileUtils.rm downloaded_file
      end
 
       # Install if running with Admin Privileges
@@ -43,11 +59,9 @@ namespace :neo4j do
       end
 
     else
-      # E.g. http://dist.neo4j.org/neo4j-community-2.0.0-unix.tar.gz
-      %x[wget http://dist.neo4j.org/neo4j-#{file}-unix.tar.gz]
-      %x[tar -xvzf neo4j-#{file}-unix.tar.gz]
+      %x[tar -xvf #{downloaded_file}]
       %x[mv neo4j-#{file} neo4j]
-      %x[rm neo4j-#{file}-unix.tar.gz]
+      %x[rm #{downloaded_file}]
       puts "Neo4j Installed in to neo4j directory."
     end
     puts "Type 'rake neo4j:start' to start it"

data/neo4j-core.gemspec

@@ -31,7 +31,8 @@ It comes included with the Apache Lucene document database.
   # Not released yet
   s.add_dependency("httparty")
   s.add_dependency("json")
-  s.add_dependency("os")
+  s.add_dependency("os")  # for Rake task
+  s.add_dependency("zip") # for Rake task
   s.add_dependency("neo4j-cypher")
 
   if RUBY_PLATFORM =~ /java/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.12
+  version: 3.0.0.alpha.13
 platform: ruby
 authors:
 - Andreas Ronge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-27 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: zip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: neo4j-cypher
   requirement: !ruby/object:Gem::Requirement