grumlin 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e12324038e3055ee0fcc736077cf70cdcc771fb655a468020358b4595355bda5
-  data.tar.gz: ec4690d68d554a38569b4e693bafbaaba7b37dad20e146b925099627b47e836e
+  metadata.gz: 553507d5129346a6cfb4de0dc7a49c921bcc55fa66bcfb1b34977e2c5745c99d
+  data.tar.gz: 50bc26cc953f4c5ecf5a98113694e27222af024d1dc44caa9a4c67f7d25f1001
 SHA512:
-  metadata.gz: f3301fc9f7018156a6d6a96fb9e3228635e62c9cefb0da2dca10ded230d8135feea23893078e833a763406c5b58b8952c097d10d2446a2965ae81ef7ea081f4b
-  data.tar.gz: 479bf195804c7b8a39c7cb82f18d5284f92a00bd4444620b94887487615eb4fcc57d4e6a619d55ff98a977b73ef0315d6d8c8495ebbd527cdc12a389b8a27b28
+  metadata.gz: fef41b400fac0f1a5630912c8dd28beac3741e5e90d22c60c20dc2bb9c7b5dba266a5ddaaf9a53fbf30f66c854a3a97dad8d61a96e3acc96edcf9bc41c5b0634
+  data.tar.gz: a45d7897f703eb52fb94e2d8e9375f9031f9ab2a5ef1c1f465d401a630a5f1831ca73819fee7c445d46bdad120687c64248d12e33874de4de74056e0d6bc8286

data/.github/workflows/main.yml

@@ -10,19 +10,16 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
           bundler-cache: true
 
-      - name: Run the default task
-        run: |
-          gem install bundler -v 2.2.15
-          bundle install
-          bundle exec rubocop
+      - name: Run rubocop
+        run: bundle exec rubocop -f github
+
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["3.0", "3.1", "3.2", "3.3"]
+        ruby: ["3.1", "3.2", "3.3"]
     steps:
       - uses: actions/checkout@v2
 
@@ -43,6 +40,7 @@ jobs:
 
       - name: Run tests
         run: bundle exec rspec
+
   publish:
     runs-on: ubuntu-latest
     needs:
@@ -54,7 +52,6 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
           bundler-cache: true
 
       - name: Build gem

data/.rubocop.yml

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

data/.tool-versions

@@ -1 +1 @@
-ruby 3.0.6
+ruby 3.1.5

data/Gemfile.lock

@@ -1,9 +1,13 @@
 PATH
   remote: .
   specs:
-    grumlin (1.2.0)
-      async-pool (~> 0.4.0)
+    grumlin (1.3.0)
+      async (~> 2.11.0)
+      async-http (~> 0.66.0)
+      async-io (~> 1.43.0)
+      async-pool (~> 0.6.0)
       async-websocket (~> 0.26.0)
+      console (~> 1.25.0)
       ibsciss-middleware (~> 0.4.0)
       oj (~> 3.16.0)
       retryable (~> 3.0.0)
@@ -23,30 +27,31 @@ GEM
       mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
-    async (1.31.0)
-      console (~> 1.10)
-      nio4r (~> 2.3)
+    async (2.11.0)
+      console (~> 1.25, >= 1.25.2)
+      fiber-annotation
+      io-event (~> 1.5, >= 1.5.1)
       timers (~> 4.1)
-    async-http (0.61.0)
-      async (>= 1.25)
-      async-io (>= 1.28)
-      async-pool (>= 0.2)
-      protocol-http (~> 0.25.0)
-      protocol-http1 (~> 0.16.0)
-      protocol-http2 (~> 0.15.0)
+    async-http (0.66.3)
+      async (>= 2.10.2)
+      async-pool (>= 0.6.1)
+      io-endpoint (~> 0.10, >= 0.10.3)
+      io-stream (~> 0.4)
+      protocol-http (~> 0.26.0)
+      protocol-http1 (~> 0.19.0)
+      protocol-http2 (~> 0.17.0)
       traces (>= 0.10.0)
-    async-io (1.38.1)
+    async-io (1.43.2)
       async
-    async-pool (0.4.0)
+    async-pool (0.6.1)
       async (>= 1.25)
     async-rspec (1.17.0)
       rspec (~> 3.0)
       rspec-files (~> 1.0)
       rspec-memory (~> 1.0)
-    async-websocket (0.26.0)
+    async-websocket (0.26.1)
       async-http (~> 0.54)
-      async-io (~> 1.23)
-      protocol-rack (~> 0.1)
+      protocol-rack (~> 0.5)
       protocol-websocket (~> 0.11)
     backport (1.2.0)
     base64 (0.2.0)
@@ -56,9 +61,10 @@ GEM
     childprocess (4.1.0)
     concurrent-ruby (1.2.2)
     connection_pool (2.4.1)
-    console (1.23.3)
+    console (1.25.2)
       fiber-annotation
-      fiber-local
+      fiber-local (~> 1.1)
+      json
     dead_end (4.0.0)
     diff-lcs (1.5.0)
     docile (1.4.0)
@@ -68,11 +74,16 @@ GEM
     factory_bot (6.4.5)
       activesupport (>= 5.0.0)
     fiber-annotation (0.2.0)
-    fiber-local (1.0.0)
+    fiber-local (1.1.0)
+      fiber-storage
+    fiber-storage (0.1.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    ibsciss-middleware (0.4.2)
+    ibsciss-middleware (0.4.3)
     iniparse (1.5.0)
+    io-endpoint (0.10.3)
+    io-event (1.5.1)
+    io-stream (0.4.0)
     jaro_winkler (1.5.6)
     json (2.7.1)
     kramdown (2.4.0)
@@ -84,7 +95,6 @@ GEM
     mini_portile2 (2.8.5)
     minitest (5.20.0)
     mutex_m (0.2.0)
-    nio4r (2.7.0)
     nokogiri (1.16.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -100,20 +110,20 @@ GEM
     parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
-    protocol-hpack (1.4.2)
-    protocol-http (0.25.0)
-    protocol-http1 (0.16.1)
+    protocol-hpack (1.4.3)
+    protocol-http (0.26.5)
+    protocol-http1 (0.19.1)
       protocol-http (~> 0.22)
-    protocol-http2 (0.15.1)
+    protocol-http2 (0.17.0)
       protocol-hpack (~> 1.4)
       protocol-http (~> 0.18)
-    protocol-rack (0.4.1)
+    protocol-rack (0.5.1)
       protocol-http (~> 0.23)
       rack (>= 1.0)
     protocol-websocket (0.12.1)
       protocol-http (~> 0.2)
     racc (1.7.3)
-    rack (3.0.8)
+    rack (3.0.11)
     rainbow (3.1.1)
     rake (13.1.0)
     rbs (2.8.4)
@@ -196,7 +206,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     yard (0.9.34)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.14)
 
 PLATFORMS
   ruby

data/README.md

@@ -27,7 +27,7 @@ event loop.
 
 ## Dependencies
 
-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).
+Grumlin works with ruby >= 3.1.
 
 ## Install
 

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(">= 3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.1")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/babbel/grumlin"
@@ -28,8 +28,12 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "async-pool", "~> 0.4.0"
+  spec.add_dependency "async", "~> 2.11.0"
+  spec.add_dependency "async-http", "~> 0.66.0"
+  spec.add_dependency "async-io", "~> 1.43.0"
+  spec.add_dependency "async-pool", "~> 0.6.0"
   spec.add_dependency "async-websocket", "~> 0.26.0"
+  spec.add_dependency "console", "~> 1.25.0"
   spec.add_dependency "ibsciss-middleware", "~> 0.4.0"
   spec.add_dependency "oj", "~> 3.16.0"
   spec.add_dependency "retryable", "~> 3.0.0"

data/lib/grumlin/client.rb

@@ -38,8 +38,6 @@ class Grumlin::Client
     end
   end
 
-  include Console
-
   # Client is not reusable. Once closed should be recreated.
   def initialize(url, parent: Async::Task.current, **client_options)
     @url = url
@@ -62,7 +60,7 @@ class Grumlin::Client
     rescue Async::Stop, Async::TimeoutError, StandardError
       close(check_requests: false)
     end
-    logger.debug(self, "Connected")
+    Console.debug(self, "Connected")
   end
 
   # Before calling close the user must ensure that:
@@ -85,7 +83,7 @@ class Grumlin::Client
 
     raise Grumlin::ResourceLeakError, "Request list is not empty: #{@request_dispatcher.requests}" if check_requests
   ensure
-    logger.debug(self, "Closed")
+    Console.debug(self, "Closed")
   end
 
   def connected?

data/lib/grumlin/config.rb

@@ -22,7 +22,7 @@ class Grumlin::Config
     @pool_size = 10
     @client_concurrency = 5
     @provider = :tinkergraph
-    @client_factory = ->(url, parent) { Grumlin::Client.new(url, parent: parent) }
+    @client_factory = ->(url, parent) { Grumlin::Client.new(url, parent:) }
   end
 
   def middlewares

data/lib/grumlin/dummy_transaction.rb

@@ -3,13 +3,11 @@
 class Grumlin::DummyTransaction < Grumlin::Transaction
   attr_reader :uuid
 
-  include Console
-
   def initialize(traversal_start_class, middlewares:, pool:)
     super
     @session_id = nil
 
-    logger.info(self) do
+    Console.info(self) do
       "#{Grumlin.config.provider} does not support transactions. commit and rollback are ignored, data will be saved"
     end
   end

data/lib/grumlin/repository/error_handling_strategy.rb

@@ -19,11 +19,11 @@ class Grumlin::Repository::ErrorHandlingStrategy
     @mode == :retry
   end
 
-  def apply!(&block)
+  def apply!(&)
     return yield if raise?
-    return ignore_errors!(&block) if ignore?
+    return ignore_errors!(&) if ignore?
 
-    retry_errors!(&block)
+    retry_errors!(&)
   end
 
   private
@@ -34,7 +34,7 @@ class Grumlin::Repository::ErrorHandlingStrategy
     # ignore errors
   end
 
-  def retry_errors!(&block)
-    Retryable.retryable(**@params, &block)
+  def retry_errors!(&)
+    Retryable.retryable(**@params, &)
   end
 end

data/lib/grumlin/repository/instance_methods.rb

@@ -42,7 +42,7 @@ module Grumlin::Repository::InstanceMethods # rubocop:disable Metrics/ModuleLeng
 
     return if traversal.count.next.zero?
 
-    drop_in_batches(traversal, batch_size: batch_size)
+    drop_in_batches(traversal, batch_size:)
 
     Console.logger.info(self) { "drop_in_batches: finished." }
   end
@@ -123,17 +123,17 @@ module Grumlin::Repository::InstanceMethods # rubocop:disable Metrics/ModuleLeng
 
   private
 
-  def with_upsert_error_handling(on_failure, params, &block)
+  def with_upsert_error_handling(on_failure, params, &)
     if params.any?
       Grumlin::Repository::ErrorHandlingStrategy.new(mode: on_failure, **UPSERT_RETRY_PARAMS.merge(params))
     else
       DEFAULT_ERROR_HANDLING_STRATEGY
-    end.apply!(&block)
+    end.apply!(&)
   end
 
-  def with_upsert_retry(retry_params, &block)
+  def with_upsert_retry(retry_params, &)
     retry_params = UPSERT_RETRY_PARAMS.merge(retry_params)
-    Retryable.retryable(**retry_params, &block)
+    Retryable.retryable(**retry_params, &)
   end
 
   def cleanup_properties(create_properties, update_properties, *props_to_cleanup)

data/lib/grumlin/request_dispatcher.rb

@@ -23,7 +23,7 @@ class Grumlin::RequestDispatcher
     raise RequestAlreadyAddedError if @requests.include?(request[:requestId])
 
     Async::Channel.new.tap do |channel|
-      @requests[request[:requestId]] = { request: request, result: [], channel: channel }
+      @requests[request[:requestId]] = { request:, result: [], channel: }
     end
   end
 

data/lib/grumlin/shortcuts/storage.rb

@@ -35,7 +35,7 @@ class Grumlin::Shortcuts::Storage
     sc = step_class
 
     shortcut_methods_module.define_method(name) do |*args, **params|
-      next sc.new(name, args: args, params: params, previous_step: self, pool: pool)
+      next sc.new(name, args:, params:, previous_step: self, pool:)
     end
     extend_traversal_classes(shortcut) unless shortcut.lazy?
   end
@@ -47,7 +47,7 @@ class Grumlin::Shortcuts::Storage
   end
 
   def g(middlewares: Grumlin.default_middlewares)
-    traversal_start_class.new(pool: Grumlin.default_pool, middlewares: middlewares)
+    traversal_start_class.new(pool: Grumlin.default_pool, middlewares:)
   end
 
   def __

data/lib/grumlin/shortcuts.rb

@@ -21,7 +21,7 @@ module Grumlin::Shortcuts
 
     raise ArgumentError, "either shortcut or block must be passed" if [shortcut, block].count(&:nil?) != 1
 
-    shortcuts.add(name, shortcut || Grumlin::Shortcut.new(name, lazy: lazy, &block))
+    shortcuts.add(name, shortcut || Grumlin::Shortcut.new(name, lazy:, &block))
   end
 
   def shortcuts_from(other_shortcuts)

data/lib/grumlin/shortcuts_applyer.rb

@@ -26,7 +26,7 @@ class Grumlin::ShortcutsApplyer
         args = step.args.map { |arg| call(arg) }
 
         shortcut = shortcuts[step.name]
-        next result << Grumlin::StepData.new(step.name, args: args, params: step.params) unless shortcut&.lazy?
+        next result << Grumlin::StepData.new(step.name, args:, params: step.params) unless shortcut&.lazy?
 
         t = shortcuts.__
         step = shortcut.apply(t, *args, **step.params)

data/lib/grumlin/step.rb

@@ -6,7 +6,7 @@ class Grumlin::Step < Grumlin::Steppable
   # TODO: replace pool, session_id and middlewares with a context?
   def initialize(name, args: [], params: {}, previous_step: nil, pool: nil, session_id: nil, # rubocop:disable Metrics/ParameterLists
                  middlewares: Grumlin.default_middlewares)
-    super(pool: pool, session_id: session_id, middlewares: middlewares)
+    super(pool:, session_id:, middlewares:)
 
     @name = name.to_sym
     @args = args # TODO: add recursive validation: only json types or Step
@@ -55,7 +55,7 @@ class Grumlin::Step < Grumlin::Steppable
   end
 
   def bytecode(no_return: false)
-    Grumlin::StepsSerializers::Bytecode.new(steps, no_return: no_return)
+    Grumlin::StepsSerializers::Bytecode.new(steps, no_return:)
   end
 
   def next
@@ -85,7 +85,7 @@ class Grumlin::Step < Grumlin::Steppable
 
   def send_query(need_results:)
     @middlewares.call(traversal: self,
-                      need_results: need_results,
+                      need_results:,
                       session_id: @session_id,
                       pool: @pool)
   end

data/lib/grumlin/steppable.rb

@@ -23,13 +23,13 @@ class Grumlin::Steppable
 
   ALL_STEPS.each do |step|
     define_method step do |*args, **params|
-      shortcuts.step_class.new(step, args: args, params: params, previous_step: self,
+      shortcuts.step_class.new(step, args:, params:, previous_step: self,
                                      session_id: @session_id, pool: @pool, middlewares: @middlewares)
     end
   end
 
   def step(name, *args, **params)
-    shortcuts.step_class.new(name, args: args, params: params, previous_step: self,
+    shortcuts.step_class.new(name, args:, params:, previous_step: self,
                                    session_id: @session_id, pool: @pool, middlewares: @middlewares)
   end
 

data/lib/grumlin/steps.rb

@@ -24,11 +24,9 @@ class Grumlin::Steps
   end
 
   def add(name, args: [], params: {}, to: :end)
-    if CONFIGURATION_STEPS.include?(name) || name.to_sym == :tx
-      return add_configuration_step(name, args: args, params: params, to: to)
-    end
+    return add_configuration_step(name, args:, params:, to:) if CONFIGURATION_STEPS.include?(name) || name.to_sym == :tx
 
-    Grumlin::StepData.new(name, args: cast_arguments(args), params: params).tap do |step|
+    Grumlin::StepData.new(name, args: cast_arguments(args), params:).tap do |step|
       next @steps << step if to == :end
       next @steps.unshift(step) if to == :begin
 
@@ -62,7 +60,7 @@ class Grumlin::Steps
   def add_configuration_step(name, args: [], params: {}, to: :end)
     raise ArgumentError, "cannot use configuration steps after start step was used" if @steps.any? && to == :end
 
-    Grumlin::StepData.new(name, args: cast_arguments(args), params: params).tap do |step|
+    Grumlin::StepData.new(name, args: cast_arguments(args), params:).tap do |step|
       next @configuration_steps << step if to == :end
       next @configuration_steps.unshift(step) if to == :begin
 

data/lib/grumlin/transaction.rb

@@ -3,8 +3,6 @@
 class Grumlin::Transaction
   attr_reader :session_id, :pool
 
-  include Console
-
   COMMIT = Grumlin::Repository.new.g.step(:tx, :commit)
   ROLLBACK = Grumlin::Repository.new.g.step(:tx, :rollback)
 

data/lib/grumlin/transport.rb

@@ -4,8 +4,6 @@ class Grumlin::Transport
   # A transport based on https://github.com/socketry/async
   # and https://github.com/socketry/async-websocket
 
-  include Console
-
   attr_reader :url
 
   # Transport is not reusable. Once closed should be recreated.
@@ -26,7 +24,7 @@ class Grumlin::Transport
     raise AlreadyConnectedError if connected?
 
     @connection = Async::WebSocket::Client.connect(Async::HTTP::Endpoint.parse(@url), **@client_options)
-    logger.debug(self) { "Connected to #{@url}." }
+    Console.debug(self) { "Connected to #{@url}." }
 
     @response_task = @parent.async { run_response_task }
 
@@ -88,7 +86,7 @@ class Grumlin::Transport
   def with_guard
     yield
   rescue Async::Stop, Async::TimeoutError, StandardError => e
-    logger.debug(self) { "Guard error, closing." }
+    Console.debug(self) { "Guard error, closing." }
     begin
       @response_channel.exception(e)
     rescue Async::Channel::ChannelClosedError

data/lib/grumlin/traversal_start.rb

@@ -12,7 +12,7 @@ class Grumlin::TraversalStart < Grumlin::Steppable
     # Pool should have size of 1 when working with session
     pool = Async::Pool::Controller.new(Grumlin::Client::PoolResource, limit: 1)
 
-    transaction = tx_class.new(self.class, pool: pool, middlewares: @middlewares)
+    transaction = tx_class.new(self.class, pool:, middlewares: @middlewares)
     return transaction unless block_given?
 
     result = nil

data/lib/grumlin/traversal_strategies/options_strategy.rb

@@ -2,6 +2,6 @@
 
 class Grumlin::TraversalStrategies::OptionsStrategy < Grumlin::TypedValue
   def initialize(value)
-    super(type: "OptionsStrategy", value: value)
+    super(type: "OptionsStrategy", value:)
   end
 end

data/lib/grumlin/version.rb

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

metadata

@@ -1,29 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-02 00:00:00.000000000 Z
+date: 2024-05-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: async
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: async-http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.66.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.66.0
+- !ruby/object:Gem::Dependency
+  name: async-io
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.43.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.43.0
 - !ruby/object:Gem::Dependency
   name: async-pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: async-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.26.0
+- !ruby/object:Gem::Dependency
+  name: console
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.25.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.25.0
 - !ruby/object:Gem::Dependency
   name: ibsciss-middleware
   requirement: !ruby/object:Gem::Requirement
@@ -213,14 +269,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Gremlin graph traversal language DSL and client for Ruby.