grumlin 0.22.2 → 0.22.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23a0ce8dacaf7c4add38674353e6aa69e51ebd9865ed83c3112f62ad96a5d213
-  data.tar.gz: 775c7c6009e6969d9a2b060772dc5d6caf9846267050509a5aeccf1bd5050e0c
+  metadata.gz: 88898067f66c807c685077f768ca71db95d7b246540764334b421f0c86fe92cc
+  data.tar.gz: 5801ac047063d58395e36e194f961ccb2abce3eb772a0b7648c3f35434700c53
 SHA512:
-  metadata.gz: 6b9a820912679a67ca1be3545130ee3affcf89bea1bd9085a47f18d4b0c2ed6583ebfe5e7c52c339d93efe672d7ec7d5e604a68681581a4c57f6b21d8dce9e21
-  data.tar.gz: a5d371995de61123f954361143f98427af0109831c189bb1ad60cdf722109c72749872478096aa60de22bc7d3139825fdf1ed07c8cce2330eca51cb5865fc6f9
+  metadata.gz: b6377eb1c36a2caf2536f92574d17a57e7da76f8f8cb7995280aabcde1412fc84e214cdb8a296a3d61d6736efd073e09c415b7a34bdf686567b427eb434ca21e
+  data.tar.gz: 172be358c5882da351e2d12db7688a2521808becf0a027c870fa38b27836e76b82b7a995ddf880f4cc205639dba92dfdc771908450891ac6117f241617969c6a

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    grumlin (0.22.2)
+    grumlin (0.22.5)
       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/action.rb

@@ -5,7 +5,7 @@ module Grumlin
     attr_reader :name, :args, :params, :next_step, :configuration_steps, :previous_step, :shortcut
 
     # client is only used when a traversal is a part of transaction
-    def initialize(name, args: [], params: {}, previous_step: nil, pool: Grumlin.default_pool, session_id: nil)
+    def initialize(name, args: [], params: {}, previous_step: nil, pool: nil, session_id: nil)
       super(pool: pool, session_id: session_id)
 
       @name = name.to_sym

data/lib/grumlin/dummy_transaction.rb

@@ -6,7 +6,7 @@ module Grumlin
 
     include Console
 
-    def initialize(traversal_start_class, pool: Grumlin.default_pool) # rubocop:disable Lint/MissingSuper, Lint/UnusedMethodArgument
+    def initialize(traversal_start_class, pool: nil) # rubocop:disable Lint/MissingSuper, Lint/UnusedMethodArgument
       @traversal_start_class = traversal_start_class
 
       logger.info(self) do

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/shortcuts/storage.rb

@@ -36,7 +36,7 @@ module Grumlin
         ac = action_class
 
         shortcut_methods_module.define_method(name) do |*args, **params|
-          next ac.new(name, args: args, params: params, previous_step: self)
+          next ac.new(name, args: args, params: params, previous_step: self, pool: Grumlin.default_pool)
         end
         extend_traversal_classes(shortcut) unless shortcut.lazy?
       end
@@ -52,7 +52,7 @@ module Grumlin
       end
 
       def __
-        @__ ||= traversal_start_class.new
+        traversal_start_class.new(pool: Grumlin.default_pool)
       end
 
       def traversal_start_class

data/lib/grumlin/steppable.rb

@@ -12,7 +12,7 @@ module Grumlin
 
     ALL_STEPS = START_STEPS + CONFIGURATION_STEPS + REGULAR_STEPS
 
-    def initialize(pool: Grumlin.default_pool, session_id: nil)
+    def initialize(pool: nil, session_id: nil)
       @pool = pool
       @session_id = session_id
 
@@ -23,12 +23,14 @@ module Grumlin
 
     ALL_STEPS.each do |step|
       define_method step do |*args, **params|
-        shortcuts.action_class.new(step, args: args, params: params, previous_step: self, session_id: @session_id)
+        shortcuts.action_class.new(step, args: args, params: params, previous_step: self,
+                                         session_id: @session_id, pool: @pool)
       end
     end
 
     def step(name, *args, **params)
-      shortcuts.action_class.new(name, args: args, params: params, previous_step: self, session_id: @session_id)
+      shortcuts.action_class.new(name, args: args, params: params, previous_step: self,
+                                       session_id: @session_id, pool: @pool)
     end
 
     def_delegator :shortcuts, :__

data/lib/grumlin/transaction.rb

@@ -9,7 +9,7 @@ module Grumlin
     COMMIT = Grumlin::Repository.new.g.step(:tx, :commit).bytecode
     ROLLBACK = Grumlin::Repository.new.g.step(:tx, :rollback).bytecode
 
-    def initialize(traversal_start_class, pool: Grumlin.default_pool)
+    def initialize(traversal_start_class, pool:)
       @traversal_start_class = traversal_start_class
       @pool = pool
 

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.2"
+  VERSION = "0.22.5"
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 0.22.2
+  version: 0.22.5
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-15 00:00:00.000000000 Z
+date: 2022-08-25 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