foreman_host_extra_validator 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d036c7bd2e21429b39a6167f5f978c1af7b38a0f36d59fdd2837ab4a6811960
-  data.tar.gz: 5c5c8dbc081a24a6f37fae3a81c15f6243e4188e143139c79731a5fef097e651
+  metadata.gz: 8f63f5ef9b4443c4a4fa5de029faf95a398b04de7872698dc031ca4ce92c6763
+  data.tar.gz: 6586b166074731b6178d7b80eecc8f4284319e0233db05c29eb5e91498afe723
 SHA512:
-  metadata.gz: 274523920b8f3a7f6adcfaa5c17621a40cbcb10033c15f3abcd368a462e575ad49defd87c3dbe5dbd6dfa29d97cf02e36a8c8baf050cfab53c05c4eba0c6128a
-  data.tar.gz: 48f52bb0e608d559c6478051a6ee2e17557aaf9729eab1c07c7bd1ad431bf47e2cae9e027cae3070b35f1c474c597184a604c12e5f6f05a4f1781f8e36aead79
+  metadata.gz: 289de1db84110f537572bb1b0dc9dc1cc156d6d61d7bccf20af34ed73d81261b3880fd528012bdb146822bbb8e205644b30048e2432eba19d60ae7380ede931e
+  data.tar.gz: 408256808741d275497f67c73f8ea9e97522fe35617954996769a845e20c05e18d4c2044f98970f7eaa0e1762e826a3f287852c9631850b31c484911a24d4052

data/db/migrate/20220923181701_fix_extra_validation_settings_category_to_dsl.rb

@@ -0,0 +1,5 @@
+class FixExtraValidationSettingsCategoryToDsl < ActiveRecord::Migration[6.0]
+  def up
+    Setting.where(category: 'Setting::ForemanHostExtraValidator').update_all(category: 'Setting')
+  end
+end

data/lib/foreman_host_extra_validator/engine.rb

@@ -4,26 +4,33 @@ module ForemanHostExtraValidator
 
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
 
-    initializer 'foreman_host_extra_validator.load_default_settings', :before => :load_config_initializers do |_app|
-      require_dependency File.expand_path('../../app/models/setting/foreman_host_extra_validator.rb', __dir__) if begin
-                                                                                                                         Setting.table_exists?
-                                                                                                                       rescue
-                                                                                                                         (false)
-                                                                                                                       end
+    # Add any db migrations
+    initializer 'foreman_host_extra_validator.load_app_instance_data' do |app|
+      ForemanHostExtraValidator::Engine.paths['db/migrate'].existent.each do |path|
+        app.config.paths['db/migrate'] << path
+      end
     end
 
     initializer 'foreman_host_extra_validator.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_host_extra_validator do
-        requires_foreman '>= 1.18'
+        requires_foreman '>= 3.0.0'
+
+        settings do
+          category(:host_extra_validator, N_('Host Extra Validator')) do
+            setting('host_name_validation_regex',
+                    description: N_('Default regex the name of a host is validated against'),
+                    type: :string,
+                    default: '^[a-zA-Z0-9\-_]+$',
+                    full_name: N_('Regular expresssion'))
+          end
+        end
       end
     end
 
     config.to_prepare do
-      begin
-        Host::Managed.send(:include, ForemanHostExtraValidator::HostExtensions)
-      rescue => e
-        Rails.logger.warn "ForemanHostExtraValidator: skipping engine hook (#{e})\n#{e.backtrace}"
-      end
+      Host::Managed.include ForemanHostExtraValidator::HostExtensions
+    rescue => e
+      Rails.logger.warn "ForemanHostExtraValidator: skipping engine hook (#{e})\n#{e.backtrace}"
     end
 
     initializer 'foreman_host_extra_validator.register_gettext', after: :load_config_initializers do |_app|

data/lib/foreman_host_extra_validator/version.rb

@@ -1,3 +1,3 @@
 module ForemanHostExtraValidator
-  VERSION = '0.1.0'
+  VERSION = '0.2.1'
 end

data/test/unit/foreman_host_extra_validator_test.rb

@@ -2,7 +2,6 @@ require 'test_plugin_helper'
 
 class ForemanHostExtraValidatorTest < ActiveSupport::TestCase
   setup do
-    Setting::ForemanHostExtraValidator.load_defaults
     disable_orchestration
     User.current = FactoryBot.build(:user, :admin)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_host_extra_validator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Timo Goebel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2022-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -49,7 +49,7 @@ files:
 - README.md
 - Rakefile
 - app/models/concerns/foreman_host_extra_validator/host_extensions.rb
-- app/models/setting/foreman_host_extra_validator.rb
+- db/migrate/20220923181701_fix_extra_validation_settings_category_to_dsl.rb
 - lib/foreman_host_extra_validator.rb
 - lib/foreman_host_extra_validator/engine.rb
 - lib/foreman_host_extra_validator/version.rb
@@ -65,7 +65,7 @@ homepage: https://github.com/theforeman/foreman_host_extra_validator
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -80,11 +80,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: This plugin adds extra validations to a host.
 test_files:
-- test/unit/foreman_host_extra_validator_test.rb
 - test/test_plugin_helper.rb
+- test/unit/foreman_host_extra_validator_test.rb

data/app/models/setting/foreman_host_extra_validator.rb

@@ -1,16 +0,0 @@
-class Setting
-  class ForemanHostExtraValidator < ::Setting
-    def self.load_defaults
-      # Check the table exists
-      return unless super
-
-      self.transaction do
-        [
-          self.set('host_name_validation_regex', _('Default regex the name of a host is validated against'), '^[a-zA-Z0-9\-_]+$')
-        ].compact.each { |s| self.create! s.update(:category => 'Setting::ForemanHostExtraValidator') }
-      end
-
-      true
-    end
-  end
-end