cel 0.1.2 → 0.2.1

data/lib/cel.rb

@@ -7,16 +7,11 @@ require "cel/ast/types"
 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"
 
-begin
-  require "google/protobuf/well_known_types"
-  require "cel/protobuf"
-rescue LoadError # rubocop:disable Lint/SuppressedException
-end
-
 module Cel
   def self.to_numeric(anything)
     num = BigDecimal(anything.to_s)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cel
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-10 00:00:00.000000000 Z
+date: 2023-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Pure Ruby implementation of Google Common Expression Language, https://opensource.google/projects/cel.
 email:
 - cardoso_tiago@hotmail.com
@@ -39,15 +53,16 @@ files:
 - README.md
 - lib/cel.rb
 - lib/cel/ast/elements.rb
+- lib/cel/ast/elements/protobuf.rb
 - lib/cel/ast/types.rb
 - lib/cel/checker.rb
 - lib/cel/context.rb
+- lib/cel/encoder.rb
 - lib/cel/environment.rb
 - lib/cel/errors.rb
 - lib/cel/macro.rb
 - lib/cel/parser.rb
 - lib/cel/program.rb
-- lib/cel/protobuf.rb
 - lib/cel/version.rb
 homepage:
 licenses:
@@ -73,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.

data/lib/cel/protobuf.rb

@@ -1,175 +0,0 @@
-# frozen_string_literal: true
-
-require "time"
-
-module Cel
-  module Protobuf
-    module CheckExtensions
-      def self.included(klass)
-        super
-        klass.alias_method :check_standard_func_without_protobuf, :check_standard_func
-        klass.alias_method :check_standard_func, :check_standard_func_with_protobuf
-
-        klass.alias_method :check_invoke_without_protobuf, :check_invoke
-        klass.alias_method :check_invoke, :check_invoke_with_protobuf
-      end
-
-      private
-
-      def check_invoke_with_protobuf(funcall)
-        var = funcall.var
-
-        return check_standard_func(funcall) unless var
-
-        var_type = case var
-                   when Identifier
-                     check_identifier(var)
-                   when Invoke
-                     check_invoke(var)
-                   else
-                     var.type
-        end
-
-        return check_invoke_without_protobuf(funcall, var_type) if var_type.is_a?(Cel::Type)
-        return check_invoke_without_protobuf(funcall, var_type) unless var_type < Google::Protobuf::MessageExts
-
-        func = funcall.func
-
-        attribute = var_type.descriptor.lookup(func.to_s)
-
-        raise NoSuchFieldError.new(var, func) unless attribute
-
-        # TODO: return super to any, or raise error?
-
-        type = attribute.type
-
-        # https://github.com/google/cel-spec/blob/master/doc/langdef.md#protocol-buffer-data-conversion
-        case type
-        when :int32, :int64, :sint32, :sint64, :sfixed32, :sfixed64
-          TYPES[:int]
-        when :uint32, :uint64, :fixed32, :fixed64
-          TYPES[:uint]
-        when :float, :double
-          TYPES[:double]
-        when :bool, :string, :bytes
-          TYPES[type]
-        when :repeated
-          TYPES[:list]
-        when :map
-          TYPES[:map]
-        when :oneof
-          TYPES[:any]
-        else
-          type
-        end
-      end
-
-      def check_standard_func_with_protobuf(funcall)
-        func = funcall.func
-        args = funcall.args
-
-        case func
-        when :duration
-          check_arity(func, args, 1)
-          unsupported_type(funcall) unless args.first.is_a?(String)
-
-          return Google::Protobuf::Duration
-        when :timestamp
-          check_arity(func, args, 1)
-          unsupported_type(funcall) unless args.first.is_a?(String)
-
-          return Google::Protobuf::Timestamp
-        end
-
-        check_standard_func_without_protobuf(funcall)
-      end
-    end
-
-    module EvaluateExtensions
-      def self.included(klass)
-        super
-        klass.alias_method :evaluate_standard_func_without_protobuf, :evaluate_standard_func
-        klass.alias_method :evaluate_standard_func, :evaluate_standard_func_with_protobuf
-
-        klass.alias_method :evaluate_invoke_without_protobuf, :evaluate_invoke
-        klass.alias_method :evaluate_invoke, :evaluate_invoke_with_protobuf
-      end
-
-      private
-
-      def evaluate_invoke_with_protobuf(invoke)
-        var = invoke.var
-
-        return evaluate_standard_func(invoke) unless var
-
-        var = case var
-              when Identifier
-                evaluate_identifier(var)
-              when Invoke
-                evaluate_invoke(var)
-              else
-                var
-        end
-
-        return evaluate_invoke_without_protobuf(invoke, var) unless var.is_a?(Google::Protobuf::MessageExts)
-
-        func = invoke.func
-
-        var.public_send(func)
-      end
-
-      def evaluate_standard_func_with_protobuf(funcall)
-        func = funcall.func
-        args = funcall.args
-
-        case func
-        when :duration
-          seconds = 0
-          nanos = 0
-          args.first.value.scan(/([0-9]*(?:\.[0-9]*)?)([a-z]+)/) do |duration, units|
-            case units
-            when "h"
-              seconds += Cel.to_numeric(duration) * 60 * 60
-            when "m"
-              seconds += Cel.to_numeric(duration) * 60
-            when "s"
-              seconds += Cel.to_numeric(duration)
-            when "ms"
-              nanos += Cel.to_numeric(duration) * 1000 * 1000
-            when "us"
-              nanos += Cel.to_numeric(duration) * 1000
-            when "ns"
-              nanos += Cel.to_numeric(duration)
-            else
-              raise EvaluateError, "#{units} is unsupported"
-            end
-          end
-          return Google::Protobuf::Duration.new(seconds: seconds, nanos: nanos)
-        when :timestamp
-          time = Time.parse(args.first)
-          return Google::Protobuf::Timestamp.from_time(time)
-        end
-
-        evaluate_standard_func_without_protobuf(funcall)
-      end
-    end
-
-    module ContextExtensions
-      def self.included(klass)
-        super
-        klass.alias_method :to_cel_type_without_protobuf, :to_cel_type
-        klass.alias_method :to_cel_type, :to_cel_type_with_protobuf
-      end
-
-      def to_cel_type_with_protobuf(v)
-        return v if v.is_a?(Google::Protobuf::MessageExts)
-
-        to_cel_type_without_protobuf(v)
-      end
-    end
-  end
-
-  Checker.include(Protobuf::CheckExtensions)
-  Program.include(Protobuf::EvaluateExtensions)
-  Context.include(Protobuf::ContextExtensions)
-end