grumlin 0.1.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8db95b253561a642cf2dde6a4ac063e1b45af6c15604c19d5721a71eba882b2
-  data.tar.gz: 035b95544c95e7609ddd2ac5d16b2096a67ea4c4e58b18d508176139efc1d5bf
+  metadata.gz: ea9263ebc4f6303d3dc02ccd39c8dd04f2b46b434456edad4466a19ebe7dede2
+  data.tar.gz: 84205bc8a2568987933d6cce5c576cbbf298700659b31d7435ecac1fde030029
 SHA512:
-  metadata.gz: de9132526ee1da7f7319662ebd646a22d72b1a949730380c0449e185a2bfbb8bdc4c7f79fb6d045068c745093a310b8e828922306e2f72c677ed52e3aa07dd07
-  data.tar.gz: edf8f9bd0ed7ba23d7f5acac79ff7f4baa7466e11f4d1f08dde4ec2e0a052e7e08b4bb40e8621d51ce00cc26dda22ca0ed6e082474128d5310aa465c9787d197
+  metadata.gz: 1fc512adc3e110cc6a6ed2f348a24b888b5f5443d566eb1f57bb3b56dad60529390f1c4c52b1391296f75a1ea4cd79dc70eb427c3f57b4bf4f4c6417e54bbe95
+  data.tar.gz: 36029a741e2d89654cbb5a9ecd28213c7122e3ecc35cd030baa320af71bd238560d1e671a8b9d2aa1f4b40938d1787679b2166733b0ebc429d5a5a113142d3b2

data/.github/workflows/main.yml

@@ -1,6 +1,6 @@
 name: Ruby
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   lint:

data/.overcommit.yml

@@ -0,0 +1,8 @@
+PreCommit:
+  RuboCop:
+    enabled: true
+    on_warn: fail # Treat all warnings as failures
+
+PrePush:
+  RSpec:
+    enabled: true

data/.rubocop.yml

@@ -7,24 +7,44 @@ require:
   - rubocop-performance
   - rubocop-rspec
 
-Style/StringLiterals:
-  Enabled: true
-  EnforcedStyle: double_quotes
-
-Style/StringLiteralsInInterpolation:
-  Enabled: true
-  EnforcedStyle: double_quotes
-
-Style/Documentation:
-  Enabled: false
-
 Layout/LineLength:
   Max: 120
+  Exclude:
+    - spec/**/*_spec.rb
 
 Metrics/BlockLength:
   Exclude:
     - spec/**/*_spec.rb
 
+Metrics/MethodLength:
+  Max: 20
+
+Metrics/ParameterLists:
+  Max: 6
+
+Naming/MethodName:
+  IgnoredPatterns:
+    - toList
+    - inVLabel
+    - outVLabel
+    - inV
+    - outV
+
+Naming/VariableName:
+  AllowedIdentifiers:
+    - inV
+    - outV
+    - inVLabel
+    - outVLabel
+
+Naming/MethodParameterName:
+  AllowedNames:
+    - id
+    - inV
+    - outV
+    - inVLabel
+    - outVLabel
+
 RSpec/NamedSubject:
   Enabled: false
 
@@ -33,3 +53,27 @@ RSpec/NestedGroups:
 
 RSpec/ExampleLength:
   Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/DescribeClass:
+  Enabled: false
+
+Style/WordArray:
+  Exclude:
+    - spec/**/*_spec.rb
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Style/Documentation:
+  Enabled: false
+
+Style/MultilineBlockChain:
+  Enabled: false

data/Gemfile

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "nokogiri"
 gem "rubocop"
 gem "rubocop-performance"
 gem "rubocop-rspec"
@@ -12,5 +13,6 @@ gem "solargraph"
 
 gem "async-rspec"
 gem "factory_bot"
+gem "overcommit"
 gem "rspec"
 gem "simplecov"

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    grumlin (0.1.3)
-      async-websocket (~> 0.18)
+    grumlin (0.5.0)
+      async-pool (~> 0.3)
+      async-websocket (~> 0.19)
 
 GEM
   remote: https://rubygems.org/
@@ -14,33 +15,34 @@ GEM
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
     ast (2.4.2)
-    async (1.29.0)
+    async (1.30.1)
       console (~> 1.10)
       nio4r (~> 2.3)
       timers (~> 4.1)
-    async-http (0.56.2)
-      async (~> 1.25)
-      async-io (~> 1.28)
-      async-pool (~> 0.2)
+    async-http (0.56.5)
+      async (>= 1.25)
+      async-io (>= 1.28)
+      async-pool (>= 0.2)
       protocol-http (~> 0.22.0)
       protocol-http1 (~> 0.14.0)
       protocol-http2 (~> 0.14.0)
-    async-io (1.31.0)
-      async (~> 1.14)
-    async-pool (0.3.6)
-      async (~> 1.25)
+    async-io (1.32.2)
+      async
+    async-pool (0.3.8)
+      async (>= 1.25)
     async-rspec (1.16.0)
       rspec (~> 3.0)
       rspec-files (~> 1.0)
       rspec-memory (~> 1.0)
-    async-websocket (0.18.0)
+    async-websocket (0.19.0)
       async-http (~> 0.54)
       async-io (~> 1.23)
       protocol-websocket (~> 0.7.0)
-    backport (1.1.2)
+    backport (1.2.0)
     benchmark (0.1.1)
+    childprocess (4.0.0)
     concurrent-ruby (1.1.8)
-    console (1.12.0)
+    console (1.13.1)
       fiber-local
     diff-lcs (1.4.4)
     docile (1.4.0)
@@ -50,20 +52,24 @@ GEM
     fiber-local (1.0.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
+    iniparse (1.5.0)
     jaro_winkler (1.5.4)
     kramdown (2.3.1)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     minitest (5.14.4)
-    nio4r (2.5.7)
-    nokogiri (1.11.5-x86_64-linux)
+    nio4r (2.5.8)
+    nokogiri (1.11.7-x86_64-linux)
       racc (~> 1.4)
+    overcommit (0.57.0)
+      childprocess (>= 0.6.3, < 5)
+      iniparse (~> 1.4)
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
     protocol-hpack (1.4.2)
-    protocol-http (0.22.0)
+    protocol-http (0.22.5)
     protocol-http1 (0.14.1)
       protocol-http (~> 0.22)
     protocol-http2 (0.14.2)
@@ -95,16 +101,16 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.15.0)
+    rubocop (1.16.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.5.0, < 2.0)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.5.0)
+    rubocop-ast (1.7.0)
       parser (>= 3.0.1.1)
     rubocop-performance (1.11.3)
       rubocop (>= 1.7.0, < 2.0)
@@ -119,10 +125,11 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.3)
-    solargraph (0.40.4)
-      backport (~> 1.1)
+    solargraph (0.43.0)
+      backport (~> 1.2)
       benchmark
       bundler (>= 1.17.2)
+      diff-lcs (~> 1.4)
       e2mmap
       jaro_winkler (~> 1.5)
       kramdown (~> 2.3)
@@ -149,6 +156,8 @@ DEPENDENCIES
   async-rspec
   factory_bot
   grumlin!
+  nokogiri
+  overcommit
   rspec
   rubocop
   rubocop-performance

data/bin/console

@@ -5,9 +5,12 @@ require "bundler/setup"
 require "grumlin"
 require "irb"
 
+Grumlin.configure do |config|
+  config.url = ENV["GREMLIN_URL"] || "ws://localhost:8182/gremlin"
+end
+
 Async do
-  client = Grumlin::Client.new("ws://localhost:8182/gremlin", mode: :bytecode)
-  g = Grumlin::Traversal.new(client)
+  g = Grumlin::Traversal.new
 
   IRB.setup(nil)
   workspace = IRB::WorkSpace.new(binding)
@@ -16,5 +19,5 @@ Async do
 rescue StandardError
   raise
 ensure
-  client.disconnect
+  Grumlin.config.default_pool.close
 end

data/bin/setup

@@ -4,5 +4,6 @@ IFS=$'\n\t'
 set -vx
 
 bundle install
+bundle exec overcommit --sign
 
 # Do any other automated setup that you need to do here

data/grumlin.gemspec

@@ -23,5 +23,6 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "async-websocket", "~> 0.18"
+  spec.add_dependency "async-pool", "~> 0.3"
+  spec.add_dependency "async-websocket", "~> 0.19"
 end

data/lib/async/channel.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Async
+  # Channel is a wrapper around Async::Queue that provides
+  # a protocol and handy tools for passing data, exceptions and closing.
+  # It is designed to be used with only one publisher and one subscriber
+  class Channel
+    class ChannelError < StandardError; end
+
+    class ChannelClosedError < ChannelError; end
+
+    def initialize
+      @queue = Async::Queue.new
+      @closed = false
+    end
+
+    def closed?
+      @closed
+    end
+
+    # Methods for a publisher
+    def <<(payload)
+      raise(ChannelClosedError, "Cannot send to a closed channel") if @closed
+
+      @queue << [:payload, payload]
+    end
+
+    def exception(exception)
+      raise(ChannelClosedError, "Cannot send to a closed channel") if closed?
+
+      @queue << [:exception, exception]
+    end
+
+    def close
+      raise(ChannelClosedError, "Cannot close a closed channel") if closed?
+
+      @queue << [:close]
+      @closed = true
+    end
+
+    # Methods for a subscriber
+    def dequeue
+      each do |payload| # rubocop:disable Lint/UnreachableLoop this is intended
+        return payload
+      end
+    end
+
+    def each
+      raise(ChannelClosedError, "Cannot receive from a closed channel") if closed?
+
+      @queue.each do |type, payload|
+        case type
+        when :exception
+          payload.set_backtrace(caller + (payload.backtrace || [])) # A hack to preserve full backtrace
+          raise payload
+        when :payload
+          yield payload
+        when :close
+          break
+        end
+      end
+    end
+  end
+end

data/lib/grumlin.rb

@@ -4,21 +4,67 @@ require "securerandom"
 require "json"
 
 require "async"
+require "async/pool"
+require "async/pool/resource"
+require "async/pool/controller"
 require "async/queue"
+require "async/barrier"
 require "async/http/endpoint"
 require "async/websocket/client"
 
+require_relative "async/channel"
+
 require_relative "grumlin/version"
 require_relative "grumlin/exceptions"
 
+require_relative "grumlin/transport"
+require_relative "grumlin/client"
+
 require_relative "grumlin/vertex"
 require_relative "grumlin/edge"
+require_relative "grumlin/path"
 require_relative "grumlin/typing"
-require_relative "grumlin/client"
 require_relative "grumlin/traversal"
-require_relative "grumlin/step"
+require_relative "grumlin/request_dispatcher"
 require_relative "grumlin/translator"
-require_relative "grumlin/traversing_context"
+
+require_relative "grumlin/anonymous_step"
+require_relative "grumlin/step"
+
+require_relative "grumlin/t"
+require_relative "grumlin/order"
+require_relative "grumlin/u"
+require_relative "grumlin/p"
+require_relative "grumlin/pop"
+require_relative "grumlin/sugar"
 
 module Grumlin
+  class Config
+    attr_accessor :url, :pool_size, :client_concurrency, :client_factory
+
+    # For some reason, client_concurrency must be greater than pool_size
+    def initialize
+      @pool_size = 10
+      @client_concurrency = 20
+      @client_factory = ->(url, parent) { Grumlin::Client.new(url, parent: parent) }
+    end
+
+    def default_pool
+      @default_pool ||= Async::Pool::Controller.new(Grumlin::Client::PoolResource, limit: pool_size)
+    end
+
+    def reset!
+      @default_pool = nil
+    end
+  end
+
+  class << self
+    def configure
+      yield config
+    end
+
+    def config
+      @config ||= Config.new
+    end
+  end
 end

data/lib/grumlin/anonymous_step.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Grumlin
+  class AnonymousStep
+    attr_reader :name, :args
+
+    def initialize(name, *args, previous_steps: [])
+      @name = name
+      @previous_steps = previous_steps
+      @args = args
+    end
+
+    %w[addV addE V E limit count drop property valueMap select from to as order by has hasLabel values hasNot
+       not outE groupCount label group in out fold unfold inV path dedup project coalesce repeat emit
+       elementMap where].each do |step|
+      define_method step do |*args|
+        add_step(step, args, previous_steps: steps)
+      end
+    end
+
+    alias addVertex addV
+    alias addEdge addE
+
+    def inspect
+      @inspect ||= to_bytecode.to_s
+    end
+
+    alias to_s inspect
+
+    def to_bytecode
+      @to_bytecode ||= (@previous_steps.last&.to_bytecode || []) + [Translator.to_bytecode(self)]
+    end
+
+    def steps
+      (@previous_steps + [self])
+    end
+
+    private
+
+    def add_step(step_name, args, previous_steps:)
+      self.class.new(step_name, *args, previous_steps: previous_steps)
+    end
+  end
+end