grumlin 0.23.0 → 1.0.0.rc1

data/lib/grumlin/typing.rb

@@ -1,89 +1,87 @@
 # frozen_string_literal: true
 
-module Grumlin
-  module Typing
-    TYPES = {
-      "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(Grumlin::Traverser, value) },
-      "g:Property" => ->(value) { cast_entity(Grumlin::Property, value) },
-      "g:Int64" => ->(value) { cast_int(value) },
-      "g:Int32" => ->(value) { cast_int(value) },
-      "g:Double" => ->(value) { cast_double(value) },
-      "g:Direction" => ->(value) { value },
-      "g:VertexProperty" => ->(value) { cast_entity(Grumlin::VertexProperty, value) },
-      "g:TraversalMetrics" => ->(value) { cast_map(value[:@value]) },
-      "g:Metrics" => ->(value) { cast_map(value[:@value]) },
-      "g:T" => ->(value) { Grumlin::Expressions::T.public_send(value) }
-    }.freeze
-
-    CASTABLE_TYPES = [Hash, String, Integer, TrueClass, FalseClass, NilClass].freeze
-
-    class << self
-      def cast(value)
-        verify_type!(value)
-
-        return value unless value.is_a?(Hash)
-
-        type = TYPES[value[:@type]]
-
-        verify_castable_hash!(value, type)
-
-        type.call(value[:@value])
-      end
+module Grumlin::Typing
+  TYPES = {
+    "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(Grumlin::Traverser, value) },
+    "g:Property" => ->(value) { cast_entity(Grumlin::Property, value) },
+    "g:Int64" => ->(value) { cast_int(value) },
+    "g:Int32" => ->(value) { cast_int(value) },
+    "g:Double" => ->(value) { cast_double(value) },
+    "g:Direction" => ->(value) { value },
+    "g:VertexProperty" => ->(value) { cast_entity(Grumlin::VertexProperty, value) },
+    "g:TraversalMetrics" => ->(value) { cast_map(value[:@value]) },
+    "g:Metrics" => ->(value) { cast_map(value[:@value]) },
+    "g:T" => ->(value) { Grumlin::Expressions::T.public_send(value) }
+  }.freeze
+
+  CASTABLE_TYPES = [Hash, String, Integer, TrueClass, FalseClass, NilClass].freeze
+
+  class << self
+    def cast(value)
+      verify_type!(value)
+
+      return value unless value.is_a?(Hash)
+
+      type = TYPES[value[:@type]]
+
+      verify_castable_hash!(value, type)
+
+      type.call(value[:@value])
+    end
 
-      private
+    private
 
-      def verify_type!(value)
-        raise TypeError, "#{value.inspect} cannot be casted" unless CASTABLE_TYPES.include?(value.class)
-      end
+    def verify_type!(value)
+      raise TypeError, "#{value.inspect} cannot be casted" unless CASTABLE_TYPES.include?(value.class)
+    end
 
-      def verify_castable_hash!(value, type)
-        raise TypeError, "#{value} cannot be casted, @type is missing" if value[:@type].nil?
-        raise(UnknownTypeError, value[:@type]) if type.nil?
-        raise TypeError, "#{value} cannot be casted, @value is missing" if value[:@value].nil?
-      end
+    def verify_castable_hash!(value, type)
+      raise TypeError, "#{value} cannot be casted, @type is missing" if value[:@type].nil?
+      raise(UnknownTypeError, value[:@type]) if type.nil?
+      raise TypeError, "#{value} cannot be casted, @value is missing" if value[:@value].nil?
+    end
 
-      def cast_int(value)
-        raise TypeError, "#{value} is not an Integer" unless value.is_a?(Integer)
+    def cast_int(value)
+      raise TypeError, "#{value} is not an Integer" unless value.is_a?(Integer)
 
-        value
-      end
+      value
+    end
 
-      def cast_double(value)
-        raise TypeError, "#{value} is not a Double" unless value.is_a?(Float)
+    def cast_double(value)
+      raise TypeError, "#{value} is not a Double" unless value.is_a?(Float)
 
-        value
-      end
+      value
+    end
 
-      def cast_entity(entity, value)
-        entity.new(**value)
-      rescue ArgumentError, TypeError
-        raise TypeError, "#{value} cannot be casted to #{entity.name}"
-      end
+    def cast_entity(entity, value)
+      entity.new(**value)
+    rescue ArgumentError, TypeError
+      raise TypeError, "#{value} cannot be casted to #{entity.name}"
+    end
 
-      def cast_map(value)
-        Hash[*value].transform_keys do |key|
-          next key.to_sym if key.respond_to?(:to_sym)
-          next cast(key) if key[:@type] # TODO: g.V.group.by(:none_existing_property).next
+    def cast_map(value)
+      Hash[*value].transform_keys do |key|
+        next key.to_sym if key.respond_to?(:to_sym)
+        next cast(key) if key[:@type] # TODO: g.V.group.by(:none_existing_property).next
 
-          raise UnknownMapKey, key, value
-        end.transform_values { |v| cast(v) }
-      rescue ArgumentError
-        raise TypeError, "#{value} cannot be casted to Hash"
-      end
+        raise UnknownMapKey, key, value
+      end.transform_values { |v| cast(v) }
+    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)
+    def cast_list(value)
+      value.each_with_object([]) do |item, result|
+        casted_value = cast(item)
+        next (result << casted_value) unless casted_value.instance_of?(Grumlin::Traverser)
 
-          casted_value.bulk.times { result << casted_value.value }
-        end
+        casted_value.bulk.times { result << casted_value.value }
       end
     end
   end

data/lib/grumlin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Grumlin
-  VERSION = "0.23.0"
+  VERSION = "1.0.0.rc1"
 end

data/lib/grumlin/vertex.rb

@@ -1,24 +1,22 @@
 # frozen_string_literal: true
 
-module Grumlin
-  class Vertex
-    attr_reader :label, :id
+class Grumlin::Vertex
+  attr_reader :label, :id
 
-    def initialize(label:, id:)
-      @label = label
-      @id = Typing.cast(id)
-    end
+  def initialize(label:, id:)
+    @label = label
+    @id = Grumlin::Typing.cast(id)
+  end
 
-    def ==(other)
-      self.class == other.class && @label == other.label && @id == other.id
-    end
+  def ==(other)
+    self.class == other.class && @label == other.label && @id == other.id
+  end
 
-    def inspect
-      "v[#{@id}]"
-    end
+  def inspect
+    "v[#{@id}]"
+  end
 
-    def to_s
-      inspect
-    end
+  def to_s
+    inspect
   end
 end

data/lib/grumlin/vertex_property.rb

@@ -1,24 +1,22 @@
 # frozen_string_literal: true
 
-module Grumlin
-  class VertexProperty
-    attr_reader :label, :value
+class Grumlin::VertexProperty
+  attr_reader :label, :value
 
-    def initialize(value)
-      @label = value[:label]
-      @value = Typing.cast(value[:value])
-    end
+  def initialize(value)
+    @label = value[:label]
+    @value = Grumlin::Typing.cast(value[:value])
+  end
 
-    def inspect
-      "vp[#{label}->#{value}]"
-    end
+  def inspect
+    "vp[#{label}->#{value}]"
+  end
 
-    def to_s
-      inspect
-    end
+  def to_s
+    inspect
+  end
 
-    def ==(other)
-      self.class == other.class && @label == other.label && @value == other.value
-    end
+  def ==(other)
+    self.class == other.class && @label == other.label && @value == other.value
   end
 end

data/lib/grumlin/with_extension.rb

@@ -1,27 +1,25 @@
 # frozen_string_literal: true
 
-module Grumlin
-  module WithExtension
-    def with(name, value)
-      prev = self
-      strategy = if is_a?(with_step_class)
-                   prev = previous_step
-                   TraversalStrategies::OptionsStrategy.new(args.first.value.merge(name => value))
-                 else
-                   TraversalStrategies::OptionsStrategy.new({ name => value })
-                 end
-      with_step_class.new(:withStrategies, args: [strategy], previous_step: prev)
-    end
+module Grumlin::WithExtension
+  def with(name, value)
+    prev = self
+    strategy = if is_a?(with_step_class)
+                 prev = previous_step
+                 Grumlin::TraversalStrategies::OptionsStrategy.new(args.first.value.merge(name => value))
+               else
+                 Grumlin::TraversalStrategies::OptionsStrategy.new({ name => value })
+               end
+    with_step_class.new(:withStrategies, args: [strategy], previous_step: prev)
+  end
 
-    private
+  private
 
-    def with_step_class
-      @with_step_class ||= Class.new(shortcuts.step_class) do
-        include WithExtension
+  def with_step_class
+    @with_step_class ||= Class.new(shortcuts.step_class) do
+      include Grumlin::WithExtension
 
-        def with_step_class
-          self.class
-        end
+      def with_step_class
+        self.class
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-pool
@@ -156,14 +156,18 @@ files:
 - lib/grumlin/features/tinkergraph_features.rb
 - lib/grumlin/middlewares/apply_shortcuts.rb
 - lib/grumlin/middlewares/build_query.rb
+- lib/grumlin/middlewares/builder.rb
 - lib/grumlin/middlewares/cast_results.rb
-- lib/grumlin/middlewares/frozen_builder.rb
+- lib/grumlin/middlewares/find_blocklisted_steps.rb
+- lib/grumlin/middlewares/find_mutating_steps.rb
 - lib/grumlin/middlewares/middleware.rb
 - lib/grumlin/middlewares/run_query.rb
 - lib/grumlin/middlewares/serialize_to_bytecode.rb
 - lib/grumlin/middlewares/serialize_to_steps.rb
 - lib/grumlin/path.rb
 - lib/grumlin/property.rb
+- lib/grumlin/query_validators/blocklisted_steps_validator.rb
+- lib/grumlin/query_validators/validator.rb
 - lib/grumlin/repository.rb
 - lib/grumlin/repository/error_handling_strategy.rb
 - lib/grumlin/repository/instance_methods.rb
@@ -183,7 +187,6 @@ files:
 - lib/grumlin/steps_serializers/human_readable_bytecode.rb
 - lib/grumlin/steps_serializers/serializer.rb
 - lib/grumlin/steps_serializers/string.rb
-- lib/grumlin/sugar.rb
 - lib/grumlin/test/rspec.rb
 - lib/grumlin/test/rspec/db_cleaner_context.rb
 - lib/grumlin/test/rspec/gremlin_context.rb
@@ -218,9 +221,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.33
 signing_key: 

data/lib/grumlin/middlewares/frozen_builder.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Grumlin
-  module Middlewares
-    class FrozenBuilder < ::Middleware::Builder
-      def initialize(opts = nil, &block)
-        super(opts, &block)
-        freeze
-      end
-
-      def freeze
-        super
-
-        stack.freeze
-      end
-    end
-  end
-end

data/lib/grumlin/sugar.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Grumlin
-  module Sugar
-    def self.included(base)
-      base.include(Grumlin::Expressions)
-    end
-
-    %i[__ g].each do |name|
-      define_method name do |cuts = Shortcuts::Storage.empty|
-        cuts.send(name)
-      end
-    end
-  end
-end