grumlin 0.13.1 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 990547dc4c35f0a964fa3deacd6f6b892e09d8b7afa5374ffff0f09b2190efcc
-  data.tar.gz: a54714b9a34b81106bb928c54d5bc4ebab5414f2953baec0039286a4983c7247
+  metadata.gz: f1574fb6f69111d6a738cdbb1e19fb085c234ade887483e1b2c45644104cc40b
+  data.tar.gz: 2910b648435d662b8e1bebfb6646b838e71912807379aa04205efdcc0a8b8a05
 SHA512:
-  metadata.gz: 75f1892b26628f1c276dd49e778e4d8b0a4371366f0d5d45432ec0fe08da66b8f83100977c12047024f55f4466bde4b6ee2273e3e9b0819d8455b49f0ed4a623
-  data.tar.gz: f72fbfab3233caf9d705277c7f10cc706ffbafe8f0b483cd02e2b8e467f0d30f33f99f44aabd63aca47a0bf9dad4a31445dec3783e19fd5f217697122c08ea7a
+  metadata.gz: 41cadcd8b01c0ef3af860942eb6d187e5acfafdfd5e7c7cd9a052bb5f261ecd9773912ebe8a6da039188b1a81519fc20a7c7c19706c915f7550787345b936ac8
+  data.tar.gz: fcbc59501668d19e08305a08158ed63ac73a6a94d375d71af0975f8a4a556f900a2dadd611da66e5b306679580e586ee1a23bdfea1d058bf9c86e77a4f7ee2fa

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,26 @@
+## [0.14.2] - 2021-12-13
+
+- Fix `Module` bloating
+- Add `Operator` expressions
+- Add `__.coalesce` and `__.constant`
+- Add steps: `sum`, `sack`
+- Add configuration steps: `withSack`
+- Rename `Grumlin::Expressions::Tool` to `Grumlin::Expressions::Expression`
+
+
+## [0.14.2] - 2021-12-12
+
+- Better exceptions
+- Add `choose` step
+- Add `__.hasNot`, `__.is`, `__.select`
+
+## [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.3)
       async-pool (~> 0.3)
       async-websocket (~> 0.19)
       oj (~> 3.12)
@@ -60,16 +60,20 @@ 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)
+    oj (3.13.10)
     overcommit (0.57.0)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    parallel (1.21.0)
+    parser (3.0.3.2)
       ast (~> 2.4.1)
     protocol-hpack (1.4.2)
     protocol-http (0.22.5)
@@ -84,7 +88,7 @@ GEM
     racc (1.5.2)
     rainbow (3.0.0)
     rake (13.0.3)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     reverse_markdown (2.0.0)
       nokogiri
     rexml (3.2.5)
@@ -105,23 +109,22 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.16.1)
+    rubocop (1.23.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.7.0)
+    rubocop-ast (1.14.0)
       parser (>= 3.0.1.1)
-    rubocop-performance (1.11.3)
+    rubocop-performance (1.12.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rspec (2.3.0)
-      rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-rspec (2.6.0)
+      rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     simplecov (0.21.2)
       docile (~> 1.1)
@@ -149,11 +152,12 @@ GEM
     timers (4.3.3)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.1.0)
     yard (0.9.26)
     zeitwerk (2.4.2)
 
 PLATFORMS
+  ruby
   x86_64-linux
 
 DEPENDENCIES

data/README.md

@@ -241,7 +241,8 @@ config.include_context(Grumlin::Test::RSpec::DBCleanerContext) # Cleans the data
 ...
 ```
 
-It is highly recommended to use `Grumlin::Sugar` and not trying to use lower level APIs as they are subject to change. 
+It is highly recommended to use `Grumlin::Sugar` or `Grumlin::Repository` and not trying to use lower level APIs
+as they are subject to change.
 
 ## Development
 

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"
@@ -31,4 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "async-websocket", "~> 0.19"
   spec.add_dependency "oj", "~> 3.12"
   spec.add_dependency "zeitwerk", "~> 2.4"
+  spec.metadata = {
+    "rubygems_mfa_required" => "true"
+  }
 end

data/lib/grumlin/anonymous_step.rb

@@ -2,38 +2,46 @@
 
 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
-                         groupCount has hasId hasLabel hasNot id in inE inV is label limit not or order out outE path
-                         project property range repeat select sideEffect skip tail to unfold union until valueMap
-                         values where with].freeze
+    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
 
-    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
       bytecode.inspect
     end
 
-    alias to_s inspect
+    def to_s
+      inspect
+    end
 
     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,22 +20,30 @@ 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
+
+    def to_s
+      inspect
     end
-    alias to_s inspect
 
     def to_readable_bytecode
       @to_readable_bytecode ||= steps.map { |s| serialize_arg(s, serialization_method: :to_readable_bytecode) }
     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/client.rb

@@ -51,7 +51,7 @@ module Grumlin
     end
 
     def connect
-      raise "ClientClosed" if @closed
+      raise ClientClosedError if @closed
 
       @transport = build_transport
       response_channel = @transport.connect
@@ -113,10 +113,13 @@ module Grumlin
       "<#{self.class} url=#{@url} connected=#{connected?}>"
     end
 
-    alias to_s inspect
+    def to_s
+      inspect
+    end
 
     private
 
+    # This might be overridden in successors
     def build_transport
       Transport.new(@url, parent: @parent, **@client_options)
     end

data/lib/grumlin/edge.rb

@@ -20,6 +20,9 @@ module Grumlin
     def inspect
       "e[#{@id}][#{@outV}-#{@label}->#{@inV}]"
     end
-    alias to_s inspect
+
+    def to_s
+      inspect
+    end
   end
 end

data/lib/grumlin/expressions/{tool.rb → expression.rb}

@@ -2,10 +2,10 @@
 
 module Grumlin
   module Expressions
-    module Tool
+    module Expression
       def define_steps(steps, tool_name)
         steps.each do |step|
-          self.class.define_method step do
+          define_method step do
             name = "@#{step}"
             return instance_variable_get(name) if instance_variable_defined?(name)
 

data/lib/grumlin/expressions/operator.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Grumlin
+  module Expressions
+    module Operator
+      SUPPORTED_STEPS = %i[addAll and assign div max min minus mult or sum].freeze
+
+      class << self
+        extend Expression
+
+        define_steps(SUPPORTED_STEPS, "Operator")
+      end
+    end
+  end
+end

data/lib/grumlin/expressions/order.rb

@@ -3,11 +3,13 @@
 module Grumlin
   module Expressions
     module Order
-      extend Tool
-
       SUPPORTED_STEPS = %i[asc desc].freeze
 
-      define_steps(SUPPORTED_STEPS, "Order")
+      class << self
+        extend Expression
+
+        define_steps(SUPPORTED_STEPS, "Order")
+      end
     end
   end
 end

data/lib/grumlin/expressions/pop.rb

@@ -3,11 +3,13 @@
 module Grumlin
   module Expressions
     module Pop
-      extend Tool
-
       SUPPORTED_STEPS = %i[all first last mixed].freeze
 
-      define_steps(SUPPORTED_STEPS, "Pop")
+      class << self
+        extend Expression
+
+        define_steps(SUPPORTED_STEPS, "Pop")
+      end
     end
   end
 end

data/lib/grumlin/expressions/scope.rb

@@ -3,11 +3,13 @@
 module Grumlin
   module Expressions
     module Scope
-      extend Tool
-
       SUPPORTED_STEPS = %i[local].freeze
 
-      define_steps(SUPPORTED_STEPS, "Scope")
+      class << self
+        extend Expression
+
+        define_steps(SUPPORTED_STEPS, "Scope")
+      end
     end
   end
 end

data/lib/grumlin/expressions/t.rb

@@ -3,11 +3,13 @@
 module Grumlin
   module Expressions
     module T
-      extend Tool
-
       SUPPORTED_STEPS = %i[id label].freeze
 
-      define_steps(SUPPORTED_STEPS, "T")
+      class << self
+        extend Expression
+
+        define_steps(SUPPORTED_STEPS, "T")
+      end
     end
   end
 end

data/lib/grumlin/expressions/u.rb

@@ -4,13 +4,13 @@ module Grumlin
   module Expressions
     module U
       # TODO: add other start steps
-      SUPPORTED_STEPS = %i[V addV count drop fold has hasLabel id in inE inV label out outE outV project repeat
-                           timeLimit unfold valueMap values].freeze
+      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
 
       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/path.rb

@@ -12,6 +12,9 @@ module Grumlin
     def inspect
       "p[#{@objects}]"
     end
-    alias to_s inspect
+
+    def to_s
+      inspect
+    end
   end
 end

data/lib/grumlin/request_dispatcher.rb

@@ -22,14 +22,18 @@ module Grumlin
       498 => ClientSideError
     }.freeze
 
-    include Console
+    class DispatcherError < Grumlin::Error; end
+
+    class RequestAlreadyAddedError < DispatcherError; end
+
+    class UnknownRequestError < DispatcherError; end
 
     def initialize
       @requests = {}
     end
 
     def add_request(request)
-      raise "ERROR" if @requests.key?(request[:requestId])
+      raise RequestAlreadyAddedError if @requests.key?(request[:requestId])
 
       Async::Channel.new.tap do |channel|
         @requests[request[:requestId]] = { request: request, result: [], channel: channel }
@@ -40,7 +44,7 @@ module Grumlin
     # TODO: sometimes response does not include requestID, no idea how to handle it so far.
     def add_response(response) # rubocop:disable Metrics/AbcSize
       request_id = response[:requestId]
-      raise "ERROR" unless ongoing_request?(request_id)
+      raise UnknownRequestError unless ongoing_request?(request_id)
 
       request = @requests[request_id]
 
@@ -61,7 +65,7 @@ module Grumlin
     end
 
     def close_request(request_id)
-      raise "ERROR" unless ongoing_request?(request_id)
+      raise UnknownRequestError unless ongoing_request?(request_id)
 
       request = @requests.delete(request_id)
       request[:channel].close

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
@@ -43,7 +43,9 @@ module Grumlin
     private
 
     def wrap_result(result)
-      return self.class.new(result, @shortcuts, parent: @parent) if result.is_a?(AnonymousStep)
+      if result.is_a?(AnonymousStep) || result.is_a?(Traversal)
+        return self.class.new(result, @shortcuts, parent: @parent)
+      end
 
       result
     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/transport.rb

@@ -23,7 +23,7 @@ module Grumlin
     end
 
     def connect
-      raise "ClientClosed" if @closed
+      raise ClientClosedError if @closed
       raise AlreadyConnectedError if connected?
 
       @connection = Async::WebSocket::Client.connect(Async::HTTP::Endpoint.parse(@url), **@client_options)

data/lib/grumlin/traversal.rb

@@ -5,13 +5,32 @@ module Grumlin
     # TODO: add other start steps
     SUPPORTED_STEPS = %i[E V addE addV].freeze
 
-    def initialize(pool = Grumlin.default_pool)
+    CONFIGURATION_STEPS = %i[withSack withSideEffect].freeze
+
+    attr_reader :configuration_steps
+
+    def initialize(pool = Grumlin.default_pool, configuration_steps: [])
       @pool = pool
+      @configuration_steps = configuration_steps
+    end
+
+    def inspect
+      "#<#{self.class}>"
+    end
+
+    def to_s
+      inspect
+    end
+
+    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/typed_value.rb

@@ -23,7 +23,13 @@ module Grumlin
     def inspect
       "<#{type}.#{value}>"
     end
-    alias to_s inspect
-    alias to_readable_bytecode inspect
+
+    def to_s
+      inspect
+    end
+
+    def to_readable_bytecode
+      inspect
+    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.3"
 end

data/lib/grumlin/vertex.rb

@@ -16,6 +16,9 @@ module Grumlin
     def inspect
       "v[#{@id}]"
     end
-    alias to_s inspect
+
+    def to_s
+      inspect
+    end
   end
 end

data/lib/grumlin.rb

@@ -43,6 +43,8 @@ module Grumlin
 
   class AlreadyConnectedError < ConnectionStatusError; end
 
+  class ClientClosedError < ConnectionStatusError; end
+
   class ProtocolError < Error; end
 
   class UnknownResponseStatus < ProtocolError

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.3
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-06 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-pool
@@ -101,12 +101,13 @@ files:
 - lib/grumlin/bytecode.rb
 - lib/grumlin/client.rb
 - lib/grumlin/edge.rb
+- lib/grumlin/expressions/expression.rb
+- lib/grumlin/expressions/operator.rb
 - lib/grumlin/expressions/order.rb
 - lib/grumlin/expressions/p.rb
 - lib/grumlin/expressions/pop.rb
 - lib/grumlin/expressions/scope.rb
 - lib/grumlin/expressions/t.rb
-- lib/grumlin/expressions/tool.rb
 - lib/grumlin/expressions/u.rb
 - lib/grumlin/expressions/with_options.rb
 - lib/grumlin/path.rb
@@ -130,9 +131,7 @@ homepage: https://github.com/zhulik/grumlin
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/zhulik/grumlin
-  source_code_uri: https://github.com/zhulik/grumlin
-  changelog_uri: https://github.com/zhulik/grumlin/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -141,7 +140,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:
   - - ">="