foreman_openscap 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9252b8e5a2b6e1d8c6fb846ad7d9057ba60791dd5f1dba7a64bb5e38899ddb56
-  data.tar.gz: ce78ad017257f0ed398b3e898d4e3245083e0fe6d0c0011e89f4760049090969
+  metadata.gz: f4a4ecc74498e831daaf3b06da9a2ab475c1eac67f34ef698fe7aabc949e7fa3
+  data.tar.gz: b917c3d1c392311306404f261541bbabbc63fcabdfb5ee277a25a794eb3cf0f2
 SHA512:
-  metadata.gz: c15b7190aea03e446fa77c35c162453d93c755888630efc4db503543f823769dba36a3ab071631d522d9ed39d556ab0637758e9dd9cc2e35f019f0c7a20da7e3
-  data.tar.gz: 14de584928d7d4f2913deb9c93b9d634a8f5c491929eed27242c8ce05f9cd65927b3df2e9bf1f348d4285cd112500578516b7d0e4bd505b8469216bad65d14aa
+  metadata.gz: 2f50b5057eac300b2f23d006d2523d0a1241d1133ce108a2836f4833a1b491a8b365ba3bb9428b9a120b7c89bf1278274844eb8e02304d2dc8edc37952477629
+  data.tar.gz: d7c772636e3a3406cf1df32cdb6521716800acc61b31825ed7a9c1d4819411ca4047aaf43c16c346eb715b83c7778b5b37daf6d41ad38a20b89435be4b5466c0

data/app/models/concerns/foreman_openscap/hostgroup_extensions.rb

@@ -22,18 +22,10 @@ module ForemanOpenscap
     end
 
     def inherited_openscap_proxy_id
-      inherited_ancestry_attribute(:openscap_proxy_id)
-    end
-
-    unless defined?(Katello::System)
-      private
-
-      def inherited_ancestry_attribute(attribute)
-        if ancestry.present?
-          self[attribute] || self.class.sort_by_ancestry(ancestors.where("#{attribute} is not NULL")).last.try(attribute)
-        else
-          self.send(attribute)
-        end
+      if ancestry.present?
+        self[:openscap_proxy_id] || self.class.sort_by_ancestry(ancestors.where.not(openscap_proxy_id: nil)).last.try(:openscap_proxy_id)
+      else
+        self.send(:openscap_proxy_id)
       end
     end
   end

data/app/models/concerns/foreman_openscap/openscap_proxy_core_extensions.rb

@@ -33,10 +33,6 @@ module ForemanOpenscap
       end
     end
 
-    def inherited_openscap_proxy_id
-      inherited_ancestry_attribute(:openscap_proxy_id)
-    end
-
     private
 
     def scap_client_lookup_values_for(lookup_keys, model_match)

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "4.0.3".freeze
+  VERSION = "4.0.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -349,52 +349,52 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports
 test_files:
-- test/factories/policy_factory.rb
-- test/factories/compliance_host_factory.rb
 - test/factories/arf_report_factory.rb
 - test/factories/asset_factory.rb
+- test/factories/compliance_host_factory.rb
 - test/factories/compliance_log_factory.rb
-- test/factories/scap_content_related.rb
 - test/factories/policy_arf_report_factory.rb
-- test/test_plugin_helper.rb
-- test/unit/policy_test.rb
-- test/unit/services/lookup_key_overrider_test.rb
-- test/unit/services/report_dashboard/data_test.rb
-- test/unit/services/hostgroup_overrider_test.rb
-- test/unit/services/config_name_service_test.rb
-- test/unit/services/tailoring_files_proxy_check_test.rb
-- test/unit/policy_mailer_test.rb
-- test/unit/tailoring_file_test.rb
-- test/unit/scap_content_test.rb
-- test/unit/message_cleaner_test.rb
-- test/unit/arf_report_status_calculator_test.rb
-- test/unit/compliance_status_test.rb
-- test/unit/openscap_host_test.rb
-- test/unit/concerns/openscap_proxy_extenstions_test.rb
-- test/unit/concerns/host_extensions_test.rb
-- test/unit/arf_report_test.rb
-- test/lib/foreman_openscap/bulk_upload_test.rb
-- test/functional/tailoring_files_controller_test.rb
-- test/functional/api/v2/compliance/scap_content_profiles_controller_test.rb
-- test/functional/api/v2/compliance/tailoring_files_controller_test.rb
+- test/factories/policy_factory.rb
+- test/factories/scap_content_related.rb
+- test/files/arf_report/arf_report.bz2
+- test/files/arf_report/arf_report.html
+- test/files/arf_report/arf_report.json
+- test/files/arf_report/arf_report_msg_desc_changed.json
+- test/files/arf_report/arf_report_msg_value_changed.json
+- test/files/scap_contents/ssg-fedora-ds.xml
+- test/files/tailoring_files/ssg-firefox-ds-tailoring-2.xml
+- test/files/tailoring_files/ssg-firefox-ds-tailoring.xml
+- test/functional/api/v2/compliance/arf_reports_controller_test.rb
 - test/functional/api/v2/compliance/policies_controller_test.rb
+- test/functional/api/v2/compliance/scap_content_profiles_controller_test.rb
 - test/functional/api/v2/compliance/scap_contents_controller_test.rb
-- test/functional/api/v2/compliance/arf_reports_controller_test.rb
+- test/functional/api/v2/compliance/tailoring_files_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
 - test/functional/arf_reports_controller_test.rb
 - test/functional/openscap_proxies_controller_test.rb
-- test/helpers/policy_dashboard_helper_test.rb
+- test/functional/tailoring_files_controller_test.rb
 - test/helpers/arf_report_dashboard_helper_test.rb
-- test/files/arf_report/arf_report.json
-- test/files/arf_report/arf_report_msg_desc_changed.json
-- test/files/arf_report/arf_report.html
-- test/files/arf_report/arf_report.bz2
-- test/files/arf_report/arf_report_msg_value_changed.json
-- test/files/scap_contents/ssg-fedora-ds.xml
-- test/files/tailoring_files/ssg-firefox-ds-tailoring.xml
-- test/files/tailoring_files/ssg-firefox-ds-tailoring-2.xml
+- test/helpers/policy_dashboard_helper_test.rb
+- test/lib/foreman_openscap/bulk_upload_test.rb
+- test/unit/arf_report_status_calculator_test.rb
+- test/unit/arf_report_test.rb
+- test/unit/compliance_status_test.rb
+- test/unit/concerns/host_extensions_test.rb
+- test/unit/concerns/openscap_proxy_extenstions_test.rb
+- test/unit/message_cleaner_test.rb
+- test/unit/openscap_host_test.rb
+- test/unit/policy_mailer_test.rb
+- test/unit/scap_content_test.rb
+- test/unit/services/config_name_service_test.rb
+- test/unit/services/hostgroup_overrider_test.rb
+- test/unit/services/lookup_key_overrider_test.rb
+- test/unit/services/report_dashboard/data_test.rb
+- test/unit/services/tailoring_files_proxy_check_test.rb
+- test/unit/tailoring_file_test.rb
+- test/unit/policy_test.rb
+- test/test_plugin_helper.rb