grumlin 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 990547dc4c35f0a964fa3deacd6f6b892e09d8b7afa5374ffff0f09b2190efcc
-  data.tar.gz: a54714b9a34b81106bb928c54d5bc4ebab5414f2953baec0039286a4983c7247
+  metadata.gz: e353294814ba425473eb717892ea994d686dd25eec4db78cd0c15102f68a7e53
+  data.tar.gz: 672458be5666e00f34386e632a8a902e3271ad91160b1b2d4bd2235d3789abd9
 SHA512:
-  metadata.gz: 75f1892b26628f1c276dd49e778e4d8b0a4371366f0d5d45432ec0fe08da66b8f83100977c12047024f55f4466bde4b6ee2273e3e9b0819d8455b49f0ed4a623
-  data.tar.gz: f72fbfab3233caf9d705277c7f10cc706ffbafe8f0b483cd02e2b8e467f0d30f33f99f44aabd63aca47a0bf9dad4a31445dec3783e19fd5f217697122c08ea7a
+  metadata.gz: cc64a8dacf4dc2384e0d3da380cb0b62f534e603e49f67f537f0c1e46feb549c8098d8580c1d9d96edf0f3b145b777ae26206025086e52ee86ca37e526d53f8a
+  data.tar.gz: 4c2ae1909426dc7c89a41feecb2e7a917daa33f8adb7330229691fa7e49585b1b1e24fca7773026e998f7a738b701d8457e50fcaf8ca3c9e271a71b698ea26e6

data/.github/workflows/main.yml

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

data/.rspec

@@ -1,3 +1,2 @@
---format documentation
 --color
 --require spec_helper

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   NewCops: enable
   SuggestExtensions: false
 

data/.tool-versions

@@ -1 +1 @@
-ruby 2.6.6
+ruby 2.7.5

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.14.0] - 2021-12-07
+
+- Add initial support for [configuration steps](https://tinkerpop.apache.org/docs/current/reference/#configuration-steps)
+- Add the `withSideEffect` configuration step
+- Fix passing keyword arguments to regular steps
+- *Drop support for ruby 2.6*
+
 ## [0.13.0] - 2021-12-03
 
 - Add `Shortcuts` and `Repository`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grumlin (0.13.1)
+    grumlin (0.14.0)
       async-pool (~> 0.3)
       async-websocket (~> 0.19)
       oj (~> 3.12)
@@ -60,8 +60,12 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
+    mini_portile2 (2.5.3)
     minitest (5.14.4)
     nio4r (2.5.8)
+    nokogiri (1.11.7)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     nokogiri (1.11.7-x86_64-linux)
       racc (~> 1.4)
     oj (3.13.9)
@@ -154,6 +158,7 @@ GEM
     zeitwerk (2.4.2)
 
 PLATFORMS
+  ruby
   x86_64-linux
 
 DEPENDENCIES

data/grumlin.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
 
   spec.homepage      = "https://github.com/zhulik/grumlin"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/zhulik/grumlin"

data/lib/grumlin/anonymous_step.rb

@@ -2,7 +2,7 @@
 
 module Grumlin
   class AnonymousStep
-    attr_reader :name, :args, :previous_step
+    attr_reader :name, :previous_step, :configuration_steps
 
     # TODO: add other steps
     SUPPORTED_STEPS = %i[E V addE addV and as both bothE by coalesce count dedup drop elementMap emit fold from group
@@ -10,20 +10,22 @@ module Grumlin
                          project property range repeat select sideEffect skip tail to unfold union until valueMap
                          values where with].freeze
 
-    def initialize(name, *args, previous_step: nil)
+    def initialize(name, *args, configuration_steps: [], previous_step: nil, **params)
       @name = name
       @previous_step = previous_step
       @args = args
+      @params = params
+      @configuration_steps = configuration_steps
     end
 
     SUPPORTED_STEPS.each do |step|
-      define_method(step) do |*args|
-        step(step, args)
+      define_method(step) do |*args, **params|
+        step(step, *args, **params)
       end
     end
 
-    def step(name, args)
-      self.class.new(name, *args, previous_step: self)
+    def step(name, *args, **params)
+      self.class.new(name, *args, previous_step: self, configuration_steps: configuration_steps, **params)
     end
 
     def inspect
@@ -35,5 +37,9 @@ module Grumlin
     def bytecode(no_return: false)
       @bytecode ||= Bytecode.new(self, no_return: no_return)
     end
+
+    def args
+      [*@args, @params.any? ? arg.params : nil].compact
+    end
   end
 end

data/lib/grumlin/bytecode.rb

@@ -20,7 +20,10 @@ module Grumlin
     end
 
     def inspect
-      to_readable_bytecode.to_s
+      configuration_steps = @step.configuration_steps.map do |s|
+        serialize_arg(s, serialization_method: :to_readable_bytecode)
+      end
+      "#{configuration_steps.any? ? configuration_steps : nil}#{to_readable_bytecode}"
     end
     alias to_s inspect
 
@@ -29,13 +32,15 @@ module Grumlin
     end
 
     def value
-      { step: (steps + (@no_return ? [NONE_STEP] : [])).map { |s| serialize_arg(s) } }
+      @value ||= { step: (steps + (@no_return ? [NONE_STEP] : [])).map { |s| serialize_arg(s) } }.tap do |v|
+        v.merge!(source: @step.configuration_steps.map { |s| serialize_arg(s) }) if @step.configuration_steps.any?
+      end
     end
 
     private
 
     # Serializes step or a step argument to either an executable query or a human readable string representation
-    # depending on the `serialization_method` parameter. I should be either `:to_readable_bytecode` for human readable
+    # depending on the `serialization_method` parameter. It should be either `:to_readable_bytecode` for human readable
     # representation or `:to_bytecode` for query.
     def serialize_arg(arg, serialization_method: :to_bytecode)
       return arg.public_send(serialization_method) if arg.respond_to?(serialization_method)

data/lib/grumlin/expressions/u.rb

@@ -9,8 +9,8 @@ module Grumlin
 
       class << self
         SUPPORTED_STEPS.each do |step|
-          define_method step do |*args|
-            AnonymousStep.new(step, *args)
+          define_method step do |*args, **params|
+            AnonymousStep.new(step, *args, **params)
           end
         end
       end

data/lib/grumlin/shortcut_proxy.rb

@@ -13,12 +13,12 @@ module Grumlin
       @parent = parent
     end
 
-    def method_missing(name, *args)
-      return @parent.public_send(name, *args) if %i[__ g].include?(name) && !@parent.nil?
+    def method_missing(name, *args, **params)
+      return @parent.public_send(name, *args, **params) if %i[__ g].include?(name) && !@parent.nil?
 
-      return wrap_result(@object.public_send(name, *args)) if @object.respond_to?(name)
+      return wrap_result(@object.public_send(name, *args, **params)) if @object.respond_to?(name)
 
-      return wrap_result(instance_exec(*args, &@shortcuts[name])) if @shortcuts.key?(name)
+      return wrap_result(instance_exec(*args, **params, &@shortcuts[name])) if @shortcuts.key?(name)
 
       super
     end

data/lib/grumlin/shortcuts/properties.rb

@@ -5,13 +5,13 @@ module Grumlin
     module Properties
       extend Grumlin::Shortcuts
 
-      shortcut :props do |props = {}|
+      shortcut :props do |*_args, **props|
         props.reduce(self) do |tt, (prop, value)|
           tt.property(prop, value)
         end
       end
 
-      shortcut :hasAll do |props = {}|
+      shortcut :hasAll do |*, **props|
         props.reduce(self) do |tt, (prop, value)|
           tt.has(prop, value)
         end

data/lib/grumlin/step.rb

@@ -4,8 +4,8 @@ module Grumlin
   class Step < AnonymousStep
     attr_reader :client
 
-    def initialize(pool, name, *args, previous_step: nil)
-      super(name, *args, previous_step: previous_step)
+    def initialize(pool, name, *args, configuration_steps: [], previous_step: nil, **params)
+      super(name, *args, previous_step: previous_step, configuration_steps: configuration_steps, **params)
       @pool = pool
     end
 
@@ -36,8 +36,8 @@ module Grumlin
       end
     end
 
-    def step(step_name, args)
-      self.class.new(@pool, step_name, *args, previous_step: self)
+    def step(step_name, *args, **params)
+      self.class.new(@pool, step_name, *args, previous_step: self, configuration_steps: @configuration_steps, **params)
     end
   end
 end

data/lib/grumlin/traversal.rb

@@ -5,13 +5,26 @@ module Grumlin
     # TODO: add other start steps
     SUPPORTED_STEPS = %i[E V addE addV].freeze
 
-    def initialize(pool = Grumlin.default_pool)
+    CONFIGURATION_STEPS = %i[withSideEffect].freeze
+
+    attr_reader :configuration_steps
+
+    def initialize(pool = Grumlin.default_pool, configuration_steps: [])
       @pool = pool
+      @configuration_steps = configuration_steps
+    end
+
+    alias inspect to_s
+
+    CONFIGURATION_STEPS.each do |step|
+      define_method step do |*args, **params|
+        self.class.new(@pool, configuration_steps: @configuration_steps + [AnonymousStep.new(step, *args, **params)])
+      end
     end
 
     SUPPORTED_STEPS.each do |step|
-      define_method step do |*args|
-        Step.new(@pool, step, *args)
+      define_method step do |*args, **params|
+        Step.new(@pool, step, *args, configuration_steps: @configuration_steps, **params)
       end
     end
   end

data/lib/grumlin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-06 00:00:00.000000000 Z
+date: 2021-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-pool
@@ -141,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="