oso-oso 0.5.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '09ee09c3366406a34633c870ddfe4ff271971529'
-  data.tar.gz: 764b0f3b440d567e19e45b71eff823b9000f35ef
+  metadata.gz: 2dbfedef3bc14832b47137d1c17b247af0cf8bf3
+  data.tar.gz: 3bad36d04f6744069299b72855be913bc4bd9562
 SHA512:
-  metadata.gz: fdae19c2528c46a85004241f0a8e59639123e416724239670cb9ff2ffc1172a87bb116b481d575e466c74f634213abdced263211f991721f1ff990e1e085d884
-  data.tar.gz: 309a196e2a0a3725e3bc1f45be8382ed85026dc7fc271662efaef8e207b0df2891f26da48ece702f1d9ce3e3731ea52c0a6cea30bf50af6acde54f08b44d79ec
+  metadata.gz: 13d18f6a934a266e82ec7e981187f7f8523c998b55158044bc09271c255fa56e40159246a55096447296971d88e9c5c68355684d37db99cea59b911810949cd9
+  data.tar.gz: 5cdae20c3b4c08752db940bcce466d65a787e9728ec935b837eb20eb98fffda4e88f812f63c1d75822f2bd25e6e741c1ae6df8620f2b587ca4b5db0f4901029b

data/Gemfile.lock

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

data/Makefile

@@ -3,17 +3,17 @@
 rust:
 	$(MAKE) -C ../.. rust-build
 
-install: rust
+install:
 	bundle install
 
-test: install
+test: install rust
 	bundle exec rake spec
 
-lint:
+lint: install
 	bundle exec rubocop
 
-typecheck:
+typecheck: install
 	bundle exec solargraph typecheck
 
-repl: install
+repl: install rust
 	bundle exec oso

data/lib/oso/polar/errors.rb

@@ -27,36 +27,24 @@ module Oso
     class UnsupportedError < PolarRuntimeError; end
     class PolarTypeError < PolarRuntimeError; end
     class StackOverflowError < PolarRuntimeError; end
+    class FileLoadingError < PolarRuntimeError; end
 
     # Errors originating from this side of the FFI boundary.
 
     class UnregisteredClassError < PolarRuntimeError; end
-    class MissingConstructorError < PolarRuntimeError; end
     class UnregisteredInstanceError < PolarRuntimeError; end
     class DuplicateInstanceRegistrationError < PolarRuntimeError; end
+
+    # TODO: I think this should probably have some arguments to say what the call is
     class InvalidCallError < PolarRuntimeError; end
     class InvalidConstructorError < PolarRuntimeError; end
     class InvalidQueryTypeError < PolarRuntimeError; end
-    class InlineQueryFailedError < PolarRuntimeError; end
     class NullByteInPolarFileError < PolarRuntimeError; end
     class UnexpectedPolarTypeError < PolarRuntimeError; end
-    class PolarFileAlreadyLoadedError < PolarRuntimeError # rubocop:disable Style/Documentation
-      # @param file [String]
-      def initialize(file)
-        super("File #{file} has already been loaded.")
-      end
-    end
-    class PolarFileContentsChangedError < PolarRuntimeError # rubocop:disable Style/Documentation
-      # @param file [String]
-      def initialize(file)
-        super("A file with the name #{file}, but different contents, has already been loaded.")
-      end
-    end
-    class PolarFileNameChangedError < PolarRuntimeError # rubocop:disable Style/Documentation
-      # @param file [String]
-      # @param existing [String]
-      def initialize(file, existing)
-        super("A file with the same contents as #{file} named #{existing} has already been loaded.")
+    class InlineQueryFailedError < PolarRuntimeError; # rubocop:disable Style/Documentation
+      # @param source [String]
+      def initialize(source)
+        super("Inline query failed: #{source}")
       end
     end
     class PolarFileExtensionError < PolarRuntimeError # rubocop:disable Style/Documentation
@@ -79,6 +67,12 @@ module Oso
       end
     end
 
+    class UnimplementedOperationError < PolarRuntimeError # rubocop:disable Style/Documentation
+      def initialize(operation)
+        super("#{operation} are unimplemented in the oso Ruby library")
+      end
+    end
+
     # Generic operational exception.
     class OperationalError < Error; end
     class UnknownError < OperationalError; end

data/lib/oso/polar/ffi.rb

@@ -46,6 +46,13 @@ module Oso
           Rust.free(ptr) unless ptr.null?
         end
       end
+
+      # Wrapper class for Source FFI pointer.
+      class Source < ::FFI::AutoPointer
+        def self.release(ptr)
+          Rust.free(ptr) unless ptr.null?
+        end
+      end
     end
     private_constant :FFI
   end
@@ -56,3 +63,4 @@ require 'oso/polar/ffi/query'
 require 'oso/polar/ffi/query_event'
 require 'oso/polar/ffi/error'
 require 'oso/polar/ffi/message'
+require 'oso/polar/ffi/source'

data/lib/oso/polar/ffi/error.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'json'
+
 module Oso
   module Polar
     module FFI
@@ -83,6 +85,8 @@ module Oso
             ::Oso::Polar::PolarTypeError.new(msg, details: details)
           when 'StackOverflow'
             ::Oso::Polar::StackOverflowError.new(msg, details: details)
+          when 'FileLoading'
+            ::Oso::Polar::FileLoadingError.new(msg, details: details)
           else
             ::Oso::Polar::PolarRuntimeError.new(msg, details: details)
           end

data/lib/oso/polar/ffi/message.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'json'
+
 module Oso
   module Polar
     module FFI
@@ -26,7 +28,7 @@ module Oso
           when 'Print'
             puts(msg)
           when 'Warning'
-            warn('[warning] %<msg>s')
+            warn(format('[warning] %<msg>s', msg: msg))
           end
         end
 

data/lib/oso/polar/ffi/polar.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'json'
+
 module Oso
   module Polar
     module FFI
@@ -10,7 +12,8 @@ module Oso
           ffi_lib FFI::LIB_PATH
 
           attach_function :new, :polar_new, [], FFI::Polar
-          attach_function :load_str, :polar_load, [FFI::Polar, :string, :string], :int32
+          attach_function :load, :polar_load, [FFI::Polar, :string, :string], :int32
+          attach_function :clear_rules, :polar_clear_rules, [FFI::Polar], :int32
           attach_function :next_inline_query, :polar_next_inline_query, [FFI::Polar, :uint32], FFI::Query
           attach_function :new_id, :polar_get_external_id, [FFI::Polar], :uint64
           attach_function :new_query_from_str, :polar_new_query, [FFI::Polar, :string, :uint32], FFI::Query
@@ -33,12 +36,19 @@ module Oso
         # @param src [String]
         # @param filename [String]
         # @raise [FFI::Error] if the FFI call returns an error.
-        def load_str(src, filename: nil)
-          loaded = Rust.load_str(self, src, filename)
+        def load(src, filename: nil)
+          loaded = Rust.load(self, src, filename)
           process_messages
           raise FFI::Error.get if loaded.zero?
         end
 
+        # @raise [FFI::Error] if the FFI call returns an error.
+        def clear_rules
+          cleared = Rust.clear_rules(self)
+          process_messages
+          raise FFI::Error.get if cleared.zero?
+        end
+
         # @return [FFI::Query] if there are remaining inline queries.
         # @return [nil] if there are no remaining inline queries.
         # @raise [FFI::Error] if the FFI call returns an error.
@@ -84,7 +94,7 @@ module Oso
         # @param name [String]
         # @param value [Hash<String, Object>]
         # @raise [FFI::Error] if the FFI call returns an error.
-        def register_constant(name, value:)
+        def register_constant(value, name:)
           registered = Rust.register_constant(self, name, JSON.dump(value))
           raise FFI::Error.get if registered.zero?
         end

data/lib/oso/polar/ffi/query.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'json'
+
 module Oso
   module Polar
     module FFI
@@ -15,6 +17,7 @@ module Oso
           attach_function :application_error, :polar_application_error, [FFI::Query, :string], :int32
           attach_function :next_event, :polar_next_query_event, [FFI::Query], FFI::QueryEvent
           attach_function :next_message, :polar_next_query_message, [FFI::Query], FFI::Message
+          attach_function :source, :polar_query_source_info, [FFI::Query], FFI::Source
           attach_function :free, :query_free, [FFI::Query], :int32
         end
         private_constant :Rust
@@ -74,6 +77,15 @@ module Oso
             message.process
           end
         end
+
+        # @return [String]
+        # @raise [FFI::Error] if the FFI call returns an error.
+        def source
+          res = Rust.source(self)
+          raise FFI::Error.get if res.null?
+
+          res.to_s
+        end
       end
     end
   end

data/lib/oso/polar/ffi/source.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Oso
+  module Polar
+    module FFI
+      # Wrapper class for Source FFI pointer.
+      class Source < ::FFI::AutoPointer
+        # @return [String]
+        def to_s
+          @to_s ||= read_string.force_encoding('UTF-8')
+        end
+
+        Rust = Module.new do
+          extend ::FFI::Library
+          ffi_lib FFI::LIB_PATH
+
+          attach_function :free, :string_free, [Message], :int32
+        end
+
+        private_constant :Rust
+      end
+    end
+  end
+end

data/lib/oso/polar/host.rb

@@ -10,8 +10,6 @@ module Oso
       attr_reader :ffi_polar
       # @return [Hash<String, Class>]
       attr_reader :classes
-      # @return [Hash<String, Object>]
-      attr_reader :constructors
       # @return [Hash<Integer, Object>]
       attr_reader :instances
 
@@ -20,14 +18,12 @@ module Oso
       def initialize(ffi_polar)
         @ffi_polar = ffi_polar
         @classes = {}
-        @constructors = {}
         @instances = {}
       end
 
       def initialize_copy(other)
         @ffi_polar = other.ffi_polar
         @classes = other.classes.dup
-        @constructors = other.constructors.dup
         @instances = other.instances.dup
       end
 
@@ -44,38 +40,18 @@ module Oso
 
       # Store a Ruby class in the {#classes} cache.
       #
-      # @param cls [Class] the class to cache
-      # @param name [String] the name to cache the class as. Defaults to the name of the class.
-      # @param constructor [Proc] optional custom constructor function. Defaults to the :new method.
+      # @param cls [Class] the class to cache.
+      # @param name [String] the name to cache the class as.
       # @return [String] the name the class is cached as.
-      # @raise [UnregisteredClassError] if the class has not been registered.
-      def cache_class(cls, name:, constructor:) # rubocop:disable Metrics/MethodLength
-        name = cls.name if name.nil?
+      # @raise [DuplicateClassAliasError] if attempting to register a class
+      # under a previously-registered name.
+      def cache_class(cls, name:)
         raise DuplicateClassAliasError, name: name, old: get_class(name), new: cls if classes.key? name
 
         classes[name] = cls
-        if constructor.nil?
-          constructors[name] = :new
-        elsif constructor.respond_to? :call
-          constructors[name] = constructor
-        else
-          raise InvalidConstructorError
-        end
         name
       end
 
-      # Fetch a constructor from the {#constructors} cache.
-      #
-      # @param name [String]
-      # @return [Symbol] if constructor is the default of `:new`.
-      # @return [Proc] if a custom constructor was registered.
-      # @raise [UnregisteredConstructorError] if the constructor has not been registered.
-      def get_constructor(name)
-        raise MissingConstructorError, name unless constructors.key? name
-
-        constructors[name]
-      end
-
       # Check if an instance exists in the {#instances} cache.
       #
       # @param id [Integer]
@@ -100,12 +76,12 @@ module Oso
         instances[id]
       end
 
-      # Cache a Ruby instance in the {#instances} cache, fetching a {#new_id}
-      # if one isn't provided.
+      # Cache a Ruby instance in the {#instances} cache, fetching a new id if
+      # one isn't provided.
       #
       # @param instance [Object]
-      # @param id [Integer]
-      # @return [Integer]
+      # @param id [Integer] the instance ID. Generated via FFI if not provided.
+      # @return [Integer] the instance ID.
       def cache_instance(instance, id: nil)
         id = ffi_polar.new_id if id.nil?
         instances[id] = instance
@@ -114,30 +90,17 @@ module Oso
 
       # Construct and cache a Ruby instance.
       #
-      # @param cls_name [String]
-      # @param initargs [Hash<String, Hash>]
-      # @param id [Integer]
+      # @param cls_name [String] name of the instance's class.
+      # @param args [Array<Object>] positional args to the constructor.
+      # @param kwargs [Hash<String, Object>] keyword args to the constructor.
+      # @param id [Integer] the instance ID.
       # @raise [PolarRuntimeError] if instance construction fails.
-      def make_instance(cls_name, initargs:, id:) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
-        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)
-                     else
-                       raise PolarRuntimeError, "Bad initargs: #{initargs}"
-                     end
-                   elsif initargs.empty?
-                     constructor.call
-                   elsif initargs.is_a? Array
-                     constructor.call(*initargs)
-                   elsif initargs.is_a? Hash
-                     constructor.call(**initargs)
+      # @return [Integer] the instance ID.
+      def make_instance(cls_name, args:, kwargs:, id:)
+        instance = if kwargs.empty? # This check is for Ruby < 2.7.
+                     get_class(cls_name).__send__(:new, *args)
                    else
-                     raise PolarRuntimeError, "Bad initargs: #{initargs}"
+                     get_class(cls_name).__send__(:new, *args, **kwargs)
                    end
         cache_instance(instance, id: id)
       rescue StandardError => e
@@ -153,9 +116,9 @@ module Oso
       # @return [Boolean]
       def subspecializer?(instance_id, left_tag:, right_tag:)
         mro = get_instance(instance_id).class.ancestors
-        mro.index(get_class(left_tag)) < mro.index(get_class(right_tag))
-      rescue StandardError
-        false
+        left_index = mro.index(get_class(left_tag))
+        right_index = mro.index(get_class(right_tag))
+        left_index && right_index && left_index < right_index
       end
 
       # Check if instance is an instance of class.
@@ -167,8 +130,6 @@ module Oso
         instance = to_ruby(instance)
         cls = get_class(class_tag)
         instance.is_a? cls
-      rescue PolarRuntimeError
-        false
       end
 
       # Check if two instances unify
@@ -180,8 +141,6 @@ module Oso
         left_instance = get_instance(left_instance_id)
         right_instance = get_instance(right_instance_id)
         left_instance == right_instance
-      rescue PolarRuntimeError
-        false
       end
 
       # Turn a Ruby value into a Polar term that's ready to be sent across the
@@ -189,22 +148,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 +188,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

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-require 'pp'
-require 'set'
-require 'digest/md5'
-
 # Missing Ruby type.
 module PolarBoolean; end
 # Monkey-patch Ruby true type.
@@ -42,8 +37,6 @@ module Oso
       def initialize
         @ffi_polar = FFI::Polar.create
         @host = Host.new(ffi_polar)
-        @loaded_names = {}
-        @loaded_contents = {}
 
         # Register built-in classes.
         register_class PolarBoolean, name: 'Boolean'
@@ -54,11 +47,12 @@ module Oso
         register_class String
       end
 
-      # Replace the current Polar instance but retain all registered classes and constructors.
-      def clear
-        loaded_names.clear
-        loaded_contents.clear
-        @ffi_polar = FFI::Polar.create
+      # Clear all rules and rule sources from the current Polar instance
+      #
+      # @return [self] for chaining.
+      def clear_rules
+        ffi_polar.clear_rules
+        self
       end
 
       # Load a Polar policy file.
@@ -66,23 +60,12 @@ module Oso
       # @param name [String]
       # @raise [PolarFileExtensionError] if provided filename has invalid extension.
       # @raise [PolarFileNotFoundError] if provided filename does not exist.
-      def load_file(name) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      # @return [self] for chaining.
+      def load_file(name)
         raise PolarFileExtensionError, name unless File.extname(name) == '.polar'
 
         file_data = File.open(name, &:read)
-        hash = Digest::MD5.hexdigest(file_data)
-
-        if loaded_names.key?(name)
-          raise PolarFileAlreadyLoadedError, name if loaded_names[name] == hash
-
-          raise PolarFileContentsChangedError, name
-        elsif loaded_contents.key?(hash)
-          raise PolarFileNameChangedError, name, loaded_contents[hash]
-        else
-          load_str(file_data, filename: name)
-          loaded_names[name] = hash
-          loaded_contents[hash] = name
-        end
+        load_str(file_data, filename: name)
       rescue Errno::ENOENT
         raise PolarFileNotFoundError, name
       end
@@ -94,10 +77,11 @@ module Oso
       # @raise [NullByteInPolarFileError] if str includes a non-terminating null byte.
       # @raise [InlineQueryFailedError] on the first failed inline query.
       # @raise [Error] if any of the FFI calls raise one.
+      # @return [self] for chaining.
       def load_str(str, filename: nil) # rubocop:disable Metrics/MethodLength
         raise NullByteInPolarFileError if str.chomp("\0").include?("\0")
 
-        ffi_polar.load_str(str, filename: filename)
+        ffi_polar.load(str, filename: filename)
         loop do
           next_query = ffi_polar.next_inline_query
           break if next_query.nil?
@@ -105,9 +89,10 @@ module Oso
           begin
             Query.new(next_query, host: host).results.next
           rescue StopIteration
-            raise InlineQueryFailedError
+            raise InlineQueryFailedError, next_query.source
           end
         end
+        self
       end
 
       # Query for a Polar predicate or string.
@@ -126,7 +111,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
@@ -145,18 +130,26 @@ module Oso
 
       # Register a Ruby class with Polar.
       #
-      # @param cls [Class]
-      # @param name [String]
-      # @param from_polar [Proc]
-      # @raise [InvalidConstructorError] if provided an invalid 'from_polar' constructor.
-      def register_class(cls, name: nil, from_polar: nil)
-        from_polar = Proc.new if block_given?
-        name = host.cache_class(cls, name: name, constructor: from_polar)
-        register_constant(name, value: cls)
+      # @param cls [Class] the class to register.
+      # @param name [String] the name to register the class as. Defaults to the name of the class.
+      # @raise [DuplicateClassAliasError] if attempting to register a class
+      # under a previously-registered name.
+      # @raise [FFI::Error] if the FFI call returns an error.
+      # @return [self] for chaining.
+      def register_class(cls, name: nil)
+        name = host.cache_class(cls, name: name || cls.name)
+        register_constant(cls, name: name)
       end
 
-      def register_constant(name, value:)
-        ffi_polar.register_constant(name, value: host.to_polar_term(value))
+      # Register a Ruby object with Polar.
+      #
+      # @param value [Object] the object to register.
+      # @param name [String] the name to register the object as.
+      # @return [self] for chaining.
+      # @raise [FFI::Error] if the FFI call returns an error.
+      def register_constant(value, name:)
+        ffi_polar.register_constant(host.to_polar(value), name: name)
+        self
       end
 
       # Start a REPL session.
@@ -178,10 +171,6 @@ module Oso
 
       # @return [FFI::Polar]
       attr_reader :ffi_polar
-      # @return [Hash<String, String>]
-      attr_reader :loaded_names
-      # @return [Hash<String, String>]
-      attr_reader :loaded_contents
 
       # The R and L in REPL for systems where readline is available.
       def repl_readline(prompt)
@@ -236,7 +225,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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'json'
+
 module Oso
   module Polar
     # A single Polar query.
@@ -43,16 +45,18 @@ module Oso
       # @param args [Array<Hash>]
       # @raise [InvalidCallError] if the method doesn't exist on the instance or
       #   the args passed to the method are invalid.
-      def register_call(attribute, call_id:, instance:, args:) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      def register_call(attribute, call_id:, instance:, args:, kwargs:) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         return if calls.key?(call_id)
 
         instance = host.to_ruby(instance)
-        if args.nil?
-          result = instance.__send__(attribute)
-        else
-          args = args.map { |a| host.to_ruby(a) }
-          result = instance.__send__(attribute, *args)
-        end
+        args = args.map { |a| host.to_ruby(a) }
+        kwargs = Hash[kwargs.map { |k, v| [k.to_sym, host.to_ruby(v)] }]
+        # The kwargs.empty? check is for Ruby < 2.7.
+        result = if kwargs.empty?
+                   instance.__send__(attribute, *args)
+                 else
+                   instance.__send__(attribute, *args, **kwargs)
+                 end
         result = [result].to_enum unless result.is_a? Enumerator # Call must be a generator.
         calls[call_id] = result.lazy
       rescue ArgumentError, NoMethodError
@@ -68,13 +72,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.
@@ -93,8 +97,8 @@ module Oso
       # @param call_id [Integer]
       # @param instance [Hash<String, Object>]
       # @raise [Error] if the FFI call raises one.
-      def handle_call(attribute, call_id:, instance:, args:)
-        register_call(attribute, call_id: call_id, instance: instance, args: args)
+      def handle_call(attribute, call_id:, instance:, args:, kwargs:)
+        register_call(attribute, call_id: call_id, instance: instance, args: args, kwargs: kwargs)
         result = JSON.dump(next_call_result(call_id))
         call_result(result, call_id: call_id)
       rescue InvalidCallError => e
@@ -104,6 +108,20 @@ module Oso
         call_result(nil, call_id: call_id)
       end
 
+      def handle_make_external(data) # rubocop:disable Metrics/AbcSize
+        id = data['instance_id']
+        raise DuplicateInstanceRegistrationError, id if host.instance? id
+
+        constructor = data['constructor']['value']
+        raise InvalidConstructorError unless constructor.key? 'Call'
+
+        cls_name = constructor['Call']['name']
+        args = constructor['Call']['args'].map { |arg| host.to_ruby(arg) }
+        kwargs = constructor['Call']['kwargs'] || {}
+        kwargs = Hash[kwargs.map { |k, v| [k.to_sym, host.to_ruby(v)] }]
+        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>]
@@ -119,27 +137,14 @@ 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']
               attribute = event.data['attribute']
-              args = event.data['args']
-              handle_call(attribute, call_id: call_id, instance: instance, args: args)
+              args = event.data['args'] || []
+              kwargs = event.data['kwargs'] || {}
+              handle_call(attribute, call_id: call_id, instance: instance, args: args, kwargs: kwargs)
             when 'ExternalIsSubSpecializer'
               instance_id = event.data['instance_id']
               left_tag = event.data['left_class_tag']
@@ -164,8 +169,10 @@ 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)
+            when 'ExternalOp'
+              raise UnimplementedOperationError, 'comparison operators'
             else
               raise "Unhandled event: #{JSON.dump(event.inspect)}"
             end

data/lib/oso/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oso-oso
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Oso Security, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -141,6 +141,7 @@ files:
 - lib/oso/polar/ffi/polar.rb
 - lib/oso/polar/ffi/query.rb
 - lib/oso/polar/ffi/query_event.rb
+- lib/oso/polar/ffi/source.rb
 - lib/oso/polar/host.rb
 - lib/oso/polar/polar.rb
 - lib/oso/polar/predicate.rb