grumlin 0.14.3 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1574fb6f69111d6a738cdbb1e19fb085c234ade887483e1b2c45644104cc40b
-  data.tar.gz: 2910b648435d662b8e1bebfb6646b838e71912807379aa04205efdcc0a8b8a05
+  metadata.gz: a8080c53730173eb1569dffffa521fddace42c531ae3487e86e19ee3f65e2950
+  data.tar.gz: 5307c15aadc7ee30306b8c5f38977aa7348ced9c9a28f2f44c0095348f0140d3
 SHA512:
-  metadata.gz: 41cadcd8b01c0ef3af860942eb6d187e5acfafdfd5e7c7cd9a052bb5f261ecd9773912ebe8a6da039188b1a81519fc20a7c7c19706c915f7550787345b936ac8
-  data.tar.gz: fcbc59501668d19e08305a08158ed63ac73a6a94d375d71af0975f8a4a556f900a2dadd611da66e5b306679580e586ee1a23bdfea1d058bf9c86e77a4f7ee2fa
+  metadata.gz: 81ea5b30d65205ae9b418c2caef9f4210a5850d3dd6c022e282d35e880916b35f4c916084c1af3ebb8842256647dbf44a099f61a37d4a21e2ac43ca3cc228c1f
+  data.tar.gz: e35049b5ac62ac624e46554a59f5350887e231ae18df29b0042ae56804939e3a9968a9bea8e597822826cf858cb0664e197a8b618be976151916e35ca633dbf6

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,24 @@
+## [0.15.1] - 2022-01-17
+
+- Fix passing arrays as step arguments
+
+## [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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grumlin (0.14.3)
+    grumlin (0.15.1)
       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.10)
+    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 sack select sideEffect skip sum 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/bytecode.rb

@@ -14,7 +14,6 @@ module Grumlin
 
     def initialize(step, no_return: false)
       super(type: "Bytecode")
-
       @step = step
       @no_return = no_return
     end
@@ -49,7 +48,7 @@ module Grumlin
       return arg.public_send(serialization_method) if arg.respond_to?(serialization_method)
       return arg unless arg.is_a?(AnonymousStep)
 
-      arg.args.flatten.each.with_object([arg.name.to_s]) do |a, res|
+      arg.args.each.with_object([arg.name.to_s]) do |a, res|
         res << if a.respond_to?(:bytecode)
                  a.bytecode.public_send(serialization_method)
                else

data/lib/grumlin/expressions/order.rb

@@ -3,7 +3,7 @@
 module Grumlin
   module Expressions
     module Order
-      SUPPORTED_STEPS = %i[asc desc].freeze
+      SUPPORTED_STEPS = %i[asc desc shuffle].freeze
 
       class << self
         extend Expression

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/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.3"
+  VERSION = "0.15.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.15.1
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-pool
@@ -111,6 +111,7 @@ files:
 - 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
@@ -123,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