grumlin 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fb5b809483aeed3b56aeafc11e0f08919a68ce420a14ae918e3aecab791e266
-  data.tar.gz: e42c886a034faeb5ca512882811e78a39f1f5f386b697b0f4061c5be5d5a5f0b
+  metadata.gz: a847514be85565126dc453b6f088ad5c9a388464e74f6744e34427f09a07ec9c
+  data.tar.gz: ea6b1241c611222aa7866b8c3a7b4b798d5a68ba09f79f030196758d4f2dd7f0
 SHA512:
-  metadata.gz: 2bd8e23cd4e6ab7526e2e4aaf92dddfa2b1e0dc51fd2e15e9e0a09541e9716c741673a8e6f85b077e5fd1a3a5f16519ae533748347b1aff0ba5de47a8394ed47
-  data.tar.gz: 673985aeb319810c061234e1d0964cf6e40b95363288423d7cda4e0932a7e271d51b957dccc5605a160e54e680d2a869bfa32769b393d19387e61e0ad15b7794
+  metadata.gz: 2aa5546c4b0139b1fd81cf2c2d5b32886a0c54ee958ddf3d9684ff9a38a19c8401fb2ef89a6767840f2dc0a12fbc86ea0b4821477f0721d767fc4c4f3a6cd7c1
+  data.tar.gz: 38da748bde5febd21a8d94a8ae00768fa8b25bb544dd9b9895a9dd544136faa489a8591d01386afcbb8ed103e5f909c7c4dfff2af9a69f2c42a77fa963be7438

data/.tool-versions

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grumlin (0.5.1)
+    grumlin (0.6.0)
       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
+                         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/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": "asc" }.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.1"
+  VERSION = "0.6.0"
 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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2021-08-30 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