grumlin 0.14.4 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02a213b95f80992accf37eecb32684369e2e8a1582d10be4014e5c59b8381ec3
-  data.tar.gz: ddf854b45f388d9a1c6e4a557e715c9d4363f2ae1c44503969e7d4c819537c1e
+  metadata.gz: a7027bddd19689f2886286b1bcd099c7c8dbf764502f77b5469434cd243387e5
+  data.tar.gz: b5a3e1e1db75e2a7378f77246c9b3bbbc066d5b32c575d15c88d38917d4658be
 SHA512:
-  metadata.gz: 812636c84d1cffaf7bfb5b9c549b3d5c2fca7999b98c395e3cc9fa95701fe73ad0d91e159ba70c672e9bc5671119efd2f6ba65313e6c1e3c8d98e96e64cedc41
-  data.tar.gz: 1863a834265130e9f14cc48d720f638825d86f1a12c70f3d77da4dd18fe835bf7ab0eedcc374ab51bdc0ec007b4c1af8e2f0798b03bd6d2c1fde71d5d544f9bb
+  metadata.gz: b116b30db9eeaf3255793843caa191b6942de7c16a5765b00aa0b803c5e7ae7a1e35d4da4372fd9e2ebe485555f9b895b0fb527cbb37ff89636824197e3a9821
+  data.tar.gz: 11647d93fe2b33814a5356607bca81f2d30edf3992cbae4c52a2191cc34db8632e65bd672ac61030ed27a3c7a7387316d0522188b53e83cef63af2171d5a8494

data/.github/workflows/main.yml

@@ -10,7 +10,7 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0
+          ruby-version: "3.0"
           bundler-cache: true
 
       - name: Run the default task
@@ -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
 
@@ -54,7 +54,7 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0
+          ruby-version: "3.0"
           bundler-cache: true
 
       - name: Build gem

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [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
+- Add `aggregate` step
+- Add `Order.shuffle`
+
 ## [0.14.4] - 2021-12-17
 
 - `Grumlin::Repository.shorcuts_from` do not raise `ArgumentError` when importing an already existing shortcut

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grumlin (0.14.4)
+    grumlin (0.15.2)
       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

@@ -5,10 +5,10 @@ module Grumlin
     attr_reader :name, :previous_step, :configuration_steps
 
     # TODO: add other steps
-    SUPPORTED_STEPS = %i[E V addE addV 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
+    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 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,7 @@ module Grumlin
     end
 
     def args
-      [*@args, @params.any? ? arg.params : nil].compact
+      [*@args, @params.any? ? @params : nil].compact
     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/order.rb

@@ -3,7 +3,7 @@
 module Grumlin
   module Expressions
     module Order
-      SUPPORTED_STEPS = %i[asc desc].freeze
+      SUPPORTED_STEPS = %i[asc desc shuffle].freeze
 
       class << self
         extend Expression

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,17 +3,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: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 }
     }.freeze
 
@@ -72,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.4"
+  VERSION = "0.15.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.15.2
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-17 00:00:00.000000000 Z
+date: 2022-01-17 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