grumlin 0.14.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d54992de5df5f10f004557bc7a7d86ec5558c104663bf36904838e843d38b4d
-  data.tar.gz: e2e5cca5ad4cc034b991760db13c9a41d780609895ea38e236ef384bfa9df8f4
+  metadata.gz: e6bc5993ec07bf70b93c7f7b73e2e3716c14b3457ddedbbda0e6f38d5f2c19ff
+  data.tar.gz: b23c85808cacf2585fbc7c47f60d093049c1976ca13acd0317d0c71bf9871a5d
 SHA512:
-  metadata.gz: 9a1f23141609f072193fa4a624ae63263200daebb72b4f2c0759e738325409546365f962117d36dbb8baf1c6df5ebd9a60f5c53453f7827cfd8cc90d450afa0e
-  data.tar.gz: c6bd3b5f1f0b02173931f8189c0dca7fdcb5c11bfc6c4f8fdb34065a8d90a55ecb4118cf50f080c3c490ed1e2afda9035716fafc4679c6f606ad74ccc955d5f3
+  metadata.gz: b752f3c20878758524da9d31de2114bca8d6585c9a9038989acef2ec21a888bbd667fe9ece033f257c67751eb87c33025c2876f80f80e3a983f25fb09c1e4b37
+  data.tar.gz: 9ac44ccf984d626cbb8254185534c75061d139934a613fae13c45cfd0cdbdf1d4d35ca088e0ff2a1073196294d8b38a5c4eff8a5b2a8a3258327537ad66daab6

data/.github/workflows/main.yml

@@ -10,7 +10,7 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0
+          ruby-version: "3.0"
           bundler-cache: true
 
       - name: Run the default task
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.7, 3.0]
+        ruby: ["2.7", "3.0"]
     steps:
       - uses: actions/checkout@v2
 
@@ -54,7 +54,7 @@ jobs:
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0
+          ruby-version: "3.0"
           bundler-cache: true
 
       - name: Build gem

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+## [0.15.0] - 2022-01-11
+
+- Add `properties` step
+- Add proper support for bulked results
+- Add support for `Property` objects
+
+## [0.14.5] - 2021-12-27
+
+- Fix params handling
+- Add `aggregate` step
+- Add `Order.shuffle`
+
+## [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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grumlin (0.14.2)
+    grumlin (0.15.0)
       async-pool (~> 0.3)
       async-websocket (~> 0.19)
       oj (~> 3.12)
@@ -68,7 +68,7 @@ GEM
       racc (~> 1.4)
     nokogiri (1.11.7-x86_64-linux)
       racc (~> 1.4)
-    oj (3.13.9)
+    oj (3.13.11)
     overcommit (0.57.0)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)

data/README.md

@@ -51,7 +51,7 @@ end
 
 ### Traversing graphs
 
-**Warning**: Not all steps and tools described in the standard are supported
+**Warning**: Not all steps and expressions defined in the reference documentation are supported.
 
 #### Sugar
 

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 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 select sideEffect skip tail to unfold union until valueMap
-                         values where with].freeze
+    SUPPORTED_STEPS = %i[E V addE addV aggregate 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 properties 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
@@ -41,7 +41,7 @@ module Grumlin
     end
 
     def args
-      [*@args, @params.any? ? arg.params : nil].compact
+      [*@args, @params.any? ? @params : nil].compact
     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 shuffle].freeze
 
-      SUPPORTED_STEPS = %i[asc desc].freeze
+      class << self
+        extend Expression
 
-      define_steps(SUPPORTED_STEPS, "Order")
+        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 hasNot id in inE inV is label out outE outV project
-                           repeat select 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/property.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Grumlin
+  class Property
+    attr_reader :key, :value
+
+    def initialize(value)
+      @key = value[:key]
+      @value = Typing.cast(value[:value])
+    end
+
+    def inspect
+      "p[#{key}->#{value}]"
+    end
+
+    def to_s
+      inspect
+    end
+
+    def ==(other)
+      self.class == other.class && @key == other.key && @value == other.value
+    end
+  end
+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/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
 

data/lib/grumlin/traverser.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Grumlin
+  class Traverser
+    attr_reader :bulk, :value
+
+    def initialize(value)
+      @bulk = value.dig(:bulk, :@value) || 1
+      @value = Typing.cast(value[:value])
+    end
+  end
+end

data/lib/grumlin/typing.rb

@@ -3,17 +3,19 @@
 module Grumlin
   module Typing
     TYPES = {
-      "g:List" => ->(value) { value.map { |item| cast(item) } },
-      "g:Set" => ->(value) { Set.new(value.map { |item| cast(item) }) },
+      "g:List" => ->(value) { cast_list(value) },
+      "g:Set" => ->(value) { cast_list(value).to_set },
       "g:Map" => ->(value) { cast_map(value) },
       "g:Vertex" => ->(value) { cast_entity(Grumlin::Vertex, value) },
       "g:Edge" => ->(value) { cast_entity(Grumlin::Edge, value) },
       "g:Path" => ->(value) { cast_entity(Grumlin::Path, value) },
+      "g:Traverser" => ->(value) { cast_entity(Traverser, value) },
+      "g:Property" => ->(value) { cast_entity(Property, value) },
       "g:Int64" => ->(value) { cast_int(value) },
       "g:Int32" => ->(value) { cast_int(value) },
       "g:Double" => ->(value) { cast_double(value) },
-      "g:Traverser" => ->(value) { cast(value[:value]) }, # TODO: wtf is bulk?
       "g:Direction" => ->(value) { value },
+      # "g:VertexProperty"=> ->(value) { value }, # TODO: implement me
       "g:T" => ->(value) { value.to_sym }
     }.freeze
 
@@ -72,6 +74,15 @@ module Grumlin
       rescue ArgumentError
         raise TypeError, "#{value} cannot be casted to Hash"
       end
+
+      def cast_list(value)
+        value.each_with_object([]) do |item, result|
+          casted_value = cast(item)
+          next (result << casted_value) unless casted_value.instance_of?(Traverser)
+
+          casted_value.bulk.times { result << casted_value.value }
+        end
+      end
     end
   end
 end

data/lib/grumlin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.0
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-11 00:00:00.000000000 Z
+date: 2022-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-pool
@@ -101,15 +101,17 @@ 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
+- lib/grumlin/property.rb
 - lib/grumlin/repository.rb
 - lib/grumlin/request_dispatcher.rb
 - lib/grumlin/shortcut_proxy.rb
@@ -122,6 +124,7 @@ files:
 - lib/grumlin/test/rspec/gremlin_context.rb
 - lib/grumlin/transport.rb
 - lib/grumlin/traversal.rb
+- lib/grumlin/traverser.rb
 - lib/grumlin/typed_value.rb
 - lib/grumlin/typing.rb
 - lib/grumlin/version.rb