oso-oso 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf2c949f57a56b4849f24ed9593c78da58baa5a0
-  data.tar.gz: 31ac99dcfa3bba1bbbee68474a3fe3702fb7484d
+  metadata.gz: eb279f6dd2c9ea6d862b47f1e6cc109bab429d19
+  data.tar.gz: 8c998ace146905bfb32574fe7d233fa0cb69e240
 SHA512:
-  metadata.gz: f1708d82f2531d50456ddcadb967bd024414700808e81b440836eb344f542cfda46af651382a6445a098dce9cf1e1c63c6802df73e3f97713a819d0b07ef5aae
-  data.tar.gz: d96b91d530555ed98d040c2d3c8e8e0adbdffa352cef6bd49c22e6f225c16bfa9f4c488d37468201e16e0950791581621737b94f1b9d5ffc8b8c4dffeaa4e656
+  metadata.gz: 1bd787012da6991d59d14877111b4022bc8855d16e3556faf859eaa1e09dcb41cb0e6d91d6d7e52faba7cf2c0a8b7993a784553221afcb6fa9dc7633ea40ec1b
+  data.tar.gz: c26f0285df44ac39e6f10717f0ca5143cf32ca1193133ce1a977885688fe72f0665de74d0c13cbc0d3ab71f4f85aa6fd39719b0872ebc4e738c25aa798fd6887

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oso-oso (0.5.1)
+    oso-oso (0.5.2)
       ffi (~> 1.0)
 
 GEM

data/lib/oso/polar/host.rb

@@ -115,29 +115,22 @@ module Oso
       # Construct and cache a Ruby instance.
       #
       # @param cls_name [String]
-      # @param initargs [Hash<String, Hash>]
+      # @param args [Array<Object>]
+      # @param kwargs [Hash<String, Object>]
       # @param id [Integer]
       # @raise [PolarRuntimeError] if instance construction fails.
-      def make_instance(cls_name, initargs:, id:) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
+      def make_instance(cls_name, args:, kwargs:, id:) # rubocop:disable Metrics/MethodLength
         constructor = get_constructor(cls_name)
         instance = if constructor == :new
-                     if initargs.empty?
-                       get_class(cls_name).__send__(:new)
-                     elsif initargs.is_a? Array
-                       get_class(cls_name).__send__(:new, *initargs)
-                     elsif initargs.is_a? Hash
-                       get_class(cls_name).__send__(:new, **initargs)
+                     if kwargs.empty?
+                       get_class(cls_name).__send__(:new, *args)
                      else
-                       raise PolarRuntimeError, "Bad initargs: #{initargs}"
+                       get_class(cls_name).__send__(:new, *args, **kwargs)
                      end
-                   elsif initargs.empty?
-                     constructor.call
-                   elsif initargs.is_a? Array
-                     constructor.call(*initargs)
-                   elsif initargs.is_a? Hash
-                     constructor.call(**initargs)
+                   elsif kwargs.empty?
+                     constructor.call(*args)
                    else
-                     raise PolarRuntimeError, "Bad initargs: #{initargs}"
+                     constructor.call(*args, **kwargs)
                    end
         cache_instance(instance, id: id)
       rescue StandardError => e
@@ -189,22 +182,29 @@ module Oso
       #
       # @param value [Object]
       # @return [Hash<String, Object>]
-      def to_polar_term(value) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+      def to_polar(value) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
         value = case true # rubocop:disable Lint/LiteralAsCondition
                 when value.instance_of?(TrueClass) || value.instance_of?(FalseClass)
                   { 'Boolean' => value }
                 when value.instance_of?(Integer)
                   { 'Number' => { 'Integer' => value } }
                 when value.instance_of?(Float)
+                  if value == Float::INFINITY
+                    value = 'Infinity'
+                  elsif value == -Float::INFINITY
+                    value = '-Infinity'
+                  elsif value.nan?
+                    value = 'NaN'
+                  end
                   { 'Number' => { 'Float' => value } }
                 when value.instance_of?(String)
                   { 'String' => value }
                 when value.instance_of?(Array)
-                  { 'List' => value.map { |el| to_polar_term(el) } }
+                  { 'List' => value.map { |el| to_polar(el) } }
                 when value.instance_of?(Hash)
-                  { 'Dictionary' => { 'fields' => value.transform_values { |v| to_polar_term(v) } } }
+                  { 'Dictionary' => { 'fields' => value.transform_values { |v| to_polar(v) } } }
                 when value.instance_of?(Predicate)
-                  { 'Call' => { 'name' => value.name, 'args' => value.args.map { |el| to_polar_term(el) } } }
+                  { 'Call' => { 'name' => value.name, 'args' => value.args.map { |el| to_polar(el) } } }
                 when value.instance_of?(Variable)
                   # This is supported so that we can query for unbound variables
                   { 'Variable' => value }
@@ -222,13 +222,28 @@ module Oso
       # @option data [Hash<String, Object>] :value
       # @return [Object]
       # @raise [UnexpectedPolarTypeError] if type cannot be converted to Ruby.
-      def to_ruby(data) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+      def to_ruby(data) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
         tag, value = data['value'].first
         case tag
         when 'String', 'Boolean'
           value
         when 'Number'
-          value.values.first
+          num = value.values.first
+          if value.key? 'Float'
+            case num
+            when 'Infinity'
+              return Float::INFINITY
+            when '-Infinity'
+              return -Float::INFINITY
+            when 'NaN'
+              return Float::NAN
+            else
+              unless value['Float'].is_a? Float # rubocop:disable Metrics/BlockNesting
+                raise PolarRuntimeError, "Expected a floating point number, got \"#{value['Float']}\""
+              end
+            end
+          end
+          num
         when 'List'
           value.map { |el| to_ruby(el) }
         when 'Dictionary'

data/lib/oso/polar/polar.rb

@@ -110,7 +110,7 @@ module Oso
         when String
           ffi_query = ffi_polar.new_query_from_str(query)
         when Predicate
-          ffi_query = ffi_polar.new_query_from_term(new_host.to_polar_term(query))
+          ffi_query = ffi_polar.new_query_from_term(new_host.to_polar(query))
         else
           raise InvalidQueryTypeError
         end
@@ -140,7 +140,7 @@ module Oso
       end
 
       def register_constant(name, value:)
-        ffi_polar.register_constant(name, value: host.to_polar_term(value))
+        ffi_polar.register_constant(name, value: host.to_polar(value))
       end
 
       # Start a REPL session.
@@ -220,7 +220,7 @@ module Oso
               puts true
             else
               result.each do |variable, value|
-                puts "#{variable} => #{value.inspect}"
+                puts "#{variable} = #{value.inspect}"
               end
             end
           end

data/lib/oso/polar/query.rb

@@ -68,13 +68,13 @@ module Oso
         ffi_query.call_result(result, call_id: call_id)
       end
 
-      # Retrieve the next result from a registered call and pass it to {#to_polar_term}.
+      # Retrieve the next result from a registered call and pass it to {#to_polar}.
       #
       # @param id [Integer]
       # @return [Hash]
       # @raise [StopIteration] if the call has been exhausted.
       def next_call_result(id)
-        host.to_polar_term(calls[id].next)
+        host.to_polar(calls[id].next)
       end
 
       # Send application error across FFI boundary.
@@ -104,12 +104,37 @@ module Oso
         call_result(nil, call_id: call_id)
       end
 
+      def handle_make_external(data) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
+        id = data['instance_id']
+        raise DuplicateInstanceRegistrationError, id if host.instance? id
+
+        constructor = data['constructor']['value']
+        if constructor.key? 'InstanceLiteral'
+          cls_name = constructor['InstanceLiteral']['tag']
+          fields = constructor['InstanceLiteral']['fields']['fields']
+          kwargs = Hash[fields.map { |k, v| [k.to_sym, host.to_ruby(v)] }]
+          args = []
+        elsif constructor.key? 'Call'
+          cls_name = constructor['Call']['name']
+          args = constructor['Call']['args'].map { |arg| host.to_ruby(arg) }
+          kwargs = constructor['Call']['kwargs']
+          kwargs = if kwargs.nil?
+                     {}
+                   else
+                     Hash[kwargs.map { |k, v| [k.to_sym, host.to_ruby(v)] }]
+                   end
+        else
+          raise InvalidConstructorError
+        end
+        host.make_instance(cls_name, args: args, kwargs: kwargs, id: id)
+      end
+
       # Create a generator that can be polled to advance the query loop.
       #
       # @yieldparam [Hash<String, Object>]
       # @return [Enumerator]
       # @raise [Error] if any of the FFI calls raise one.
-      def start # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+      def start # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
         Enumerator.new do |yielder| # rubocop:disable Metrics/BlockLength
           loop do # rubocop:disable Metrics/BlockLength
             event = ffi_query.next_event
@@ -119,21 +144,7 @@ module Oso
             when 'Result'
               yielder << event.data['bindings'].transform_values { |v| host.to_ruby(v) }
             when 'MakeExternal'
-              id = event.data['instance_id']
-              raise DuplicateInstanceRegistrationError, id if host.instance? id
-
-              constructor = event.data['constructor']['value']
-              if constructor.key? 'InstanceLiteral'
-                cls_name = constructor['InstanceLiteral']['tag']
-                fields = constructor['InstanceLiteral']['fields']['fields']
-                initargs = Hash[fields.map { |k, v| [k.to_sym, host.to_ruby(v)] }]
-              elsif constructor.key? 'Call'
-                cls_name = constructor['Call']['name']
-                initargs = constructor['Call']['args'].map { |arg| host.to_ruby(arg) }
-              else
-                raise InvalidConstructorError
-              end
-              host.make_instance(cls_name, initargs: initargs, id: id)
+              handle_make_external(event.data)
             when 'ExternalCall'
               call_id = event.data['call_id']
               instance = event.data['instance']
@@ -164,7 +175,7 @@ module Oso
               rescue EOFError
                 next
               end
-              command = JSON.dump(host.to_polar_term(input))
+              command = JSON.dump(host.to_polar(input))
               ffi_query.debug_command(command)
             else
               raise "Unhandled event: #{JSON.dump(event.inspect)}"

data/lib/oso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Oso
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oso-oso
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Oso Security, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi