grumlin 0.22.1 → 0.22.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f91cc8f8b58fc3d72726e876dabac6a8f167e81bd524907eef4df7d72802e79
-  data.tar.gz: 892fa89f75c999899ff0869c7c6f74c26526b9eb5a6da0b43bd4df8a1b64504a
+  metadata.gz: 512af99a3613024d7ea0a4837359fae0f54d0a8cbe1077b5084dc9f5b0136143
+  data.tar.gz: ef0ba0abdcc269b1873e81b30fd08fce1647b31856f75d6652af67151fc402f4
 SHA512:
-  metadata.gz: 5d50c9b36f4a69a431620404b333b71c8fd9ca2fd8a6b2689c6ece3da57198de4cfa294adaf631238ca1186581eaa3b74a9ec8dea6e6f50f69a977a78ea71a79
-  data.tar.gz: 3f201c437eee80beac09bb76f121542f7c611b68ce513545fb46d6c44790cf061527564e5f9c03e4f55e51c70c67e355802d0e63e64004d4db36de135f110750
+  metadata.gz: 881de04b1163b74f27a6b890d3a43e16deaa2ab05f553c5bb567af20c689dc78fc5fed4cd81a33803ab3ed37f19be721f71e49062bcb89fa318370c5926ed20f
+  data.tar.gz: e26aad07bc0e3f8f59ca06ed2bb0875b3cc499db7e3982e1617a28da4995a60c8b68dceb6666379fa36289cbe4fa3c7a621c8a72509e7e8fbe7c7f504fcc7ebc

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    grumlin (0.22.1)
+    grumlin (0.22.4)
       async-pool (~> 0.3)
-      async-websocket (~> 0.19)
+      async-websocket (>= 0.19, < 0.20)
       oj (~> 3.13)
       retryable (~> 3.0)
       zeitwerk (~> 2.6)
@@ -11,7 +11,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.3)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -21,7 +21,7 @@ GEM
       console (~> 1.10)
       nio4r (~> 2.3)
       timers (~> 4.1)
-    async-http (0.58.0)
+    async-http (0.59.1)
       async (>= 1.25)
       async-io (>= 1.28)
       async-pool (>= 0.2)
@@ -31,7 +31,7 @@ GEM
       traces (>= 0.4.0)
     async-io (1.33.0)
       async
-    async-pool (0.3.10)
+    async-pool (0.3.11)
       async (>= 1.25)
     async-rspec (1.16.1)
       rspec (~> 3.0)
@@ -55,33 +55,30 @@ GEM
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     fiber-local (1.0.0)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     iniparse (1.5.0)
     jaro_winkler (1.5.4)
+    json (2.6.2)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     memory_profiler (1.0.0)
-    mini_portile2 (2.8.0)
-    minitest (5.15.0)
+    minitest (5.16.3)
     nio4r (2.5.8)
-    nokogiri (1.13.6)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.13.8-x86_64-linux)
       racc (~> 1.4)
-    nokogiri (1.13.6-x86_64-linux)
-      racc (~> 1.4)
-    oj (3.13.20)
+    oj (3.13.21)
     overcommit (0.59.1)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
       rexml (~> 3.2)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
     protocol-hpack (1.4.2)
-    protocol-http (0.23.4)
+    protocol-http (0.23.5)
     protocol-http1 (0.14.4)
       protocol-http (~> 0.22)
     protocol-http2 (0.14.2)
@@ -115,22 +112,23 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.30.1)
+    rubocop (1.35.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.18.0, < 2.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.18.0)
+    rubocop-ast (1.21.0)
       parser (>= 3.1.1.0)
-    rubocop-performance (1.14.2)
+    rubocop-performance (1.14.3)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rspec (2.11.1)
-      rubocop (~> 1.19)
+    rubocop-rspec (2.12.1)
+      rubocop (~> 1.31)
     ruby-prof (1.4.3)
     ruby-progressbar (1.11.0)
     simplecov (0.21.2)
@@ -139,7 +137,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    solargraph (0.45.0)
+    solargraph (0.46.0)
       backport (~> 1.2)
       benchmark
       bundler (>= 1.17.2)
@@ -155,19 +153,18 @@ GEM
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
     thor (1.2.1)
-    tilt (2.0.10)
+    tilt (2.0.11)
     timers (4.3.3)
-    traces (0.6.0)
-    tzinfo (2.0.4)
+    traces (0.6.1)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.2.0)
     webrick (1.7.0)
     yard (0.9.28)
       webrick (~> 1.7.0)
     zeitwerk (2.6.0)
 
 PLATFORMS
-  ruby
   x86_64-linux
 
 DEPENDENCIES

data/grumlin.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "async-pool", "~> 0.3"
-  spec.add_dependency "async-websocket", "~> 0.19"
+  spec.add_dependency "async-websocket", ">= 0.19", "< 0.20"
   spec.add_dependency "oj", "~> 3.13"
   spec.add_dependency "retryable", "~> 3.0"
   spec.add_dependency "zeitwerk", "~> 2.6"

data/lib/definitions.yml

@@ -69,6 +69,7 @@ steps:
   - unfold
   - union
   - until
+  - value
   - valueMap
   - values
   - where

data/lib/grumlin/repository/instance_methods.rb

@@ -10,7 +10,7 @@ module Grumlin
       UPSERT_RETRY_PARAMS = {
         on: [Grumlin::AlreadyExistsError, Grumlin::ConcurrentModificationError],
         sleep_method: ->(n) { Async::Task.current.sleep(n) },
-        tries: 3,
+        tries: 5,
         sleep: ->(n) { (n**2) + 1 + rand }
       }.freeze
 

data/lib/grumlin/request_error_factory.rb

@@ -18,11 +18,19 @@ module Grumlin
     # {"detailedMessage":"",
     #  "requestId":"UUID",
     #  "code":"ConcurrentModificationException"}
-    # Currencly we simply search for substings to identify the exact error
+    # Currently we simply search for substrings to identify the exact error
     # TODO: parse json and use `code` instead
+
     VERTEX_ALREADY_EXISTS = "Vertex with id already exists:"
     EDGE_ALREADY_EXISTS = "Edge with id already exists:"
+
     CONCURRENT_VERTEX_INSERT_FAILED = "Failed to complete Insert operation for a Vertex due to conflicting concurrent"
+
+    CONCURRENT_VERTEX_PROPERTY_INSERT_FAILED =
+      "Failed to complete Insert operation for a VertexProperty due to conflicting concurrent"
+    CONCURRENT_EDGE_PROPERTY_INSERT_FAILED =
+      "Failed to complete Insert operation for a EdgeProperty due to conflicting concurrent"
+
     CONCURRENT_EDGE_INSERT_FAILED = "Failed to complete Insert operation for an Edge due to conflicting concurrent"
     CONCURRENCT_MODIFICATION_FAILED = "Failed to complete operation due to conflicting concurrent"
 
@@ -49,9 +57,15 @@ module Grumlin
         return EdgeAlreadyExistsError if status[:message]&.include?(EDGE_ALREADY_EXISTS)
       end
 
-      def concurrent_modification_error(status)
+      def concurrent_modification_error(status) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         return ConcurrentVertexInsertFailedError if status[:message]&.include?(CONCURRENT_VERTEX_INSERT_FAILED)
+        if status[:message]&.include?(CONCURRENT_VERTEX_PROPERTY_INSERT_FAILED)
+          return ConcurrentVertexPropertyInsertFailedError
+        end
         return ConcurrentEdgeInsertFailedError if status[:message]&.include?(CONCURRENT_EDGE_INSERT_FAILED)
+        if status[:message]&.include?(CONCURRENT_EDGE_PROPERTY_INSERT_FAILED)
+          return ConcurrentEdgePropertyInsertFailedError
+        end
         return ConcurrentModificationError if status[:message]&.include?(CONCURRENCT_MODIFICATION_FAILED)
       end
     end

data/lib/grumlin/typing.rb

@@ -9,13 +9,13 @@ module Grumlin
       "g:Vertex" => ->(value) { cast_entity(Grumlin::Vertex, value) },
       "g:Edge" => ->(value) { cast_entity(Grumlin::Edge, value) },
       "g:Path" => ->(value) { cast_entity(Grumlin::Path, value) },
-      "g:Traverser" => ->(value) { cast_entity(Traverser, value) },
-      "g:Property" => ->(value) { cast_entity(Property, value) },
+      "g:Traverser" => ->(value) { cast_entity(Grumlin::Traverser, value) },
+      "g:Property" => ->(value) { cast_entity(Grumlin::Property, value) },
       "g:Int64" => ->(value) { cast_int(value) },
       "g:Int32" => ->(value) { cast_int(value) },
       "g:Double" => ->(value) { cast_double(value) },
       "g:Direction" => ->(value) { value },
-      # "g:VertexProperty"=> ->(value) { value }, # TODO: implement me
+      "g:VertexProperty" => ->(value) { cast_entity(Grumlin::VertexProperty, value) },
       "g:TraversalMetrics" => ->(value) { cast_map(value[:@value]) },
       "g:Metrics" => ->(value) { cast_map(value[:@value]) },
       "g:T" => ->(value) { Grumlin::Expressions::T.public_send(value) }

data/lib/grumlin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Grumlin
-  VERSION = "0.22.1"
+  VERSION = "0.22.4"
 end

data/lib/grumlin/vertex_property.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Grumlin
+  class VertexProperty
+    attr_reader :label, :value
+
+    def initialize(value)
+      @label = value[:label]
+      @value = Typing.cast(value[:value])
+    end
+
+    def inspect
+      "vp[#{label}->#{value}]"
+    end
+
+    def to_s
+      inspect
+    end
+
+    def ==(other)
+      self.class == other.class && @label == other.label && @value == other.value
+    end
+  end
+end

data/lib/grumlin.rb

@@ -107,6 +107,9 @@ module Grumlin
   class ConcurrentVertexInsertFailedError < ConcurrentInsertFailedError; end
   class ConcurrentEdgeInsertFailedError < ConcurrentInsertFailedError; end
 
+  class ConcurrentVertexPropertyInsertFailedError < ConcurrentInsertFailedError; end
+  class ConcurrentEdgePropertyInsertFailedError < ConcurrentInsertFailedError; end
+
   class ServerSerializationError < ServerSideError; end
 
   class ServerTimeoutError < ServerSideError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.22.4
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-15 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-pool
@@ -28,16 +28,22 @@ dependencies:
   name: async-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.19'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.19'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +173,7 @@ files:
 - lib/grumlin/typing.rb
 - lib/grumlin/version.rb
 - lib/grumlin/vertex.rb
+- lib/grumlin/vertex_property.rb
 - lib/grumlin/with_extension.rb
 - lib/tasks/benchmark.rake
 homepage: https://github.com/zhulik/grumlin