grumlin 0.19.3 → 0.19.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ce013b3f95a61f038a3dd646c4f47de81026bf9ec396467a0500f2fc7c055e3
-  data.tar.gz: 78cd3caf0ce18bce7741236cf9f232b58eb0b675492102826635ccc441f98cec
+  metadata.gz: f2765e4dfacbbe6e54cbcf07768a2834f42101866c3c448ba218425682fa285e
+  data.tar.gz: 0bae4cc9ca063e09df152a3de1a5ad602561870ded4c1628486f45fc613bed0e
 SHA512:
-  metadata.gz: 3f49d27bc55301991f4eff5935eb90d1a3dff873551466ffcbf6ecc978d25149eba939a45b2e9e966b706470a7c47496e575f51ba2fab26ebb96e9deb9d31bcd
-  data.tar.gz: 656e68d9d2ba385d0e2c17d4e28658f15b2d224338e9e3d0bc93b2336bcfe4c4d30226f2efb653e21678c0131f79c9a3d3043e1ac8b1a0b9489e12606c65d425
+  metadata.gz: 196703410673b311e1c7054ea0f88b1dfab59a495d240e5b2fe98afe24252050bee1247c6349ee0dc1343b408bf8d380790f0f2fbe4f139b8afbffae1dd86236
+  data.tar.gz: 7c43b9bc02172d8d00be62d35182a5c0d9f921a84289dbbdd4c20c16cd3fa9a06c6ed68ac84732cdfccba6864fb7aece6278581211c308e2487364e217907b9d

data/.rubocop.yml

@@ -24,7 +24,7 @@ Metrics/ParameterLists:
   Max: 6
 
 Naming/MethodName:
-  IgnoredPatterns:
+  AllowedPatterns:
     - toList
     - inVLabel
     - outVLabel

data/Gemfile

@@ -5,19 +5,23 @@ source "https://rubygems.org"
 gemspec
 
 gem "nokogiri"
-gem "rubocop"
-gem "rubocop-performance"
-gem "rubocop-rspec"
+gem "parallel"
 
 gem "solargraph"
 
-gem "async-rspec"
-gem "factory_bot"
 gem "overcommit"
 gem "rake"
+
+gem "async-rspec"
+gem "factory_bot"
 gem "rspec"
+
 gem "simplecov"
 
 gem "benchmark-ips"
 gem "memory_profiler"
 gem "ruby-prof"
+
+gem "rubocop"
+gem "rubocop-performance"
+gem "rubocop-rspec"

data/Gemfile.lock

@@ -1,24 +1,23 @@
 PATH
   remote: .
   specs:
-    grumlin (0.19.3)
+    grumlin (0.19.6)
       async-pool (~> 0.3)
       async-websocket (~> 0.19)
-      oj (~> 3.12)
+      oj (~> 3.13)
       retryable (~> 3.0)
-      zeitwerk (~> 2.4)
+      zeitwerk (~> 2.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3.2)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ast (2.4.2)
-    async (1.30.2)
+    async (1.30.3)
       console (~> 1.10)
       nio4r (~> 2.3)
       timers (~> 4.1)
@@ -34,7 +33,7 @@ GEM
       async
     async-pool (0.3.10)
       async (>= 1.25)
-    async-rspec (1.16.0)
+    async-rspec (1.16.1)
       rspec (~> 3.0)
       rspec-files (~> 1.0)
       rspec-memory (~> 1.0)
@@ -43,41 +42,42 @@ GEM
       async-io (~> 1.23)
       protocol-websocket (~> 0.7.0)
     backport (1.2.0)
-    benchmark (0.1.1)
+    benchmark (0.2.0)
     benchmark-ips (2.10.0)
-    childprocess (4.0.0)
-    concurrent-ruby (1.1.8)
-    console (1.15.0)
+    childprocess (4.1.0)
+    concurrent-ruby (1.1.10)
+    console (1.15.3)
       fiber-local
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     docile (1.4.0)
     e2mmap (0.1.0)
-    factory_bot (6.2.0)
+    factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     fiber-local (1.0.0)
-    i18n (1.8.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     iniparse (1.5.0)
     jaro_winkler (1.5.4)
-    kramdown (2.3.1)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     memory_profiler (1.0.0)
-    mini_portile2 (2.7.1)
-    minitest (5.14.4)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
     nio4r (2.5.8)
-    nokogiri (1.13.1)
-      mini_portile2 (~> 2.7.0)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.1-x86_64-linux)
+    nokogiri (1.13.6-x86_64-linux)
       racc (~> 1.4)
-    oj (3.13.11)
-    overcommit (0.57.0)
+    oj (3.13.14)
+    overcommit (0.59.1)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
-    parallel (1.21.0)
-    parser (3.0.3.2)
+      rexml (~> 3.2)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
     protocol-hpack (1.4.2)
     protocol-http (0.22.6)
@@ -90,45 +90,45 @@ GEM
       protocol-http (~> 0.2)
       protocol-http1 (~> 0.2)
     racc (1.6.0)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.2.0)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.5.0)
     retryable (3.0.5)
-    reverse_markdown (2.0.0)
+    reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-files (1.1.1)
+      rspec-support (~> 3.11.0)
+    rspec-files (1.1.2)
       rspec (~> 3.0)
-    rspec-memory (1.0.2)
+    rspec-memory (1.0.3)
       rspec (~> 3.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.23.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.30.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.14.0)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.12.0)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.14.2)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rspec (2.6.0)
+    rubocop-rspec (2.11.1)
       rubocop (~> 1.19)
     ruby-prof (1.4.3)
     ruby-progressbar (1.11.0)
@@ -137,8 +137,8 @@ GEM
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
-    solargraph (0.43.0)
+    simplecov_json_formatter (0.1.4)
+    solargraph (0.45.0)
       backport (~> 1.2)
       benchmark
       bundler (>= 1.17.2)
@@ -153,15 +153,17 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    thor (1.1.0)
+    thor (1.2.1)
     tilt (2.0.10)
     timers (4.3.3)
     traces (0.4.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
-    yard (0.9.26)
-    zeitwerk (2.4.2)
+    webrick (1.7.0)
+    yard (0.9.28)
+      webrick (~> 1.7.0)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby
@@ -175,6 +177,7 @@ DEPENDENCIES
   memory_profiler
   nokogiri
   overcommit
+  parallel
   rake
   rspec
   rubocop

data/Rakefile

@@ -28,3 +28,5 @@ namespace :definitions do
     File.write(path, YAML.dump(definitions))
   end
 end
+
+Dir.glob(File.join("lib/tasks/**/*.rake")).each { |file| load file }

data/bin/console

@@ -8,7 +8,7 @@ require "irb"
 require "irb/completion"
 
 Grumlin.configure do |config|
-  config.url = ENV["GREMLIN_URL"] || "ws://localhost:8182/gremlin"
+  config.url = ENV.fetch("GREMLIN_URL", "ws://localhost:8182/gremlin")
 end
 
 Async do

data/gremlin_server/Dockerfile

@@ -1,3 +1,5 @@
 FROM tinkerpop/gremlin-server
 
+ADD tinkergraph-gremlin /opt/gremlin-server/ext/tinkergraph-gremlin
+
 ADD tinkergraph-empty.properties /opt/gremlin-server/conf/

data/grumlin.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/zhulik/grumlin"
   spec.metadata["changelog_uri"] = "https://github.com/zhulik/grumlin/blob/master/CHANGELOG.md"
+  spec.metadata["rubygems_mfa_required"] = "true"
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
@@ -29,10 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "async-pool", "~> 0.3"
   spec.add_dependency "async-websocket", "~> 0.19"
-  spec.add_dependency "oj", "~> 3.12"
+  spec.add_dependency "oj", "~> 3.13"
   spec.add_dependency "retryable", "~> 3.0"
-  spec.add_dependency "zeitwerk", "~> 2.4"
-  spec.metadata = {
-    "rubygems_mfa_required" => "true"
-  }
+  spec.add_dependency "zeitwerk", "~> 2.6"
 end

data/lib/definitions.yml

@@ -11,6 +11,7 @@ steps:
   - both
   - bothE
   - by
+  - cap
   - choose
   - coalesce
   - constant
@@ -19,6 +20,7 @@ steps:
   - drop
   - elementMap
   - emit
+  - filter
   - fold
   - from
   - group
@@ -37,6 +39,7 @@ steps:
   - label
   - limit
   - map
+  - match
   - none
   - not
   - option
@@ -77,9 +80,13 @@ steps:
   - withSack
   - withSideEffect
 expressions:
+  cardinality:
+  - list
+  - set
+  - single
   column:
-    - keys
-    - values
+  - keys
+  - values
   operator:
   - addAll
   - and

data/lib/grumlin/benchmark/repository.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Grumlin
+  module Benchmark
+    class Repository
+      extend Grumlin::Repository
+
+      shortcut :simple_test do
+        self.V
+      end
+
+      def simple_test
+        g.V.bytecode.serialize
+      end
+
+      def simple_test_with_shortcut
+        g.simple_test.bytecode.serialize
+      end
+    end
+  end
+end

data/lib/grumlin/expressions/cardinality.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Grumlin
+  module Expressions
+    module Cardinality
+      SUPPORTED_STEPS = Grumlin.definitions.dig(:expressions, :cardinality).map(&:to_sym).freeze
+
+      class << self
+        extend Expression
+
+        define_steps(SUPPORTED_STEPS, "Cardinality")
+      end
+    end
+  end
+end

data/lib/grumlin/request_dispatcher.rb

@@ -107,13 +107,13 @@ module Grumlin
     end
 
     def already_exists_error(status)
-      return VertexAlreadyExistsError if status[:message].include?(VERTEX_ALREADY_EXISTS)
-      return EdgeAlreadyExistsError if status[:message].include?(EDGE_ALREADY_EXISTS)
+      return VertexAlreadyExistsError if status[:message]&.include?(VERTEX_ALREADY_EXISTS)
+      return EdgeAlreadyExistsError if status[:message]&.include?(EDGE_ALREADY_EXISTS)
     end
 
     def concurrent_insert_error(status)
-      return ConcurrentVertexInsertFailedError if status[:message].include?(CONCURRENT_VERTEX_INSERT_FAILED)
-      return ConcurrentEdgeInsertFailedError if status[:message].include?(CONCURRENT_EDGE_INSERT_FAILED)
+      return ConcurrentVertexInsertFailedError if status[:message]&.include?(CONCURRENT_VERTEX_INSERT_FAILED)
+      return ConcurrentEdgeInsertFailedError if status[:message]&.include?(CONCURRENT_EDGE_INSERT_FAILED)
     end
   end
 end

data/lib/grumlin/test/rspec/db_cleaner_context.rb

@@ -10,7 +10,8 @@ module Grumlin
         include DBCleanerContext
 
         before do
-          g.V().drop.iterate
+          g.E.drop.iterate
+          g.V.drop.iterate
         end
       end
     end

data/lib/grumlin/version.rb

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

data/lib/grumlin.rb

@@ -21,14 +21,14 @@ require "retryable"
 
 require "zeitwerk"
 
-loader = Zeitwerk::Loader.for_gem
+loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.inflector.inflect(
   "rspec" => "RSpec",
   "db_cleaner_context" => "DBCleanerContext"
 )
 
-db_adapters = "#{__dir__}/grumlin/test"
-loader.do_not_eager_load(db_adapters)
+test_helpers = "#{__dir__}/grumlin/test"
+loader.do_not_eager_load(test_helpers)
 
 module Grumlin
   class Error < StandardError; end

data/lib/tasks/benchmark.rake

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "grumlin"
+require "benchmark/ips"
+
+namespace :benchmark do
+  desc "Run serialization benchmarks"
+  task :serialization do
+    repo = Grumlin::Benchmark::Repository.new
+
+    Benchmark.ips do |x|
+      x.time = 3
+      x.report("Simple") { repo.simple_test }
+      x.report("Simple shortcut") { repo.simple_test_with_shortcut }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 0.19.3
+  version: 0.19.6
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-11 00:00:00.000000000 Z
+date: 2022-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-pool
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: retryable
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.6'
 description: 'Gremlin graph traversal language DSL and client for Ruby. Suitable and
   tested with gremlin-server and AWS Neptune.
 
@@ -108,13 +108,17 @@ files:
 - docker-compose.yml
 - gremlin_server/Dockerfile
 - gremlin_server/tinkergraph-empty.properties
+- gremlin_server/tinkergraph-gremlin/lib/tinkergraph-gremlin-3.5.3.jar
+- gremlin_server/tinkergraph-gremlin/plugin/tinkergraph-gremlin-3.5.3.jar
 - grumlin.gemspec
 - lib/async/channel.rb
 - lib/definitions.yml
 - lib/grumlin.rb
 - lib/grumlin/action.rb
+- lib/grumlin/benchmark/repository.rb
 - lib/grumlin/client.rb
 - lib/grumlin/edge.rb
+- lib/grumlin/expressions/cardinality.rb
 - lib/grumlin/expressions/column.rb
 - lib/grumlin/expressions/expression.rb
 - lib/grumlin/expressions/operator.rb
@@ -153,10 +157,14 @@ files:
 - lib/grumlin/typing.rb
 - lib/grumlin/version.rb
 - lib/grumlin/vertex.rb
+- lib/tasks/benchmark.rake
 homepage: https://github.com/zhulik/grumlin
 licenses:
 - MIT
 metadata:
+  homepage_uri: https://github.com/zhulik/grumlin
+  source_code_uri: https://github.com/zhulik/grumlin
+  changelog_uri: https://github.com/zhulik/grumlin/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []