grumlin 0.1.1 → 0.4.0

data/lib/grumlin/transport.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module Grumlin
+  class Transport
+    # A transport based on https://github.com/socketry/async
+    # and https://github.com/socketry/async-websocket
+
+    attr_reader :url
+
+    def initialize(url, parent: Async::Task.current, **client_options)
+      @url = url
+      @parent = parent
+      @client_options = client_options
+      @request_channel = Async::Channel.new
+      @response_channel = Async::Channel.new
+      reset!
+    end
+
+    def connected?
+      @connected
+    end
+
+    def connect # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      raise AlreadyConnectedError if connected?
+
+      @connection = Async::WebSocket::Client.connect(Async::HTTP::Endpoint.parse(@url), **@client_options)
+
+      @response_task = @parent.async do
+        loop do
+          data = @connection.read
+          @response_channel << data
+        end
+      rescue Async::Stop
+        @response_channel.close
+      rescue StandardError => e
+        @response_channel.exception(e)
+      end
+
+      @request_task = @parent.async do
+        @request_channel.each do |message|
+          @connection.write(message)
+          @connection.flush
+        end
+      rescue StandardError => e
+        @response_channel.exception(e)
+      end
+
+      @connected = true
+
+      @response_channel
+    end
+
+    def write(message)
+      raise NotConnectedError unless connected?
+
+      @request_channel << message
+    end
+
+    def close # rubocop:disable Metrics/MethodLength
+      return unless connected?
+
+      @request_channel.close
+      @request_task.wait
+
+      @response_task.stop
+      @response_task.wait
+
+      begin
+        @connection.close
+      rescue Errno::EPIPE
+        nil
+      end
+
+      reset!
+    end
+
+    private
+
+    def reset!
+      @connected = false
+      @connection = nil
+      @response_task = nil
+      @request_task = nil
+    end
+  end
+end

data/lib/grumlin/traversal.rb

@@ -4,21 +4,14 @@ module Grumlin
   class Traversal
     attr_reader :connection
 
-    def initialize(client_or_url, &block)
-      @client = if client_or_url.is_a?(String)
-                  Grumlin::Client.new(client_or_url)
-                else
-                  client_or_url
-                end
-
-      return if block.nil?
-
-      TraversingContext.new(self).instance_exec(&block)
+    def initialize(pool = Grumlin.config.default_pool)
+      @pool = pool
     end
 
+    # TODO: add other start steps
     %w[addV addE V E].each do |step|
       define_method step do |*args|
-        Step.new(@client, step, *args)
+        Step.new(@pool, step, *args)
       end
     end
 

data/lib/grumlin/typing.rb

@@ -4,15 +4,19 @@ module Grumlin
   module Typing
     TYPES = {
       "g:List" => ->(value) { value.map { |item| cast(item) } },
+      "g:Set" => ->(value) { Set.new(value.map { |item| cast(item) }) },
       "g:Map" => ->(value) { cast_map(value) },
       "g:Vertex" => ->(value) { cast_entity(Grumlin::Vertex, value) },
       "g:Edge" => ->(value) { cast_entity(Grumlin::Edge, value) },
+      "g:Path" => ->(value) { cast_entity(Grumlin::Path, value) },
       "g:Int64" => ->(value) { cast_int(value) },
       "g:Int32" => ->(value) { cast_int(value) },
-      "g:Traverser" => ->(value) { cast(value[:value]) } # TODO: wtf is bulk?
+      "g:Double" => ->(value) { cast_double(value) },
+      "g:Traverser" => ->(value) { cast(value[:value]) }, # TODO: wtf is bulk?
+      "g:T" => ->(value) { value.to_sym }
     }.freeze
 
-    CASTABLE_TYPES = [Hash, String, Integer].freeze
+    CASTABLE_TYPES = [Hash, String, Integer, TrueClass, FalseClass].freeze
 
     class << self
       def cast(value)
@@ -27,6 +31,13 @@ module Grumlin
         type.call(value[:@value])
       end
 
+      def to_bytecode(step)
+        {
+          "@type": "g:Bytecode",
+          "@value": { step: step }
+        }
+      end
+
       private
 
       def castable_type?(value); end
@@ -47,6 +58,12 @@ module Grumlin
         value
       end
 
+      def cast_double(value)
+        raise TypeError, "#{value} is not a Double" unless value.is_a?(Float)
+
+        value
+      end
+
       def cast_entity(entity, value)
         entity.new(**value)
       rescue ArgumentError, TypeError
@@ -54,12 +71,15 @@ module Grumlin
       end
 
       def cast_map(value)
-        Hash[*value].transform_keys(&:to_sym).transform_values { |v| cast(v) }
+        Hash[*value].transform_keys do |key|
+          next key.to_sym if key.respond_to?(:to_sym)
+          next cast(key) if key[:@type]
+
+          raise UnknownMapKey, key, value
+        end.transform_values { |v| cast(v) }
       rescue ArgumentError
         raise TypeError, "#{value} cannot be casted to Hash"
       end
-
-      def cast_traverser(value); end
     end
   end
 end

data/lib/grumlin/u.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Grumlin
+  module U
+    module U
+      extend self # rubocop:disable Style/ModuleFunction
+
+      %w[addV V has count out values unfold].each do |step|
+        define_method step do |*args|
+          AnonymousStep.new(step, *args)
+        end
+      end
+    end
+
+    # TODO: add alias __
+    extend U
+  end
+end

data/lib/grumlin/version.rb

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

data/lib/grumlin/vertex.rb

@@ -10,11 +10,11 @@ module Grumlin
     end
 
     def ==(other)
-      @label == other.label && @id == other.id
+      self.class == other.class && @label == other.label && @id == other.id
     end
 
     def inspect
-      "<V #{@label}(#{@id})>"
+      "v[#{@id}]"
     end
     alias to_s inspect
   end

metadata

@@ -1,30 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: async-pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: async-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
-description: A ruby client for Gremlin query language.
+        version: '0.19'
+description: Gremlin query language DSL for Ruby.
 email:
 - zhulik.gleb@gmail.com
 executables: []
@@ -33,6 +47,7 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/main.yml"
 - ".gitignore"
+- ".overcommit.yml"
 - ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md
@@ -43,20 +58,32 @@ files:
 - README.md
 - bin/console
 - bin/setup
-- bin/stress
 - docker-compose.yml
 - gremlin_server/Dockerfile
 - gremlin_server/tinkergraph-empty.properties
 - grumlin.gemspec
+- lib/async/channel.rb
 - lib/grumlin.rb
+- lib/grumlin/anonymous_step.rb
 - lib/grumlin/client.rb
 - lib/grumlin/edge.rb
 - lib/grumlin/exceptions.rb
+- lib/grumlin/order.rb
+- lib/grumlin/p.rb
+- lib/grumlin/path.rb
+- lib/grumlin/pop.rb
+- lib/grumlin/request_dispatcher.rb
 - lib/grumlin/step.rb
+- lib/grumlin/sugar.rb
+- lib/grumlin/t.rb
+- lib/grumlin/test/rspec.rb
+- lib/grumlin/test/rspec/db_cleaner_context.rb
+- lib/grumlin/test/rspec/gremlin_context.rb
 - lib/grumlin/translator.rb
+- lib/grumlin/transport.rb
 - lib/grumlin/traversal.rb
-- lib/grumlin/traversing_context.rb
 - lib/grumlin/typing.rb
+- lib/grumlin/u.rb
 - lib/grumlin/version.rb
 - lib/grumlin/vertex.rb
 homepage: https://github.com/zhulik/grumlin
@@ -81,8 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
-summary: A ruby client for Gremlin query language.
+summary: Gremlin query language DSL for Ruby.
 test_files: []

data/bin/stress

@@ -1,51 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require "bundler/setup"
-require "grumlin"
-require "irb"
-
-def queries(client, uuids)
-  total = 0
-  g = Grumlin::Traversal.new(client)
-
-  loop do
-    uuid = uuids.sample
-    result = g.V(uuid).toList[0]
-    raise "!!!" if result.id != uuid
-
-    total += 1
-  end
-rescue Async::Stop
-  total
-end
-
-def prepare_dataset(client)
-  uuids = Array.new(1000) { SecureRandom.uuid }
-
-  Grumlin::Traversal.new(client) do
-    g.V().drop
-
-    uuids.each do |uuid|
-      g.addV("test_vertex").property(id, uuid).toList
-    end
-  end
-
-  uuids
-end
-
-Async do |task|
-  client = Grumlin::Client.new("ws://localhost:8182/gremlin", mode: :bytecode)
-
-  uuids = prepare_dataset(client)
-  tasks = Array.new(20) { task.async { queries(client, uuids) } }
-
-  task.sleep(60)
-
-  tasks.each(&:stop)
-  total = tasks.sum(&:wait)
-
-  p("#{total} requests performed")
-ensure
-  client.disconnect
-end

data/lib/grumlin/traversing_context.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Grumlin
-  class TraversingContext
-    ID = { :@type => "g:T", :@value => "id" }.freeze
-
-    attr_reader :g
-
-    def initialize(traversal)
-      @g = traversal
-    end
-
-    def id
-      ID
-    end
-  end
-end