neo4j-core 3.0.0.alpha.18 → 3.0.0.alpha.19

data/lib/neo4j/transaction.rb

@@ -1,51 +1,118 @@
 module Neo4j
-  class Transaction
-    def self.new(current = Session.current)
-      current.begin_tx
-    end
+  module Transaction
 
+    extend self
 
-    class << self
+    module Instance
+      # @private
+      def register_instance
+        @pushed_nested = 0
+        Neo4j::Transaction.register(self)
+      end
 
-      def run(run_in_tx=true)
-        raise ArgumentError.new("Expected a block to run in Transaction.run") unless block_given?
+      # Marks this transaction as failed, which means that it will unconditionally be rolled back when close() is called.
+      def failure
+        @failure = true
+      end
+      alias_method :fail, :failure
 
-        return yield(nil) unless run_in_tx
+      # If it has been marked as failed
+      def failure?
+        !!@failure
+      end
 
-        begin
-          tx = Neo4j::Transaction.new
-          ret = yield tx
-          tx.success
-        rescue Exception => e
-          if e.respond_to?(:cause) && e.cause
-            puts "Java Exception in a transaction, cause: #{e.cause}"
-            e.cause.print_stack_trace
-          end
-          tx.failure unless tx.nil?
-          raise
-        ensure
-          tx.finish unless tx.nil?
-        end
-        ret
+      # @private
+      def push_nested!
+        @pushed_nested += 1
       end
 
-      def current
-        Thread.current[:neo4j_curr_tx]
+      # @private
+      def pop_nested!
+        @pushed_nested -= 1
       end
 
-      def unregister(tx)
-        Thread.current[:neo4j_curr_tx] = nil if tx == Thread.current[:neo4j_curr_tx]
+      # Only for the embedded neo4j !
+      # Acquires a read lock for entity for this transaction.
+      # See neo4j java docs.
+      # @param [Neo4j::Node,Neo4j::Relationship] entity
+      # @return [Java::OrgNeo4jKernelImplCoreapi::PropertyContainerLocker]
+      def acquire_read_lock(entity)
       end
 
-      def register(tx)
-        # we don't support running more then one transaction per thread
-        raise "Already running a transaction" if current
-        Thread.current[:neo4j_curr_tx] = tx
+      # Only for the embedded neo4j !
+      # Acquires a write lock for entity for this transaction.
+      # See neo4j java docs.
+      # @param [Neo4j::Node,Neo4j::Relationship] entity
+      # @return [Java::OrgNeo4jKernelImplCoreapi::PropertyContainerLocker]
+      def acquire_write_lock(entity)
       end
 
-      def unregister_current
-        Thread.current[:neo4j_curr_tx] = nil
+      # Commits or marks this transaction for rollback, depending on whether failure() has been previously invoked.
+      def close
+        pop_nested!
+        return if @pushed_nested >= 0
+        raise "Can't commit transaction, already committed" if (@pushed_nested < -1)
+        Neo4j::Transaction.unregister(self)
+        if failure?
+          _delete_tx
+        else
+          _commit_tx
+        end
       end
+
+    end
+
+
+
+    # @return [Neo4j::Transaction::Instance]
+    def new(current = Session.current!)
+      current.begin_tx
+    end
+
+    # Runs the given block in a new transaction.
+    # @param [Boolean] run_in_tx if true a new transaction will not be created, instead if will simply yield to the given block
+    # @@yield [Neo4j::Transaction::Instance]
+    def run(run_in_tx=true)
+      raise ArgumentError.new("Expected a block to run in Transaction.run") unless block_given?
+
+      return yield(nil) unless run_in_tx
+
+      begin
+        tx = Neo4j::Transaction.new
+        ret = yield tx
+      rescue Exception => e
+        if e.respond_to?(:cause) && e.cause
+          puts "Java Exception in a transaction, cause: #{e.cause}"
+          e.cause.print_stack_trace
+        end
+        tx.failure unless tx.nil?
+        raise
+      ensure
+        tx.close unless tx.nil?
+      end
+      ret
+    end
+
+    # @return [Neo4j::Transaction]
+    def current
+      Thread.current[:neo4j_curr_tx]
+    end
+
+    # @private
+    def unregister(tx)
+      Thread.current[:neo4j_curr_tx] = nil if tx == Thread.current[:neo4j_curr_tx]
+    end
+
+    # @private
+    def register(tx)
+      # we don't support running more then one transaction per thread
+      raise "Already running a transaction" if current
+      Thread.current[:neo4j_curr_tx] = tx
+    end
+
+    # @private
+    def unregister_current
+      Thread.current[:neo4j_curr_tx] = nil
     end
 
   end

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha.18
+  version: 3.0.0.alpha.19
 platform: ruby
 authors:
 - Andreas Ronge
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: os
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: zip
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !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
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: neo4j-community
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+  prerelease: false
+  type: :runtime
 description: |
   You can think of Neo4j as a high-performance graph engine with all the features of a mature and robust database.
   The programmer works with an object-oriented, flexible network structure rather than with strict and static tables
@@ -87,14 +101,20 @@ files:
 - lib/neo4j-core/query.rb
 - lib/neo4j-core/query_clauses.rb
 - lib/neo4j-core/version.rb
+- lib/neo4j-core/version.rb~
 - lib/neo4j-embedded.rb
 - lib/neo4j-embedded/cypher_response.rb
+- lib/neo4j-embedded/cypher_response.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_node.rb~
 - lib/neo4j-embedded/embedded_relationship.rb
+- lib/neo4j-embedded/embedded_relationship.rb~
 - lib/neo4j-embedded/embedded_session.rb
+- lib/neo4j-embedded/embedded_session.rb~
+- lib/neo4j-embedded/embedded_transaction.rb
 - lib/neo4j-embedded/property.rb
 - lib/neo4j-embedded/to_java.rb
 - lib/neo4j-server.rb
@@ -103,6 +123,7 @@ files:
 - lib/neo4j-server/cypher_node_uncommited.rb
 - lib/neo4j-server/cypher_relationship.rb
 - lib/neo4j-server/cypher_response.rb
+- lib/neo4j-server/cypher_response.rb~
 - lib/neo4j-server/cypher_session.rb
 - lib/neo4j-server/cypher_transaction.rb
 - lib/neo4j-server/neo4j_server_endpoint.rb
@@ -114,6 +135,7 @@ files:
 - lib/neo4j/property_validator.rb
 - lib/neo4j/relationship.rb
 - lib/neo4j/session.rb
+- lib/neo4j/session.rb~
 - lib/neo4j/tasks/neo4j_server.rb
 - lib/neo4j/transaction.rb
 - neo4j-core.gemspec
@@ -121,31 +143,31 @@ homepage: http://github.com/andreasronge/neo4j-core/tree
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
-- "--quiet"
-- "--title"
+- --quiet
+- --title
 - Neo4j::Core
-- "--line-numbers"
-- "--main"
+- --line-numbers
+- --main
 - README.rdoc
-- "--inline-source"
+- --inline-source
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: neo4j-core
 rubygems_version: 2.2.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A graph database for Ruby
 test_files: []