neo4j-core 3.0.0.alpha.1 → 3.0.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52081ded1131dccd5959a5250721490e7e19edb2
-  data.tar.gz: 8376070a82544ac1db4ebb5070adbf7bde0c69e9
+  metadata.gz: d39f7102c26a7e8aff35bbb2e0bff24cc4f383a3
+  data.tar.gz: 04f2ad73f2fe99a55ff14f981474ec2114436d27
 SHA512:
-  metadata.gz: 4b3e4f7d925395e6a021421db53ab56498dde23b0d2415b5adb366fbcbc0fe3fe936ace5b4fbaf95cbfc22576de6a32ed0cf2547a67059220a62822ae476cc16
-  data.tar.gz: ed4927902a386ca3b0c6ca03a3ab9587432f95a3f5019252362611182701894a2f1f8dacb61e11a394b6a558eec0afef279aa631d42f895383da6c9249835a9f
+  metadata.gz: c26991e87c194a1be4f4a49c237e2ebeaa181b571450a060c936916fc65cbc658fb451a0f58b93a918a2bd9e109ca2393d7b4ba00f2cf1bccdd83078ab081772
+  data.tar.gz: 8f6fcaa0a955b5c14248de1a4d4587bfe40f47d226abb22499f7d90466f5d0ce830967a0391fe3e8c0f1c51713f19827b19e2a39e539073c7ed0db945ef2d643

data/README.md

@@ -18,7 +18,7 @@ You need to install the Neo4j server. This can be done by included Rake file.
 Example
 
 ```
-rake neo4j:install[community-2.0.0,M06]
+rake neo4j:install[community-2.0.0]
 rake neo4j:start
 ```
 
@@ -158,6 +158,19 @@ Neo4j::Transaction.run do
 end
 ```
 
+Rollback occurs if an exception is thrown, or the failure method is called on the transaction.
+
+E.g.
+
+```ruby
+Neo4j::Transaction.run do |tx|
+  n = Neo4j::Node.create(name: 'kalle')
+  tx.failure # all operations inside this tx will be rollbacked
+  n[:age] = 42
+end
+
+```
+
 ### Relationship
 
 How to create a relationship between node n1 and node n2 with one property

data/lib/neo4j-core/version.rb

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

data/lib/neo4j-embedded.rb

@@ -1,11 +1,6 @@
 require 'java'
 
-# TODO: release neo4j-community jar 2.0
-# Load Neo4j Jars for the jars folder
-jar_folder = File.expand_path('../neo4j/jars', __FILE__)
-jars = Dir.new(jar_folder).entries.find_all { |x| x =~ /\.jar$/ }
-jars.each { |jar| require File.expand_path(jar, jar_folder) }
-
+require 'neo4j-community'
 require 'neo4j-embedded/to_java'
 require 'neo4j-embedded/property'
 require 'neo4j-embedded/embedded_session'

data/lib/neo4j-embedded/embedded_impermanent_session.rb

@@ -0,0 +1,17 @@
+Neo4j::Community.load_test_jars!
+
+Neo4j::Session.register_db(:impermanent_db) do |*args|
+  Neo4j::Embedded::EmbeddedImpermanentSession.new(*args)
+end
+
+module Neo4j::Embedded
+  class EmbeddedImpermanentSession < EmbeddedSession
+    def start
+      raise Error.new("Embedded Neo4j db is already running") if running?
+      #puts "Start test impermanent embedded Neo4j db at #{db_location}"
+      @graph_db = Java::OrgNeo4jTest::TestGraphDatabaseFactory.new.newImpermanentDatabase()
+      Neo4j::Session._notify_listeners(:session_available, self)
+    end
+  end
+end
+

data/lib/neo4j-embedded/embedded_node.rb

@@ -56,10 +56,7 @@ module Neo4j::Embedded
           tx_methods :exist?
 
           def labels
-            iterator = _labels.iterator
-            iterator.to_a.map{|x| x.name.to_sym}
-          ensure
-            iterator && iterator.close
+            _labels.iterator.map{|x| x.name.to_sym}
           end
           tx_methods :labels
 

data/lib/neo4j-embedded/embedded_session.rb

@@ -4,9 +4,6 @@ Neo4j::Session.register_db(:embedded_db) do |*args|
   Neo4j::Embedded::EmbeddedSession.new(*args)
 end
 
-Neo4j::Session.register_db(:impermanent_db) do |*args|
-  Neo4j::Embedded::EmbeddedImpermanentSession.new(*args)
-end
 
 module Neo4j::Embedded
   class EmbeddedSession < Neo4j::Session
@@ -31,6 +28,7 @@ module Neo4j::Embedded
       puts "Start embedded Neo4j db at #{db_location}"
       factory = Java::OrgNeo4jGraphdbFactory::GraphDatabaseFactory.new
       @graph_db = factory.newEmbeddedDatabase(db_location)
+      Neo4j::Session._notify_listeners(:session_available, self)
     end
 
     def factory_class
@@ -138,14 +136,6 @@ module Neo4j::Embedded
 
   end
 
-  class EmbeddedImpermanentSession < EmbeddedSession
-    def start
-      raise Error.new("Embedded Neo4j db is already running") if running?
-      #puts "Start test impermanent embedded Neo4j db at #{db_location}"
-      @graph_db = Java::OrgNeo4jTest::TestGraphDatabaseFactory.new.newImpermanentDatabase()
-    end
-  end
-
 
 
 end

data/lib/neo4j-server/cypher_session.rb

@@ -17,6 +17,7 @@ module Neo4j::Server
     def initialize(data_url)
       Neo4j::Session.register(self)
       initialize_resource(data_url)
+      Neo4j::Session._notify_listeners(:session_available, self)
     end
 
     def to_s
@@ -38,9 +39,7 @@ module Neo4j::Server
     end
 
     def begin_tx
-      tx = wrap_resource(self, 'transaction', CypherTransaction, nil, :post)
-      Thread.current[:neo4j_curr_tx] = tx
-      tx
+      Thread.current[:neo4j_curr_tx] = wrap_resource(self, 'transaction', CypherTransaction, nil, :post)
     end
 
     def create_node(props=nil, labels=[])
@@ -82,7 +81,7 @@ module Neo4j::Server
       data_resource = JSON.parse(response.body)
 
       property_keys = data_resource.map do |row|
-        row['property-keys'].map(&:to_sym)
+        row['property_keys'].map(&:to_sym)
       end
 
       {

data/lib/neo4j-server/cypher_transaction.rb

@@ -48,7 +48,7 @@ module Neo4j::Server
         cr.set_data(first_result['data'], first_result['columns'])
       else
         first_error = response['errors'].first
-        cr.set_error(first_error['message'], first_error['status'], first_error['code'])
+        cr.set_error(first_error['message'], first_error['code'], first_error['code'])
       end
       cr
     end

data/lib/neo4j/property_validator.rb

@@ -1,6 +1,6 @@
 module Neo4j
   module PropertyValidator
-
+    require 'set'
     class InvalidPropertyException < Exception
 
     end

data/lib/neo4j/session.rb

@@ -106,6 +106,19 @@ module Neo4j
         @@current_session = session
       end
 
+      def add_listener(&listener)
+        self._listeners << listener
+      end
+
+      def _listeners
+        @@listeners ||= []
+        @@listeners
+      end
+
+      def _notify_listeners(event, data)
+        _listeners.each {|li| li.call(event, data)}
+      end
+
       def register(session)
         set_current(session) unless @@current_session
         @@current_session

data/lib/neo4j/tasks/neo4j_server.rb

@@ -4,15 +4,17 @@ require 'os'
 namespace :neo4j do
   desc "Install Neo4j"
   task :install, :edition, :version do |t, args|
-    args.with_defaults(:edition => "community", :version => "1.7")
-    puts "Installing Neo4j-#{args[:edition]}-#{args[:version]}"
+    args.with_defaults(:edition => "community")
+
+    file = args[:version] ? "#{args[:edition]}-#{args[:version]}" : "#{args[:edition]}"
+    puts "Installing Neo4j-#{file}"
     
     if OS::Underlying.windows?
-      # Download Neo4j    
+      # Download Neo4j
       unless File.exist?('neo4j.zip')
         df = File.open('neo4j.zip', 'wb')
         begin
-          df << HTTParty.get("http://dist.neo4j.org/neo4j-#{args[:edition]}-#{args[:version]}-windows.zip")
+          df << HTTParty.get("http://dist.neo4j.org/neo4j-#{file}-windows.zip")
         ensure
           df.close()
         end
@@ -31,7 +33,7 @@ namespace :neo4j do
            end
           end
         end
-        FileUtils.mv "neo4j-#{args[:edition]}-#{args[:version]}", "neo4j"
+        FileUtils.mv "neo4j-#{file}", "neo4j"
      end
 
       # Install if running with Admin Privileges
@@ -40,11 +42,12 @@ namespace :neo4j do
         puts "Neo4j Installed as a service."
       end
 
-    else    
-      %x[wget http://dist.neo4j.org/neo4j-#{args[:edition]}-#{args[:version]}-unix.tar.gz]
-      %x[tar -xvzf neo4j-#{args[:edition]}-#{args[:version]}-unix.tar.gz]
-      %x[mv neo4j-#{args[:edition]}-#{args[:version]} neo4j]
-      %x[rm neo4j-#{args[:edition]}-#{args[:version]}-unix.tar.gz]
+    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[mv neo4j-#{file} neo4j]
+      %x[rm neo4j-#{file}-unix.tar.gz]
       puts "Neo4j Installed in to neo4j directory."
     end
     puts "Type 'rake neo4j:start' to start it"

data/neo4j-core.gemspec

@@ -30,6 +30,8 @@ It comes included with the Apache Lucene document database.
   s.add_dependency("httparty")
   s.add_dependency("json")
   s.add_dependency("neo4j-cypher")
-#  s.add_dependency("neo4j-community", '>=1.9.M05', '<2.0')
-#  s.add_dependency("neo4j-cypher", '~> 1.0.0')
+
+  if RUBY_PLATFORM =~ /java/
+    s.add_dependency("neo4j-community", '~> 2.0.0')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.1
+  version: 3.0.0.alpha.2
 platform: ruby
 authors:
 - Andreas Ronge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -64,18 +64,6 @@ extra_rdoc_files:
 - README.md
 files:
 - lib/neo4j/entity_equality.rb
-- lib/neo4j/jars/concurrentlinkedhashmap-lru-1.3.1.jar
-- lib/neo4j/jars/geronimo-jta_1.1_spec-1.1.1.jar
-- lib/neo4j/jars/lucene-core-3.6.2.jar
-- lib/neo4j/jars/neo4j-cypher-2.0.0-M06.jar
-- lib/neo4j/jars/neo4j-kernel-2.0-SNAPSHOT-tests.jar
-- lib/neo4j/jars/neo4j-kernel-2.0.0-M06.jar
-- lib/neo4j/jars/neo4j-lucene-index-2.0.0-M06.jar
-- lib/neo4j/jars/neo4j-management-2.0.0-M06.jar
-- lib/neo4j/jars/org.apache.servicemix.bundles.jline-0.9.94_1.jar
-- lib/neo4j/jars/parboiled-core-1.1.6.jar
-- lib/neo4j/jars/parboiled-scala_2.10-1.1.6.jar
-- lib/neo4j/jars/scala-library-2.10.2.jar
 - lib/neo4j/label.rb
 - lib/neo4j/node.rb
 - lib/neo4j/property_container.rb
@@ -91,6 +79,7 @@ files:
 - lib/neo4j-core/version.rb
 - lib/neo4j-core.rb
 - lib/neo4j-embedded/embedded_database.rb
+- lib/neo4j-embedded/embedded_impermanent_session.rb
 - lib/neo4j-embedded/embedded_label.rb
 - lib/neo4j-embedded/embedded_node.rb
 - lib/neo4j-embedded/embedded_relationship.rb