grumlin 0.19.7 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b92be5cc47881f78213096e0d47f53f2b590bca2526a50a5d1aff18dcbf10d14
-  data.tar.gz: 324242ec87f8ac18e099f22d346b1ac56c8c16755c46d16841aa663bcc905bab
+  metadata.gz: e2a547fb7cbcfe53c2fab5486236b4d1021b8c4fe487307003571b24ea9e04d8
+  data.tar.gz: b1f73d016d9779f63a0d19c2c02afc5b975544a479aa9e9a1f5424edfde2911f
 SHA512:
-  metadata.gz: a626ef9e710036168cd951c1da269130001121ce1b8731e5cf3ac48fee73343e07fbb1a314896151bbf24b074f75a75f0de930ccf5f4624449a5748797d046f6
-  data.tar.gz: d4bcff4062607bd1a5c3e4d46afe51f2e088b776ee739697a3c4aee44abbc4e4c7215114e7ba9fd6b7830dc5fffd6d5605dcc1b5b975f2ae6cc6c088dd2039ca
+  metadata.gz: 5e8c6fa1bea702a974a9c0b22ec7c3f914ccceaf7c12f4bc8b5f8ce94eace7edd6dce4e47f318189e3e1b7af8c5e8ace6b00479283823274e3badfe25b6b0b07
+  data.tar.gz: cbb5bbfd192542785f041157232097ed01fe0d1444c20fc7c5606c1873229a7d7577183b8919f475085b5e7bf6700fae6cc987e0024fe6263cfab61f44ce898c

data/.rspec

@@ -1,2 +1,3 @@
 --color
+--require dead_end
 --require spec_helper

data/Gemfile

@@ -13,6 +13,7 @@ gem "overcommit"
 gem "rake"
 
 gem "async-rspec"
+gem "dead_end"
 gem "factory_bot"
 gem "rspec"
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grumlin (0.19.7)
+    grumlin (0.20.2)
       async-pool (~> 0.3)
       async-websocket (~> 0.19)
       oj (~> 3.13)
@@ -48,6 +48,7 @@ GEM
     concurrent-ruby (1.1.10)
     console (1.15.3)
       fiber-local
+    dead_end (4.0.0)
     diff-lcs (1.5.0)
     docile (1.4.0)
     e2mmap (0.1.0)
@@ -71,7 +72,7 @@ GEM
       racc (~> 1.4)
     nokogiri (1.13.6-x86_64-linux)
       racc (~> 1.4)
-    oj (3.13.16)
+    oj (3.13.17)
     overcommit (0.59.1)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
@@ -172,6 +173,7 @@ PLATFORMS
 DEPENDENCIES
   async-rspec
   benchmark-ips
+  dead_end
   factory_bot
   grumlin!
   memory_profiler

data/README.md

@@ -80,8 +80,7 @@ sequences of standard gremlin steps, other shortcuts and even add new initially
 Remember ActiveRecord scopes? Shortcuts are very similar.
 
 **Important**: if a shortcut's name matches a name of a method defined on the wrapped object, this shortcut will be
-be ignored because methods have higher priority. You cannot override supported by Grumlin steps with shortcuts, 
-`Grumlin::Shortcuts.shortcut` will raise an `ArgumentError`. Please carefully choose names for your shortcuts.
+be ignored because methods have higher priority.
 
 Shortcuts are designed to be used with `Grumlin::Repository` but still can be used separately, with `Grumlin::Sugar`
 for example.
@@ -143,6 +142,22 @@ class MyRepository
 end
 ```
 
+##### Overriding standard steps and shortcuts
+
+Sometimes it may be useful to override standard steps. Grumlin does not allow it by default, but one
+is still able to override standard steps if they know what they are doing:
+
+```ruby
+shortcut :addV, override: true do |label|
+  super(label).property(:default, :value)
+end
+```
+
+This will create a new shortcut that overrides the standard step `addV` and adds default properties to all vertices
+created by the repository that uses this shortcut.
+
+Shortcuts also can be overridden, but super() is not available.
+
 #### Grumlin::Repository
 `Grumlin::Repository` combines functionality of `Grumlin::Sugar` and `Grumlin::Shortcuts` as well as adds a few useful
 shortcuts to make gremlin code more rubyish. Can be used as a drop in replacement for `Grumlin::Sugar`. Remember that
@@ -167,6 +182,23 @@ class MyRepository
     hasAll(T.label => :triangle, color: color)
   end
 
+  # `default_vertex_properties` and `default_edge_properties`
+  # override `addV` and `addE` according and inject hashes returned from passed
+  # as properties for newly created vertices and edges.
+  # In case if a repository is inherited, newly defined default properties will be merged to
+  # default properties defined in the parent repository.
+  default_vertex_properties do |_label|
+    {
+      created_at: Time.now.to_i
+    }
+  end
+
+  default_edge_properties do |_label|
+    {
+      created_at: Time.now.to_i
+    }
+  end
+
   # g and __ are already aware of shortcuts
   query(:triangles_with_color, return_mode: :list) do |color| # :list is the default return mode, also possible: :none, :single, :traversal
     g.V.hasLabel(:triangle)

data/bin/console

@@ -7,6 +7,8 @@ require "grumlin"
 require "irb"
 require "irb/completion"
 
+require "dead_end"
+
 Grumlin.configure do |config|
   config.url = ENV.fetch("GREMLIN_URL", "ws://localhost:8182/gremlin")
 end

data/gremlin_server/Dockerfile

@@ -1,5 +1,7 @@
 FROM tinkerpop/gremlin-server
 
+RUN rm -rf /opt/gremlin-server/ext/tinkergraph-gremlin
+
 ADD tinkergraph-gremlin /opt/gremlin-server/ext/tinkergraph-gremlin
 
 ADD tinkergraph-empty.properties /opt/gremlin-server/conf/

data/lib/definitions.yml

@@ -82,6 +82,7 @@ steps:
   configuration:
   - withSack
   - withSideEffect
+  - withStrategies
 expressions:
   cardinality:
   - list

data/lib/grumlin/action.rb

@@ -1,32 +1,17 @@
 # frozen_string_literal: true
 
 module Grumlin
-  class Action
-    START_STEPS = Grumlin.definitions.dig(:steps, :start).map(&:to_sym).freeze
-    CONFIGURATION_STEPS = Grumlin.definitions.dig(:steps, :configuration).map(&:to_sym).freeze
-    REGULAR_STEPS = Grumlin.definitions.dig(:steps, :regular).map(&:to_sym).freeze
+  class Action < Steppable
+    attr_reader :name, :args, :params, :next_step, :configuration_steps, :previous_step, :shortcut
 
-    ALL_STEPS = START_STEPS + CONFIGURATION_STEPS + REGULAR_STEPS
-
-    attr_reader :name, :args, :params, :shortcuts, :next_step, :configuration_steps, :previous_step
-
-    def initialize(name, args: [], params: {}, previous_step: nil, shortcuts: {}, pool: Grumlin.default_pool)
+    def initialize(name, args: [], params: {}, previous_step: nil, pool: nil)
+      super()
       @name = name.to_sym
       @args = args # TODO: add recursive validation: only json types or Action
       @params = params # TODO: add recursive validation: only json types
       @previous_step = previous_step
-      @shortcuts = shortcuts
-      @pool = pool
-    end
-
-    ALL_STEPS.each do |step|
-      define_method step do |*args, **params|
-        step(step, *args, **params)
-      end
-    end
-
-    def step(name, *args, **params)
-      Action.new(name, args: args, params: params, previous_step: self, shortcuts: @shortcuts, pool: @pool)
+      @shortcut = shortcuts[@name]
+      @pool = pool || Grumlin.default_pool
     end
 
     def configuration_step?
@@ -45,23 +30,13 @@ module Grumlin
       ALL_STEPS.include?(@name)
     end
 
-    def shortcut?
-      @shortcuts.key?(@name)
-    end
-
-    def method_missing(name, *args, **params)
-      return step(name, *args, **params) if @shortcuts.key?(name)
-
-      super
-    end
-
     def ==(other)
       self.class == other.class &&
         @name == other.name &&
         @args == other.args &&
         @params == other.params &&
         @previous_step == other.previous_step &&
-        @shortcuts == other.shortcuts
+        shortcuts == other.shortcuts
     end
 
     def steps
@@ -108,11 +83,5 @@ module Grumlin
         client.write(bytecode(no_return: true))
       end
     end
-
-    private
-
-    def respond_to_missing?(name, _include_private = false)
-      @shortcuts.key?(name)
-    end
   end
 end

data/lib/grumlin/repository/instance_methods.rb

@@ -5,6 +5,8 @@ module Grumlin
     module InstanceMethods
       include Grumlin::Expressions
 
+      extend Forwardable
+
       UPSERT_RETRY_PARAMS = {
         on: [Grumlin::AlreadyExistsError, Grumlin::ConcurrentInsertFailedError],
         sleep_method: ->(n) { Async::Task.current.sleep(n) },
@@ -14,12 +16,10 @@ module Grumlin
 
       DEFAULT_ERROR_HANDLING_STRATEGY = ErrorHandlingStrategy.new(mode: :retry, **UPSERT_RETRY_PARAMS)
 
-      def __
-        @__ ||= TraversalStart.new(self.class.shortcuts)
-      end
+      def_delegators :shortcuts, :g, :__
 
-      def g
-        @g ||= TraversalStart.new(self.class.shortcuts)
+      def shortcuts
+        self.class.shortcuts
       end
 
       def drop_vertex(id)
@@ -56,7 +56,7 @@ module Grumlin
         with_upsert_error_handling(on_failure, params) do
           create_properties, update_properties = cleanup_properties(create_properties, update_properties)
 
-          g.upsertV(label, id, create_properties, update_properties).next
+          g.upsertV(label, id, create_properties, update_properties).id.next
         end
       end
 
@@ -70,7 +70,7 @@ module Grumlin
               create_properties, update_properties = cleanup_properties(create_properties, update_properties)
 
               t.upsertV(label, id, create_properties, update_properties)
-            end.iterate
+            end.id.iterate
           end
         end
       end
@@ -80,12 +80,12 @@ module Grumlin
       def upsert_edge(label, from:, to:, create_properties: {}, update_properties: {}, on_failure: :retry, **params) # rubocop:disable Metrics/ParameterLists
         with_upsert_error_handling(on_failure, params) do
           create_properties, update_properties = cleanup_properties(create_properties, update_properties, T.label)
-          g.upsertE(label, from, to, create_properties, update_properties).next
+          g.upsertE(label, from, to, create_properties, update_properties).id.next
         end
       end
 
       # edges:
-      # [["label", "id", {create: :properties}, {update: properties}]]
+      # [["label", "from", "to", {create: :properties}, {update: properties}]]
       # params can override Retryable config from UPSERT_RETRY_PARAMS
       def upsert_edges(edges, batch_size: 100, on_failure: :retry, **params)
         edges.each_slice(batch_size) do |slice|
@@ -94,7 +94,7 @@ module Grumlin
               create_properties, update_properties = cleanup_properties(create_properties, update_properties, T.label)
 
               t.upsertE(label, from, to, create_properties, update_properties)
-            end.iterate
+            end.id.iterate
           end
         end
       end

data/lib/grumlin/repository.rb

@@ -23,7 +23,7 @@ module Grumlin
 
       define_method name do |*args, query_params: {}, **params, &block|
         t = instance_exec(*args, **params, &query_block)
-        return t if self.class.empty_result?(t)
+        return t if t.nil? || (t.respond_to?(:empty?) && t.empty?)
 
         unless t.is_a?(Grumlin::Action)
           raise WrongQueryResult,
@@ -45,8 +45,20 @@ module Grumlin
       end
     end
 
+    def default_vertex_properties(&block)
+      shortcut :addV, override: true do |*args|
+        super(*args).props(**block.call(*args)) # rubocop:disable Performance/RedundantBlockCall
+      end
+    end
+
+    def default_edge_properties(&block)
+      shortcut :addE, override: true do |*args|
+        super(*args).props(**block.call(*args))  # rubocop:disable Performance/RedundantBlockCall
+      end
+    end
+
     def validate_return_mode!(return_mode)
-      return return_mode if RETURN_MODES.key?(return_mode)
+      return return_mode if RETURN_MODES.include?(return_mode)
 
       raise ArgumentError, "unsupported return mode #{return_mode}. Supported modes: #{RETURN_MODES.keys}"
     end
@@ -60,9 +72,5 @@ module Grumlin
       raise ArgumentError,
             "postprocess_with must be a String, Symbol or a callable object, given: #{postprocess_with.class}"
     end
-
-    def empty_result?(result)
-      result.nil? || (result.respond_to?(:empty?) && result.empty?)
-    end
   end
 end

data/lib/grumlin/request_dispatcher.rb

@@ -38,7 +38,7 @@ module Grumlin
     end
 
     def add_request(request)
-      raise RequestAlreadyAddedError if @requests.key?(request[:requestId])
+      raise RequestAlreadyAddedError if @requests.include?(request[:requestId])
 
       Async::Channel.new.tap do |channel|
         @requests[request[:requestId]] = { request: request, result: [], channel: channel }
@@ -73,7 +73,7 @@ module Grumlin
     end
 
     def ongoing_request?(request_id)
-      @requests.key?(request_id)
+      @requests.include?(request_id)
     end
 
     def clear

data/lib/grumlin/shortcut.rb

@@ -9,8 +9,9 @@ module Grumlin
     def_delegator :@block, :arity
     def_delegator :@block, :source_location
 
-    def initialize(name, &block)
+    def initialize(name, lazy: true, &block)
       @name = name
+      @lazy = lazy
       @block = block
     end
 
@@ -18,6 +19,10 @@ module Grumlin
       @name == other.name && @block == other.block
     end
 
+    def lazy?
+      @lazy
+    end
+
     # TODO: to_s, inspect, preview
 
     def apply(object, *args, **params)

data/lib/grumlin/shortcuts/storage.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+module Grumlin
+  module Shortcuts
+    class Storage
+      extend Forwardable
+
+      class << self
+        def [](other)
+          new(other)
+        end
+
+        def empty
+          @empty ||= new
+        end
+      end
+
+      def initialize(storage = {})
+        @storage = storage
+        storage.each do |n, s|
+          add(n, s)
+        end
+      end
+
+      def_delegator :@storage, :[]
+      def_delegator :@storage, :include?, :known?
+      def_delegator :@storage, :keys, :names
+
+      def ==(other)
+        @storage == other.storage
+      end
+
+      def add(name, shortcut)
+        @storage[name] = shortcut
+
+        ac = action_class
+
+        shortcut_methods_module.define_method(name) do |*args, **params|
+          next ac.new(name, args: args, params: params, previous_step: self)
+        end
+        extend_traversal_classes(shortcut) unless shortcut.lazy?
+      end
+
+      def add_from(other)
+        other.storage.each do |name, shortcut|
+          add(name, shortcut)
+        end
+      end
+
+      def g
+        __
+      end
+
+      def __
+        @__ ||= traversal_start_class.new
+      end
+
+      def traversal_start_class
+        @traversal_start_class ||= shortcut_aware_class(TraversalStart)
+      end
+
+      def action_class
+        @action_class ||= shortcut_aware_class(Action)
+      end
+
+      protected
+
+      attr_reader :storage
+
+      private
+
+      def shortcut_methods_module
+        @shortcut_methods_module ||= begin
+          shorts = self
+          Module.new do
+            define_method :shortcuts do
+              shorts
+            end
+          end
+        end
+      end
+
+      def shortcut_aware_class(base)
+        methods = shortcut_methods_module
+        Class.new(base) do
+          include methods
+        end
+      end
+
+      def extend_traversal_classes(shortcut)
+        m = Module.new do
+          define_method(shortcut.name, &shortcut.block)
+        end
+        action_class.include(m)
+        traversal_start_class.include(m)
+      end
+    end
+  end
+end

data/lib/grumlin/shortcuts/upserts.rb

@@ -5,16 +5,16 @@ module Grumlin
     module Upserts
       extend Grumlin::Shortcuts
 
-      shortcut :upsertV do |label, id, create_properties, update_properties|
+      shortcut :upsertV do |label, id, create_properties = {}, update_properties = {}|
         self.V(id)
             .fold
-            .coalesce( # TODO: extract upsert pattern to a shortcut
+            .coalesce(
               __.unfold,
               __.addV(label).props(**create_properties.merge(T.id => id))
             ).props(**update_properties)
       end
 
-      shortcut :upsertE do |label, from, to, create_properties, update_properties|
+      shortcut :upsertE do |label, from, to, create_properties = {}, update_properties = {}|
         self.V(from)
             .outE(label).where(__.inV.hasId(to))
             .fold

data/lib/grumlin/shortcuts.rb

@@ -11,33 +11,26 @@ module Grumlin
       subclass.shortcuts_from(self)
     end
 
-    def shortcut(name, shortcut = nil, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    def shortcut(name, shortcut = nil, override: false, lazy: true, &block)
       name = name.to_sym
-      # TODO: blocklist of names to avoid conflicts with standard methods?
-      if Grumlin::Action::REGULAR_STEPS.include?(name)
-        raise ArgumentError,
-              "cannot use names of standard gremlin steps"
-      end
+      lazy = false if override
 
-      if (shortcut.nil? && block.nil?) || (shortcut && block)
-        raise ArgumentError, "either shortcut or block must be passed"
+      if Grumlin::Action::REGULAR_STEPS.include?(name) && !override
+        raise ArgumentError,
+              "overriding standard gremlin steps is not allowed, if you know what you're doing, pass `override: true`"
       end
 
-      shortcut ||= Shortcut.new(name, &block)
+      raise ArgumentError, "either shortcut or block must be passed" if [shortcut, block].count(&:nil?) != 1
 
-      raise ArgumentError, "shortcut '#{name}' already exists" if shortcuts.key?(name) && shortcuts[name] != shortcut
-
-      shortcuts[name] = shortcut
+      shortcuts.add(name, shortcut || Shortcut.new(name, lazy: lazy, &block))
     end
 
     def shortcuts_from(other_shortcuts)
-      other_shortcuts.shortcuts.each do |name, shortcut|
-        shortcut(name, shortcut)
-      end
+      shortcuts.add_from(other_shortcuts.shortcuts)
     end
 
     def shortcuts
-      @shortcuts ||= {}
+      @shortcuts ||= Storage.new
     end
   end
 end

data/lib/grumlin/shortcuts_applyer.rb

@@ -4,15 +4,17 @@ module Grumlin
   class ShortcutsApplyer
     class << self
       def call(steps)
-        return steps unless steps.uses_shortcuts?
+        return steps if !steps.is_a?(Steps) || !steps.uses_shortcuts?
 
         shortcuts = steps.shortcuts
 
-        configuration_steps = process_steps(steps.configuration_steps, shortcuts)
-        regular_steps = process_steps(steps.steps, shortcuts)
+        steps = [
+          *process_steps(steps.configuration_steps, shortcuts),
+          *process_steps(steps.steps, shortcuts)
+        ]
 
         Steps.new(shortcuts).tap do |processed_steps|
-          (configuration_steps + regular_steps).each do |step|
+          steps.each do |step|
             processed_steps.add(step.name, args: step.args, params: step.params)
           end
         end
@@ -22,21 +24,17 @@ module Grumlin
 
       def process_steps(steps, shortcuts) # rubocop:disable Metrics/AbcSize
         steps.each_with_object([]) do |step, result|
-          args = step.args.map do |arg|
-            arg.is_a?(Steps) ? ShortcutsApplyer.call(arg) : arg
-          end
+          args = step.args.map { |arg| call(arg) }
 
-          if shortcuts.include?(step.name)
-            t = TraversalStart.new(shortcuts)
-            action = shortcuts[step.name].apply(t, *args, **step.params)
-            next if action.nil? || action == t # Shortcut did not add any steps
+          shortcut = shortcuts[step.name]
+          next result << StepData.new(step.name, args: args, params: step.params) unless shortcut&.lazy?
 
-            new_steps = ShortcutsApplyer.call(Steps.from(action))
-            result.concat(new_steps.configuration_steps)
-            result.concat(new_steps.steps)
-          else
-            result << StepData.new(step.name, args: args, params: step.params)
-          end
+          t = shortcuts.__
+          action = shortcut.apply(t, *args, **step.params)
+          next if action.nil? || action == t # Shortcut did not add any steps
+
+          new_steps = call(Steps.from(action))
+          result.concat(new_steps.configuration_steps, new_steps.steps)
         end
       end
     end

data/lib/grumlin/steppable.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Grumlin
+  class Steppable
+    extend Forwardable
+
+    START_STEPS = Grumlin.definitions.dig(:steps, :start).map(&:to_sym).freeze
+    REGULAR_STEPS = Grumlin.definitions.dig(:steps, :regular).map(&:to_sym).freeze
+    CONFIGURATION_STEPS = Grumlin.definitions.dig(:steps, :configuration).map(&:to_sym).freeze
+
+    ALL_STEPS = START_STEPS + CONFIGURATION_STEPS + REGULAR_STEPS
+
+    def initialize
+      return if respond_to?(:shortcuts)
+
+      raise "steppable must not be initialized directly, use Grumlin::Shortcuts::Storage#g or #__ instead"
+    end
+
+    ALL_STEPS.each do |step|
+      define_method step do |*args, **params|
+        shortcuts.action_class.new(step, args: args, params: params, previous_step: self)
+      end
+    end
+
+    def step(name, *args, **params)
+      shortcuts.action_class.new(name, args: args, params: params, previous_step: self)
+    end
+
+    def_delegator :shortcuts, :__
+  end
+end

data/lib/grumlin/steps.rb

@@ -11,7 +11,7 @@ module Grumlin
       shortcuts = action.shortcuts
       actions = []
 
-      until action.nil?
+      until action.nil? || action.is_a?(TraversalStart)
         actions.unshift(action)
         action = action.previous_step
       end
@@ -56,7 +56,7 @@ module Grumlin
 
     def shortcuts?(steps_ary)
       steps_ary.any? do |step|
-        @shortcuts.include?(step.name) || step.args.any? do |arg|
+        @shortcuts.known?(step.name) || step.args.any? do |arg|
           arg.is_a?(Steps) ? arg.uses_shortcuts? : false
         end
       end

data/lib/grumlin/sugar.rb

@@ -6,12 +6,10 @@ module Grumlin
       base.include(Grumlin::Expressions)
     end
 
-    def __(shortcuts = {})
-      Grumlin::TraversalStart.new(shortcuts) # TODO: allow only regular and start steps
-    end
-
-    def g(shortcuts = {})
-      Grumlin::TraversalStart.new(shortcuts)
+    %i[__ g].each do |name|
+      define_method name do |cuts = Shortcuts::Storage.empty|
+        cuts.send(name)
+      end
     end
   end
 end

data/lib/grumlin/traversal_start.rb

@@ -1,38 +1,8 @@
 # frozen_string_literal: true
 
 module Grumlin
-  class TraversalStart
-    START_STEPS = Grumlin.definitions.dig(:steps, :start).map(&:to_sym).freeze
-    REGULAR_STEPS = Grumlin.definitions.dig(:steps, :regular).map(&:to_sym).freeze
-    CONFIGURATION_STEPS = Grumlin.definitions.dig(:steps, :configuration).map(&:to_sym).freeze
-
-    ALL_STEPS = START_STEPS + CONFIGURATION_STEPS + REGULAR_STEPS
-
-    ALL_STEPS.each do |step|
-      define_method step do |*args, **params|
-        step(step, *args, **params)
-      end
-    end
-
-    attr_reader :shortcuts
-
-    def initialize(shortcuts)
-      @shortcuts = shortcuts
-    end
-
-    def step(name, *args, **params)
-      Action.new(name, args: args, params: params, shortcuts: @shortcuts)
-    end
-
-    def method_missing(name, *args, **params)
-      return step(name, *args, **params) if @shortcuts.key?(name)
-
-      super
-    end
-
-    def __
-      @__ ||= TraversalStart.new(@shortcuts) # TODO: allow only regular and start steps
-    end
+  class TraversalStart < Steppable
+    include WithExtension
 
     def to_s(*)
       self.class.to_s
@@ -41,11 +11,5 @@ module Grumlin
     def inspect
       self.class.inspect
     end
-
-    private
-
-    def respond_to_missing?(name, _include_private = false)
-      @shortcuts.key?(name)
-    end
   end
 end

data/lib/grumlin/traversal_strategies/options_strategy.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Grumlin
+  module TraversalStrategies
+    class OptionsStrategy < TypedValue
+      def initialize(value)
+        super(type: "OptionsStrategy", value: value)
+      end
+    end
+  end
+end

data/lib/grumlin/version.rb

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

data/lib/grumlin/with_extension.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Grumlin
+  module WithExtension
+    def with(name, value)
+      prev = self
+      strategy = if is_a?(with_action_class)
+                   prev = previous_step
+                   TraversalStrategies::OptionsStrategy.new(args.first.value.merge(name => value))
+                 else
+                   TraversalStrategies::OptionsStrategy.new({ name => value })
+                 end
+      with_action_class.new(:withStrategies, args: [strategy], previous_step: prev)
+    end
+
+    private
+
+    def with_action_class
+      @with_action_class ||= Class.new(shortcuts.action_class) do
+        include WithExtension
+
+        def with_action_class
+          self.class
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 0.19.7
+  version: 0.20.2
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2022-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-pool
@@ -138,9 +138,11 @@ files:
 - lib/grumlin/shortcut.rb
 - lib/grumlin/shortcuts.rb
 - lib/grumlin/shortcuts/properties.rb
+- lib/grumlin/shortcuts/storage.rb
 - lib/grumlin/shortcuts/upserts.rb
 - lib/grumlin/shortcuts_applyer.rb
 - lib/grumlin/step_data.rb
+- lib/grumlin/steppable.rb
 - lib/grumlin/steps.rb
 - lib/grumlin/steps_serializers/bytecode.rb
 - lib/grumlin/steps_serializers/human_readable_bytecode.rb
@@ -152,11 +154,13 @@ files:
 - lib/grumlin/test/rspec/gremlin_context.rb
 - lib/grumlin/transport.rb
 - lib/grumlin/traversal_start.rb
+- lib/grumlin/traversal_strategies/options_strategy.rb
 - lib/grumlin/traverser.rb
 - lib/grumlin/typed_value.rb
 - lib/grumlin/typing.rb
 - lib/grumlin/version.rb
 - lib/grumlin/vertex.rb
+- lib/grumlin/with_extension.rb
 - lib/tasks/benchmark.rake
 homepage: https://github.com/zhulik/grumlin
 licenses: