grumlin 0.15.4 → 0.15.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e796fc1b5bff2cb474d068ad2a05a2b8a195df1981842745d5c90798ab5e02b7
-  data.tar.gz: 39cd9ac6bbedfb6a8707d306c6a6e0223856028162778bb665865e387dcf2bc3
+  metadata.gz: 195f614a2cbebbe43f6dd2aedb3aeb54891c4377f50f85f21f44ee3325c87f58
+  data.tar.gz: 0f0a3c0b5aa8f03fb4d613c406b08497685ee9fb4cbea2e8a0b99385f749ebf3
 SHA512:
-  metadata.gz: 072df70e88f7192272cad5c6127740ef10d52b5057f42a557e9f4ea722e55f53d222025e7b4d7607666d4c5038d3e630abb55faec7f05c640efed53d442a2b57
-  data.tar.gz: 32ac57244365458e56c9b2c2705500c87254ba523454817b67f88637e07444d5e0b2abfa361540693f0dedf578b7e5f346c8a2515e536c69ad86e5ee09fa7bf3
+  metadata.gz: 21a7d91e9ce0a9e143f4bba9bb15d4bd31f6337f72500038bf09cd471ab05535d9d3ade4cfba6d6b6d779e09600b6352ed83b3e4bd70aeadd1417e51ba663937
+  data.tar.gz: 9cd14a8f18b856eca87d3b51b48c3f3c0d8d454b76fae92466bd7aee370019bbbb0b398236187acfcfed2322520aa4a3aa68a0e6bfb8b02a073e27f0db3cf525

data/.rubocop.yml

@@ -60,6 +60,9 @@ RSpec/MultipleExpectations:
 RSpec/DescribeClass:
   Enabled: false
 
+RSpec/MultipleMemoizedHelpers:
+  Max: 7
+
 Style/WordArray:
   Exclude:
     - spec/**/*_spec.rb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grumlin (0.15.4)
+    grumlin (0.15.6)
       async-pool (~> 0.3)
       async-websocket (~> 0.19)
       oj (~> 3.12)
@@ -28,7 +28,7 @@ GEM
       protocol-http (~> 0.22.0)
       protocol-http1 (~> 0.14.0)
       protocol-http2 (~> 0.14.0)
-    async-io (1.32.2)
+    async-io (1.33.0)
       async
     async-pool (0.3.9)
       async (>= 1.25)

data/lib/definitions.yml

@@ -32,11 +32,14 @@ steps:
   - in
   - inE
   - inV
+  - inject
   - is
   - label
   - limit
   - map
+  - none
   - not
+  - option
   - or
   - order
   - out
@@ -68,6 +71,7 @@ steps:
   - V
   - addE
   - addV
+  - inject
   configuration:
   - withSack
   - withSideEffect

data/lib/grumlin/shortcut.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Grumlin
+  class Shortcut
+    extend Forwardable
+
+    attr_reader :name, :block
+
+    def_delegator :@block, :arity
+    def_delegator :@block, :source_location
+
+    def initialize(name, &block)
+      @name = name
+      @block = block
+    end
+
+    def ==(other)
+      @name == other.name && @block == other.block
+    end
+
+    # TODO: to_s, inspect, preview
+
+    def apply(object, *args, **params)
+      object.instance_exec(*args, **params, &@block)
+    end
+  end
+end

data/lib/grumlin/shortcut_proxy.rb

@@ -18,7 +18,7 @@ module Grumlin
 
       return wrap_result(@object.public_send(name, *args, **params)) if @object.respond_to?(name)
 
-      return wrap_result(instance_exec(*args, **params, &@shortcuts[name])) if @shortcuts.key?(name)
+      return wrap_result(@shortcuts[name].apply(self, *args, **params)) if @shortcuts.key?(name)
 
       super
     end

data/lib/grumlin/shortcuts.rb

@@ -18,7 +18,7 @@ module Grumlin
       subclass.shortcuts_from(self)
     end
 
-    def shortcut(name, &block)
+    def shortcut(name, shortcut = nil, &block) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       name = name.to_sym
       # TODO: blocklist of names to avoid conflicts with standard methods?
       if Grumlin::AnonymousStep::SUPPORTED_STEPS.include?(name)
@@ -26,14 +26,20 @@ module Grumlin
               "cannot use names of standard gremlin steps"
       end
 
-      raise ArgumentError, "shortcut '#{name}' already exists" if shortcuts.key?(name) && shortcuts[name] != block
+      if (shortcut.nil? && block.nil?) || (shortcut && block)
+        raise ArgumentError, "either shortcut or block must be passed"
+      end
+
+      shortcut ||= Shortcut.new(name, &block)
+
+      raise ArgumentError, "shortcut '#{name}' already exists" if shortcuts.key?(name) && shortcuts[name] != shortcut
 
-      shortcuts[name] = block
+      shortcuts[name] = shortcut
     end
 
     def shortcuts_from(other_shortcuts)
-      other_shortcuts.shortcuts.each do |name, block|
-        shortcut(name, &block)
+      other_shortcuts.shortcuts.each do |name, shortcut|
+        shortcut(name, shortcut)
       end
     end
 

data/lib/grumlin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 0.15.4
+  version: 0.15.6
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-pool
@@ -115,6 +115,7 @@ files:
 - lib/grumlin/property.rb
 - lib/grumlin/repository.rb
 - lib/grumlin/request_dispatcher.rb
+- lib/grumlin/shortcut.rb
 - lib/grumlin/shortcut_proxy.rb
 - lib/grumlin/shortcuts.rb
 - lib/grumlin/shortcuts/properties.rb