pacer-neo4j 2.3.6-java → 2.3.7-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4b41ed206cdac528c19ae104d9dc2721da2f949
-  data.tar.gz: 6b91323fdb6975bcb5bf8e203cda50e7538be6f2
+  metadata.gz: fb5ae3d33a7a0cb20096d759a169e3b91cda462d
+  data.tar.gz: f9f6ef9f5811bdbb8722f10ac921e1077766742c
 SHA512:
-  metadata.gz: a07f554b469dd41970f6f025b21b4265c6b3e3d18b2a824e64251510ecc1ceba1b6e1887c2494e54a0b1898152de37ab15f7804c20c1ca26a4b3cdaf17b9f996
-  data.tar.gz: 30dbe55f17795b728958f26ecc01babca2d78bb5bb2ad5281ff02cd34870a9546d6b16f3f5cd8dbf6c542c78ad1e849253824a4170574c55e13356a1357965a0
+  metadata.gz: 314361d41e620002f9724521fac1fdff104f141fceac4089fae4dbb23faa95a168452cc7987ab931d740554075eacecfefe2f4b7795509d713250566d345d788
+  data.tar.gz: 3be0b55fd8b1ef72ac3833fb1d3b629da4da7473838003bfca03355a7113d942ed616c58a060a16eca1786ec8060f596bca2f8eed30f2a0229c87ef5aea79c7a

data/lib/pacer-neo4j/graph.rb

@@ -109,12 +109,28 @@ module Pacer
         blueprints_graph.raw_graph
       end
 
-      def on_commit(&block)
-        return unless block
-        TransactionEventHandler.new(self).tap do |h|
-          h.on_commit = block
-          neo_graph.registerTransactionEventHandler h
+      def transaction_event_handler
+        unless @teh
+          @teh = TransactionEventHandler.new(self)
+          neo_graph.registerTransactionEventHandler @teh
         end
+        @teh
+      end
+
+      def before_commit(wrapper = nil, &block)
+        return unless block
+        wrapper = false if block.arity == 0
+        transaction_event_handler.before_commit_wrapper = wrapper unless wrapper.nil?
+        transaction_event_handler.before_commit = block
+        nil
+      end
+
+      def on_commit(wrapper = nil, &block)
+        return unless block
+        wrapper = false if block.arity == 0
+        transaction_event_handler.on_commit_wrapper = wrapper unless wrapper.nil?
+        transaction_event_handler.on_commit = block
+        nil
       end
 
       # This is actually only called if the commit fails and then it internally tries to
@@ -123,20 +139,12 @@ module Pacer
       # An exception in before_commit can definitely trigger this.
       #
       # Regular rollbacks do not get seen by the transaction system and no callback happens.
-      def on_commit_failed(&block)
-        return unless block
-        TransactionEventHandler.new(self).tap do |h|
-          h.on_commit_failed = block
-          neo_graph.registerTransactionEventHandler h
-        end
-      end
-
-      def before_commit(&block)
+      def on_commit_failed(wrapper = nil, &block)
         return unless block
-        TransactionEventHandler.new(self).tap do |h|
-          h.before_commit = block
-          neo_graph.registerTransactionEventHandler h
-        end
+        wrapper = false if block.arity == 0
+        transaction_event_handler.on_commit_failed_wrapper = wrapper unless wrapper.nil?
+        transaction_event_handler.on_commit_failed = block
+        nil
       end
 
       def drop_handler(h)

data/lib/pacer-neo4j/transaction_event_handler.rb

@@ -3,27 +3,61 @@ module Pacer
     class TransactionEventHandler
       include org.neo4j.graphdb.event.TransactionEventHandler
 
-      attr_reader :graph
-      attr_accessor :on_commit, :on_commit_failed, :before_commit
+      attr_reader :graph, :enable_cache
+      attr_accessor :on_commit         , :on_commit_failed         , :before_commit
+      attr_accessor :on_commit_wrapper , :on_commit_failed_wrapper , :before_commit_wrapper
+      attr_accessor :type_property
 
       def initialize(graph)
         @graph = graph
+        @on_commit_wrapper = @on_commit_failed_wrapper = @before_commit_wrapper = TxDataWrapper
       end
 
       def unregister!
         graph.drop_handler self
       end
 
+      def enable_cache!
+        @enable_cache = true
+      end
+
       private
 
       # Return value is passed to afterCommit or afterRollback, but some values can cause crashes.
       def beforeCommit(data)
-        before_commit.call TxDataWrapper.new data, graph if before_commit
-        nil
+        if before_commit_wrapper and (before_commit or enable_cache)
+          wrapped = before_commit_wrapper.new data, graph, type_property
+        end
+        if before_commit
+          if before_commit_wrapper
+            before_commit.call wrapped
+          else
+            before_commit.call
+          end
+        end
+        if enable_cache
+          wrapped.data
+        end
+      rescue Exception => e
+        p e.message
+        pp e.backtrace
+        throw
       end
 
-      def afterCommit(data, ignore)
-        on_commit.call TxDataWrapper.new data, graph if on_commit
+      def afterCommit(data, cache)
+        if on_commit
+          if cache
+            on_commit.call cache
+          elsif on_commit_wrapper
+            on_commit.call on_commit_wrapper.new data, graph
+          else
+            on_commit.call
+          end
+        end
+      rescue Exception => e
+        p e.message
+        pp e.backtrace
+        throw
       end
 
       # This is actually only called if the commit fails and then it internally tries to
@@ -32,8 +66,20 @@ module Pacer
       # An exception in beforeCommit can definitely trigger this.
       #
       # Regular rollbacks do not get seen by the transaction system and no callback happens.
-      def afterRollback(data, ignore)
-        on_commit_failed.call TxDataWrapper.new data, graph if on_commit_failed
+      def afterRollback(data, cache)
+        if on_commit_failed
+          if cache
+            on_commit_failed.call cache
+          elsif on_commit_failed_wrapper
+            on_commit_failed.call on_commit_failed_wrapper.new data, graph
+          else
+            on_commit_failed.call
+          end
+        end
+      rescue Exception => e
+        p e.message
+        pp e.backtrace
+        throw
       end
     end
   end

data/lib/pacer-neo4j/tx_data_wrapper.rb

@@ -7,11 +7,12 @@ module Pacer
     class TxDataWrapper
       include Algo::Wrapping
 
-      attr_reader :graph, :tx
+      attr_reader :graph, :tx, :type_property
 
-      def initialize(tx, graph)
+      def initialize(tx, graph, type_property)
         @tx = tx
         @graph = graph
+        @type_property = type_property
       end
 
       def created_v
@@ -31,7 +32,16 @@ module Pacer
       end
 
       def created_v_ids
-        tx.createdNodes.map { |n| n.getId }
+        if type_property
+          tx.createdNodes.map do |n|
+            if n.hasProperty(type_property)
+              type = n.getProperty(type_property)
+            end
+            [n.getId, type]
+          end
+        else
+          tx.createdNodes.map { |n| [n.getId] }
+        end
       end
 
       def deleted_v_ids
@@ -39,7 +49,7 @@ module Pacer
       end
 
       def created_e_ids
-        tx.createdRelationships.map { |n| n.getId }
+        tx.createdRelationships.map { |n| [n.getId, n.getType.name, n.getStartNode.getId, n.getEndNode.getId] }
       end
 
       def deleted_e_ids
@@ -50,42 +60,38 @@ module Pacer
         tx.is_deleted e.element.rawElement
       end
 
-      def changed_v
+      def assigned_v
         tx.assignedNodeProperties.map do |p|
-          { element_type: :vertex,
-            id: p.entity.getId,
-            key: p.key,
-            was: graph.decode_property(p.previouslyCommitedValue),
-            is: graph.decode_property(p.value) }
-        end +
+          [p.entity.getId, p.key, graph.decode_property(p.value)]
+        end
+      end
+
+      def cleared_v
         tx.removedNodeProperties.map do |p|
-          { element_type: :vertex,
-            id: p.entity.getId,
-            key: p.key,
-            was: graph.decode_property(p.previouslyCommitedValue),
-            is: nil }
+          [p.entity.getId, p.key]
         end
       end
 
-      def changed_e
+      def assigned_e
         tx.assignedRelationshipProperties.map do |p|
-          { element_type: :edge,
-            id: p.entity.getId,
-            key: p.key,
-            was: graph.decode_property(p.previouslyCommitedValue),
-            is: graph.decode_property(p.value) }
-        end +
+          [p.entity.getId, p.key, graph.decode_property(p.value)]
+        end
+      end
+
+      def cleared_e
         tx.removedRelationshipProperties.map do |p|
-          { element_type: :edge,
-            id: p.entity.getId,
-            key: p.key,
-            was: graph.decode_property(p.previouslyCommitedValue),
-            is: nil }
+          [p.entity.getId, p.key]
         end
       end
 
-      def changes
-        changed_v + changed_e
+      def each_v_change(&blk)
+        assigned_v.each(&blk)
+        cleared_v.each(&blk)
+      end
+
+      def each_e_change(&blk)
+        assigned_e.each(&blk)
+        cleared_e.each(&blk)
       end
 
       def summary
@@ -93,8 +99,72 @@ module Pacer
           deleted_v: deleted_v_ids,
           created_e: created_e_ids,
           deleted_e: deleted_e_ids,
-          changed_v: changed_v,
-          changed_e: changed_e }
+          assigned_v: assigned_v,
+          cleared_v: cleared_v,
+          assigned_e: assigned_e,
+          cleared_e: cleared_e }
+      end
+
+      def data
+        TxCachedData.new summary
+      end
+
+      def as_json(options = nil)
+        data.as_json(options)
+      end
+    end
+
+    class TxCachedData
+      attr_reader :summary
+
+      def initialize(summary)
+        @summary = summary
+      end
+
+      def created_v_ids
+        summary[:created_v]
+      end
+
+      def deleted_v_ids
+        summary[:deleted_v]
+      end
+
+      def created_e_ids
+        summary[:created_e]
+      end
+
+      def deleted_e_ids
+        summary[:deleted_e]
+      end
+
+      def assigned_v
+        summary[:assigned_v]
+      end
+
+      def cleared_v
+        summary[:cleared_v]
+      end
+
+      def assigned_e
+        summary[:assigned_e]
+      end
+
+      def cleared_e
+        summary[:cleared_e]
+      end
+
+      def each_v_change(&blk)
+        assigned_v.each(&blk)
+        cleared_v.each(&blk)
+      end
+
+      def each_e_change(&blk)
+        assigned_e.each(&blk)
+        cleared_e.each(&blk)
+      end
+
+      def as_json(options = nil)
+        summary.as_json(options)
       end
     end
   end

data/lib/pacer-neo4j/version.rb

@@ -1,6 +1,6 @@
 module Pacer
   module Neo4j
-    VERSION = "2.3.6"
+    VERSION = "2.3.7"
     PACER_REQ = ">= 2.0.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pacer-neo4j
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.3.7
 platform: java
 authors:
 - Darrick Wiebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pacer