foreman_expire_hosts 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a6df2938b1dd23bcc51ceeec5b038f7b4cbbb86
-  data.tar.gz: 5d0d5c9d10dc61ca98425b68eb012bc06f4dea3d
+  metadata.gz: dff569ea01095e51ec33f834ac418f0727562f74
+  data.tar.gz: 0ee7ddb292e6c9939363cbc11d1e824b137b30af
 SHA512:
-  metadata.gz: 473e5e92b4df667cd758a6abb628cbf8d47a4521e8de5b184b792a41110a91c0c402a5e27876598d9e7c15e317a0b1e06637d6eda2ba219627a327ebadf3a9b0
-  data.tar.gz: 4070af0f6b9ab0703edba57c4fe6c086496c62abce17386906f122ae6f929557b28c1f1907579016e8cc6a69e7975a489f415c1bf44026c78870050a56efeae5
+  metadata.gz: 6ec7cc032b18d3f485060ecad97a57a2de20355b9ed719380f7a9b425155f18b0aa4f276649bb06e138822fcc3f7a8eb3604180f2b8d4b61dd69564ee0b3ea66
+  data.tar.gz: 6c62884427e54bc0900810558e346534685ae53942799138e0f97c65353b594ee8a2e4e9fe6d8baac42e4f16324d5aa9886f973e9351828585351e545e2b05ee

data/README.md

@@ -13,6 +13,7 @@ This plugin will send two warning notification before host expiry (see Settings)
 | Foreman Version | Plugin Version |
 | --------------- | -------------- |
 | >= 1.11         | ~> 2.0         |
+| >= 1.13         | ~> 2.1         |
 
 # Screenshots
 ![Expiry date field in host form](https://raw.githubusercontent.com/ingenico-group/screenshots/master/foreman_host_expiry/expiry-date-field-in-host-form.png)

data/app/models/concerns/foreman_expire_hosts/host_ext.rb

@@ -4,7 +4,6 @@ module ForemanExpireHosts
 
     included do
       after_validation :validate_expired_on
-      attr_accessible :expired_on
 
       validates :expired_on, :presence => true, :if => -> { Setting[:is_host_expiry_date_mandatory] }
 

data/lib/expire_hosts_notifications.rb

@@ -33,13 +33,13 @@ module ExpireHostsNotifications
       unless deleted_hosts.empty?
         ExpireHostsNotifications.hosts_by_user(deleted_hosts).each do |user_id, hosts_hash|
           catch_delivery_errors(_('Failed to deliver deleted hosts notification'), deleted_hosts) do
-            ExpireHostsMailer.deleted_hosts_notification(hosts_hash['email'], hosts_hash['hosts']).deliver
+            ExpireHostsMailer.deleted_hosts_notification(hosts_hash['email'], hosts_hash['hosts']).deliver_now
           end
         end
       end
       return if failed_delete_hosts.empty?
       catch_delivery_errors(_('Failed to deliver deleted hosts notification failed status'), failed_delete_hosts) do
-        ExpireHostsMailer.failed_to_delete_hosts_notification(self.admin_email, failed_delete_hosts).deliver
+        ExpireHostsMailer.failed_to_delete_hosts_notification(self.admin_email, failed_delete_hosts).deliver_now
       end
     end
 
@@ -65,13 +65,13 @@ module ExpireHostsNotifications
         delete_date = (Date.today + self.days_to_delete_after_expired.to_i)
         hosts_by_user(stopped_hosts).each do |user_id, hosts_hash|
           catch_delivery_errors(_('Failed to deliver stopped hosts notification'), stopped_hosts) do
-            ExpireHostsMailer.stopped_hosts_notification(hosts_hash['email'], delete_date, hosts_hash['hosts']).deliver
+            ExpireHostsMailer.stopped_hosts_notification(hosts_hash['email'], delete_date, hosts_hash['hosts']).deliver_now
           end
         end
       end
       return if failed_stop_hosts.empty?
       catch_delivery_errors(_('Failed to deliver stopped hosts notification failed status'), failed_stop_hosts) do
-        ExpireHostsMailer.failed_to_stop_hosts_notification(self.admin_email, failed_stop_hosts).deliver
+        ExpireHostsMailer.failed_to_stop_hosts_notification(self.admin_email, failed_stop_hosts).deliver_now
       end
     end
 
@@ -83,7 +83,7 @@ module ExpireHostsNotifications
       unless notifiable_hosts.empty?
         hosts_by_user(notifiable_hosts).each do |user_id, hosts_hash|
           catch_delivery_errors(_('Failed to deliver expiring hosts notification'), notifiable_hosts) do
-            ExpireHostsMailer.expiry_warning_notification(hosts_hash['email'], expiry_date, hosts_hash['hosts']).deliver
+            ExpireHostsMailer.expiry_warning_notification(hosts_hash['email'], expiry_date, hosts_hash['hosts']).deliver_now
           end
         end
       end

data/lib/foreman_expire_hosts/engine.rb

@@ -23,9 +23,12 @@ module ForemanExpireHosts
 
     initializer 'foreman_expire_hosts.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_expire_hosts do
-        requires_foreman '>= 1.10'
+        requires_foreman '>= 1.13'
         register_custom_status HostStatus::ExpirationStatus
 
+        # strong parameters
+        parameter_filter Host::Managed, :expires_on
+
         security_block :hosts do
           permission :edit_hosts, {:hosts => [:select_multiple_expiration, :update_multiple_expiration]}
         end

data/lib/foreman_expire_hosts/version.rb

@@ -1,3 +1,3 @@
 module ForemanExpireHosts
-  VERSION = '2.0.2'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/test/unit/expire_hosts_mailer_test.rb

@@ -9,7 +9,7 @@ class ExpireHostMailerTest < ActionMailer::TestCase
 
   context 'deleted hosts notification' do
     setup do
-      @mail = ExpireHostsMailer.deleted_hosts_notification(@emails, @hosts).deliver
+      @mail = ExpireHostsMailer.deleted_hosts_notification(@emails, @hosts).deliver_now
     end
 
     test 'subject should be set' do
@@ -20,7 +20,7 @@ class ExpireHostMailerTest < ActionMailer::TestCase
 
   context 'failed to delete hosts notification' do
     setup do
-      @mail = ExpireHostsMailer.failed_to_delete_hosts_notification(@emails, @hosts).deliver
+      @mail = ExpireHostsMailer.failed_to_delete_hosts_notification(@emails, @hosts).deliver_now
     end
 
     test 'subject should be set' do
@@ -31,7 +31,7 @@ class ExpireHostMailerTest < ActionMailer::TestCase
 
   context 'stopped hosts notification' do
     setup do
-      @mail = ExpireHostsMailer.stopped_hosts_notification(@emails, Date.today, @hosts).deliver
+      @mail = ExpireHostsMailer.stopped_hosts_notification(@emails, Date.today, @hosts).deliver_now
     end
 
     test 'subject should be set' do
@@ -42,7 +42,7 @@ class ExpireHostMailerTest < ActionMailer::TestCase
 
   context 'failed to stop hosts notification' do
     setup do
-      @mail = ExpireHostsMailer.failed_to_stop_hosts_notification(@emails, @hosts).deliver
+      @mail = ExpireHostsMailer.failed_to_stop_hosts_notification(@emails, @hosts).deliver_now
     end
 
     test 'subject should be set' do
@@ -53,7 +53,7 @@ class ExpireHostMailerTest < ActionMailer::TestCase
 
   context 'expiry warning notification' do
     setup do
-      @mail = ExpireHostsMailer.expiry_warning_notification(@emails, Date.today, @hosts).deliver
+      @mail = ExpireHostsMailer.expiry_warning_notification(@emails, Date.today, @hosts).deliver_now
     end
 
     test 'subject should be set' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_expire_hosts
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Nagarjuna Rachaneni
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Foreman plugin for limiting host lifetime
@@ -155,4 +155,3 @@ test_files:
 - test/unit/concerns/host_extensions_test.rb
 - test/unit/expire_hosts_mailer_test.rb
 - test/unit/host_status/expiration_status_test.rb
-has_rdoc: