cel 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 868e7e643aad1444aa54da0dab45e583a49abf2e6af0dcbbd1512b88af209e88
-  data.tar.gz: 2f174f88813b63181f1c16e701d1baf961eda0d9ef18c575b29b5afdc53d450c
+  metadata.gz: 54879dbe064eebebe6597acd098c6b10b8376f7b2333d2f822ca02c24a0815bb
+  data.tar.gz: 95e2fed808711b64aedc8ed6aff2f8bc8eb9e5f9562907c0d794df186a35f035
 SHA512:
-  metadata.gz: 26c83e074c1729c00f5b8c3ca271865bb009f562326c6b6ddca3d5c127cf7c7f33ab93b3c964d4db0eafbe442e07dc1413abf2dc5b5ac487950da2d02fc8cd69
-  data.tar.gz: 3aa55062c1693eb5c3d3ad45bb09d95028c5115a9428d8bf2fdd3189b5c8869c4b6d92c6aa3e864b515f555fe78d3015fbeaf03799d64f0ef9f8365ce95a87d0
+  metadata.gz: 59349c9633015f0a63c297573e30e33d459de63f1af8ff032f808b045c069716c19142e2208f653864bd4a2363009dd7cb54c8feed3160e6c792c260853cc79f
+  data.tar.gz: 2070807c5f7a01217117d96373372e111697727069b915a665acfc6fd2a58c6ff4adfb4fd747522585d7b03733cfb77ee2b7b726b6c36edb3f6d828a93ffed10

data/CHANGELOG.md

@@ -1,5 +1,38 @@
 ## [Unreleased]
 
+## [0.2.1] - 2023-07-26
+
+
+### Improvements
+
+Collection type declarations are now better supported, i.e. declaring "an array of strings" is now possible:
+
+```ruby
+Cel::Types[:list, :string] # array of strings
+Cel::Environment.new(
+    names: Cel::Types[:list, :string],
+    owned_by: Cel::Types[:map, :string] # hash map of string keys
+)
+```
+
+### Bugfixes
+
+Collections passed as variables of an expression are now correctly cast to Cel types:
+
+```ruby
+env.evaluate("a", { a: [1, 2, 3] }) #=> now returns a Cel::List
+```
+
+Conversely, custom functions now expose ruby types in the blocks, instead of its Cel counterparts:
+
+```ruby
+func = Cel::Function(:list, :list, return_type: :list) do |a, b|
+  # a is now a ruby array, b as well
+  a & b
+  # function returns a ruby array, will be converted to a Cel::List for use in the expression
+end
+```
+
 ## [0.2.0] - 2023-01-17
 
 ### Features

data/README.md

@@ -1,8 +1,8 @@
 # Cel::Ruby
 
 [![Gem Version](https://badge.fury.io/rb/cel.svg)](http://rubygems.org/gems/cel)
-[![pipeline status](https://gitlab.com/honeyryderchuck/cel-ruby/badges/master/pipeline.svg)](https://gitlab.com/honeyryderchuck/cel-ruby/pipelines?page=1&scope=all&ref=master)
-[![coverage report](https://gitlab.com/honeyryderchuck/cel-ruby/badges/master/coverage.svg?job=coverage)](https://honeyryderchuck.gitlab.io/cel-ruby/coverage/#_AllFiles)
+[![pipeline status](https://gitlab.com/os85/cel-ruby/badges/master/pipeline.svg)](https://gitlab.com/os85/cel-ruby/pipelines?page=1&scope=all&ref=master)
+[![coverage report](https://gitlab.com/os85/cel-ruby/badges/master/coverage.svg?job=coverage)](https://os85.gitlab.io/cel-ruby/coverage/#_AllFiles)
 
 Pure Ruby implementation of Google Common Expression Language, https://opensource.google/projects/cel.
 
@@ -45,19 +45,20 @@ end
 prg = env.program(ast)
 # 1.3 evaluate
 return_value = prg.evaluate(name: Cel::String.new("/groups/acme.co/documents/secret-stuff"),
-    group: Cel::String.new("acme.co")))
+    group: Cel::String.new("acme.co"))
 
 # 2.1 parse and check
 prg = env.program('name.startsWith("/groups/" + group)')
 # 2.2 then evaluate
 return_value = prg.evaluate(name: Cel::String.new("/groups/acme.co/documents/secret-stuff"),
-    group: Cel::String.new("acme.co")))
+    group: Cel::String.new("acme.co"))
 
 # 3. or parse, check and evaluate
 begin
   return_value = env.evaluate(ast,
     name: Cel::String.new("/groups/acme.co/documents/secret-stuff"),
-    group: Cel::String.new("acme.co"))
+    group: Cel::String.new("acme.co")
+  )
 rescue Cel::Error => e
   STDERR.puts("evaluation error: #{e.message}")
   raise e
@@ -66,6 +67,20 @@ end
 puts return_value #=> true
 ```
 
+### types
+
+`cel-ruby` supports declaring the types of variables in the environment, which allows for expression checking:
+
+```ruby
+env = Cel::Environment.new(
+  first_name: :string, # shortcut for Cel::Types[:string]
+  middle_names: Cel::Types[:list, :string], # list of strings
+  last_name: :string
+)
+
+# you can use Cel::Types to access any type of primitive type, i.e. Cel::Types[:bytes]
+```
+
 ### protobuf
 
 If `google/protobuf` is available in the environment, `cel-ruby` will also be able to integrate with protobuf declarations in CEL expressions.

data/lib/cel/ast/elements.rb

@@ -176,6 +176,10 @@ module Cel
       end
     end
 
+    def to_ruby_type
+      @value
+    end
+
     private
 
     def check; end
@@ -296,6 +300,10 @@ module Cel
     def to_ary
       [self]
     end
+
+    def to_ruby_type
+      value.map(&:to_ruby_type)
+    end
   end
 
   class Map < Literal
@@ -318,6 +326,10 @@ module Cel
       [self]
     end
 
+    def to_ruby_type
+      value.to_h { |*args| args.map(&:to_ruby_type) }
+    end
+
     def respond_to_missing?(meth, *args)
       super || (@value && @value.keys.any? { |k| k.to_s == meth.to_s })
     end

data/lib/cel/ast/types.rb

@@ -58,6 +58,14 @@ module Cel
     def get(idx)
       @type_list[idx]
     end
+
+    def ==(other)
+      other == :list || super
+    end
+
+    def cast(value)
+      List.new(value)
+    end
   end
 
   class MapType < Type
@@ -73,12 +81,45 @@ module Cel
       _, value = @type_map.find { |k, _| k == attrib.to_s }
       value
     end
+
+    def ==(other)
+      other == :map || super
+    end
+
+    def cast(value)
+      Map.new(value)
+    end
   end
 
   # Primitive Cel Types
 
   PRIMITIVE_TYPES = %i[int uint double bool string bytes list map timestamp duration null_type type].freeze
-  TYPES = PRIMITIVE_TYPES.to_h { |typ| [typ, Type.new(typ)] }
+  COLTYPES = %i[list map].freeze
+  TYPES = (PRIMITIVE_TYPES - COLTYPES).to_h { |typ| [typ, Type.new(typ)] }
   TYPES[:type] = Type.new(:type)
   TYPES[:any] = Type.new(:any)
+
+  module CollectionTypeFetch
+    def [](*args)
+      col_type, elem_type = args
+
+      return super unless COLTYPES.include?(col_type)
+
+      return super if args.size > 2
+
+      elem_type ||= :any
+
+      type = case col_type
+             when :list
+               ListType.new([])
+             when :map
+               MapType.new({})
+      end
+
+      type.element_type = super(*elem_type)
+      type
+    end
+  end
+
+  TYPES.singleton_class.prepend(CollectionTypeFetch)
 end

data/lib/cel/checker.rb

@@ -148,7 +148,7 @@ module Cel
         case func
         when :[]
           attribute = var_type.get(args)
-          unsupported_operation(funcall) unless attribute
+          return TYPES[:any] unless attribute
         when :all, :exists, :exists_one
           check_arity(funcall, args, 2)
           identifier, predicate = args
@@ -162,7 +162,7 @@ module Cel
           return TYPES[:bool]
         else
           attribute = var_type.get(func)
-          unsupported_operation(funcall) unless attribute
+          return TYPES[:any] unless attribute
         end
 
         call(attribute)
@@ -381,7 +381,7 @@ module Cel
         end
       end
 
-      TYPES[type]
+      type && types.is_a?(Type) ? types : TYPES[type]
     end
 
     def check_arity(func, args, arity)

data/lib/cel/program.rb

@@ -93,7 +93,7 @@ module Cel
       when String
         raise EvaluateError, "#{invoke} is not supported" unless String.method_defined?(func, false)
 
-        var.public_send(func, *args)
+        var.public_send(func, *args.map(&method(:call)))
       when Message
         # If e evaluates to a message and f is not declared in this message, the
         # runtime error no_such_field is raised.
@@ -134,10 +134,12 @@ module Cel
 
         val.class
       # MACROS
-      when :has, :size
-        Macro.__send__(func, *args)
+      when :has
+        Bool.new(Macro.__send__(func, *args))
+      when :size
+        Cel::Number.new(:int, Macro.__send__(func, *args))
       when :matches
-        Macro.__send__(func, *args.map(&method(:call)))
+        Bool.new(Macro.__send__(func, *args.map(&method(:call))))
       when :int, :uint, :string, :double, :bytes, :duration, :timestamp
         type = TYPES[func]
         type.cast(call(args.first))
@@ -153,7 +155,7 @@ module Cel
     def evaluate_custom_func(func, funcall)
       args = funcall.args
 
-      func.call(*args.map(&method(:call)))
+      func.call(*args.map(&method(:call)).map(&:to_ruby_type))
     end
   end
 end

data/lib/cel/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cel
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-17 00:00:00.000000000 Z
+date: 2023-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Pure Ruby implementation of Google Common Expression Language, https://opensource.google/projects/cel.