grumlin 0.5.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea9263ebc4f6303d3dc02ccd39c8dd04f2b46b434456edad4466a19ebe7dede2
-  data.tar.gz: 84205bc8a2568987933d6cce5c576cbbf298700659b31d7435ecac1fde030029
+  metadata.gz: 6633f34f12f74200b56d3447e7b1cd5c2c4185cd4013a27157d809b2f97f01b2
+  data.tar.gz: a5b0c1b0f4a8ef813a48144b79b17a71c6385802ff77b46ef0fa703643790ac1
 SHA512:
-  metadata.gz: 1fc512adc3e110cc6a6ed2f348a24b888b5f5443d566eb1f57bb3b56dad60529390f1c4c52b1391296f75a1ea4cd79dc70eb427c3f57b4bf4f4c6417e54bbe95
-  data.tar.gz: 36029a741e2d89654cbb5a9ecd28213c7122e3ecc35cd030baa320af71bd238560d1e671a8b9d2aa1f4b40938d1787679b2166733b0ebc429d5a5a113142d3b2
+  metadata.gz: 6824448759e26af95f8753a1461fac6b0b66677e1cab723b8e79c76333c4e791b5364da81f87844b624796238a3e02b13065a7afb64d7a5ef7ca83a6e9c3e8be
+  data.tar.gz: d7ce1a01b2b50f90a317d270ad005561220fcb0f69da5036b97d20c88b2458e5dd7ea285c384cef5d5e9521ff077f2d43650985c1e928942e463cfc29bbdd247

data/.overcommit.yml

@@ -3,6 +3,3 @@ PreCommit:
     enabled: true
     on_warn: fail # Treat all warnings as failures
 
-PrePush:
-  RSpec:
-    enabled: true

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.6.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grumlin (0.5.0)
+    grumlin (0.6.2)
       async-pool (~> 0.3)
       async-websocket (~> 0.19)
 
@@ -70,7 +70,7 @@ GEM
       ast (~> 2.4.1)
     protocol-hpack (1.4.2)
     protocol-http (0.22.5)
-    protocol-http1 (0.14.1)
+    protocol-http1 (0.14.2)
       protocol-http (~> 0.22)
     protocol-http2 (0.14.2)
       protocol-hpack (~> 1.4)
@@ -166,4 +166,4 @@ DEPENDENCIES
   solargraph
 
 BUNDLED WITH
-   2.2.15
+   2.2.26

data/bin/console

@@ -10,7 +10,7 @@ Grumlin.configure do |config|
 end
 
 Async do
-  g = Grumlin::Traversal.new
+  include Grumlin::Sugar
 
   IRB.setup(nil)
   workspace = IRB::WorkSpace.new(binding)

data/lib/grumlin/anonymous_step.rb

@@ -4,23 +4,23 @@ module Grumlin
   class AnonymousStep
     attr_reader :name, :args
 
+    # TODO: add other steps
+    SUPPORTED_STEPS = %w[E V addE addV as by coalesce count dedup drop elementMap emit fold from group groupCount has
+                         hasId hasLabel hasNot in inV label limit not order out outE path project property repeat select
+                         to unfold valueMap values where].freeze
+
     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|
+    SUPPORTED_STEPS.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

data/lib/grumlin/client.rb

@@ -26,6 +26,14 @@ module Grumlin
       def write(*args)
         @client.write(*args)
       end
+
+      def viable?
+        !closed?
+      end
+
+      def reusable?
+        !closed?
+      end
     end
 
     def initialize(url, parent: Async::Task.current, **client_options)
@@ -49,8 +57,10 @@ module Grumlin
     end
 
     def close
-      @transport.close
-      raise ResourceLeakError, "Request list is not empty: #{requests}" if @request_dispatcher.requests.any?
+      @transport&.close
+      if @request_dispatcher&.requests&.any?
+        raise ResourceLeakError, "Request list is not empty: #{@request_dispatcher.requests}"
+      end
 
       reset!
     end

data/lib/grumlin/order.rb

@@ -2,16 +2,15 @@
 
 module Grumlin
   module Order
+    # TODO: share the code?
     class << self
-      DESC = { "@type": "g:Order", "@value": "desc" }.freeze
-      ASC = { "@type": "g:Order", "@value": "desc" }.freeze
+      %i[asc desc].each do |step|
+        define_method step do
+          name = "@#{step}"
+          return instance_variable_get(name) if instance_variable_defined?(name)
 
-      def asc
-        ASC
-      end
-
-      def desc
-        DESC
+          instance_variable_set(name, TypedValue.new("Order", step))
+        end
       end
     end
   end

data/lib/grumlin/p.rb

@@ -5,7 +5,7 @@ module Grumlin
     module P
       %w[within].each do |step|
         define_method step do |*args|
-          { # TODO: replace with a class?
+          { # TODO: replace with a TypedValue?
             "@type": "g:P",
             "@value": { predicate: "within", value: { "@type": "g:List", "@value": args } }
           }

data/lib/grumlin/pop.rb

@@ -2,26 +2,15 @@
 
 module Grumlin
   module Pop
+    # TODO: share the code?
     class << self
-      FIRST = { "@type": "g:Pop", "@value": "first" }.freeze
-      LAST = { "@type": "g:Pop", "@value": "last" }.freeze
-      ALL = { "@type": "g:Pop", "@value": "all" }.freeze
-      MIXED = { "@type": "g:Pop", "@value": "mixed" }.freeze
+      %i[first last all mixed].each do |step|
+        define_method step do
+          name = "@#{step}"
+          return instance_variable_get(name) if instance_variable_defined?(name)
 
-      def first
-        FIRST
-      end
-
-      def last
-        LAST
-      end
-
-      def all
-        ALL
-      end
-
-      def mixed
-        MIXED
+          instance_variable_set(name, TypedValue.new("Pop", step))
+        end
       end
     end
   end

data/lib/grumlin/t.rb

@@ -2,16 +2,15 @@
 
 module Grumlin
   module T
+    # TODO: share the code?
     class << self
-      T_ID = { :@type => "g:T", :@value => "id" }.freeze # TODO: replace with a class?
-      T_LABEL = { :@type => "g:T", :@value => "label" }.freeze # TODO: replace with a class?
+      %i[id label].each do |step|
+        define_method step do
+          name = "@#{step}"
+          return instance_variable_get(name) if instance_variable_defined?(name)
 
-      def id
-        T_ID
-      end
-
-      def label
-        T_LABEL
+          instance_variable_set(name, TypedValue.new("T", step))
+        end
       end
     end
   end

data/lib/grumlin/translator.rb

@@ -20,6 +20,7 @@ module Grumlin
       private
 
       def arg_to_bytecode(arg)
+        return arg.to_bytecode if arg.is_a?(TypedValue)
         return arg unless arg.is_a?(AnonymousStep)
 
         args = arg.args.flatten.map do |a|
@@ -30,8 +31,11 @@ module Grumlin
 
       def arg_to_query_bytecode(arg)
         return ["none"] if arg.nil?
+        return arg.to_bytecode if arg.is_a?(TypedValue)
         return arg unless arg.is_a?(AnonymousStep)
 
+        # return arg.to_bytecode if arg.is_a?(TypedValue)
+
         args = arg.args.flatten.map do |a|
           a.instance_of?(AnonymousStep) ? Typing.to_bytecode(to_bytecode(a.steps)) : arg_to_query_bytecode(a)
         end

data/lib/grumlin/traversal.rb

@@ -4,18 +4,17 @@ module Grumlin
   class Traversal
     attr_reader :connection
 
+    # TODO: add other start steps
+    SUPPORTED_START_STEPS = %w[E V addE addV].freeze
+
     def initialize(pool = Grumlin.config.default_pool)
       @pool = pool
     end
 
-    # TODO: add other start steps
-    %w[addV addE V E].each do |step|
+    SUPPORTED_START_STEPS.each do |step|
       define_method step do |*args|
         Step.new(@pool, step, *args)
       end
     end
-
-    alias addVertex addV
-    alias addEdge addE
   end
 end

data/lib/grumlin/typed_value.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Grumlin
+  # TODO: find a better name
+  class TypedValue
+    def initialize(type, value)
+      @type = type
+      @value = value
+    end
+
+    def inspect(*)
+      "#{@type}.#{@value}"
+    end
+
+    def to_bytecode
+      @to_bytecode ||= { "@type": "g:#{@type}", "@value": @value }
+    end
+  end
+end

data/lib/grumlin/u.rb

@@ -2,8 +2,11 @@
 
 module Grumlin
   module U
+    # TODO: add other start steps
+    SUPPORTED_START_STEPS = %w[V addV count has out unfold values].freeze
+
     class << self
-      %w[addV V has count out values unfold].each do |step|
+      SUPPORTED_START_STEPS.each do |step|
         define_method step do |*args|
           AnonymousStep.new(step, *args)
         end

data/lib/grumlin/version.rb

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

data/lib/grumlin.rb

@@ -19,6 +19,7 @@ require_relative "grumlin/exceptions"
 
 require_relative "grumlin/transport"
 require_relative "grumlin/client"
+require_relative "grumlin/typed_value"
 
 require_relative "grumlin/vertex"
 require_relative "grumlin/edge"
@@ -42,10 +43,9 @@ 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_concurrency = 2
       @client_factory = ->(url, parent) { Grumlin::Client.new(url, parent: parent) }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2021-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-pool
@@ -50,6 +50,7 @@ files:
 - ".overcommit.yml"
 - ".rspec"
 - ".rubocop.yml"
+- ".tool-versions"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -82,6 +83,7 @@ files:
 - lib/grumlin/translator.rb
 - lib/grumlin/transport.rb
 - lib/grumlin/traversal.rb
+- lib/grumlin/typed_value.rb
 - lib/grumlin/typing.rb
 - lib/grumlin/u.rb
 - lib/grumlin/version.rb