grumlin 0.14.0 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e353294814ba425473eb717892ea994d686dd25eec4db78cd0c15102f68a7e53
-  data.tar.gz: 672458be5666e00f34386e632a8a902e3271ad91160b1b2d4bd2235d3789abd9
+  metadata.gz: 02a213b95f80992accf37eecb32684369e2e8a1582d10be4014e5c59b8381ec3
+  data.tar.gz: ddf854b45f388d9a1c6e4a557e715c9d4363f2ae1c44503969e7d4c819537c1e
 SHA512:
-  metadata.gz: cc64a8dacf4dc2384e0d3da380cb0b62f534e603e49f67f537f0c1e46feb549c8098d8580c1d9d96edf0f3b145b777ae26206025086e52ee86ca37e526d53f8a
-  data.tar.gz: 4c2ae1909426dc7c89a41feecb2e7a917daa33f8adb7330229691fa7e49585b1b1e24fca7773026e998f7a738b701d8457e50fcaf8ca3c9e271a71b698ea26e6
+  metadata.gz: 812636c84d1cffaf7bfb5b9c549b3d5c2fca7999b98c395e3cc9fa95701fe73ad0d91e159ba70c672e9bc5671119efd2f6ba65313e6c1e3c8d98e96e64cedc41
+  data.tar.gz: 1863a834265130e9f14cc48d720f638825d86f1a12c70f3d77da4dd18fe835bf7ab0eedcc374ab51bdc0ec007b4c1af8e2f0798b03bd6d2c1fde71d5d544f9bb

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [0.14.4] - 2021-12-17
+
+- `Grumlin::Repository.shorcuts_from` do not raise `ArgumentError` when importing an already existing shortcut
+  pointing to the same block. This fixes importing shortcuts from another repository.
+
+## [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)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grumlin (0.14.0)
+    grumlin (0.14.4)
       async-pool (~> 0.3)
       async-websocket (~> 0.19)
       oj (~> 3.12)
@@ -68,12 +68,12 @@ GEM
       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)
@@ -88,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)
@@ -109,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)
@@ -153,7 +152,7 @@ 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)
 

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

@@ -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

@@ -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 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, configuration_steps: [], previous_step: nil, **params)
       @name = name
@@ -32,7 +32,9 @@ module Grumlin
       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)

data/lib/grumlin/bytecode.rb

@@ -25,7 +25,10 @@ module Grumlin
       end
       "#{configuration_steps.any? ? configuration_steps : nil}#{to_readable_bytecode}"
     end
-    alias to_s inspect
+
+    def to_s
+      inspect
+    end
 
     def to_readable_bytecode
       @to_readable_bytecode ||= steps.map { |s| serialize_arg(s, serialization_method: :to_readable_bytecode) }

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,8 +4,8 @@ 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|

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

@@ -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.rb

@@ -23,7 +23,7 @@ module Grumlin
       # TODO: blocklist of names to avoid conflicts with standard methods?
       raise ArgumentError, "cannot use names of standard gremlin steps" if Grumlin.supported_steps.include?(name)
 
-      raise ArgumentError, "shortcut '#{name}' already exists" if shortcuts.key?(name)
+      raise ArgumentError, "shortcut '#{name}' already exists" if shortcuts.key?(name) && shortcuts[name] != block
 
       shortcuts[name] = block
     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,7 +5,7 @@ module Grumlin
     # TODO: add other start steps
     SUPPORTED_STEPS = %i[E V addE addV].freeze
 
-    CONFIGURATION_STEPS = %i[withSideEffect].freeze
+    CONFIGURATION_STEPS = %i[withSack withSideEffect].freeze
 
     attr_reader :configuration_steps
 
@@ -14,7 +14,13 @@ module Grumlin
       @configuration_steps = configuration_steps
     end
 
-    alias inspect to_s
+    def inspect
+      "#<#{self.class}>"
+    end
+
+    def to_s
+      inspect
+    end
 
     CONFIGURATION_STEPS.each do |step|
       define_method step do |*args, **params|

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.14.0"
+  VERSION = "0.14.4"
 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.14.0
+  version: 0.14.4
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2021-12-17 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: