grumlin 0.14.5 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f286174f46acd657ca106d29b2b5aa981c7b8b6f78d5e5e0ccffc8c844991510
-  data.tar.gz: f810075cd2f7ac036dd292f03b626b8033ff79070299a6c9356ac72a15604292
+  metadata.gz: b44c62fb657fac1ce08d4a4dcb05456a2750284dddcd5adbbd20f56bb2b9ef9c
+  data.tar.gz: eccc2648799e68be2225ce606a06411b49953ce586e4b8249156dc680fc3522e
 SHA512:
-  metadata.gz: 80fdbe5667fe93115a8d5dc817bf6d3f4bf6869c5f739a0d2ea36d53c06cf10fcff74c6384a4b796272b265e3fa392000b41954ab89c5400c017d5f40aabff81
-  data.tar.gz: 2b4d6f0b34194c91d8bef2a64f7dd9f98d458a3156a4edeaf2e4e9a5044133af45ed2e946584c2fe8d433ed24c13d2e3619fefdfca926682a39619a30656f17e
+  metadata.gz: dfc9f36a53d49749425df0014005e18ddd47b91e5c35bdc4dd4c7dfc0ec3309ba15df4e8a3367a8dba4c92494a2f70cab9fe4a846ded833100dc09937bf4ff9b
+  data.tar.gz: d315dfb2945c27091f76a21af2e30f77eb8753042519cf2bd7813ef544cb805f4970808158a550e5abdc1891c1526d4c3441bda46334bae67e2bf49a8ff9bd87

data/.github/workflows/main.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["2.7", "3.0"]
+        ruby: ["2.7", "3.0", "3.1"]
     steps:
       - uses: actions/checkout@v2
 

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## [0.15.3] - 2022-01-18
+
+- Fix passing nils as step arguments. Even if they are not supported by the server, they should not be omitted.
+
+## [0.15.2] - 2022-01-17
+
+- New steps: `map` and `identity`
+
+## [0.15.1] - 2022-01-17
+
+- Fix passing arrays as step arguments
+
+## [0.15.0] - 2022-01-11
+
+- Add `properties` step
+- Add proper support for bulked results
+- Add support for `Property` objects
+
 ## [0.14.5] - 2021-12-27
 
 - Fix params handling

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grumlin (0.14.5)
+    grumlin (0.15.3)
       async-pool (~> 0.3)
       async-websocket (~> 0.19)
       oj (~> 3.12)
@@ -60,15 +60,15 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    mini_portile2 (2.5.3)
+    mini_portile2 (2.7.1)
     minitest (5.14.4)
     nio4r (2.5.8)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.13.1)
+      mini_portile2 (~> 2.7.0)
       racc (~> 1.4)
-    nokogiri (1.11.7-x86_64-linux)
+    nokogiri (1.13.1-x86_64-linux)
       racc (~> 1.4)
-    oj (3.13.10)
+    oj (3.13.11)
     overcommit (0.57.0)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
@@ -85,7 +85,7 @@ GEM
     protocol-websocket (0.7.5)
       protocol-http (~> 0.2)
       protocol-http1 (~> 0.2)
-    racc (1.5.2)
+    racc (1.6.0)
     rainbow (3.0.0)
     rake (13.0.3)
     regexp_parser (2.2.0)

data/README.md

@@ -51,7 +51,7 @@ end
 
 ### Traversing graphs
 
-**Warning**: Not all steps and tools described in the standard are supported
+**Warning**: Not all steps and expressions defined in the reference documentation are supported.
 
 #### Sugar
 

data/lib/grumlin/anonymous_step.rb

@@ -6,9 +6,9 @@ module Grumlin
 
     # TODO: add other steps
     SUPPORTED_STEPS = %i[E V addE addV aggregate and as both bothE by choose coalesce count dedup drop elementMap emit
-                         fold from group groupCount has hasId hasLabel hasNot id in inE inV is label limit not or order
-                         out outE path project property range repeat sack select sideEffect skip sum tail to unfold
-                         union until valueMap values where with].freeze
+                         fold from group groupCount has hasId hasLabel hasNot id identity in inE inV is label limit
+                         map not or order out outE path project properties property range repeat sack select sideEffect
+                         skip sum tail to unfold union until valueMap values where with].freeze
 
     def initialize(name, *args, configuration_steps: [], previous_step: nil, **params)
       @name = name
@@ -41,7 +41,9 @@ module Grumlin
     end
 
     def args
-      [*@args, @params.any? ? @params : nil].compact
+      [*@args].tap do |args|
+        args << @params if @params.any?
+      end
     end
   end
 end

data/lib/grumlin/bytecode.rb

@@ -14,7 +14,6 @@ module Grumlin
 
     def initialize(step, no_return: false)
       super(type: "Bytecode")
-
       @step = step
       @no_return = no_return
     end
@@ -49,7 +48,7 @@ module Grumlin
       return arg.public_send(serialization_method) if arg.respond_to?(serialization_method)
       return arg unless arg.is_a?(AnonymousStep)
 
-      arg.args.flatten.each.with_object([arg.name.to_s]) do |a, res|
+      arg.args.each.with_object([arg.name.to_s]) do |a, res|
         res << if a.respond_to?(:bytecode)
                  a.bytecode.public_send(serialization_method)
                else

data/lib/grumlin/expressions/u.rb

@@ -4,8 +4,8 @@ module Grumlin
   module Expressions
     module U
       # TODO: add other start steps
-      SUPPORTED_STEPS = %i[V addV coalesce constant count drop fold has hasLabel hasNot id in inE inV is label out outE
-                           outV project repeat select timeLimit unfold valueMap values].freeze
+      SUPPORTED_STEPS = %i[V addV coalesce constant count drop fold has hasLabel hasNot id identity in inE inV is label
+                           out outE outV project repeat select timeLimit unfold valueMap values].freeze
 
       class << self
         SUPPORTED_STEPS.each do |step|

data/lib/grumlin/property.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Grumlin
+  class Property
+    attr_reader :key, :value
+
+    def initialize(value)
+      @key = value[:key]
+      @value = Typing.cast(value[:value])
+    end
+
+    def inspect
+      "p[#{key}->#{value}]"
+    end
+
+    def to_s
+      inspect
+    end
+
+    def ==(other)
+      self.class == other.class && @key == other.key && @value == other.value
+    end
+  end
+end

data/lib/grumlin/traverser.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Grumlin
+  class Traverser
+    attr_reader :bulk, :value
+
+    def initialize(value)
+      @bulk = value.dig(:bulk, :@value) || 1
+      @value = Typing.cast(value[:value])
+    end
+  end
+end

data/lib/grumlin/typing.rb

@@ -3,16 +3,17 @@
 module Grumlin
   module Typing
     TYPES = {
-      "g:List" => ->(value) { value.map { |item| cast(item) } },
-      "g:Set" => ->(value) { Set.new(value.map { |item| cast(item) }) },
+      "g:List" => ->(value) { cast_list(value) },
+      "g:Set" => ->(value) { cast_list(value).to_set },
       "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:Traverser" => ->(value) { cast_entity(Traverser, value) },
+      "g:Property" => ->(value) { cast_entity(Property, value) },
       "g:Int64" => ->(value) { cast_int(value) },
       "g:Int32" => ->(value) { cast_int(value) },
       "g:Double" => ->(value) { cast_double(value) },
-      "g:Traverser" => ->(value) { cast(value[:value]) }, # TODO: wtf is bulk?
       "g:Direction" => ->(value) { value },
       # "g:VertexProperty"=> ->(value) { value }, # TODO: implement me
       "g:T" => ->(value) { value.to_sym }
@@ -73,6 +74,15 @@ module Grumlin
       rescue ArgumentError
         raise TypeError, "#{value} cannot be casted to Hash"
       end
+
+      def cast_list(value)
+        value.each_with_object([]) do |item, result|
+          casted_value = cast(item)
+          next (result << casted_value) unless casted_value.instance_of?(Traverser)
+
+          casted_value.bulk.times { result << casted_value.value }
+        end
+      end
     end
   end
 end

data/lib/grumlin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 0.14.5
+  version: 0.15.3
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-27 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-pool
@@ -111,6 +111,7 @@ files:
 - lib/grumlin/expressions/u.rb
 - lib/grumlin/expressions/with_options.rb
 - lib/grumlin/path.rb
+- lib/grumlin/property.rb
 - lib/grumlin/repository.rb
 - lib/grumlin/request_dispatcher.rb
 - lib/grumlin/shortcut_proxy.rb
@@ -123,6 +124,7 @@ files:
 - lib/grumlin/test/rspec/gremlin_context.rb
 - lib/grumlin/transport.rb
 - lib/grumlin/traversal.rb
+- lib/grumlin/traverser.rb
 - lib/grumlin/typed_value.rb
 - lib/grumlin/typing.rb
 - lib/grumlin/version.rb