oso-cloud 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 339079e696596a482f6f1fe6bc875d9f88dc5415b0eaca4b4e7a04304280cc7a
-  data.tar.gz: '099c6b0532405a7fc0cf5933b09ea03991fe43f3e2da6b726d5e33e932706b55'
+  metadata.gz: 9268075db2dd7d76b41905d870962afa84ec350ff9d0b335f4c473cef169868e
+  data.tar.gz: 7eacd7959071d7d2500ceeebf14d09846d5482cd5189139a92667155df796db9
 SHA512:
-  metadata.gz: 441e11c7fdb4b201cf22d84195d7f0cc5454a64186c0078086ae085138a31a8ee10f667f5723b94b467aa74ee89780e1ccd853c435d044f84616b46f78a44527
-  data.tar.gz: 56c4cb7d88820805bbd9238624f8220253c48aa19fdffe71298af26ff9369e3bf5692d49be70f439a582e4f76ff9d4b7458f45a303fa32c02296c5c2324f9f08
+  metadata.gz: 8fbea6dd735db2f768fd9d1c8a6af8b3219abc5e688b3d9bc2e557b512aa9303fa2e6afa792f701aa60bebc0443d6703fa6fcd3e48ce5a6fcfd3aad8a09e17c4
+  data.tar.gz: 84baac085041cf7d3e34c0b2261b3bf66a83245ea82d42b42ed3d47de39600d28939e31bf119d000477d5e67dce09a40a3a4a64bd60ecf0bf80ceb1d2f3d8c97

data/.rubocop.yml

@@ -0,0 +1,5 @@
+AllCops:
+  TargetRubyVersion: 3.0.0
+  Exclude:
+    - "bin/**/*"
+  NewCops: enable

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oso-cloud (1.0.1)
+    oso-cloud (1.1.1)
       faraday (~> 2.5.2)
       faraday-retry (~> 2.0.0)
 

data/lib/oso/api.rb

@@ -4,6 +4,7 @@ require 'faraday'
 require 'faraday/retry'
 
 require 'oso/helpers'
+require 'oso/version'
 
 module OsoCloud
   # @!visibility private
@@ -26,8 +27,7 @@ module OsoCloud
 
     # @!visibility private
     class Policy
-      attr_reader :filename
-      attr_reader :src
+      attr_reader :filename, :src
 
       def initialize(filename:, src:)
         @filename = filename
@@ -40,29 +40,27 @@ module OsoCloud
       attr_reader :policy
 
       def initialize(policy:)
-        if policy.is_a? Policy
-          @policy = policy
-        else
-          @policy = Policy.new(**policy)
-        end
+        @policy = if policy.is_a? Policy
+                    policy
+                  else
+                    Policy.new(**policy)
+                  end
       end
     end
 
     # @!visibility private
     class Fact
-      attr_reader :predicate
-      attr_reader :args
+      attr_reader :predicate, :args
 
       def initialize(predicate:, args:)
         @predicate = predicate
-        @args = args.map { |v| if v.is_a? Value then v else Value.new(**v) end }
+        @args = args.map { |v| (v.is_a? Value) ? v : Value.new(**v) }
       end
     end
 
     # @!visibility private
     class Value
-      attr_reader :type
-      attr_reader :id
+      attr_reader :type, :id
 
       def initialize(type:, id:)
         @type = type
@@ -72,12 +70,11 @@ module OsoCloud
 
     # @!visibility private
     class Bulk
-      attr_reader :delete
-      attr_reader :tell
+      attr_reader :delete, :tell
 
       def initialize(delete:, tell:)
-        @delete = delete.map { |v| if v.is_a? Fact then v else Fact.new(**v) end }
-        @tell = tell.map { |v| if v.is_a? Fact then v else Fact.new(**v) end }
+        @delete = delete.map { |v| (v.is_a? Fact) ? v : Fact.new(**v) }
+        @tell = tell.map { |v| (v.is_a? Fact) ? v : Fact.new(**v) }
       end
     end
 
@@ -92,12 +89,7 @@ module OsoCloud
 
     # @!visibility private
     class AuthorizeQuery
-      attr_reader :actor_type
-      attr_reader :actor_id
-      attr_reader :action
-      attr_reader :resource_type
-      attr_reader :resource_id
-      attr_reader :context_facts
+      attr_reader :actor_type, :actor_id, :action, :resource_type, :resource_id, :context_facts
 
       def initialize(actor_type:, actor_id:, action:, resource_type:, resource_id:, context_facts:)
         @actor_type = actor_type
@@ -105,7 +97,7 @@ module OsoCloud
         @action = action
         @resource_type = resource_type
         @resource_id = resource_id
-        @context_facts = context_facts.map { |v| if v.is_a? Fact then v else Fact.new(**v) end }
+        @context_facts = context_facts.map { |v| (v.is_a? Fact) ? v : Fact.new(**v) }
       end
     end
 
@@ -114,24 +106,20 @@ module OsoCloud
       attr_reader :results
 
       def initialize(results:)
-        @results = results.map { |v| if v.is_a? Value then v else Value.new(**v) end }
+        @results = results.map { |v| (v.is_a? Value) ? v : Value.new(**v) }
       end
     end
 
     # @!visibility private
     class AuthorizeResourcesQuery
-      attr_reader :actor_type
-      attr_reader :actor_id
-      attr_reader :action
-      attr_reader :resources
-      attr_reader :context_facts
+      attr_reader :actor_type, :actor_id, :action, :resources, :context_facts
 
       def initialize(actor_type:, actor_id:, action:, resources:, context_facts:)
         @actor_type = actor_type
         @actor_id = actor_id
         @action = action
-        @resources = resources.map { |v| if v.is_a? Value then v else Value.new(**v) end }
-        @context_facts = context_facts.map { |v| if v.is_a? Fact then v else Fact.new(**v) end }
+        @resources = resources.map { |v| (v.is_a? Value) ? v : Value.new(**v) }
+        @context_facts = context_facts.map { |v| (v.is_a? Fact) ? v : Fact.new(**v) }
       end
     end
 
@@ -146,18 +134,14 @@ module OsoCloud
 
     # @!visibility private
     class ListQuery
-      attr_reader :actor_type
-      attr_reader :actor_id
-      attr_reader :action
-      attr_reader :resource_type
-      attr_reader :context_facts
+      attr_reader :actor_type, :actor_id, :action, :resource_type, :context_facts
 
       def initialize(actor_type:, actor_id:, action:, resource_type:, context_facts:)
         @actor_type = actor_type
         @actor_id = actor_id
         @action = action
         @resource_type = resource_type
-        @context_facts = context_facts.map { |v| if v.is_a? Fact then v else Fact.new(**v) end }
+        @context_facts = context_facts.map { |v| (v.is_a? Fact) ? v : Fact.new(**v) }
       end
     end
 
@@ -172,18 +156,14 @@ module OsoCloud
 
     # @!visibility private
     class ActionsQuery
-      attr_reader :actor_type
-      attr_reader :actor_id
-      attr_reader :resource_type
-      attr_reader :resource_id
-      attr_reader :context_facts
+      attr_reader :actor_type, :actor_id, :resource_type, :resource_id, :context_facts
 
       def initialize(actor_type:, actor_id:, resource_type:, resource_id:, context_facts:)
         @actor_type = actor_type
         @actor_id = actor_id
         @resource_type = resource_type
         @resource_id = resource_id
-        @context_facts = context_facts.map { |v| if v.is_a? Fact then v else Fact.new(**v) end }
+        @context_facts = context_facts.map { |v| (v.is_a? Fact) ? v : Fact.new(**v) }
       end
     end
 
@@ -192,30 +172,27 @@ module OsoCloud
       attr_reader :results
 
       def initialize(results:)
-        @results = results.map { |v| if v.is_a? Fact then v else Fact.new(**v) end }
+        @results = results.map { |v| (v.is_a? Fact) ? v : Fact.new(**v) }
       end
     end
 
     # @!visibility private
     class Query
-      attr_reader :fact
-      attr_reader :context_facts
+      attr_reader :fact, :context_facts
 
       def initialize(fact:, context_facts:)
-        if fact.is_a? Fact
-          @fact = fact
-        else
-          @fact = Fact.new(**fact)
-        end
-        @context_facts = context_facts.map { |v| if v.is_a? Fact then v else Fact.new(**v) end }
+        @fact = if fact.is_a? Fact
+                  fact
+                else
+                  Fact.new(**fact)
+                end
+        @context_facts = context_facts.map { |v| (v.is_a? Fact) ? v : Fact.new(**v) }
       end
     end
 
     # @!visibility private
     class StatsResult
-      attr_reader :num_roles
-      attr_reader :num_relations
-      attr_reader :num_facts
+      attr_reader :num_roles, :num_relations, :num_facts
 
       def initialize(num_roles:, num_relations:, num_facts:)
         @num_roles = num_roles
@@ -224,7 +201,6 @@ module OsoCloud
       end
     end
 
-
     # @!visibility private
     class Api
       def initialize(url: 'https://cloud.osohq.com', api_key: nil, options: nil)
@@ -246,7 +222,7 @@ module OsoCloud
             retry_statuses: [429, 500, 502, 503, 504],
             # ensure authorize and related check functions are retried because
             # they are POST requests, which are not retried automatically
-            retry_if: ->(env, _exc) {
+            retry_if: lambda { |env, _exc|
               %w[
                 /api/authorize
                 /api/authorize_resources
@@ -254,18 +230,18 @@ module OsoCloud
                 /api/actions
                 /api/query
               ].include? env.url.path
-            },
+            }
           }
 
-          if (options && options[:test_adapter])
+          if options && options[:test_adapter]
             faraday.adapter :test do |stub|
-              stub.post(options[:test_adapter][:path]) do |env|
+              stub.post(options[:test_adapter][:path]) do |_env|
                 options[:test_adapter][:func].call
               end
-              stub.get(options[:test_adapter][:path]) do |env|
+              stub.get(options[:test_adapter][:path]) do |_env|
                 options[:test_adapter][:func].call
               end
-              stub.delete(options[:test_adapter][:path]) do |env|
+              stub.delete(options[:test_adapter][:path]) do |_env|
                 options[:test_adapter][:func].call
               end
             end
@@ -274,12 +250,13 @@ module OsoCloud
           end
         end
         @api_key = api_key
+        @user_agent = "Oso Cloud (ruby #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}; rv:#{VERSION})"
       end
 
-      def get_policy()
+      def get_policy
         params = {}
         data = nil
-        url = "/policy"
+        url = '/policy'
         result = GET(url, params, data)
         GetPolicyResult.new(**result)
       end
@@ -287,7 +264,7 @@ module OsoCloud
       def post_policy(data)
         params = {}
         data = OsoCloud::Helpers.to_hash(data)
-        url = "/policy"
+        url = '/policy'
         result = POST(url, params, data)
         ApiResult.new(**result)
       end
@@ -295,7 +272,7 @@ module OsoCloud
       def post_facts(data)
         params = {}
         data = OsoCloud::Helpers.to_hash(data)
-        url = "/facts"
+        url = '/facts'
         result = POST(url, params, data)
         Fact.new(**result)
       end
@@ -303,7 +280,7 @@ module OsoCloud
       def delete_facts(data)
         params = {}
         data = OsoCloud::Helpers.to_hash(data)
-        url = "/facts"
+        url = '/facts'
         result = DELETE(url, params, data)
         ApiResult.new(**result)
       end
@@ -311,7 +288,7 @@ module OsoCloud
       def post_bulk_load(data)
         params = {}
         data = OsoCloud::Helpers.to_hash(data)
-        url = "/bulk_load"
+        url = '/bulk_load'
         result = POST(url, params, data)
         ApiResult.new(**result)
       end
@@ -319,7 +296,7 @@ module OsoCloud
       def post_bulk_delete(data)
         params = {}
         data = OsoCloud::Helpers.to_hash(data)
-        url = "/bulk_delete"
+        url = '/bulk_delete'
         result = POST(url, params, data)
         ApiResult.new(**result)
       end
@@ -327,7 +304,7 @@ module OsoCloud
       def post_bulk(data)
         params = {}
         data = OsoCloud::Helpers.to_hash(data)
-        url = "/bulk"
+        url = '/bulk'
         result = POST(url, params, data)
         ApiResult.new(**result)
       end
@@ -335,7 +312,7 @@ module OsoCloud
       def post_authorize(data)
         params = {}
         data = OsoCloud::Helpers.to_hash(data)
-        url = "/authorize"
+        url = '/authorize'
         result = POST(url, params, data)
         AuthorizeResult.new(**result)
       end
@@ -343,7 +320,7 @@ module OsoCloud
       def post_authorize_resources(data)
         params = {}
         data = OsoCloud::Helpers.to_hash(data)
-        url = "/authorize_resources"
+        url = '/authorize_resources'
         result = POST(url, params, data)
         AuthorizeResourcesResult.new(**result)
       end
@@ -351,7 +328,7 @@ module OsoCloud
       def post_list(data)
         params = {}
         data = OsoCloud::Helpers.to_hash(data)
-        url = "/list"
+        url = '/list'
         result = POST(url, params, data)
         ListResult.new(**result)
       end
@@ -359,7 +336,7 @@ module OsoCloud
       def post_actions(data)
         params = {}
         data = OsoCloud::Helpers.to_hash(data)
-        url = "/actions"
+        url = '/actions'
         result = POST(url, params, data)
         ActionsResult.new(**result)
       end
@@ -367,33 +344,34 @@ module OsoCloud
       def post_query(data)
         params = {}
         data = OsoCloud::Helpers.to_hash(data)
-        url = "/query"
+        url = '/query'
         result = POST(url, params, data)
         QueryResult.new(**result)
       end
 
-      def get_stats()
+      def get_stats
         params = {}
         data = nil
-        url = "/stats"
+        url = '/stats'
         result = GET(url, params, data)
         StatsResult.new(**result)
       end
 
-      def clear_data()
+      def clear_data
         params = {}
         data = nil
-        url = "/clear_data"
+        url = '/clear_data'
         result = POST(url, params, data)
         ApiResult.new(**result)
       end
 
-
       # hard-coded, not generated
       def get_facts(predicate, args)
         params = {}
-        params["predicate"] = predicate
+        params['predicate'] = predicate
         args.each_with_index do |arg, i|
+          next if arg.nil?
+
           arg_query = OsoCloud::Helpers.extract_arg_query(arg)
           if arg_query
             params["args.#{i}.type"] = arg_query.type
@@ -401,26 +379,26 @@ module OsoCloud
           end
         end
         data = nil
-        url = "/facts"
+        url = '/facts'
         result = GET(url, params, data)
         result.map { |v| Fact.new(**v) }
       end
 
-      def headers()
+      def headers
         {
-          "Authorization" => "Bearer %s" % @api_key,
-          "User-Agent" => "Oso Cloud (ruby)",
-          "Accept": "application/json",
-          "Content-Type": "application/json",
-          "X-OsoApiVersion": "0"
+          'Authorization' => format('Bearer %s', @api_key),
+          'User-Agent' => @user_agent,
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+          'X-OsoApiVersion': '0'
         }
       end
 
-      def GET(path, params, body)
-        response = @connection.get("api#{path}", params, headers )
+      def GET(path, params, _body)
+        response = @connection.get("api#{path}", params, headers)
         handle_faraday_response response
-      rescue Faraday::Error => error
-        handle_faraday_error error
+      rescue Faraday::Error => e
+        handle_faraday_error e
       end
 
       def POST(path, params, body)
@@ -428,8 +406,8 @@ module OsoCloud
           req.params = params
         end
         handle_faraday_response response
-      rescue Faraday::Error => error
-        handle_faraday_error error
+      rescue Faraday::Error => e
+        handle_faraday_error e
       end
 
       def DELETE(path, params, body)
@@ -437,12 +415,12 @@ module OsoCloud
           req.body = body
         end
         handle_faraday_response response
-      rescue Faraday::Error => error
-        handle_faraday_error error
+      rescue Faraday::Error => e
+        handle_faraday_error e
       end
 
       def handle_faraday_response(response)
-        # TODO:(@patrickod) refactor duplicative JSON parsing
+        # TODO: (@patrickod) refactor duplicative JSON parsing
         JSON.parse(response.env[:raw_body], symbolize_names: true)
       end
 
@@ -453,6 +431,5 @@ module OsoCloud
         raise ApiError.new(message: e.message)
       end
     end
-
   end
 end

data/lib/oso/helpers.rb

@@ -3,9 +3,9 @@ module OsoCloud
   module Helpers
     # @!visibility private
     def self.extract_value(x)
-      return OsoCloud::Core::Value.new(type: "String", id: x) if x.is_a? String
+      return OsoCloud::Core::Value.new(type: 'String', id: x) if x.is_a? String
 
-      return nil if x.nil?
+      return OsoCloud::Core::Value.new(type: nil, id: nil) if x.nil?
 
       type = (x.type.nil? ? nil : x.type.to_s)
       id = (x.id.nil? ? nil : x.id.to_s)
@@ -14,17 +14,33 @@ module OsoCloud
 
     # @!visibility private
     def self.extract_arg_query(x)
-      self.extract_value(x)
+      extract_value(x)
     end
 
     # @!visibility private
     def self.param_to_fact(predicate, args)
-      OsoCloud::Core::Fact.new(predicate: predicate, args: args.map { |a| self.extract_value(a) })
+      OsoCloud::Core::Fact.new(predicate: predicate, args: args.map { |a| extract_value(a) })
     end
 
     # @!visibility private
     def self.params_to_facts(facts)
-      facts.map { |predicate, *args| self.param_to_fact(predicate, args) }
+      facts.map { |predicate, *args| param_to_fact(predicate, args) }
+    end
+
+    # @!visibility private
+    def self.facts_to_params(facts)
+      facts.map do |f|
+        name = f.predicate
+        args = f.args.map do |a|
+          v = from_value(a)
+          if v.is_a? Hash
+            OsoCloud::Value.new(type: v[:type], id: v[:id])
+          else
+            v
+          end
+        end
+        [name, *args]
+      end
     end
 
     def self.from_value(value)
@@ -34,25 +50,24 @@ module OsoCloud
         else
           { type: value.type }
         end
+      elsif value.type == 'String'
+        value.id
       else
-        if value.type == "String"
-          value.id
-        else
-          { id: value.id, type: value.type }
-        end
+        { id: value.id, type: value.type }
       end
     end
 
     # @!visibility private
     def self.to_hash(o)
-      return o.map { |v| self.to_hash(v) } if o.is_a? Array
+      return o.map { |v| to_hash(v) } if o.is_a? Array
       return o if o.instance_variables.empty?
+
       hash = {}
-      o.instance_variables.each { |var|
-        v = var.to_s.delete("@")
+      o.instance_variables.each do |var|
+        v = var.to_s.delete('@')
         value = o.send(v)
-        hash[v] = self.to_hash(value)
-      }
+        hash[v] = to_hash(value)
+      end
       hash
     end
   end

data/lib/oso/oso.rb

@@ -10,11 +10,9 @@ require 'oso/helpers'
 # For more detailed documentation, see
 # https://www.osohq.com/docs/reference/client-apis/ruby
 module OsoCloud
-
   # Represents an object in your application, with a type and id.
   # Both "type" and "id" should be strings.
-  Value = Struct::new(:type, :id, keyword_init: true) do
-
+  Value = Struct.new(:type, :id, keyword_init: true) do
     def to_api_value
       OsoCloud::Helpers.extract_value(self)
     end
@@ -43,7 +41,7 @@ module OsoCloud
     # @param policy [String]
     # @return [nil]
     def policy(policy)
-      @api.post_policy(OsoCloud::Core::Policy.new(src: policy, filename: ""))
+      @api.post_policy(OsoCloud::Core::Policy.new(src: policy, filename: ''))
       nil
     end
 
@@ -58,18 +56,18 @@ module OsoCloud
     # @param resource [OsoCloud::Value]
     # @param context_facts [Array<fact>]
     # @return [Boolean]
-    # @see Oso more information about facts
+    # @see Oso for more information about facts
     def authorize(actor, action, resource, context_facts = [])
       actor_typed_id = actor.to_api_value
       resource_typed_id = resource.to_api_value
       result = @api.post_authorize(OsoCloud::Core::AuthorizeQuery.new(
-        actor_type: actor_typed_id.type,
-        actor_id: actor_typed_id.id,
-        action: action,
-        resource_type: resource_typed_id.type,
-        resource_id: resource_typed_id.id,
-        context_facts: OsoCloud::Helpers.params_to_facts(context_facts)
-      ))
+                                     actor_type: actor_typed_id.type,
+                                     actor_id: actor_typed_id.id,
+                                     action: action,
+                                     resource_type: resource_typed_id.type,
+                                     resource_id: resource_typed_id.id,
+                                     context_facts: OsoCloud::Helpers.params_to_facts(context_facts)
+                                   ))
       result.allowed
     end
 
@@ -84,7 +82,7 @@ module OsoCloud
     # @param resources [Array<OsoCloud::Value>]
     # @param context_facts [Array<fact>]
     # @return [Array<OsoCloud::Value>]
-    # @see Oso more information about facts
+    # @see Oso for more information about facts
     def authorize_resources(actor, action, resources, context_facts = [])
       return [] if resources.nil?
       return [] if resources.empty?
@@ -99,26 +97,23 @@ module OsoCloud
         actor_type: actor_typed_id.type, actor_id: actor_typed_id.id,
         action: action,
         resources: resources_extracted,
-        context_facts: OsoCloud::Helpers::params_to_facts(context_facts)
+        context_facts: OsoCloud::Helpers.params_to_facts(context_facts)
       )
       result = @api.post_authorize_resources(data)
 
       return [] if result.results.empty?
 
-      results_lookup = Hash.new
+      results_lookup = {}
       result.results.each do |r|
         k = key.call(r.type, r.id)
-        if results_lookup[k] == nil
-          results_lookup[k] = true
-        end
+        results_lookup[k] = true if results_lookup[k].nil?
       end
 
-      results = resources.select do |r|
+      resources.select do |r|
         e = r.to_api_value
         exists = results_lookup[key.call(e.type, e.id)]
         exists
       end
-      results
     end
 
     ##
@@ -132,16 +127,16 @@ module OsoCloud
     # @param resource_type [String]
     # @param context_facts [Array<fact>]
     # @return [Array<String>]
-    # @see Oso more information about facts
+    # @see Oso for more information about facts
     def list(actor, action, resource_type, context_facts = [])
       actor_typed_id = actor.to_api_value
       result = @api.post_list(OsoCloud::Core::ListQuery.new(
-        actor_type: actor_typed_id.type,
-        actor_id: actor_typed_id.id,
-        action: action,
-        resource_type: resource_type,
-        context_facts: OsoCloud::Helpers.params_to_facts(context_facts)
-      ))
+                                actor_type: actor_typed_id.type,
+                                actor_id: actor_typed_id.id,
+                                action: action,
+                                resource_type: resource_type,
+                                context_facts: OsoCloud::Helpers.params_to_facts(context_facts)
+                              ))
       result.results
     end
 
@@ -154,17 +149,17 @@ module OsoCloud
     # @param resource [OsoCloud::Value]
     # @param context_facts [Array<fact>]
     # @return [Array<String>]
-    # @see Oso more information about facts
+    # @see Oso for more information about facts
     def actions(actor, resource, context_facts = [])
       actor_typed_id = actor.to_api_value
       resource_typed_id = resource.to_api_value
       result = @api.post_actions(OsoCloud::Core::ActionsQuery.new(
-        actor_type: actor_typed_id.type,
-        actor_id: actor_typed_id.id,
-        resource_type: resource_typed_id.type,
-        resource_id: resource_typed_id.id,
-        context_facts: OsoCloud::Helpers.params_to_facts(context_facts)
-      ))
+                                   actor_type: actor_typed_id.type,
+                                   actor_id: actor_typed_id.id,
+                                   resource_type: resource_typed_id.type,
+                                   resource_id: resource_typed_id.id,
+                                   context_facts: OsoCloud::Helpers.params_to_facts(context_facts)
+                                 ))
       result.results
     end
 
@@ -177,7 +172,7 @@ module OsoCloud
     # @param args [*[String, OsoCloud::Value]]
     # @return [nil]
     def tell(name, *args)
-      typed_args = args.map { |a| OsoCloud::Helpers.extract_value(a)}
+      typed_args = args.map { |a| OsoCloud::Helpers.extract_value(a) }
       @api.post_facts(OsoCloud::Core::Fact.new(predicate: name, args: typed_args))
       nil
     end
@@ -189,7 +184,7 @@ module OsoCloud
     #
     # @param facts [Array<fact>]
     # @return [nil]
-    # @see Oso more information about facts
+    # @see Oso for more information about facts
     def bulk_tell(facts)
       @api.post_bulk_load(OsoCloud::Helpers.params_to_facts(facts))
       nil
@@ -217,12 +212,32 @@ module OsoCloud
     #
     # @param facts [Array<fact>]
     # @return [nil]
-    # @see Oso more information about facts
+    # @see Oso for more information about facts
     def bulk_delete(facts)
       @api.post_bulk_delete(OsoCloud::Helpers.params_to_facts(facts))
       nil
     end
 
+    ##
+    # Transactionally delete and insert fact(s)
+    #
+    # Delete(s) are processed before insertion(s). nil arguments in facts to be
+    # deleted act as wildcards. Does not throw an error if facts to be deleted
+    # are not found or facts to be inserted already exist.
+    #
+    #
+    # Throws an OsoCloud::Core::Api exception if error returned from server.
+    #
+    # @param delete [Array<fact>]
+    # @param insert [Array<fact>]
+    # @return [nil]
+    # @see Oso for more information about facts
+    def bulk(delete: [], insert: [])
+      @api.post_bulk(OsoCloud::Core::Bulk.new(delete: OsoCloud::Helpers.params_to_facts(delete),
+                                              tell: OsoCloud::Helpers.params_to_facts(insert)))
+      nil
+    end
+
     ##
     # List facts
     #
@@ -233,23 +248,27 @@ module OsoCloud
     # @param name [String]
     # @param args [*[String, OsoCloud::Value, nil]]
     # @return [Array<fact>]
-    # @see Oso more information about facts
+    # @see Oso for more information about facts
     def get(name, *args)
-      @api.get_facts(name, args).map do |f|
-        name = f.predicate
-        args = f.args.map do |a|
-          v = OsoCloud::Helpers.from_value(a)
-          if v.is_a? Hash
-            OsoCloud::Value.new(type: v[:type], id: v[:id])
-          else
-            v
-          end
-        end
-        [name, *args]
-      end
+      OsoCloud::Helpers.facts_to_params(@api.get_facts(name, args))
     end
 
-
-    # TODO query, bulk
+    ##
+    # List added and derived facts
+    #
+    # Lists facts that are stored in Oso Cloud in addition to derived facts
+    # from evaluating the policy. nil arguments operate as wildcards.
+    #
+    # @param name [String]
+    # @param args [Array<[String, OsoCloud::Value, nil]>]
+    # @param context_facts [Array<fact>]
+    # @return [Array<fact>]
+    # @see Oso for more information about facts
+    def query(name, *args, context_facts: [])
+      typed_args = args.map { |a| OsoCloud::Helpers.extract_value(a) }
+      result = @api.post_query(OsoCloud::Core::Query.new(fact: OsoCloud::Helpers.param_to_fact(name, typed_args),
+                                                         context_facts: OsoCloud::Helpers.params_to_facts(context_facts)))
+      OsoCloud::Helpers.facts_to_params(result.results)
+    end
   end
 end

data/lib/oso/version.rb

@@ -1,3 +1,3 @@
 module OsoCloud
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oso-cloud
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Oso Security, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-29 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
 - README.md