grumlin 0.8.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22dad640b5ac86f86381b9bc9fab03989e7b8c42c4b19234efc6b3a223d07055
-  data.tar.gz: c0cea0f26f1e5a5a9ef1c6ab96335bf24e7f642968030b2b1f1c0a74210898d7
+  metadata.gz: 0f0edafd4d46b787eb3f8e0ec4032948bdb4de865e4de3199606fb470dc16ef3
+  data.tar.gz: f23ba59dfb18dabe70fc860c38ea4c1777214b4a37e04771b24210d90f449612
 SHA512:
-  metadata.gz: 71b7e970733edc7db87736c449008389b47431d41c12382c426b0db348e106047343d279e3d8901d76dd44175478279b4c2e22cd896b690c9d63eedbf605b6ec
-  data.tar.gz: 82f71e74fb61435de9d6a86fa8cceb4cea32cd8a87f91c6a941bbfbd622a21b67b434f3ccbe298f94265edb9999faa33ea4f80148a56a1e39c6491a575df1ae6
+  metadata.gz: 4629a25995953c6617a45721d7082baee59b76425636f6a4536308220bae3e7cb72b571317102339b1888c0e430dbe73320c12f44518940f45c67db829a9a265
+  data.tar.gz: fae1a56f95150f82da47a886da5e4b4a7ab0f725f66e68af61f6456c9a2f1af2cefc580ebf793cba612f0ceeda0b782361476a38511019062cc1534ad98fdb3c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grumlin (0.8.0)
+    grumlin (0.11.0)
       async-pool (~> 0.3)
       async-websocket (~> 0.19)
       oj (~> 3.12)
@@ -64,7 +64,7 @@ GEM
     nio4r (2.5.8)
     nokogiri (1.11.7-x86_64-linux)
       racc (~> 1.4)
-    oj (3.13.4)
+    oj (3.13.6)
     overcommit (0.57.0)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)

data/lib/grumlin/anonymous_step.rb

@@ -7,7 +7,7 @@ module Grumlin
     # 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
+                         to unfold union valueMap values where].freeze
 
     def initialize(name, *args, previous_step: nil)
       @name = name

data/lib/grumlin/bytecode.rb

@@ -3,7 +3,7 @@
 module Grumlin
   # Incapsulates logic of converting step chains and step arguments to queries that can be sent to the server
   # and to human readable strings.
-  class Bytecode
+  class Bytecode < TypedValue
     class NoneStep
       def to_bytecode
         ["none"]
@@ -13,6 +13,8 @@ module Grumlin
     NONE_STEP = NoneStep.new
 
     def initialize(step, no_return: false)
+      super(type: "Bytecode")
+
       @step = step
       @no_return = no_return
     end
@@ -22,27 +24,12 @@ module Grumlin
     end
     alias to_s inspect
 
-    def to_query
-      {
-        requestId: SecureRandom.uuid,
-        op: "bytecode",
-        processor: "traversal",
-        args: {
-          gremlin: to_bytecode,
-          aliases: { g: :g }
-        }
-      }
-    end
-
     def to_readable_bytecode
       @to_readable_bytecode ||= steps.map { |s| serialize_arg(s, serialization_method: :to_readable_bytecode) }
     end
 
-    def to_bytecode
-      @to_bytecode ||= {
-        "@type": "g:Bytecode",
-        "@value": { step: (steps + (@no_return ? [NONE_STEP] : [])).map { |s| serialize_arg(s) } }
-      }
+    def value
+      { step: (steps + (@no_return ? [NONE_STEP] : [])).map { |s| serialize_arg(s) } }
     end
 
     private

data/lib/grumlin/client.rb

@@ -97,7 +97,7 @@ module Grumlin
     def write(bytecode)
       raise NotConnectedError unless connected?
 
-      request = bytecode.to_query
+      request = to_query(bytecode.to_bytecode)
       channel = @request_dispatcher.add_request(request)
       @transport.write(request)
 
@@ -120,5 +120,17 @@ module Grumlin
     def build_transport
       Transport.new(@url, parent: @parent, **@client_options)
     end
+
+    def to_query(bytecode)
+      {
+        requestId: SecureRandom.uuid,
+        op: "bytecode",
+        processor: "traversal",
+        args: {
+          gremlin: bytecode,
+          aliases: { g: :g }
+        }
+      }
+    end
   end
 end

data/lib/grumlin/order.rb

@@ -9,7 +9,7 @@ module Grumlin
           name = "@#{step}"
           return instance_variable_get(name) if instance_variable_defined?(name)
 
-          instance_variable_set(name, TypedValue.new("Order", step))
+          instance_variable_set(name, TypedValue.new(type: "Order", value: step))
         end
       end
     end

data/lib/grumlin/p.rb

@@ -3,12 +3,40 @@
 module Grumlin
   module P
     module P
-      %w[within].each do |step|
-        define_method step do |*args|
-          { # TODO: replace with a TypedValue?
-            "@type": "g:P",
-            "@value": { predicate: "within", value: { "@type": "g:List", "@value": args } }
-          }
+      class Predicate < TypedValue
+        def initialize(name, args:, arg_type: nil)
+          super(type: "P")
+          @name = name
+          @args = args
+          @arg_type = arg_type
+        end
+
+        def value
+          @value ||=
+            {
+              predicate: @name,
+              value: TypedValue.new(type: @arg_type, value: @args).to_bytecode
+            }
+        end
+      end
+
+      # TODO: support more predicates
+      %w[eq neq].each do |predicate|
+        define_method predicate do |*args|
+          Predicate.new(predicate, args: args[0])
+        end
+      end
+
+      %w[within without].each do |predicate|
+        define_method predicate do |*args|
+          args = if args.count == 1 && args[0].is_a?(Array)
+                   args[0]
+                 elsif args.count == 1 && args[0].is_a?(Set)
+                   args[0].to_a
+                 else
+                   args.to_a
+                 end
+          Predicate.new(predicate, args: args, arg_type: "List")
         end
       end
     end

data/lib/grumlin/pop.rb

@@ -9,7 +9,7 @@ module Grumlin
           name = "@#{step}"
           return instance_variable_get(name) if instance_variable_defined?(name)
 
-          instance_variable_set(name, TypedValue.new("Pop", step))
+          instance_variable_set(name, TypedValue.new(type: "Pop", value: step))
         end
       end
     end

data/lib/grumlin/request_dispatcher.rb

@@ -44,7 +44,7 @@ module Grumlin
 
       request = @requests[request_id]
 
-      check_errors!(response[:status])
+      check_errors!(response[:status], request[:request])
 
       case SUCCESS[response.dig(:status, :code)]
       when :success
@@ -77,9 +77,9 @@ module Grumlin
 
     private
 
-    def check_errors!(status)
+    def check_errors!(status, query)
       if (error = ERRORS[status[:code]])
-        raise(error, status)
+        raise error.new(status, query)
       end
 
       return unless SUCCESS[status[:code]].nil?

data/lib/grumlin/step.rb

@@ -10,8 +10,18 @@ module Grumlin
     end
 
     def next
-      @enum ||= toList.to_enum
-      @enum.next
+      to_enum.next
+    end
+
+    def hasNext # rubocop:disable Naming/MethodName
+      to_enum.peek
+      true
+    rescue StopIteration
+      false
+    end
+
+    def to_enum
+      @to_enum ||= toList.to_enum
     end
 
     def toList

data/lib/grumlin/t.rb

@@ -9,7 +9,7 @@ module Grumlin
           name = "@#{step}"
           return instance_variable_get(name) if instance_variable_defined?(name)
 
-          instance_variable_set(name, TypedValue.new("T", step))
+          instance_variable_set(name, TypedValue.new(type: "T", value: step))
         end
       end
     end

data/lib/grumlin/typed_value.rb

@@ -1,19 +1,27 @@
 # frozen_string_literal: true
 
 module Grumlin
-  # TODO: find a better name
   class TypedValue
-    def initialize(type, value)
+    attr_reader :type, :value
+
+    def initialize(type: nil, value: nil)
       @type = type
       @value = value
     end
 
     def to_bytecode
-      @to_bytecode ||= { "@type": "g:#{@type}", "@value": @value }
+      @to_bytecode ||= if type.nil?
+                         value
+                       else
+                         {
+                           "@type": "g:#{type}",
+                           "@value": value
+                         }
+                       end
     end
 
     def inspect
-      "<#{@type}.#{@value}>"
+      "<#{type}.#{value}>"
     end
     alias to_s inspect
     alias to_readable_bytecode inspect

data/lib/grumlin/u.rb

@@ -3,7 +3,7 @@
 module Grumlin
   module U
     # TODO: add other start steps
-    SUPPORTED_START_STEPS = %w[V addV count has out unfold values].freeze
+    SUPPORTED_START_STEPS = %w[V addV count fold has out repeat unfold values].freeze
 
     class << self
       SUPPORTED_START_STEPS.each do |step|

data/lib/grumlin/version.rb

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

data/lib/grumlin.rb

@@ -57,11 +57,12 @@ module Grumlin
   class UnknownTypeError < ProtocolError; end
 
   class StatusError < Error
-    attr_reader :status
+    attr_reader :status, :query
 
-    def initialize(status)
+    def initialize(status, query)
       super(status[:message])
       @status = status
+      @query = query
     end
   end
 
@@ -103,16 +104,10 @@ module Grumlin
       @client_concurrency = 5
       @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
 
+  @pool_mutex = Mutex.new
+
   class << self
     def configure
       yield config
@@ -123,14 +118,26 @@ module Grumlin
     end
 
     def default_pool
-      config.default_pool
+      if Thread.current.thread_variable_get(:grumlin_default_pool)
+        return Thread.current.thread_variable_get(:grumlin_default_pool)
+      end
+
+      @pool_mutex.synchronize do
+        Thread.current.thread_variable_set(:grumlin_default_pool,
+                                           Async::Pool::Controller.new(Grumlin::Client::PoolResource,
+                                                                       limit: config.pool_size))
+      end
     end
 
     def close
-      default_pool.wait while default_pool.busy?
-
-      default_pool.close
-      config.reset!
+      return if Thread.current.thread_variable_get(:grumlin_default_pool).nil?
+
+      @pool_mutex.synchronize do
+        pool = Thread.current.thread_variable_get(:grumlin_default_pool)
+        pool.wait while pool.busy?
+        pool.close
+        Thread.current.thread_variable_set(:grumlin_default_pool, nil)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-07 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-pool