grumlin 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49bd6724ef81d1ac81e11d07d353b1f474ffaa60616dfab291d3f43ae81f95aa
-  data.tar.gz: 8023ce32bede0aadaed1c0495654b5d2bec8e244deb007b766561254b7c9b69e
+  metadata.gz: e532964db5d5afd11d89978a132a5f4f7d1a4d98c740f639acadac260c93be89
+  data.tar.gz: 9015cb71bbab17895d8809dc7ff514b90e9d1ceb81ed6a9eec446a0db7ec0994
 SHA512:
-  metadata.gz: 434d14086ce4814684de2f414ba9eb9e5dd24f5a96b4acb0861b526f1515ad13dff96d5460d871e8373335f38baae013c248815d08e0ff2616a6ace873e1316a
-  data.tar.gz: e5fd01d1b8743d263097449f1f17ae515073e6253c7d7cfc11e65e923870b695c5d0a482105a41c20cea2a401f4cd2ffab3282defa74d0e9ed739e60fd850ead
+  metadata.gz: a4295b9e6041726c36c05cc0aed94a645e8d7103c99351dfadef7077f14037b81daf87a4ffb1fd48105d8c1fa888e96ce173aa3be42c9b35ec58de3e289c01ed
+  data.tar.gz: 51824ca159be63be91fc798b40777a25d55f0ce423b07a9ce4ce9880002e94b4e4196bc0d92b4ca84bee86356f17fd90f3cc2dd9daa594f906fc2e93f11be422

data/.github/workflows/main.yml

@@ -1,18 +1,73 @@
 name: Ruby
 
-on: [push,pull_request]
+on: [push, pull_request]
 
 jobs:
-  build:
+  lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 3.0.1
-    - name: Run the default task
-      run: |
-        gem install bundler -v 2.2.15
-        bundle install
-        bundle exec rake
+      - uses: actions/checkout@v2
+
+      - 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
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [2.6, 2.7, 3.0]
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Start Gremlin server
+        run: |
+          docker-compose up -d --build
+          sleep 3
+
+      - name: Install deps
+        run: |
+          gem install bundler -v 2.2.15
+          bundle install
+
+      - name: Run tests
+        run: bundle exec rspec
+  publish:
+    runs-on: ubuntu-latest
+    needs:
+      - lint
+      - test
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0
+          bundler-cache: true
+
+      - name: Build gem
+        run: gem build
+
+      - name: Create credentials
+        run: |
+          mkdir ~/.gem
+          cat << EOF > ~/.gem/credentials
+          ---
+          :rubygems_api_key: ${{ secrets.rubygems_api_key }}
+          EOF
+          chmod 0600 /home/runner/.gem/credentials
+
+      - name: Push gem
+        run: gem push *gem

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem
 
 # rspec failure tracking
 .rspec_status

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

@@ -33,3 +33,6 @@ RSpec/NestedGroups:
 
 RSpec/ExampleLength:
   Enabled: false
+
+Style/MultilineBlockChain:
+  Enabled: false

data/Gemfile

@@ -4,8 +4,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "rake"
-
+gem "nokogiri"
 gem "rubocop"
 gem "rubocop-performance"
 gem "rubocop-rspec"
@@ -14,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.0)
-      async-websocket (~> 0.18)
+    grumlin (0.3.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,6 +52,7 @@ 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
@@ -57,13 +60,16 @@ GEM
       kramdown (~> 2.0)
     minitest (5.14.4)
     nio4r (2.5.7)
-    nokogiri (1.11.5-x86_64-linux)
+    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)
@@ -74,7 +80,6 @@ GEM
       protocol-http1 (~> 0.2)
     racc (1.5.2)
     rainbow (3.0.0)
-    rake (13.0.3)
     regexp_parser (2.1.1)
     reverse_markdown (2.0.0)
       nokogiri
@@ -96,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)
@@ -120,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)
@@ -150,7 +156,8 @@ DEPENDENCIES
   async-rspec
   factory_bot
   grumlin!
-  rake
+  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/docker-compose.yml

@@ -0,0 +1,6 @@
+version: "3"
+services:
+  gremlin_server:
+    build: gremlin_server
+    ports:
+      - "8182:8182"

data/gremlin_server/Dockerfile

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

data/gremlin_server/tinkergraph-empty.properties

@@ -0,0 +1,3 @@
+gremlin.graph=org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph
+gremlin.tinkergraph.vertexIdManager=ANY
+gremlin.tinkergraph.edgeIdManager=ANY

data/grumlin.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Gleb Sinyavskiy"]
   spec.email         = ["zhulik.gleb@gmail.com"]
 
-  spec.summary       = "A ruby client for Gremlin query language."
-  spec.description   = "A ruby client for Gremlin query language."
+  spec.summary       = "Gremlin query language DSL for Ruby."
+  spec.description   = "Gremlin query language DSL for Ruby."
   spec.homepage      = "https://github.com/zhulik/grumlin"
   spec.license       = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
@@ -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/grumlin.rb

@@ -4,21 +4,64 @@ 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 "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
+
+    # For some reason, client_concurrency must be greather pool_size
+    def initialize
+      @pool_size = 10
+      @client_concurrency = 20
+    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