grumlin 1.0.0.rc5 → 1.0.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8a926f7ceafbe22e613403079a0b5dc220b606b999481bc7971cb02ba629363
-  data.tar.gz: dd2f10b273622c6a19c989e67b6d99c33b0cebd928dacfa57cef681f489570a8
+  metadata.gz: cf656a485be79f0ce06a1a091d3fb5421712ef05251150ff02ff5d12d867c777
+  data.tar.gz: 4ad9b95cfc61a9c41cdd0cb43ddd7ecc6686a1797a1162709b1c86cf512fb820
 SHA512:
-  metadata.gz: 6249760bd49fe1bdafed248b087d1361fce5781246c8ac87b3b3be4844fa80b8b44628c01cbcfe16c35c5b89d17d987eba338877ec8a4c14451d0f31b015c30c
-  data.tar.gz: a67cd4edbf4b6a0e442534657a10412851024f571ea262a6a62b49debac3406177f3679a525f39d63fd7316335e8bec4d40715a040f834116dd7427181f8111e
+  metadata.gz: '091041ce7819097c45dbf14c8ed50a3dc620f9a4be929d615934e0f131ed49f1684ecc3bdaf281f77a018c7c4db71e79e8fdb55039f447089e5700f6d5214edb'
+  data.tar.gz: 00067b1313025fb03bbbf336b5a7258a1ce7de33ab4756f697c916ee7610c54c8a8e28b804af2acf4c766a5de9e4e1188ecea13ba4af7a6b96cf34fcad1884f8

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    grumlin (1.0.0.rc5)
-      async-pool (~> 0.3)
-      async-websocket (>= 0.19, < 0.20)
+    grumlin (1.0.0.rc7)
+      async-pool (~> 0.3.0)
+      async-websocket (~> 0.22.0)
       ibsciss-middleware (~> 0.4.0)
-      oj (~> 3.13)
-      retryable (~> 3.0)
-      zeitwerk (~> 2.6)
+      oj (~> 3.13.0)
+      retryable (~> 3.0.0)
+      zeitwerk (~> 2.6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.3.1)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -22,14 +22,14 @@ GEM
       console (~> 1.10)
       nio4r (~> 2.3)
       timers (~> 4.1)
-    async-http (0.59.2)
+    async-http (0.59.3)
       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.4.0)
+      traces (>= 0.8.0)
     async-io (1.34.0)
       async
     async-pool (0.3.12)
@@ -38,16 +38,17 @@ GEM
       rspec (~> 3.0)
       rspec-files (~> 1.0)
       rspec-memory (~> 1.0)
-    async-websocket (0.19.2)
+    async-websocket (0.22.1)
       async-http (~> 0.54)
       async-io (~> 1.23)
-      protocol-websocket (~> 0.7.0)
+      protocol-rack (~> 0.1)
+      protocol-websocket (~> 0.9.1)
     backport (1.2.0)
     benchmark (0.2.0)
     benchmark-ips (2.10.0)
     childprocess (4.1.0)
     concurrent-ruby (1.1.10)
-    console (1.15.3)
+    console (1.16.2)
       fiber-local
     dead_end (4.0.0)
     diff-lcs (1.5.0)
@@ -66,12 +67,16 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    memory_profiler (1.0.0)
+    memory_profiler (1.0.1)
+    mini_portile2 (2.8.0)
     minitest (5.16.3)
     nio4r (2.5.8)
-    nokogiri (1.13.8-x86_64-linux)
+    nokogiri (1.13.9)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    oj (3.13.21)
+    nokogiri (1.13.9-x86_64-linux)
+      racc (~> 1.4)
+    oj (3.13.23)
     overcommit (0.59.1)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
@@ -86,51 +91,55 @@ GEM
     protocol-http2 (0.14.2)
       protocol-hpack (~> 1.4)
       protocol-http (~> 0.18)
-    protocol-websocket (0.7.5)
+    protocol-rack (0.2.4)
+      protocol-http (~> 0.23)
+      rack (>= 1.0)
+    protocol-websocket (0.9.1)
       protocol-http (~> 0.2)
       protocol-http1 (~> 0.2)
     racc (1.6.0)
+    rack (3.0.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.5.0)
+    regexp_parser (2.6.0)
     retryable (3.0.5)
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    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-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-files (1.1.2)
+      rspec-support (~> 3.12.0)
+    rspec-files (1.1.3)
       rspec (~> 3.0)
     rspec-memory (1.0.3)
       rspec (~> 3.0)
-    rspec-mocks (3.11.1)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.35.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.38.0)
       json (~> 2.3)
       parallel (~> 1.10)
       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.20.1, < 2.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
+    rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
-    rubocop-performance (1.14.3)
+    rubocop-performance (1.15.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rspec (2.12.1)
-      rubocop (~> 1.31)
+    rubocop-rspec (2.15.0)
+      rubocop (~> 1.33)
     ruby-prof (1.4.3)
     ruby-progressbar (1.11.0)
     simplecov (0.21.2)
@@ -139,7 +148,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    solargraph (0.46.0)
+    solargraph (0.47.2)
       backport (~> 1.2)
       benchmark
       bundler (>= 1.17.2)
@@ -156,17 +165,18 @@ GEM
       yard (~> 0.9, >= 0.9.24)
     thor (1.2.1)
     tilt (2.0.11)
-    timers (4.3.4)
-    traces (0.7.0)
+    timers (4.3.5)
+    traces (0.8.0)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.2.0)
+    unicode-display_width (2.3.0)
     webrick (1.7.0)
     yard (0.9.28)
       webrick (~> 1.7.0)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.6)
 
 PLATFORMS
+  ruby
   x86_64-linux
 
 DEPENDENCIES

data/README.md

@@ -24,6 +24,11 @@ event loop.
 - [License](#license)
 - [Code Of Conduct](#code-of-conduct)
 
+
+## 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).
+
 ## Install
 
 Add this line to your application's Gemfile:

data/grumlin.gemspec

@@ -28,10 +28,10 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "async-pool", "~> 0.3"
-  spec.add_dependency "async-websocket", ">= 0.19", "< 0.20"
+  spec.add_dependency "async-pool", "~> 0.3.0"
+  spec.add_dependency "async-websocket", "~> 0.22.0"
   spec.add_dependency "ibsciss-middleware", "~> 0.4.0"
-  spec.add_dependency "oj", "~> 3.13"
-  spec.add_dependency "retryable", "~> 3.0"
-  spec.add_dependency "zeitwerk", "~> 2.6"
+  spec.add_dependency "oj", "~> 3.13.0"
+  spec.add_dependency "retryable", "~> 3.0.0"
+  spec.add_dependency "zeitwerk", "~> 2.6.0"
 end

data/lib/grumlin/client.rb

@@ -83,7 +83,7 @@ class Grumlin::Client
 
     @request_dispatcher.clear unless check_requests
 
-    raise ResourceLeakError, "Request list is not empty: #{@request_dispatcher.requests}" if check_requests
+    raise Grumlin::ResourceLeakError, "Request list is not empty: #{@request_dispatcher.requests}" if check_requests
   ensure
     logger.debug(self, "Closed")
   end

data/lib/grumlin/transport.rb

@@ -70,7 +70,7 @@ class Grumlin::Transport
   def run_response_task
     with_guard do
       loop do
-        data = @connection.read
+        data = Oj.load(@connection.read.to_str, symbolize_names: true)
         @response_channel << data
       end
     end
@@ -79,7 +79,7 @@ class Grumlin::Transport
   def run_request_task
     with_guard do
       @request_channel.each do |message|
-        @connection.write(message)
+        @connection.write(Oj.dump(message, mode: :compat))
         @connection.flush
       end
     end

data/lib/grumlin/typing.rb

@@ -20,12 +20,14 @@ module Grumlin::Typing
     "g:T" => ->(value) { Grumlin::Expressions::T.public_send(value) }
   }.freeze
 
-  CASTABLE_TYPES = [Hash, String, Integer, TrueClass, FalseClass, NilClass].freeze
+  CASTABLE_TYPES = [Hash, String, Integer, TrueClass, FalseClass, NilClass, Array].freeze
 
   class << self
     def cast(value)
       verify_type!(value)
 
+      return value.map { |v| cast(v) } if value.is_a?(Array)
+
       return value unless value.is_a?(Hash)
 
       type = TYPES[value[:@type]]

data/lib/grumlin/version.rb

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

data/lib/grumlin/vertex.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 class Grumlin::Vertex
-  attr_reader :label, :id
+  attr_reader :label, :id, :properties
 
-  def initialize(label:, id:)
+  def initialize(label:, id:, properties: nil)
     @label = label
     @id = Grumlin::Typing.cast(id)
+    @properties = properties&.transform_values { |v| Grumlin::Typing.cast(v) }
   end
 
   def ==(other)

data/lib/grumlin.rb

@@ -4,10 +4,6 @@ require "securerandom"
 require "oj"
 require "yaml"
 
-# TODO: use Oj directly
-Oj.mimic_JSON
-Oj.add_to_json
-
 require "async"
 require "async/pool"
 require "async/pool/resource"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc5
+  version: 1.0.0.rc7
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-20 00:00:00.000000000 Z
+date: 2022-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-pool
@@ -16,34 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: async-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.19'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: 0.22.0
   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'
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: ibsciss-middleware
   requirement: !ruby/object:Gem::Requirement
@@ -64,42 +58,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: 3.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: 3.13.0
 - !ruby/object:Gem::Dependency
   name: retryable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: 2.6.0
 description: 'Gremlin graph traversal language DSL and client for Ruby. Suitable and
   tested with gremlin-server and AWS Neptune.