grumlin 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2306eba516eebd5d53ac7e8e77acd5d7b2fcb7ad3579e9abc734210aec20ce29
-  data.tar.gz: ebd72733ea3f6ac4554044a00aac252f6a14997664a7b95ebdba01d082e4c8cd
+  metadata.gz: 0f0edafd4d46b787eb3f8e0ec4032948bdb4de865e4de3199606fb470dc16ef3
+  data.tar.gz: f23ba59dfb18dabe70fc860c38ea4c1777214b4a37e04771b24210d90f449612
 SHA512:
-  metadata.gz: bda5181c00cabc8d69fdaa891a81943527dabfaa69ce70babbba6c1f11efc83b6f942d23d6aaf792d580f842ca7f64971986def6e1cfc1e6d4d3626da05efa1b
-  data.tar.gz: 212fbac76d50dfe281e574604ffbb82e8008937d777c279575a05468ee0f063faa6f0a8fa1417e8ea40e96f72b1b9f1f61c9e881e7c9b800d25964ce3ad7932a
+  metadata.gz: 4629a25995953c6617a45721d7082baee59b76425636f6a4536308220bae3e7cb72b571317102339b1888c0e430dbe73320c12f44518940f45c67db829a9a265
+  data.tar.gz: fae1a56f95150f82da47a886da5e4b4a7ab0f725f66e68af61f6456c9a2f1af2cefc580ebf793cba612f0ceeda0b782361476a38511019062cc1534ad98fdb3c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grumlin (0.10.1)
+    grumlin (0.11.0)
       async-pool (~> 0.3)
       async-websocket (~> 0.19)
       oj (~> 3.12)

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/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/version.rb

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

metadata

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