grumlin 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37a377cb78a69351a6b8dec3dd7a0cfe1e26798050a63e2a1d06ae6f98ef1685
-  data.tar.gz: 59fb7208327b03c9977c7926b877a7901df018ae7d5cf3f6826dbce991e51134
+  metadata.gz: 27313f7516a4bcc6bfb1d7ec133faca0c0c091bbcb87b6e14a7b3883e115d103
+  data.tar.gz: f711cd54afbf840ad783fe2d10c48b96ce1e63d571aef704d7929ab7cf9d8c7c
 SHA512:
-  metadata.gz: 7131525255531d09a5d01c9dfdd7e39a2b9be0f17861f13852a405b7469f72143ff456a0dd993d57c64f1d5ef3448261332db476f52580e2272fb1e70869f074
-  data.tar.gz: 208349b5295e788c7b179950a5efccca28b50622d0f642066fcbd6da75d5557d0560b044d9b9431de105ff11837b39e1e5bccd4b872bafd78b8bcef283b7ea4f
+  metadata.gz: 2ef4a63618eec2f7f8f6615f809141b9197647b984c0215090853a9b07a74c35f9ce93df1d5047aa02697ab8bff24cf061953efe310aaec38b6c1f98cd0c7ac8
+  data.tar.gz: 8158dd69e67ca1e218c835360c02221cf5fb4f9428205d35be3e4b5ef1d57c3058e38ede2403937a0d2fa2ddef9ba961a61f02a2e561818a47a278a2ff6ee926

data/.github/workflows/main.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["2.7", "3.0", "3.1"]
+        ruby: ["3.0", "3.1", "3.2"]
     steps:
       - uses: actions/checkout@v2
 

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   NewCops: enable
   SuggestExtensions: false
 

data/.tool-versions

@@ -1 +1 @@
-ruby 2.7.5
+ruby 3.0.6

data/Gemfile.lock

@@ -1,54 +1,56 @@
 PATH
   remote: .
   specs:
-    grumlin (1.0.4)
-      async-pool (~> 0.3.0)
-      async-websocket (~> 0.22.0)
+    grumlin (1.1.0)
+      async-pool (~> 0.4.0)
+      async-websocket (~> 0.25.0)
       ibsciss-middleware (~> 0.4.0)
-      oj (~> 3.13.0)
+      oj (~> 3.15.0)
       retryable (~> 3.0.0)
       zeitwerk (~> 2.6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4)
+    activesupport (7.0.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
-    async (1.30.3)
+    async (1.31.0)
       console (~> 1.10)
       nio4r (~> 2.3)
       timers (~> 4.1)
-    async-http (0.59.3)
+    async-http (0.60.2)
       async (>= 1.25)
       async-io (>= 1.28)
       async-pool (>= 0.2)
-      protocol-http (~> 0.23.1)
-      protocol-http1 (~> 0.14.0)
-      protocol-http2 (~> 0.14.0)
-      traces (>= 0.8.0)
-    async-io (1.34.0)
+      protocol-http (~> 0.24.0)
+      protocol-http1 (~> 0.15.0)
+      protocol-http2 (~> 0.15.0)
+      traces (>= 0.10.0)
+    async-io (1.35.0)
       async
-    async-pool (0.3.12)
+    async-pool (0.4.0)
       async (>= 1.25)
-    async-rspec (1.16.1)
+    async-rspec (1.17.0)
       rspec (~> 3.0)
       rspec-files (~> 1.0)
       rspec-memory (~> 1.0)
-    async-websocket (0.22.1)
+    async-websocket (0.25.1)
       async-http (~> 0.54)
       async-io (~> 1.23)
       protocol-rack (~> 0.1)
-      protocol-websocket (~> 0.9.1)
+      protocol-websocket (~> 0.11)
     backport (1.2.0)
-    benchmark (0.2.0)
-    benchmark-ips (2.10.0)
+    base64 (0.1.1)
+    benchmark (0.2.1)
+    benchmark-ips (2.12.0)
     childprocess (4.1.0)
-    concurrent-ruby (1.1.10)
-    console (1.16.2)
+    concurrent-ruby (1.2.2)
+    console (1.23.2)
+      fiber-annotation
       fiber-local
     dead_end (4.0.0)
     diff-lcs (1.5.0)
@@ -56,122 +58,135 @@ GEM
     e2mmap (0.1.0)
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
+    fiber-annotation (0.2.0)
     fiber-local (1.0.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     ibsciss-middleware (0.4.2)
     iniparse (1.5.0)
-    jaro_winkler (1.5.4)
-    json (2.6.2)
+    jaro_winkler (1.5.6)
+    json (2.6.3)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
+    language_server-protocol (3.17.0.3)
     memory_profiler (1.0.1)
-    mini_portile2 (2.8.0)
-    minitest (5.16.3)
-    nio4r (2.5.8)
-    nokogiri (1.13.9)
-      mini_portile2 (~> 2.8.0)
+    mini_portile2 (2.8.4)
+    minitest (5.19.0)
+    nio4r (2.5.9)
+    nokogiri (1.15.4)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oj (3.13.23)
-    overcommit (0.59.1)
+    nokogiri (1.15.4-x86_64-linux)
+      racc (~> 1.4)
+    oj (3.15.1)
+    overcommit (0.60.0)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
       rexml (~> 3.2)
-    parallel (1.22.1)
-    parser (3.1.2.1)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
     protocol-hpack (1.4.2)
-    protocol-http (0.23.12)
-    protocol-http1 (0.14.6)
+    protocol-http (0.24.7)
+    protocol-http1 (0.15.1)
       protocol-http (~> 0.22)
-    protocol-http2 (0.14.2)
+    protocol-http2 (0.15.1)
       protocol-hpack (~> 1.4)
       protocol-http (~> 0.18)
-    protocol-rack (0.2.4)
+    protocol-rack (0.2.6)
       protocol-http (~> 0.23)
       rack (>= 1.0)
-    protocol-websocket (0.9.1)
+    protocol-websocket (0.12.0)
       protocol-http (~> 0.2)
       protocol-http1 (~> 0.2)
-    racc (1.6.0)
-    rack (3.0.1)
+    racc (1.7.1)
+    rack (3.0.8)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.6.0)
+    rbs (2.8.4)
+    regexp_parser (2.8.1)
     retryable (3.0.5)
     reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.2.5)
+    rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-files (1.1.3)
       rspec (~> 3.0)
-    rspec-memory (1.0.3)
+    rspec-memory (1.0.4)
       rspec (~> 3.0)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.38.0)
+    rspec-support (3.12.1)
+    rubocop (1.56.0)
+      base64 (~> 0.1.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.23.0)
-      parser (>= 3.1.1.0)
-    rubocop-performance (1.15.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.23.1)
+      rubocop (~> 1.33)
+    rubocop-performance (1.19.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rspec (2.15.0)
+    rubocop-rspec (2.23.2)
       rubocop (~> 1.33)
-    ruby-prof (1.4.3)
-    ruby-progressbar (1.11.0)
-    simplecov (0.21.2)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-prof (1.6.3)
+    ruby-progressbar (1.13.0)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    solargraph (0.47.2)
+    solargraph (0.49.0)
       backport (~> 1.2)
       benchmark
-      bundler (>= 1.17.2)
+      bundler (~> 2.0)
       diff-lcs (~> 1.4)
       e2mmap
       jaro_winkler (~> 1.5)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.1)
       parser (~> 3.0)
-      reverse_markdown (>= 1.0.5, < 3)
-      rubocop (>= 0.52)
+      rbs (~> 2.0)
+      reverse_markdown (~> 2.0)
+      rubocop (~> 1.38)
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    thor (1.2.1)
-    tilt (2.0.11)
+    thor (1.2.2)
+    tilt (2.2.0)
     timers (4.3.5)
-    traces (0.8.0)
-    tzinfo (2.0.5)
+    traces (0.11.1)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
-    webrick (1.7.0)
-    yard (0.9.28)
-      webrick (~> 1.7.0)
-    zeitwerk (2.6.6)
+    unicode-display_width (2.4.2)
+    yard (0.9.34)
+    zeitwerk (2.6.11)
 
 PLATFORMS
   ruby
@@ -197,4 +212,4 @@ DEPENDENCIES
   solargraph
 
 BUNDLED WITH
-   2.2.26
+   2.2.33

data/README.md

@@ -27,7 +27,7 @@ event loop.
 
 ## Dependencies
 
-Grumlin works with ruby >= 2.7, but it's recommended to use 3.1 due to [zlib warnings](https://github.com/socketry/async-websocket/issues/42).
+Grumlin works with ruby >= 3.0, but it's recommended to use 3.1 due to [zlib warnings](https://github.com/socketry/async-websocket/issues/42).
 
 ## Install
 

data/Rakefile

@@ -15,7 +15,7 @@ namespace :definitions do
   desc "Format definitions.yml"
   task :format do
     path = File.join(__dir__, "lib", "definitions.yml")
-    definitions = YAML.safe_load(File.read(path))
+    definitions = YAML.safe_load_file(path)
 
     definitions.each_value do |kind|
       kind.each do |name, list|

data/grumlin.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
 
   spec.homepage      = "https://github.com/babbel/grumlin"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/babbel/grumlin"
@@ -28,10 +28,10 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "async-pool", "~> 0.3.0"
-  spec.add_dependency "async-websocket", "~> 0.22.0"
+  spec.add_dependency "async-pool", "~> 0.4.0"
+  spec.add_dependency "async-websocket", "~> 0.25.0"
   spec.add_dependency "ibsciss-middleware", "~> 0.4.0"
-  spec.add_dependency "oj", "~> 3.13.0"
+  spec.add_dependency "oj", "~> 3.15.0"
   spec.add_dependency "retryable", "~> 3.0.0"
   spec.add_dependency "zeitwerk", "~> 2.6.0"
 end

data/lib/grumlin/middlewares/builder.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Grumlin::Middlewares::Builder < ::Middleware::Builder
+class Grumlin::Middlewares::Builder < Middleware::Builder
   def similar?(other)
     stack == other.stack
   end

data/lib/grumlin/repository/instance_methods.rb

@@ -58,7 +58,7 @@ module Grumlin::Repository::InstanceMethods # rubocop:disable Metrics/ModuleLeng
 
   def add_vertex(label, id = nil, start: g, **properties)
     id ||= properties[T.id]
-    properties = except(properties, T.id)
+    properties = properties.except(T.id)
 
     t = start.addV(label)
     t = t.props(T.id => id) unless id.nil?
@@ -67,7 +67,7 @@ module Grumlin::Repository::InstanceMethods # rubocop:disable Metrics/ModuleLeng
 
   def add_edge(label, id = nil, from:, to:, start: g, **properties)
     id ||= properties[T.id]
-    properties = except(properties, T.label)
+    properties = properties.except(T.label)
     properties[T.id] = id
 
     start.addE(label).from(__.V(from)).to(__.V(to)).props(**properties).next
@@ -132,24 +132,14 @@ module Grumlin::Repository::InstanceMethods # rubocop:disable Metrics/ModuleLeng
   end
 
   def with_upsert_retry(retry_params, &block)
-    retry_params = UPSERT_RETRY_PARAMS.merge((retry_params))
+    retry_params = UPSERT_RETRY_PARAMS.merge(retry_params)
     Retryable.retryable(**retry_params, &block)
   end
 
-  # A polyfill for Hash#except for ruby 2.x environments without ActiveSupport
-  # TODO: delete and use native Hash#except after ruby 2.7 is deprecated.
-  def except(hash, *keys)
-    return hash.except(*keys) if hash.respond_to?(:except)
-
-    hash.each_with_object({}) do |(k, v), res|
-      res[k] = v unless keys.include?(k)
-    end
-  end
-
   def cleanup_properties(create_properties, update_properties, *props_to_cleanup)
     props_to_cleanup = [T.id, T.label] if props_to_cleanup.empty?
     [create_properties, update_properties].map do |props|
-      except(props, props_to_cleanup)
+      props.except(props_to_cleanup)
     end
   end
 end

data/lib/grumlin/repository.rb

@@ -81,7 +81,7 @@ module Grumlin::Repository
 
   def default_edge_properties(&block)
     shortcut :addE, override: true do |*args|
-      super(*args).props(**block.call(*args))  # rubocop:disable Performance/RedundantBlockCall
+      super(*args).props(**block.call(*args)) # rubocop:disable Performance/RedundantBlockCall
     end
   end
 

data/lib/grumlin/request_error_factory.rb

@@ -54,7 +54,8 @@ class Grumlin::RequestErrorFactory
 
     def already_exists_error(status)
       return Grumlin::VertexAlreadyExistsError if status[:message]&.include?(VERTEX_ALREADY_EXISTS)
-      return Grumlin::EdgeAlreadyExistsError if status[:message]&.include?(EDGE_ALREADY_EXISTS)
+
+      Grumlin::EdgeAlreadyExistsError if status[:message]&.include?(EDGE_ALREADY_EXISTS)
     end
 
     def concurrent_modification_error(status) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
@@ -66,7 +67,8 @@ class Grumlin::RequestErrorFactory
       if status[:message]&.include?(CONCURRENT_EDGE_PROPERTY_INSERT_FAILED)
         return Grumlin::ConcurrentEdgePropertyInsertFailedError
       end
-      return Grumlin::ConcurrentModificationError if status[:message]&.include?(CONCURRENCT_MODIFICATION_FAILED)
+
+      Grumlin::ConcurrentModificationError if status[:message]&.include?(CONCURRENCT_MODIFICATION_FAILED)
     end
   end
 end

data/lib/grumlin/version.rb

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

data/lib/grumlin.rb

@@ -181,7 +181,7 @@ module Grumlin
     end
 
     def definitions
-      @definitions ||= YAML.safe_load(File.read(File.join(__dir__, "definitions.yml")), symbolize_names: true)
+      @definitions ||= YAML.safe_load_file(File.join(__dir__, "definitions.yml"), symbolize_names: true)
     end
 
     def fake_uuid(*parts, separator: "->")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Gleb Sinyavskiy
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: async-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.25.0
 - !ruby/object:Gem::Dependency
   name: ibsciss-middleware
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.0
+        version: 3.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.0
+        version: 3.15.0
 - !ruby/object:Gem::Dependency
   name: retryable
   requirement: !ruby/object:Gem::Requirement
@@ -213,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="