insights-api-common 4.0.3 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 972f294824d5a600f98ee785b45a310d83b2b056d1bc9e8fee4af2afd1d43f9c
-  data.tar.gz: 93f294e0f183debaa844c4ff4272c4fa921a8aef51269d0caffbe8a630a84de7
+  metadata.gz: e43686bd25c46149f1fd5886e5c60452fd04a06c183042ea4f678f227a6b1ca6
+  data.tar.gz: 882ea648b87f2ee1d7c6c8fa171e85f828c1c46ad818799f3e0d638b4e7b9384
 SHA512:
-  metadata.gz: 7f12eb12ddd1bd97b486d88e09463c5ac29f95350ad5431c1ff292df6eb222700628d9a8e0cc055ec7942a0e5a8814aad7249edfd4603f691d6426d85faceef1
-  data.tar.gz: df4bbc507ad58eb38b94e8bddebd3dd3060a3f4eff33d807b85a88cfd5d9fa33ade8239db2dbae7197b56548fec1fbf456a953fa57226be2b9da1b709f04c0ca
+  metadata.gz: cc9dd41c400b94bf67648ac2ddf0f6b5d30ec44ed17cc5f3294155e518908911e261cd5b304518ed9f730840695c06a2b5ecbbc05a6149f38571d95c1d4d8748
+  data.tar.gz: 92e36a165e0b440a279951f6d5a0e8ddd516eb439b9b31768be0ef880350eacf52b8ec2286552f112553eec01cf72e2ba3d2bb635d6791cdab3ea6e134c267d6

data/lib/insights/api/common/application_controller_mixins/exception_handling.rb

@@ -45,7 +45,7 @@ module Insights
           end
 
           def api_client_errors(exc, error_document)
-            body = JSON.parse(exc.response_body)
+            body = json_parsed_body(exc)
             if body.is_a?(Hash) && body.key?('errors') && body['errors'].is_a?(Array)
               body['errors'].each do |error|
                 next unless error.key?('status') && error.key?('detail')
@@ -56,6 +56,12 @@ module Insights
               error_document.add(exc.code.to_s, exc.message )
             end
           end
+
+          def json_parsed_body(exc)
+            JSON.parse(exc.response_body)
+          rescue StandardError
+            nil
+          end
         end
       end
     end

data/lib/insights/api/common/open_api.rb

@@ -1,2 +1,3 @@
 require "insights/api/common/open_api/docs"
+require "insights/api/common/open_api/version_from_prefix"
 require "insights/api/common/open_api/serializer"

data/lib/insights/api/common/open_api/serializer.rb

@@ -3,27 +3,40 @@ module Insights
     module Common
       module OpenApi
         module Serializer
+          include VersionFromPrefix
+
           def as_json(arg = {})
-            previous = super
+            previous = super(:except => _excluded_attributes(arg))
+
             encrypted_columns_set = (self.class.try(:encrypted_columns) || []).to_set
             encryption_filtered = previous.except(*encrypted_columns_set)
             return encryption_filtered unless arg.key?(:prefixes)
-            version = api_version_from_prefix(arg[:prefixes].first)
-            presentation_name = self.class.try(:presentation_name) || self.class.name
-            schema  = ::Insights::API::Common::OpenApi::Docs.instance[version].definitions[presentation_name]
-            attrs   = encryption_filtered.slice(*schema["properties"].keys)
-            schema["properties"].keys.each do |name|
+
+            attrs = encryption_filtered.slice(*_schema_properties(arg).keys)
+            _schema_properties(arg).keys.each do |name|
               next if attrs[name].nil?
               attrs[name] = attrs[name].iso8601 if attrs[name].kind_of?(Time)
               attrs[name] = attrs[name].to_s if name.ends_with?("_id") || name == "id"
-              attrs[name] = self.public_send(name) if !attrs.key?(name) && !encrypted_columns_set.include?(name)
             end
             attrs.compact
           end
 
-          def api_version_from_prefix(prefix)
-            /\/?\w+\/v(?<major>\d+)[x\.]?(?<minor>\d+)?\// =~ prefix
-            [major, minor].compact.join(".")
+          private
+
+          def _excluded_attributes(arg)
+            return [] unless arg.key?(:prefixes)
+
+            self.attributes.keys - _schema_properties(arg).keys
+          end
+
+          def _schema_properties(arg)
+            @schema_properties ||= _schema(arg)["properties"]
+          end
+
+          def _schema(arg)
+            version = api_version_from_prefix(arg[:prefixes].first)
+            presentation_name = self.class.try(:presentation_name) || self.class.name
+            ::Insights::API::Common::OpenApi::Docs.instance[version].definitions[presentation_name]
           end
         end
       end

data/lib/insights/api/common/open_api/version_from_prefix.rb

@@ -0,0 +1,14 @@
+module Insights
+  module API
+    module Common
+      module OpenApi
+        module VersionFromPrefix
+          def api_version_from_prefix(prefix)
+            /\/?\w+\/v(?<major>\d+)[x\.]?(?<minor>\d+)?\// =~ prefix
+            [major, minor].compact.join(".")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/insights/api/common/version.rb

@@ -1,7 +1,7 @@
 module Insights
   module API
     module Common
-      VERSION = "4.0.3".freeze
+      VERSION = "4.1.0".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: insights-api-common
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.1.0
 platform: ruby
 authors:
 - Insights Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_tenant
@@ -292,16 +292,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -371,6 +371,7 @@ files:
 - lib/insights/api/common/open_api/docs/object_definition.rb
 - lib/insights/api/common/open_api/generator.rb
 - lib/insights/api/common/open_api/serializer.rb
+- lib/insights/api/common/open_api/version_from_prefix.rb
 - lib/insights/api/common/option_redirect_enhancements.rb
 - lib/insights/api/common/paginated_response.rb
 - lib/insights/api/common/paginated_response_v2.rb