cel 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54879dbe064eebebe6597acd098c6b10b8376f7b2333d2f822ca02c24a0815bb
-  data.tar.gz: 95e2fed808711b64aedc8ed6aff2f8bc8eb9e5f9562907c0d794df186a35f035
+  metadata.gz: ed190ec0ddbda3e8c5229160dff580efa6cf1175f8b5ed5245e8de40f1feb800
+  data.tar.gz: 5f5d64c6a0199a0d47c7c29a3ef0c022f666e752147cadefbe6fc7090685e819
 SHA512:
-  metadata.gz: 59349c9633015f0a63c297573e30e33d459de63f1af8ff032f808b045c069716c19142e2208f653864bd4a2363009dd7cb54c8feed3160e6c792c260853cc79f
-  data.tar.gz: 2070807c5f7a01217117d96373372e111697727069b915a665acfc6fd2a58c6ff4adfb4fd747522585d7b03733cfb77ee2b7b726b6c36edb3f6d828a93ffed10
+  metadata.gz: c1c1aec4b0d8e54cf52a18057933c1ed214cddd79671ba6280f4e46f852c595f62259b4a10e2d8d0187d0b296f726b6dcae0b07aaccded157769b55f44d88900
+  data.tar.gz: 06c5d2653edca32b4cfb411a788734a0de1c9dcd6368f95b4ad4dcaeffe0b7fb82504c8e861d515acd19dbadb514804c5c6c108aa09e1600da0b9c1a60aec519

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## [Unreleased]
 
+## [0.2.2] - 2023-08-17
+
+* Reimplements `Cel::Literal#==` in a simpler way, to avoid several comparison issues arising from the previous implementation.
+* fix initialization of `Cel::Duration` and `Cel::Timestamp` from string notation.
+* fix protobuf-to-cel parsing of negative literals.
+* more consistent usage of Cel types internally.
+* fix condition clause evaluation.
+
+
 ## [0.2.1] - 2023-07-26
 
 

data/lib/cel/ast/elements/protobuf.rb

@@ -60,9 +60,15 @@ module Cel
 
         value = value.fetch(key, value)
 
-        value = Number.new(:double, value) if key == "number_value"
-
-        value
+        value = case key
+                when "null_value"
+                  Null.new if value.zero?
+                when "number_value"
+                  value = -value.operands.first if value.is_a?(Operation) && value.op == "-" && value.unary?
+                  Number.new(:double, value)
+                else
+                  value
+        end
       when "BoolValue", "google.protobuf.BoolValue"
         value = value.nil? ? Bool.new(false) : value[Identifier.new("value")]
       when "BytesValue", "google.protobuf.BytesValue"

data/lib/cel/ast/elements.rb

@@ -143,6 +143,7 @@ module Cel
     end
 
     def ==(other)
+      other = other.value if other.is_a?(Literal)
       @value == other || super
     end
 
@@ -194,7 +195,7 @@ module Cel
       OUT
     end
 
-    LOGICAL_OPERATORS.each do |op|
+    (LOGICAL_OPERATORS - %w[==]).each do |op|
       class_eval(<<-OUT, __FILE__, __LINE__ + 1)
         def #{op}(other)
           Bool.new(super)
@@ -208,13 +209,17 @@ module Cel
       super(:bool, value)
     end
 
-    LOGICAL_OPERATORS.each do |op|
+    (LOGICAL_OPERATORS - %w[==]).each do |op|
       class_eval(<<-OUT, __FILE__, __LINE__ + 1)
         def #{op}(other)
           Bool.new(super)
         end
       OUT
     end
+
+    def !
+      Bool.new(super)
+    end
   end
 
   class Null < Literal
@@ -246,14 +251,6 @@ module Cel
       Macro.matches(self, pattern)
     end
 
-    LOGICAL_OPERATORS.each do |op|
-      class_eval(<<-OUT, __FILE__, __LINE__ + 1)
-        def #{op}(other)
-          other.is_a?(Cel::Literal) ? Bool.new(super) : super
-        end
-      OUT
-    end
-
     %i[+ -].each do |op|
       class_eval(<<-OUT, __FILE__, __LINE__ + 1)
         def #{op}(other)
@@ -272,7 +269,7 @@ module Cel
       [self]
     end
 
-    LOGICAL_OPERATORS.each do |op|
+    (LOGICAL_OPERATORS - %w[==]).each do |op|
       class_eval(<<-OUT, __FILE__, __LINE__ + 1)
         def #{op}(other)
           Bool.new(super)
@@ -358,7 +355,7 @@ module Cel
   class Timestamp < Literal
     def initialize(value)
       value = case value
-              when String then Time.parse(value)
+              when ::String then Time.parse(value)
               when Numeric then Time.at(value)
               else value
       end
@@ -443,7 +440,7 @@ module Cel
   class Duration < Literal
     def initialize(value)
       value = case value
-              when String
+              when ::String
                 init_from_string(value)
               when Hash
                 seconds, nanos = value.values_at(:seconds, :nanos)
@@ -553,6 +550,10 @@ module Cel
       end
     end
 
+    def unary?
+      @operands.size == 1
+    end
+
     def to_s
       return "#{@op}#{@operands.first}" if @operands.size == 1
 

data/lib/cel/ast/types.rb

@@ -21,6 +21,8 @@ module Cel
     end
 
     def cast(value)
+      value = value.value if value.is_a?(Literal)
+
       case @type
       when :int
         Number.new(:int, Integer(value))

data/lib/cel/checker.rb

@@ -357,7 +357,7 @@ module Cel
 
       return unless typ
 
-      return convert(typ) if id_call_chain.empty?
+      convert(typ) if id_call_chain.empty?
     end
 
     def convert(typ)

data/lib/cel/macro.rb

@@ -43,21 +43,24 @@ module Cel
     end
 
     def all(collection, identifier, predicate, context:)
-      collection.all? do |element, *|
+      return_value = collection.all? do |element, *|
         Program.new(context.merge(identifier.to_sym => element)).evaluate(predicate).value
       end
+      Bool.new(return_value)
     end
 
     def exists(collection, identifier, predicate, context:)
-      collection.any? do |element, *|
+      return_value = collection.any? do |element, *|
         Program.new(context.merge(identifier.to_sym => element)).evaluate(predicate).value
       end
+      Bool.new(return_value)
     end
 
     def exists_one(collection, identifier, predicate, context:)
-      collection.one? do |element, *|
+      return_value = collection.one? do |element, *|
         Program.new(context.merge(identifier.to_sym => element)).evaluate(predicate).value
       end
+      Bool.new(return_value)
     end
 
     def filter(collection, identifier, predicate, context:)

data/lib/cel/program.rb

@@ -57,20 +57,22 @@ module Cel
         ev_operand
       end
 
-      if values.size == 1 &&
+      if operation.unary? &&
          op != "!" # https://bugs.ruby-lang.org/issues/18246
         # unary operations
-        values.first.__send__(:"#{op}@")
+        Literal.to_cel_type(values.first.__send__(:"#{op}@"))
       elsif op == "&&"
-        Bool.new(values.all? { |x| true == x }) # rubocop:disable Style/YodaCondition
+        Bool.new(values.all? { |x| true == x.value }) # rubocop:disable Style/YodaCondition
       elsif op == "||"
-        Bool.new(values.any? { |x| true == x }) # rubocop:disable Style/YodaCondition
+        Bool.new(values.any? { |x| true == x.value }) # rubocop:disable Style/YodaCondition
       elsif op == "in"
         element, collection = values
         Bool.new(collection.include?(element))
       else
         op_value, *values = values
-        op_value.public_send(op, *values)
+        val = op_value.public_send(op, *values)
+
+        Literal.to_cel_type(val)
       end
     end
 
@@ -120,7 +122,7 @@ module Cel
     end
 
     def evaluate_condition(condition)
-      call(condition.if) ? call(condition.then) : call(condition.else)
+      call(condition.if).value ? call(condition.then) : call(condition.else)
     end
 
     def evaluate_standard_func(funcall)
@@ -135,11 +137,11 @@ module Cel
         val.class
       # MACROS
       when :has
-        Bool.new(Macro.__send__(func, *args))
+        Macro.__send__(func, *args)
       when :size
         Cel::Number.new(:int, Macro.__send__(func, *args))
       when :matches
-        Bool.new(Macro.__send__(func, *args.map(&method(:call))))
+        Macro.__send__(func, *args.map(&method(:call)))
       when :int, :uint, :string, :double, :bytes, :duration, :timestamp
         type = TYPES[func]
         type.cast(call(args.first))

data/lib/cel/version.rb

@@ -2,6 +2,6 @@
 
 module Cel
   module Ruby
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cel
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-26 00:00:00.000000000 Z
+date: 2023-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest