cel 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd670ce6076540d040019d05ad1ae2a67bd8a8d94f60e51ea860090f69d4f179
-  data.tar.gz: 76782582c4d81ddb8dbd5fda83c67a56635a30eebe88cf9320bcfe21f7926c9c
+  metadata.gz: 288ce099928eb32ac8c45875c0d0219d9f61f29bb81c8a44f4bc52d8e821da69
+  data.tar.gz: 64d61f4d2934e7ff455cb47472a2b5d6dc87a2d6ad73380ed34401be5ae58a20
 SHA512:
-  metadata.gz: 40cadbc9e54c3ae8ea219c6d1a41bae8242ced85f8474115a865a70eff65fb234935874bcaf1d6b467b615f92224c4a6dba31aee30af9628585e77bb809d6ecd
-  data.tar.gz: 1f8269fb2391074acecedae34645d0cb3bd0c06eda26004d99f8fd7ea15b26735c2796f5124c74b474133aabe639a739599e248d280cd630f8c2e7d6dd94a6a6
+  metadata.gz: 180607d29b2dac71d3a73ff3f25fb406809918c354994089a9bfa02ea5a7c97ec68487b59d054a7aa576bf6268a5c486e35a41694a55e19e67f59e2595401021
+  data.tar.gz: 7d3555dedbf3021e1d81ece6f22581058378c8edfe716913f088f73a25aeb2baadb908a02f0aef428291377e9d97425dd25e64668312d80e928e86c3c362c90a

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [0.1.1] - 2022-08-11
+
+* fixed handling of comparison of primmitive types with Cel types.
+* fixed truffleruby compatibility by improving parser number handling.
+
 ## [0.1.0] - 2021-11-23
 
 - Initial release

data/README.md

@@ -34,15 +34,26 @@ require "cel"
 # set the environment
 env = Cel::Environment.new(name: :string, group: :string)
 
-# parse and check
+# 1.1 parse
 begin
   ast = env.compile('name.startsWith("/groups/" + group)') #=> Cel::Types[:bool], which is == :bool
 rescue Cel::Error => e
   STDERR.puts("type-check error: #{e.message}")
   raise e
 end
-
-# evaluate
+# 1.2 check
+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")))
+
+# 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")))
+
+# 3. or parse, check and evaluate
 begin
   return_value = env.evaluate(ast,
     name: Cel::String.new("/groups/acme.co/documents/secret-stuff"),
@@ -98,4 +109,4 @@ Changes in the parser are therefore accomplished by modifying the `parser.ry` fi
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://gitlab.com/honeyryderchuck/cel-ruby.
+Bug reports and pull requests are welcome on Gitlab at https://gitlab.com/honeyryderchuck/cel-ruby.

data/lib/cel/ast/elements.rb

@@ -27,9 +27,9 @@ module Cel
 
     def initialize(type, struct)
       @struct = Struct.new(*struct.keys.map(&:to_sym)).new(*struct.values)
-      @type = type.is_a?(Type) ? type : MapType.new(struct.map do |k, v|
+      @type = type.is_a?(Type) ? type : MapType.new(struct.to_h do |k, v|
                                                       [Literal.to_cel_type(k), Literal.to_cel_type(v)]
-                                                    end.to_h)
+                                                    end)
       super(@struct)
     end
 
@@ -176,7 +176,7 @@ module Cel
     LOGICAL_OPERATORS.each do |op|
       class_eval(<<-OUT, __FILE__, __LINE__ + 1)
         def #{op}(other)
-          Bool.new(super)
+          other.is_a?(Cel::Literal) ? Bool.new(super) : super
         end
       OUT
     end
@@ -231,9 +231,9 @@ module Cel
 
   class Map < Literal
     def initialize(value)
-      value = value.map do |k, v|
+      value = value.to_h do |k, v|
         [Literal.to_cel_type(k), Literal.to_cel_type(v)]
-      end.to_h
+      end
       super(MapType.new(value), value)
       check
     end

data/lib/cel/ast/types.rb

@@ -72,7 +72,7 @@ module Cel
   # Primitive Cel Types
 
   PRIMITIVE_TYPES = %i[int uint double bool string bytes list map null_type type].freeze
-  TYPES = PRIMITIVE_TYPES.map { |typ| [typ, Type.new(typ)] }.to_h
+  TYPES = PRIMITIVE_TYPES.to_h { |typ| [typ, Type.new(typ)] }
   TYPES[:type] = Type.new(:type)
   TYPES[:any] = Type.new(:any)
 end

data/lib/cel/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.5.1
+# This file is automatically generated by Racc 1.6.0
 # from Racc grammar file "".
 #
 
@@ -142,21 +142,21 @@ def convert_to_number(scanner)
   matched = scanner.matched
   hexa, uint, number, floating, exp = scanner.captures
 
-  if !hexa.empty?
+  if hexa && !hexa.empty?
     return [:tINT, hexa.to_i(16)]
   end
 
-  if !uint.empty?
+  if uint && !uint.empty?
     return [:tUINT, Integer(uint)]
   end
 
-  if !exp.empty?
+  if exp && !exp.empty?
     # third matched group, can only be a floating exponential, let's convert tout suite
     [:tDOUBLE, BigDecimal(matched)]
-  elsif !floating.empty?
+  elsif floating && !floating.empty?
     if number == floating || floating.start_with?(".")
       [:tDOUBLE, Float(matched)]
-    elsif number.empty?
+    elsif number.nil? || number.empty?
       [:tDOUBLE, BigDecimal(matched)]
     end
   else

data/lib/cel/version.rb

@@ -2,6 +2,6 @@
 
 module Cel
   module Ruby
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,24 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: cel
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-23 00:00:00.000000000 Z
+date: 2022-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: minitest
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.14
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Pure Ruby implementation of Google Common Expression Language, https://opensource.google/projects/cel.