grumlin 1.0.0.rc1 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5a4223c6fde72d3f4ce23f3da0081a816f395a070d8737d9915f15b166c9721
-  data.tar.gz: 8c95dcb15d4f55741cc370298e1e763427858908abebaec33f945e404d3a6fa3
+  metadata.gz: 00b4b216f2e14d752c8ada35d0bb511e850ba1bc7eefc4b474ae17348060efc5
+  data.tar.gz: ae38aae9acdbbc6163c6c1e6759955074f8ae416d04ce5cec2b06853009a44c2
 SHA512:
-  metadata.gz: 69162f44551c45c0898ffa0c3650cee448a155d1950de5ea0a2a4b570c1b2b41612f3b97bd063f88f683af5fad3c18d4b874b96392a30334c77ab0e1fb1fd226
-  data.tar.gz: 1fdb7d10a84da7d8c8173e2b0edb0f5b0f913fb0418fce59bb92d28de9c2e9a1743b89eca1f0ed8495b4d0519d2068c2314e9f17f23b77a4297e080512ace082
+  metadata.gz: 47c0afe0c2708158a16b76efc64d4212ddb7a610f5f72f2afed4f7da4b75b921685c396b10984d4ebb1577387ba55ca92c95253fe98f36c58b7e1202ee0adf49
+  data.tar.gz: 07eab1e1fb55641f58a09ca3ed3a478e58a52635a7059e62eda656d0a16a1d2797d0cb5f2d66fcfa1bca513fe05f6ab7791e459b2867c44eadfcc15a89f0ac3b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grumlin (1.0.0.rc1)
+    grumlin (1.0.0.rc3)
       async-pool (~> 0.3)
       async-websocket (>= 0.19, < 0.20)
       ibsciss-middleware (~> 0.4.0)

data/README.md

@@ -148,9 +148,14 @@ Each `return_mode` is mapped to a particular termination step:
 
 and a few methods that emulate upserts:
 - `upsert_vertex(label, id, create_properties: {}, update_properties: {}, on_failure: :retry, start: g, **params)`
+- `upsert_vertices(edges, batch_size: 100, on_failure: :retry, start: g, **params)`
 - `upsert_edge(label, from:, to:, create_properties: {}, update_properties: {}, on_failure: :retry, start: g, **params)`
 - `upsert_edges(edges, batch_size: 100, on_failure: :retry, start: g, **params)`
-- `upsert_vertices(edges, batch_size: 100, on_failure: :retry, start: g, **params)`
+
+**Note**: all upsert methods expect your provider has support for user supplied string ids for nodes and edges 
+respectively. For edges and if `create_properties[T.id]` if nil, grumlin will generate a uuid-like id out of `from` and
+`to` vertex ids and edge's label to ensure uniqueness of the edge. If you manually provide an id, it's your 
+responsibility to ensure it's uniquely identifies the edge using it's `from`, `to` and `label`.
 
 All of them support 3 different modes for error handling: `:retry`, `:ignore` and `:raise`. Retry mode is implemented
 with [retryable](https://github.com/nfedyashev/retryable). **params will be merged to the default config for upserts

data/lib/grumlin/dummy_transaction.rb

@@ -5,8 +5,9 @@ class Grumlin::DummyTransaction < Grumlin::Transaction
 
   include Console
 
-  def initialize(traversal_start_class, middlewares:, pool: nil) # rubocop:disable Lint/MissingSuper, Lint/UnusedMethodArgument
-    @traversal_start_class = traversal_start_class
+  def initialize(traversal_start_class, middlewares:, pool:)
+    super
+    @session_id = nil
 
     logger.info(self) do
       "#{Grumlin.config.provider} does not support transactions. commit and rollback are ignored, data will be saved"

data/lib/grumlin/shortcuts/upserts.rb

@@ -13,12 +13,13 @@ module Grumlin::Shortcuts::Upserts
   end
 
   shortcut :upsertE do |label, from, to, create_properties = {}, update_properties = {}|
+    id = create_properties[T.id] || Grumlin.fake_uuid(from, label, to)
     self.V(from)
         .outE(label).where(__.inV.hasId(to))
         .fold
         .coalesce(
           __.unfold,
-          __.addE(label).from(__.V(from)).to(__.V(to)).props(**create_properties)
+          __.addE(label).from(__.V(from)).to(__.V(to)).props(**create_properties.merge(T.id => id))
         ).props(**update_properties)
   end
 end

data/lib/grumlin/steppable.rb

@@ -14,7 +14,6 @@ class Grumlin::Steppable
   def initialize(pool: nil, session_id: nil, middlewares: Grumlin.default_middlewares)
     @pool = pool
     @session_id = session_id
-
     @middlewares = middlewares
 
     return if respond_to?(:shortcuts)

data/lib/grumlin/transaction.rb

@@ -16,7 +16,7 @@ class Grumlin::Transaction
   end
 
   def begin
-    @traversal_start_class.new(session_id: @session_id)
+    @traversal_start_class.new(session_id: @session_id, pool: @pool)
   end
 
   def commit

data/lib/grumlin/traversal_start.rb

@@ -12,15 +12,19 @@ class Grumlin::TraversalStart < Grumlin::Steppable
     transaction = tx_class.new(self.class, pool: @pool, middlewares: @middlewares)
     return transaction unless block_given?
 
+    result = nil
+
     begin
-      yield transaction.begin
+      result = yield transaction.begin
     rescue Grumlin::Rollback
       transaction.rollback
+      result
     rescue StandardError
       transaction.rollback
       raise
     else
       transaction.commit
+      result
     end
   end
 

data/lib/grumlin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Grumlin
-  VERSION = "1.0.0.rc1"
+  VERSION = "1.0.0.rc3"
 end

data/lib/grumlin.rb

@@ -184,6 +184,19 @@ module Grumlin
     def definitions
       @definitions ||= YAML.safe_load(File.read(File.join(__dir__, "definitions.yml")), symbolize_names: true)
     end
+
+    def fake_uuid(*parts, separator: "->")
+      uuid = Digest::MD5.hexdigest(parts.join(separator))
+
+      segments = [8, 4, 4, 4, 12]
+      parts = segments.map do |n|
+        uuid[0...n].tap do
+          uuid = uuid[n..]
+        end
+      end
+
+      parts.join("-")
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-13 00:00:00.000000000 Z
+date: 2022-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-pool