insights-api-common 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc3e9311fa97474f63d69e67945cc243bac2f249ab67ab7055e45212727fc130
-  data.tar.gz: 88aabb5afa5ddf89aafe5401342a6954c84523f6f4ecb6b77652b136c4bc58b6
+  metadata.gz: b6498652170c68a06887694e324b8864d318390fc8e5f86f827cb310111c0c71
+  data.tar.gz: 36bf35a644fca5018e0e4a9870bf17d7db4e4b0bf6dde2edaf9e94d17730f653
 SHA512:
-  metadata.gz: 933e547ddc3cab50a6b78051be51195d1ebccb32a48acfcf369429a2a7b751b3a4ba0bd7050496117bcaef5ec238b57e8b5320d70d445748891444143e8fccb5
-  data.tar.gz: bd10b8a9bd50bfe2e7fa90500e733d4517bb48a710582e0a251a33b83ba083dc27e42ea02285df5ae36c633b8a6c49f6640dd9176b0e4090f8ad880a5813eed1
+  metadata.gz: 1b7e883f0a2d5b617892e880ad061c044afa56644e0a2e4da05e7069b45adec29e1a027e9215c001e086dc7d0fddeec0c62d3a110a63e358cb8bdea321ce9155
+  data.tar.gz: c12ce153ce3acfcf141a51609f93f62209c954305070b8fa24574190080e27f032f5b5ca42dbe04e88fbc3109d871570d48522f31b6d98d0077ee0531ee62c9d

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

@@ -25,7 +25,7 @@ module Insights
             end
 
             def api_doc_definition
-              @api_doc_definition ||= api_doc.definitions[model.name]
+              @api_doc_definition ||= api_doc.definitions[name.split("::").last[0..-11].singularize]
             end
 
             def api_version

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

@@ -419,7 +419,7 @@ module Insights
             new_content = openapi_contents.dup
             new_content["paths"] = build_paths.sort.to_h
             new_content["components"] ||= {}
-            new_content["components"]["schemas"]    = schemas.sort.each_with_object({})    { |(name, val), h| h[name] = val || openapi_contents["components"]["schemas"][name]    || {} }
+            new_content["components"]["schemas"]    = schemas.merge(schema_overrides).sort.each_with_object({}) { |(name, val), h| h[name] = val || openapi_contents["components"]["schemas"][name] || {} }
             new_content["components"]["parameters"] = parameters.sort.each_with_object({}) { |(name, val), h| h[name] = val || openapi_contents["components"]["parameters"][name] || {} }
             File.write(openapi_file, JSON.pretty_generate(new_content) + "\n")
             Insights::API::Common::GraphQL::Generator.generate(api_version, new_content) if graphql
@@ -438,6 +438,8 @@ module Insights
                 [key, openapi_schema_properties_value(klass_name, model, key, value)]
               end
             end.compact.sort.to_h
+          rescue NameError
+            openapi_contents["components"]["schemas"][klass_name]["properties"]
           end
 
           def generator_blacklist_attributes
@@ -472,10 +474,12 @@ module Insights
 
           def build_paths
             applicable_rails_routes.each_with_object({}) do |route, expected_paths|
-              without_format = route.path.split("(.:format)").first
-              sub_path = without_format.split(base_path).last.sub(/:[_a-z]*id/, "{id}")
-              klass_name = route.controller.split("/").last.camelize.singularize
-              verb = route.verb.downcase
+              without_format     = route.path.split("(.:format)").first
+              sub_path           = without_format.split(base_path).last.sub(/:[_a-z]*id/, "{id}")
+              route_destination  = route.controller.split("/").last.camelize
+              controller         = "Api::V#{api_version.sub(".", "x")}::#{route_destination}Controller".safe_constantize
+              klass_name         = controller.try(:presentation_name) || route_destination.singularize
+              verb               = route.verb.downcase
               primary_collection = sub_path.split("/")[1].camelize.singularize
 
               expected_paths[sub_path] ||= {}
@@ -513,6 +517,10 @@ module Insights
 
           def handle_custom_route_action(_route_action, _verb, _primary_collection)
           end
+
+          def schema_overrides
+            {}
+          end
         end
       end
     end

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

@@ -9,7 +9,8 @@ module Insights
             encryption_filtered = previous.except(*encrypted_columns_set)
             return encryption_filtered unless arg.key?(:prefixes)
             version = api_version_from_prefix(arg[:prefixes].first)
-            schema  = ::Insights::API::Common::OpenApi::Docs.instance[version].definitions[self.class.name]
+            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|
               next if attrs[name].nil?

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

@@ -1,7 +1,7 @@
 module Insights
   module API
     module Common
-      VERSION = "3.0.0".freeze
+      VERSION = "3.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: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Insights Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_tenant