oso-oso 0.23.0 → 0.26.0

data/lib/oso/polar/query.rb

@@ -94,8 +94,7 @@ module Oso
                  else
                    instance.__send__(attribute, *args, **kwargs)
                  end
-        result = JSON.dump(host.to_polar(result))
-        call_result(result, call_id: call_id)
+        call_result(host.to_polar(result), call_id: call_id)
       rescue ArgumentError, NoMethodError => e
         application_error(e.message)
         call_result(nil, call_id: call_id)
@@ -143,7 +142,7 @@ module Oso
           calls[call_id] = value.lazy
         end
 
-        result = JSON.dump(next_call_result(call_id))
+        result = next_call_result(call_id)
         call_result(result, call_id: call_id)
       rescue StopIteration
         call_result(nil, call_id: call_id)
@@ -245,12 +244,23 @@ module Oso
 
       def handle_relationship(call_id, instance, rel) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         typ = host.types[rel.other_type]
-        constraint = ::Oso::Polar::DataFiltering::Filter.new(
-          kind: 'Eq',
-          field: rel.other_field,
-          value: instance.send(rel.my_field)
+
+        cls = typ.klass.get
+
+        condition = ::Oso::Polar::Data::Filter::Condition.new(
+          ::Oso::Polar::Data::Filter::Projection.new(cls, rel.other_field),
+          'Eq',
+          instance.send(rel.my_field)
         )
-        res = typ.exec_query[typ.build_query[[constraint]]]
+
+        filter = ::Oso::Polar::Data::Filter.new(
+          model: cls,
+          relations: [],
+          conditions: [[condition]],
+          types: host.types
+        )
+
+        res = host.adapter.execute_query host.adapter.build_query(filter)
 
         if rel.kind == 'one'
           raise "multiple parents: #{res}" unless res.length == 1
@@ -258,8 +268,7 @@ module Oso
           res = res[0]
         end
 
-        res = JSON.dump host.to_polar res
-        call_result(res, call_id: call_id)
+        call_result(host.to_polar(res), call_id: call_id)
       end
     end
   end

data/lib/oso/polar.rb

@@ -11,6 +11,7 @@ require 'oso/polar/query'
 require 'oso/polar/query_event'
 require 'oso/polar/variable'
 require 'oso/polar/data_filtering'
+require 'oso/polar/data'
 
 module Oso
   # Top-level namespace for Polar language library.

data/lib/oso/version.rb

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

data/lib/oso.rb

@@ -8,7 +8,6 @@ require 'oso/version'
 # Top-level namespace for Oso authorization library.
 module Oso
   Relation = ::Oso::Polar::DataFiltering::Relation
-  Filter = ::Oso::Polar::DataFiltering::Filter
 
   def self.new(not_found_error: NotFoundError, forbidden_error: ForbiddenError, read_action: 'read')
     ::Oso::Oso.new(not_found_error: not_found_error, forbidden_error: forbidden_error, read_action: read_action)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oso-oso
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Oso Security, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-10 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -162,16 +162,18 @@ files:
 - lib/oso/errors.rb
 - lib/oso/oso.rb
 - lib/oso/polar.rb
+- lib/oso/polar/data.rb
+- lib/oso/polar/data/adapter.rb
+- lib/oso/polar/data/adapter/active_record_adapter.rb
+- lib/oso/polar/data/filter.rb
 - lib/oso/polar/data_filtering.rb
 - lib/oso/polar/errors.rb
 - lib/oso/polar/expression.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/ffi/rust_string.rb
 - lib/oso/polar/host.rb
 - lib/oso/polar/pattern.rb
 - lib/oso/polar/polar.rb

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

@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-require 'json'
-
-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(enrich_message)
-          message = JSON.parse(to_s)
-          kind = message['kind']
-          msg = message['msg']
-          msg = enrich_message.call(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/query_event.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Oso
-  module Polar
-    module FFI
-      # Wrapper class for QueryEvent FFI pointer + operations.
-      class QueryEvent < ::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, [FFI::QueryEvent], :int32
-        end
-        private_constant :Rust
-      end
-    end
-  end
-end