oso-oso 0.3.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f319a22c3568b2a11da1be2ff92d458acac50a1
-  data.tar.gz: b42631f294bbf9f5f45c70c8c8beef6bf13756ce
+  metadata.gz: 70321ccb3dc8e6468b89109aa7d9bbb97868d1be
+  data.tar.gz: 8b7c1873eba4dae6d1150f8f91a74a3d5a72e51c
 SHA512:
-  metadata.gz: 60774d89d1abec361c3d4ad96c2c5e1dd56fde369f4c49cb36fbdd6c9cb3f78d3ea51ee394febbf5472d1500dace92a8f346281fd3c04c8a88e9e040d467e5fd
-  data.tar.gz: 2e08087f17170f44fcd528c5f8f756d5979a1b30765b4417506195f10b6b8587f70500582efea0d1780a8124091b7ccc71a7c0d66d00ef601dbd48077d5a3707
+  metadata.gz: 639ea45ef8a86ebf97ae20ee1977499e18f04827b05d869369c7ec01792eb7a7747c6bae9f7d7789af4993a4b04edef5b375c9caa504c6e09afe701ed931874f
+  data.tar.gz: 7dc68ed639125472e808ff375059ceb6d70837fad20c05672a183452bef78eeee56dcc0dc58579d21536749bc8e2fbc2628baa349473984c824d23b38d1270f4

data/.rubocop.yml

@@ -0,0 +1,7 @@
+AllCops:
+  TargetRubyVersion: 2.4
+  Exclude:
+    - '**/*~'
+    - 'bin/oso'
+    - 'vendor/**/*'
+  NewCops: enable

data/Gemfile

@@ -3,4 +3,3 @@
 source 'https://rubygems.org'
 
 gemspec
-

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oso-oso (0.3.1)
+    oso-oso (0.6.0)
       ffi (~> 1.0)
 
 GEM
@@ -12,18 +12,18 @@ GEM
     benchmark (0.1.0)
     byebug (11.1.3)
     coderay (1.1.3)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     e2mmap (0.1.0)
     ffi (1.13.1)
     jaro_winkler (1.5.4)
     maruku (0.7.3)
     method_source (1.0.0)
     mini_portile2 (2.4.0)
-    nokogiri (1.10.9)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    parallel (1.19.1)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -49,19 +49,19 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.85.1)
+    rubocop (0.89.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.0.3)
+      rubocop-ast (>= 0.3.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.0.3)
-      parser (>= 2.7.0.1)
+    rubocop-ast (0.3.0)
+      parser (>= 2.7.1.4)
     ruby-progressbar (1.10.1)
-    solargraph (0.39.8)
+    solargraph (0.39.14)
       backport (~> 1.1)
       benchmark
       bundler (>= 1.17.2)
@@ -88,7 +88,8 @@ DEPENDENCIES
   pry-byebug (~> 3.9.0)
   rake (~> 12.0)
   rspec (~> 3.0)
-  solargraph (~> 0.39.8)
+  rubocop (~> 0.89.1)
+  solargraph (~> 0.39.14)
   yard (~> 0.9.25)
 
 BUNDLED WITH

data/Makefile

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

data/Rakefile

@@ -6,4 +6,3 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
-

data/bin/oso

@@ -4,4 +4,4 @@
 require 'bundler/setup'
 require 'oso'
 
-Oso.new.repl(load: true)
+Oso.new.repl(ARGV)

data/lib/oso/http.rb

@@ -3,7 +3,7 @@
 module Oso
   # An HTTP resource.
   class Http
-    def initialize(hostname: nil, path: nil, query: nil)
+    def initialize(hostname, path, query)
       @hostname = hostname
       @path = path
       @query = query

data/lib/oso/oso.rb

@@ -3,7 +3,7 @@
 require_relative 'polar/polar'
 
 module Oso
-  # Oso authorization API.
+  # oso authorization API.
   class Oso < Polar::Polar
     def initialize
       super
@@ -11,6 +11,13 @@ module Oso
       register_class(PathMapper, name: 'PathMapper')
     end
 
+    # Query the knowledge base to determine whether an actor is allowed to
+    # perform an action upon a resource.
+    #
+    # @param actor [Object] Subject.
+    # @param action [Object] Verb.
+    # @param resource [Object] Object.
+    # @return [Boolean] An access control decision.
     def allowed?(actor:, action:, resource:)
       query_rule('allow', actor, action, resource).next
       true

data/lib/oso/path_mapper.rb

@@ -4,7 +4,7 @@ module Oso
   # Map from a template string with capture groups of the form
   # `{name}` to a dictionary of the form `{name: captured_value}`
   class PathMapper
-    def initialize(template:)
+    def initialize(template)
       capture_group = /({([^}]+)})/
 
       template = template.dup

data/lib/oso/polar/errors.rb

@@ -5,16 +5,12 @@ module Oso
     # Base error type for Oso::Polar.
     class Error < ::RuntimeError
       attr_reader :stack_trace
-      
+
       # @param message [String]
       # @param details [Hash]
       def initialize(message = nil, details: nil)
         @details = details
-        if details and details.key?("stack_trace")
-          @stack_trace = details['stack_trace']
-        else
-          @stack_trace = nil
-        end
+        @stack_trace = details&.fetch('stack_trace', nil)
         super(message)
       end
     end
@@ -31,6 +27,7 @@ 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.
 
@@ -38,15 +35,22 @@ module Oso
     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 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
-      def initialize
-        super('Polar files must have .pol or .polar extension.')
+      def initialize(file)
+        super("Polar files must have .polar extension. Offending file: #{file}")
       end
     end
     class PolarFileNotFoundError < PolarRuntimeError # rubocop:disable Style/Documentation
@@ -59,7 +63,7 @@ module Oso
       # @param as [String]
       # @param old [Class]
       # @param new [Class]
-      def initialize(name:, old:, new:) # rubocop:disable Naming/MethodParameterName
+      def initialize(name:, old:, new:)
         super("Attempted to alias #{new} as '#{name}', but #{old} already has that alias.")
       end
     end

data/lib/oso/polar/ffi.rb

@@ -5,7 +5,7 @@ require 'ffi'
 module Oso
   module Polar
     module FFI
-      LIB = ::FFI::Platform::LIBPREFIX + 'polar.' + ::FFI::Platform::LIBSUFFIX
+      LIB = "#{::FFI::Platform::LIBPREFIX}polar.#{::FFI::Platform::LIBSUFFIX}"
       RELEASE_PATH = File.expand_path(File.join(__dir__, "../../../ext/oso-oso/lib/#{LIB}"))
       DEV_PATH = File.expand_path(File.join(__dir__, "../../../../../target/debug/#{LIB}"))
       # If the lib exists in the ext/ dir, use it. Otherwise, fall back to
@@ -37,7 +37,20 @@ module Oso
       # Wrapper class for Error FFI pointer + operations.
       class Error < ::FFI::AutoPointer
         def self.release(ptr)
-          Rust.free(ptr)
+          Rust.free(ptr) unless ptr.null?
+        end
+      end
+      # Wrapper class for Message FFI pointer + operations.
+      class Message < ::FFI::AutoPointer
+        def self.release(ptr)
+          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
@@ -49,3 +62,5 @@ require 'oso/polar/ffi/polar'
 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

@@ -22,7 +22,7 @@ module Oso
         #
         # @return [::Oso::Polar::Error] if there's an FFI error.
         # @return [::Oso::Polar::FFIErrorNotFound] if there isn't one.
-        def self.get # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        def self.get # rubocop:disable Metrics/MethodLength
           error = Rust.get
           return ::Oso::Polar::FFIErrorNotFound if error.null?
 
@@ -48,7 +48,7 @@ module Oso
         # @param msg [String]
         # @param details [Hash<String, Object>]
         # @return [::Oso::Polar::ParseError] the object converted into the expected format.
-        private_class_method def self.parse_error(kind, msg:, details:) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
+        private_class_method def self.parse_error(kind, msg:, details:) # rubocop:disable Metrics/MethodLength
           case kind
           when 'ExtraToken'
             ::Oso::Polar::ParseError::ExtraToken.new(msg, details: details)
@@ -83,6 +83,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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Oso
+  module Polar
+    module FFI
+      # Wrapper class for Message FFI pointer + operations.
+      class Message < ::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
+
+        def process
+          message = JSON.parse(to_s)
+          kind = message['kind']
+          msg = message['msg']
+
+          case kind
+          when 'Print'
+            puts(msg)
+          when 'Warning'
+            warn(format('[warning] %<msg>s', msg: msg))
+          end
+        end
+
+        private_constant :Rust
+      end
+    end
+  end
+end

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

@@ -10,12 +10,13 @@ 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 :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
           attach_function :new_query_from_term, :polar_new_query_from_term, [FFI::Polar, :string, :uint32], FFI::Query
           attach_function :register_constant, :polar_register_constant, [FFI::Polar, :string, :string], :int32
+          attach_function :next_message, :polar_next_polar_message, [FFI::Polar], FFI::Message
           attach_function :free, :polar_free, [FFI::Polar], :int32
         end
         private_constant :Rust
@@ -32,8 +33,10 @@ module Oso
         # @param src [String]
         # @param filename [String]
         # @raise [FFI::Error] if the FFI call returns an error.
-        def load_str(src, filename: nil)
-          raise FFI::Error.get if Rust.load_str(self, src, filename).zero?
+        def load(src, filename: nil)
+          loaded = Rust.load(self, src, filename)
+          process_messages
+          raise FFI::Error.get if loaded.zero?
         end
 
         # @return [FFI::Query] if there are remaining inline queries.
@@ -41,6 +44,7 @@ module Oso
         # @raise [FFI::Error] if the FFI call returns an error.
         def next_inline_query
           query = Rust.next_inline_query(self, 0)
+          process_messages
           query.null? ? nil : query
         end
 
@@ -60,6 +64,7 @@ module Oso
         # @raise [FFI::Error] if the FFI call returns an error.
         def new_query_from_str(str)
           query = Rust.new_query_from_str(self, str, 0)
+          process_messages
           raise FFI::Error.get if query.null?
 
           query
@@ -70,6 +75,7 @@ module Oso
         # @raise [FFI::Error] if the FFI call returns an error.
         def new_query_from_term(term)
           query = Rust.new_query_from_term(self, JSON.dump(term), 0)
+          process_messages
           raise FFI::Error.get if query.null?
 
           query
@@ -79,7 +85,21 @@ module Oso
         # @param value [Hash<String, Object>]
         # @raise [FFI::Error] if the FFI call returns an error.
         def register_constant(name, value:)
-          raise FFI::Error.get if Rust.register_constant(self, name, JSON.dump(value)).zero?
+          registered = Rust.register_constant(self, name, JSON.dump(value))
+          raise FFI::Error.get if registered.zero?
+        end
+
+        def next_message
+          Rust.next_message(self)
+        end
+
+        def process_messages
+          loop do
+            message = next_message
+            break if message.null?
+
+            message.process
+          end
         end
       end
     end

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

@@ -14,6 +14,8 @@ module Oso
           attach_function :question_result, :polar_question_result, [FFI::Query, :uint64, :int32], :int32
           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
@@ -22,6 +24,7 @@ module Oso
         # @raise [FFI::Error] if the FFI call returns an error.
         def debug_command(cmd)
           res = Rust.debug_command(self, cmd)
+          process_messages
           raise FFI::Error.get if res.zero?
         end
 
@@ -54,10 +57,33 @@ module Oso
         # @raise [FFI::Error] if the FFI call returns an error.
         def next_event
           event = Rust.next_event(self)
+          process_messages
           raise FFI::Error.get if event.null?
 
           ::Oso::Polar::QueryEvent.new(JSON.parse(event.to_s))
         end
+
+        def next_message
+          Rust.next_message(self)
+        end
+
+        def process_messages
+          loop do
+            message = next_message
+            break if message.null?
+
+            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

@@ -3,8 +3,9 @@
 module Oso
   module Polar
     # Translate between Polar and the host language (Ruby).
-    class Host
+    class Host # rubocop:disable Metrics/ClassLength
       protected
+
       # @return [FFI::Polar]
       attr_reader :ffi_polar
       # @return [Hash<String, Class>]
@@ -15,6 +16,7 @@ module Oso
       attr_reader :instances
 
       public
+
       def initialize(ffi_polar)
         @ffi_polar = ffi_polar
         @classes = {}
@@ -44,9 +46,10 @@ module Oso
       #
       # @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.
       # @return [String] the name the class is cached as.
       # @raise [UnregisteredClassError] if the class has not been registered.
-      def cache_class(cls, name:, constructor:)
+      def cache_class(cls, name:, constructor:) # rubocop:disable Metrics/MethodLength
         name = cls.name if name.nil?
         raise DuplicateClassAliasError, name: name, old: get_class(name), new: cls if classes.key? name
 
@@ -66,14 +69,14 @@ module Oso
       # @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.
+      # @raise [MissingConstructorError] 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 has been cached.
+      # Check if an instance exists in the {#instances} cache.
       #
       # @param id [Integer]
       # @return [Boolean]
@@ -97,7 +100,8 @@ module Oso
         instances[id]
       end
 
-      # Cache a Ruby instance, 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]
@@ -111,22 +115,23 @@ module Oso
       # Construct and cache a Ruby instance.
       #
       # @param cls_name [String]
-      # @param fields [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, fields:, id:) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      def make_instance(cls_name, args:, kwargs:, id:) # rubocop:disable Metrics/MethodLength
         constructor = get_constructor(cls_name)
-        fields = Hash[fields.map { |k, v| [k.to_sym, to_ruby(v)] }]
+        # The kwargs.empty? checks are for Ruby < 2.7.
         instance = if constructor == :new
-                     if fields.empty?
-                       get_class(cls_name).__send__(:new)
+                     if kwargs.empty?
+                       get_class(cls_name).__send__(:new, *args)
                      else
-                       get_class(cls_name).__send__(:new, **fields)
+                       get_class(cls_name).__send__(:new, *args, **kwargs)
                      end
-                   elsif fields.empty?
-                     constructor.call
+                   elsif kwargs.empty?
+                     constructor.call(*args)
                    else
-                     constructor.call(**fields)
+                     constructor.call(*args, **kwargs)
                    end
         cache_instance(instance, id: id)
       rescue StandardError => e
@@ -142,22 +147,20 @@ 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.
       #
-      # @param instance_id [Integer]
+      # @param instance [Hash<String, Object>]
       # @param class_tag [String]
       # @return [Boolean]
-      def isa?(instance_id, class_tag:)
-        instance = get_instance(instance_id)
+      def isa?(instance, class_tag:)
+        instance = to_ruby(instance)
         cls = get_class(class_tag)
         instance.is_a? cls
-      rescue PolarRuntimeError
-        false
       end
 
       # Check if two instances unify
@@ -169,8 +172,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
@@ -178,22 +179,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 }
@@ -211,13 +219,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

@@ -3,36 +3,72 @@
 require 'json'
 require 'pp'
 require 'set'
+require 'digest/md5'
+
+# Missing Ruby type.
+module PolarBoolean; end
+# Monkey-patch Ruby true type.
+class TrueClass; include PolarBoolean; end
+# Monkey-patch Ruby false type.
+class FalseClass; include PolarBoolean; end
+
+# https://github.com/ruby/ruby/blob/bb9ecd026a6cadd5d0f85ac061649216806ed935/lib/bundler/vendor/thor/lib/thor/shell/color.rb#L99-L105
+def supports_color
+  $stdout.tty? && $stderr.tty? && ENV['NO_COLOR'].nil?
+end
+
+if supports_color
+  RESET = "\x1b[0m"
+  FG_BLUE = "\x1b[34m"
+  FG_RED = "\x1b[31m"
+else
+  RESET = ''
+  FG_BLUE = ''
+  FG_RED = ''
+end
+
+def print_error(error)
+  warn FG_RED + error.class.name.split('::').last + RESET
+  warn error.message
+end
 
 module Oso
   module Polar
     # Create and manage an instance of the Polar runtime.
-    class Polar
+    class Polar # rubocop:disable Metrics/ClassLength
       # @return [Host]
       attr_reader :host
 
       def initialize
         @ffi_polar = FFI::Polar.create
         @host = Host.new(ffi_polar)
-        @load_queue = Set.new
+
+        # Register built-in classes.
+        register_class PolarBoolean, name: 'Boolean'
+        register_class Integer
+        register_class Float
+        register_class Array, name: 'List'
+        register_class Hash, name: 'Dictionary'
+        register_class String
       end
 
       # Replace the current Polar instance but retain all registered classes and constructors.
       def clear
-        load_queue.clear
         @ffi_polar = FFI::Polar.create
       end
 
-      # Enqueue a Polar policy file for loading into the KB.
+      # Load a Polar policy file.
       #
       # @param name [String]
       # @raise [PolarFileExtensionError] if provided filename has invalid extension.
       # @raise [PolarFileNotFoundError] if provided filename does not exist.
       def load_file(name)
-        raise PolarFileExtensionError unless ['.pol', '.polar'].include? File.extname(name)
-        raise PolarFileNotFoundError, name unless File.file?(name)
+        raise PolarFileExtensionError, name unless File.extname(name) == '.polar'
 
-        load_queue << name
+        file_data = File.open(name, &:read)
+        load_str(file_data, filename: name)
+      rescue Errno::ENOENT
+        raise PolarFileNotFoundError, name
       end
 
       # Load a Polar string into the KB.
@@ -45,7 +81,7 @@ module Oso
       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?
@@ -53,24 +89,28 @@ module Oso
           begin
             Query.new(next_query, host: host).results.next
           rescue StopIteration
-            raise InlineQueryFailedError
+            raise InlineQueryFailedError, next_query.source
           end
         end
       end
 
-      # Query for a predicate, parsing it if necessary.
+      # Query for a Polar predicate or string.
       #
-      # @param query [String or Predicate]
-      # @return Enumerator of resulting bindings
-      # @raise [Error] if the FFI call raises one.
+      # @overload query(query)
+      #   @param query [String]
+      #   @return [Enumerator] of resulting bindings
+      #   @raise [Error] if the FFI call raises one.
+      # @overload query(query)
+      #   @param query [Predicate]
+      #   @return [Enumerator] of resulting bindings
+      #   @raise [Error] if the FFI call raises one.
       def query(query)
-        load_queued_files
         new_host = host.dup
         case query
         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
@@ -81,54 +121,12 @@ module Oso
       #
       # @param name [String]
       # @param args [Array<Object>]
+      # @return [Enumerator] of resulting bindings
       # @raise [Error] if the FFI call raises one.
       def query_rule(name, *args)
         query(Predicate.new(name, args: args))
       end
 
-      # Start a REPL session.
-      #
-      # @raise [Error] if the FFI call raises one.
-      def repl(load: false) # rubocop:disable Metrics/MethodLength
-        ARGV.map { |f| load_file(f) } if load
-        load_queued_files
-
-        loop do
-          print('query> ')
-          begin
-            query = STDIN.readline.chomp.chomp(';')
-          rescue EOFError
-            return
-          end
-
-          begin
-            ffi_query = ffi_polar.new_query_from_str(query)
-          rescue ParseError => e
-            puts("Parse error: " + e.to_s)
-            next
-          end
-
-          begin
-            results = Query.new(ffi_query, host: host).results.to_a
-          rescue PolarRuntimeError => e
-            puts(e.to_s)
-            next
-          end
-
-          if results.empty?
-            pp false
-          else
-            results.each do |result|
-              if result.empty?
-                pp true
-              else
-                pp result
-              end
-            end
-          end
-        end
-      end
-
       # Register a Ruby class with Polar.
       #
       # @param cls [Class]
@@ -136,31 +134,98 @@ module Oso
       # @param from_polar [Proc]
       # @raise [InvalidConstructorError] if provided an invalid 'from_polar' constructor.
       def register_class(cls, name: nil, from_polar: nil)
-        if block_given?
-          from_polar = Proc.new
-        end
+        from_polar = Proc.new if block_given?
         name = host.cache_class(cls, name: name, constructor: from_polar)
         register_constant(name, value: cls)
       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
 
-      # Load all queued files, flushing the {#load_queue}.
-      def load_queued_files
-        load_queue.reject! do |filename|
-          File.open(filename) { |file| load_str(file.read, filename: filename) }
-          true
-        end
+      # Start a REPL session.
+      #
+      # @param files [Array<String>]
+      # @raise [Error] if the FFI call raises one.
+      def repl(files = [])
+        files.map { |f| load_file(f) }
+        prompt = "#{FG_BLUE}query>#{RESET} "
+        # Try loading the readline module from the Ruby stdlib. If we get a
+        # LoadError, fall back to the standard REPL with no readline support.
+        require 'readline'
+        repl_readline(prompt)
+      rescue LoadError
+        repl_standard(prompt)
       end
 
       private
 
       # @return [FFI::Polar]
       attr_reader :ffi_polar
-      # @return [Array<String>]
-      attr_reader :load_queue
+      # @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)
+        while (buf = Readline.readline(prompt, true))
+          if /^\s*$/ =~ buf # Don't add empty entries to history.
+            Readline::HISTORY.pop
+            next
+          end
+          process_line(buf)
+        end
+      rescue Interrupt # rubocop:disable Lint/SuppressedException
+      end
+
+      # The R and L in REPL for systems where readline is not available.
+      def repl_standard(prompt)
+        loop do
+          puts prompt
+          begin
+            buf = $stdin.readline
+          rescue EOFError
+            return
+          end
+          process_line(buf)
+        end
+      rescue Interrupt # rubocop:disable Lint/SuppressedException
+      end
+
+      # Process a line of user input in the REPL.
+      #
+      # @param buf [String]
+      def process_line(buf) # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity, Metrics/AbcSize
+        query = buf.chomp.chomp(';')
+        begin
+          ffi_query = ffi_polar.new_query_from_str(query)
+        rescue ParseError => e
+          print_error(e)
+          return
+        end
+
+        begin
+          results = Query.new(ffi_query, host: host).results.to_a
+        rescue PolarRuntimeError => e
+          print_error(e)
+          return
+        end
+
+        if results.empty?
+          puts false
+        else
+          results.each do |result|
+            if result.empty?
+              puts true
+            else
+              result.each do |variable, value|
+                puts "#{variable} = #{value.inspect}"
+              end
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/oso/polar/query.rb

@@ -3,11 +3,12 @@
 module Oso
   module Polar
     # A single Polar query.
-    class Query
+    class Query # rubocop:disable Metrics/ClassLength
+      # @return [Enumerator]
       attr_reader :results
 
       # @param ffi_query [FFI::Query]
-      # @param ffi_polar [FFI::Polar]
+      # @param host [Oso::Polar::Host]
       def initialize(ffi_query, host:)
         @calls = {}
         @ffi_query = ffi_query
@@ -38,21 +39,22 @@ module Oso
       #
       # @param method [#to_sym]
       # @param call_id [Integer]
-      # @param instance [Hash]
+      # @param instance [Hash<String, Object>]
       # @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(method, call_id:, instance:, args:)
+      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)
         args = args.map { |a| host.to_ruby(a) }
-        if instance['value'].key? 'ExternalInstance'
-          instance_id = instance['value']['ExternalInstance']['instance_id']
-          instance = host.get_instance(instance_id)
-        else
-          instance = host.to_ruby(instance)
-        end
-        result = instance.__send__(method, *args)
+        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,19 +70,18 @@ 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 result of predicate check across FFI boundary.
+      # Send application error across FFI boundary.
       #
-      # @param result [Boolean]
-      # @param call_id [Integer]
+      # @param message [String]
       # @raise [Error] if the FFI call raises one.
       def application_error(message)
         ffi_query.application_error(message)
@@ -92,10 +93,10 @@ module Oso
       # @param method [#to_sym]
       # @param args [Array<Hash>]
       # @param call_id [Integer]
-      # @param instance_id [Integer]
+      # @param instance [Hash<String, Object>]
       # @raise [Error] if the FFI call raises one.
-      def handle_call(method, call_id:, instance:, args:)
-        register_call(method, 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
@@ -105,12 +106,26 @@ 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>]
       # @return [Enumerator]
       # @raise [Error] if any of the FFI calls raise one.
-      def start # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+      def start # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
         Enumerator.new do |yielder| # rubocop:disable Metrics/BlockLength
           loop do # rubocop:disable Metrics/BlockLength
             event = ffi_query.next_event
@@ -120,18 +135,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
-
-              cls_name = event.data['instance']['tag']
-              fields = event.data['instance']['fields']['fields']
-              host.make_instance(cls_name, fields: fields, id: id)
+              handle_make_external(event.data)
             when 'ExternalCall'
               call_id = event.data['call_id']
               instance = event.data['instance']
-              method = event.data['attribute']
-              args = event.data['args']
-              handle_call(method, call_id: call_id, instance: instance, args: args)
+              attribute = event.data['attribute']
+              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']
@@ -139,9 +150,9 @@ module Oso
               answer = host.subspecializer?(instance_id, left_tag: left_tag, right_tag: right_tag)
               question_result(answer, call_id: event.data['call_id'])
             when 'ExternalIsa'
-              instance_id = event.data['instance_id']
+              instance = event.data['instance']
               class_tag = event.data['class_tag']
-              answer = host.isa?(instance_id, class_tag: class_tag)
+              answer = host.isa?(instance, class_tag: class_tag)
               question_result(answer, call_id: event.data['call_id'])
             when 'ExternalUnify'
               left_instance_id = event.data['left_instance_id']
@@ -152,11 +163,11 @@ module Oso
               puts event.data['message'] if event.data['message']
               print 'debug> '
               begin
-                input = STDIN.readline.chomp.chomp(';')
+                input = $stdin.readline.chomp.chomp(';')
               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.3.1'
+  VERSION = '0.6.0'
 end

data/oso-oso.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-byebug', '~> 3.9.0'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'solargraph', '~> 0.39.8'
+  spec.add_development_dependency 'rubocop', '~> 0.89.1'
+  spec.add_development_dependency 'solargraph', '~> 0.39.14'
   spec.add_development_dependency 'yard', '~> 0.9.25'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oso-oso
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Oso Security, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-31 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -66,20 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.89.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.89.1
 - !ruby/object:Gem::Dependency
   name: solargraph
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.39.8
+        version: 0.39.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.39.8
+        version: 0.39.14
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +118,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".solargraph.yml"
 - Gemfile
 - Gemfile.lock
@@ -122,9 +137,11 @@ files:
 - lib/oso/polar/errors.rb
 - lib/oso/polar/ffi.rb
 - lib/oso/polar/ffi/error.rb
+- lib/oso/polar/ffi/message.rb
 - 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