cel 0.4.0 → 0.4.1

data/lib/cel/ast/types.rb

@@ -2,12 +2,18 @@
 
 module Cel
   class Type
+    include CelMethods
+
     def initialize(type)
       @type = type
     end
 
-    def ==(other)
-      (other.is_a?(Symbol) && other == @type) || super
+    define_cel_method(:==) do |other|
+      (other.is_a?(Symbol) && other == @type) || super(other)
+    end
+
+    define_cel_method(:"!=") do |other|
+      !cel_send(:==, other)
     end
 
     def to_str
@@ -154,6 +160,29 @@ module Cel
         raise Error, "unsupported cast operation to #{@type}"
       end
     end
+
+    def convert(primitive_value)
+      case @type
+      when :int, :uint, :double
+        Number.new(@type, primitive_value)
+      when :string
+        String.new(primitive_value)
+      when :bytes
+        Bytes.new(primitive_value)
+      when :bool
+        Bool.new(primitive_value)
+      when :null_type
+        Null::INSTANCE
+      when :timestamp
+        Timestamp.new(primitive_value)
+      when :duration
+        Duration.new(primitive_value)
+      when :any
+        Literal.to_cel_type(primitive_value)
+      else
+        raise EvaluateError, "Type conversion error"
+      end
+    end
   end
 
   class ListType < Type
@@ -176,7 +205,11 @@ module Cel
     end
 
     def cast(value)
-      value.is_a?(List) ? value : List.new(value)
+      value.is_a?(List) ? value : convert(value)
+    end
+
+    def convert(primitive_value)
+      List.new(primitive_value)
     end
   end
 
@@ -203,15 +236,27 @@ module Cel
     end
 
     def cast(value)
-      value.is_a?(Map) ? value : Map.new(value)
+      value.is_a?(Map) ? value : convert(value)
+    end
+
+    def convert(primitive_value)
+      Map.new(primitive_value)
     end
   end
 
   class AbstractType < Type
+    attr_reader :params
+    protected :params
     def initialize(name, *params)
       super(name)
       @params = params
     end
+
+    define_cel_method(:==) do |other|
+      return super(other) unless other.is_a?(AbstractType)
+
+      other.type && @type && other.params == @params
+    end
   end
   # Primitive Cel Types
 

data/lib/cel/errors.rb

@@ -3,6 +3,8 @@
 module Cel
   class Error < StandardError; end
 
+  class NoCelMethodError < Error; end
+
   class ParseError < Error; end
 
   class MaxRecursionDepthExceededError < ParseError; end

data/lib/cel/extensions/string.rb

@@ -115,13 +115,13 @@ module Cel
   end
 
   class String
-    def charAt(idx)
+    define_cel_method(:charAt) do |idx|
       raise EvaluateError, "index out of range: #{idx}" unless idx.between?(0, @value.size)
 
       String.new(@value[idx] || "")
     end
 
-    def indexOf(substr, *args)
+    define_cel_method(:indexOf) do |substr, *args|
       idx, = args
 
       raise EvaluateError, "index out of range: #{idx}" if idx && !idx.between?(0, @value.size)
@@ -129,7 +129,7 @@ module Cel
       Number.new(:int, @value.index(substr, *args) || -1)
     end
 
-    def lastIndexOf(substr, *args)
+    define_cel_method(:lastIndexOf) do |substr, *args|
       idx, = args
 
       raise EvaluateError, "index out of range: #{idx}" if idx && !idx.between?(0, @value.size)
@@ -137,17 +137,17 @@ module Cel
       Number.new(:int, @value.rindex(substr, *args) || -1)
     end
 
-    def lowerAscii
+    define_cel_method(:lowerAscii) do
       String.new(@value.downcase(:ascii))
     end
 
-    def upperAscii
+    define_cel_method(:upperAscii) do
       String.new(@value.upcase(:ascii))
     end
 
     UNICODE_WHITESPACE = /[ \t\r\n\u000C\u000D\u0020\u0085\u00A0\u1680\u2000-\u200A\u2028-\u2029\u202F\u205F\u3000]+/
 
-    def trim
+    define_cel_method(:trim) do
       # why this? because String#split only takes null, horizontal tab, line feed, vertical tab, form feed,
       # carriage return, space into account. We need the unicode definition of whitespace.
       value = @value.gsub(/\A#{UNICODE_WHITESPACE}/o, "")
@@ -156,23 +156,25 @@ module Cel
       String.new(value.strip)
     end
 
-    def reverse
+    define_cel_method(:reverse) do
       String.new(@value.reverse)
     end
 
-    def split(pattern, *args)
+    define_cel_method(:split) do |pattern, *args|
       raise NoOverloadError unless pattern.is_a?(String) && args.size.between?(0, 1)
 
       limit, = args
 
       raise NoOverloadError if limit && !limit.is_a?(Number)
 
-      return List.new([]) if limit && limit.zero?
-
-      List.new(@value.split(pattern, *args))
+      if limit && limit.zero?
+        List.new([])
+      else
+        List.new(@value.split(pattern, *args))
+      end
     end
 
-    def substring(*args)
+    define_cel_method(:substring) do |*args|
       raise NoOverloadError unless args.size.between?(1, 2)
 
       start_idx, end_idx = *args
@@ -187,7 +189,7 @@ module Cel
       String.new(@value[start_idx..(end_idx - 1)])
     end
 
-    def replace(pattern, replacement, *args)
+    define_cel_method(:replace) do |pattern, replacement, *args|
       raise NoOverloadError unless args.size.between?(0, 1)
 
       limit, = args
@@ -215,14 +217,14 @@ module Cel
       String.new(value)
     end
 
-    def format(mappings)
+    define_cel_method(:format) do |mappings|
       String.new(format(@value, *mappings))
     end
   end
 
   class List
-    def join(*)
-      String.new(super)
+    define_cel_method(:join) do |*args|
+      String.new(super(*args))
     end
   end
 end

data/lib/cel/extensions.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require "cel/extensions/math"
-require "cel/extensions/string"
-require "cel/extensions/bind"
-require "cel/extensions/encoders"
+require_relative "extensions/math"
+require_relative "extensions/string"
+require_relative "extensions/bind"
+require_relative "extensions/encoders"
 
 module Cel
   EXTENSIONS = {

data/lib/cel/parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.8.1
@@ -32,7 +33,7 @@ else
   }
 end.freeze
 
-OPERATORS_RE = Regexp.union(*OPERATORS.keys)
+OPERATORS_RE = Regexp.union(*OPERATORS.keys).freeze
 
 BACKSLASH = "\\\\" # Must be literally two backslashes for proper interpolation
 DIGIT     = "[0-9]"
@@ -46,24 +47,24 @@ ESC_BYTE_SEQ = "#{BACKSLASH}[xX]#{HEXDIGIT}{2}"
 ESC_UNI_SEQ  = "#{BACKSLASH}u#{HEXDIGIT}{4}|#{BACKSLASH}U#{HEXDIGIT}{8}"
 ESC_SEQ      = "#{ESC_CHAR_SEQ}|#{ESC_BYTE_SEQ}|#{ESC_UNI_SEQ}|#{ESC_OCT_SEQ}"
 
-WHITESPACE_REGEX = /[ \t\r\n\u000C]+/
-COMMENT_REGEX = %r{//[^\n]*}
+WHITESPACE_REGEX = /[ \t\r\n\u000C]+/.freeze
+COMMENT_REGEX = %r{//[^\n]*}.freeze
 
 NUM_FLOAT_REGEX = Regexp.union(
   /#{DIGIT}+\.#{DIGIT}+#{EXPONENT}?/,
   /#{DIGIT}+#{EXPONENT}/,
   /\.#{DIGIT}+#{EXPONENT}?/
-)
+).freeze
 
 NUM_INT_REGEX = Regexp.union(
   /0x(?<hex>#{HEXDIGIT}+)/,
   /(?<dec>#{DIGIT}+)/
-)
+).freeze
 
 NUM_UINT_REGEX = Regexp.union(
   /0x(?<hex>#{HEXDIGIT}+)[uU]/,
   /(?<dec>#{DIGIT}+)[uU]/
-)
+).freeze
 
 STRING_REGEX = Regexp.union(
   /"""(?<str>(?:#{ESC_SEQ}|[^\\])*)"""/,
@@ -74,20 +75,20 @@ STRING_REGEX = Regexp.union(
   /#{RAW}'''(?<str>.*?)'''/m,
   /#{RAW}"(?<str>[^"\n\r]*)"/,
   /#{RAW}'(?<str>[^'\n\r]*)'/,
-)
+).freeze
 
-QUOTED_MAP_FIELD_REGEX = /`/
+QUOTED_MAP_FIELD_REGEX = /`/.freeze
 
-BYTES_REGEX = /[bB]#{STRING_REGEX}/
+BYTES_REGEX = /[bB]#{STRING_REGEX}/.freeze
 
 RESERVED = %W[
 as break const continue else
 for function if import let
 loop package namespace return
 var void while
-].freeze
+].each(&:freeze).freeze
 
-IDENTIFIER_REGEX = /[_a-zA-Z][_a-zA-Z0-9]*/
+IDENTIFIER_REGEX = /[_a-zA-Z][_a-zA-Z0-9]*/.freeze
 
 def initialize(
   package = nil,

data/lib/cel/program.rb

@@ -183,12 +183,12 @@ module Cel
           t.is_a?(Class) && t < Protobuf.base_class ? 1 : 0
         end
 
-        val = lhs.public_send(op, rhs)
+        val = lhs.cel_send(op, rhs)
 
         Literal.to_cel_type(val)
       else
         op_value, *values = operands.map(&method(:call))
-        val = op_value.public_send(op, *values)
+        val = op_value.cel_send(op, *values)
 
         Literal.to_cel_type(val)
       end
@@ -197,7 +197,8 @@ module Cel
     def evaluate_invoke(invoke, var = invoke.var)
       return evaluate_standard_func(invoke) unless var
 
-      func = invoke.func
+      func = call(invoke.func) || invoke.func
+
       args = invoke.args
 
       var =
@@ -229,7 +230,7 @@ module Cel
       when String
         raise EvaluateError, "#{invoke} is not supported" unless String.method_defined?(func, false)
 
-        var.public_send(func, *args.map(&method(:call)))
+        var.cel_send(func, *args.map(&method(:call)))
       when Map
         return Macro.__send__(func, var, *args, program: self) if !Module.respond_to?(func) && Macro.respond_to?(func)
 
@@ -238,9 +239,13 @@ module Cel
         # to the expression x['foo'] when x evaluates to a map).
 
         if args
-          var.public_send(func, *args)
+          var.cel_send(func, *args)
         else
+          # this should only be a data accessor, calling functions is disallowed
+          raise EvaluateError, "#{invoke} is not supported" unless var.key?(func)
+
           begin
+            # TODO: use explicit lookup method to circumvent the need to method_missing it
             var.public_send(func)
           rescue NoMethodError
             raise NoSuchKeyError.new(var, func)
@@ -254,8 +259,8 @@ module Cel
         # to the expression x['foo'] when x evaluates to a map).
 
         args ?
-        var.public_send(func, *Array(args).map(&method(:call))) :
-        var.public_send(func)
+        var.cel_send(func, *Array(args).map(&method(:call))) :
+        var.cel_send(func)
       when Timestamp, Duration
         raise EvaluateError, "#{invoke} is not supported" unless var.class.method_defined?(func, false)
 
@@ -266,7 +271,7 @@ module Cel
         # runtime error no_such_field is raised.
         raise NoSuchFieldError.new(var, func) unless var.respond_to?(func)
 
-        var.public_send(func, *args)
+        var.cel_send(func, *args)
       when Literal
         # eliminate ruby API from the lookup
         raise NoMatchingOverloadError.new(var, func) if Literal.instance_methods.include?(func)
@@ -275,7 +280,7 @@ module Cel
         # runtime error no_such_field is raised.
         raise NoSuchFieldError.new(var, func) unless var.respond_to?(func)
 
-        var.public_send(func)
+        var.cel_send(func)
       when Protobuf.base_class
         # eliminate protobuf API from the lookup
         raise NoMatchingOverloadError.new(var, func) if Protobuf.base_class.instance_methods.include?(func)
@@ -323,6 +328,8 @@ module Cel
       else
         raise EvaluateError, "#{invoke} is not supported"
       end
+    rescue NoCelMethodError
+      raise EvaluateError, "#{invoke} is not supported"
     end
 
     def evaluate_condition(condition)

data/lib/cel/version.rb

@@ -2,6 +2,6 @@
 
 module Cel
   module Ruby
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

data/lib/cel.rb

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
 
 require "bigdecimal"
-require "cel/version"
-require "cel/errors"
-require "cel/ast/types"
-require "cel/ast/elements"
-require "cel/extensions"
-require "cel/parser"
-require "cel/macro"
-require "cel/context"
-require "cel/encoder" if RUBY_VERSION >= "3.1.0"
-require "cel/checker"
-require "cel/program"
-require "cel/environment"
+require_relative "cel/version"
+require_relative "cel/errors"
+require_relative "cel/ast/cel_methods"
+require_relative "cel/ast/types"
+require_relative "cel/ast/elements"
+require_relative "cel/extensions"
+require_relative "cel/parser"
+require_relative "cel/macro"
+require_relative "cel/context"
+require_relative "cel/encoder" if RUBY_VERSION >= "3.1.0"
+require_relative "cel/checker"
+require_relative "cel/program"
+require_relative "cel/environment"
 
 begin
   require "tzinfo"
@@ -20,7 +21,7 @@ rescue LoadError # rubocop:disable Lint/SuppressedException
 end
 
 begin
-  require "cel/ast/elements/protobuf"
+  require_relative "cel/ast/elements/protobuf"
 rescue LoadError => e
   puts e
   module Cel
@@ -253,4 +254,17 @@ module Cel
       /[[:upper:]]/.match?(typ[0]) ? typ : typ.capitalize
     end.join("::")
   end
+
+  # freeze constants to make cel ractor-friendly
+  Number.freeze
+  Bool.freeze
+  Null.freeze
+  String.freeze
+  Bytes.freeze
+  List.freeze
+  Map.freeze
+  Timestamp.freeze
+  Duration.freeze
+  Type.freeze
+  TYPES.each_value(&:freeze).freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cel
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Tiago Cardoso
@@ -79,8 +79,26 @@ files:
 - LICENSE.txt
 - README.md
 - lib/cel.rb
+- lib/cel/ast/cel_methods.rb
 - lib/cel/ast/elements.rb
+- lib/cel/ast/elements/bool.rb
+- lib/cel/ast/elements/bytes.rb
+- lib/cel/ast/elements/condition.rb
+- lib/cel/ast/elements/duration.rb
+- lib/cel/ast/elements/function.rb
+- lib/cel/ast/elements/group.rb
+- lib/cel/ast/elements/identifier.rb
+- lib/cel/ast/elements/invoke.rb
+- lib/cel/ast/elements/list.rb
+- lib/cel/ast/elements/literal.rb
+- lib/cel/ast/elements/map.rb
+- lib/cel/ast/elements/message.rb
+- lib/cel/ast/elements/null.rb
+- lib/cel/ast/elements/number.rb
+- lib/cel/ast/elements/operation.rb
 - lib/cel/ast/elements/protobuf.rb
+- lib/cel/ast/elements/string.rb
+- lib/cel/ast/elements/timestamp.rb
 - lib/cel/ast/types.rb
 - lib/cel/checker.rb
 - lib/cel/context.rb