intruder updated

2 files changed, 25 insertions, 13 deletions

diff --git a/app/models/intruder.rb b/app/models/intruder.rb
index 192d64d..c013ee8 100644
--- a/app/models/intruder.rb
+++ b/app/models/intruder.rb
@@ -1,3 +1,26 @@
 class Intruder < ActiveRecord::Base
   attr_accessible :list_type, :key, :points, :bans, :ban_last, :ban_end, :contact_ip, :contact_port, :contact_count, :contact_last, :contacts_per_second, :contacts_per_second_max, :user_agent, :to_user, :comment
+
+  LIST_TYPES = ['blacklist', 'whitelist']
+
+  validates :list_type,
+            :presence => true,
+            :inclusion => { :in => LIST_TYPES }
+
+  validates :key,
+            :presence => true,
+            :uniqueness => true
+
+  validates :contact_ip,
+            :presence => true,
+            :uniqueness => true
+
+  before_validation :set_key_if_empty
+
+  private
+  def set_key_if_empty
+    if self.key.blank?
+      self.key = self.contact_ip
+    end
+  end
 end
diff --git a/app/views/intruders/_form_core.html.haml b/app/views/intruders/_form_core.html.haml
index ae2da39..780d8cd 100644
--- a/app/views/intruders/_form_core.html.haml
+++ b/app/views/intruders/_form_core.html.haml
@@ -1,16 +1,5 @@
 .inputs
-  = f.input :list_type, :label => t('intruders.form.list_type.label'), :hint => conditional_hint('intruders.form.list_type.hint')
-  = f.input :key, :label => t('intruders.form.key.label'), :hint => conditional_hint('intruders.form.key.hint')
-  = f.input :points, :label => t('intruders.form.points.label'), :hint => conditional_hint('intruders.form.points.hint')
-  = f.input :bans, :label => t('intruders.form.bans.label'), :hint => conditional_hint('intruders.form.bans.hint')
-  = f.input :ban_last, :label => t('intruders.form.ban_last.label'), :hint => conditional_hint('intruders.form.ban_last.hint')
-  = f.input :ban_end, :label => t('intruders.form.ban_end.label'), :hint => conditional_hint('intruders.form.ban_end.hint')
+  = f.input :list_type, :collection => Intruder::LIST_TYPES, :label => t('intruders.form.list_type.label'), :hint => conditional_hint('intruders.form.list_type.hint'), :include_blank => false
   = f.input :contact_ip, :label => t('intruders.form.contact_ip.label'), :hint => conditional_hint('intruders.form.contact_ip.hint')
-  = f.input :contact_port, :label => t('intruders.form.contact_port.label'), :hint => conditional_hint('intruders.form.contact_port.hint')
-  = f.input :contact_count, :label => t('intruders.form.contact_count.label'), :hint => conditional_hint('intruders.form.contact_count.hint')
-  = f.input :contact_last, :label => t('intruders.form.contact_last.label'), :hint => conditional_hint('intruders.form.contact_last.hint')
-  = f.input :contacts_per_second, :label => t('intruders.form.contacts_per_second.label'), :hint => conditional_hint('intruders.form.contacts_per_second.hint')
-  = f.input :contacts_per_second_max, :label => t('intruders.form.contacts_per_second_max.label'), :hint => conditional_hint('intruders.form.contacts_per_second_max.hint')
-  = f.input :user_agent, :label => t('intruders.form.user_agent.label'), :hint => conditional_hint('intruders.form.user_agent.hint')
-  = f.input :to_user, :label => t('intruders.form.to_user.label'), :hint => conditional_hint('intruders.form.to_user.hint')
+  = f.input :ban_end, :label => t('intruders.form.ban_end.label'), :hint => conditional_hint('intruders.form.ban_end.hint')
   = f.input :comment, :label => t('intruders.form.comment.label'), :hint => conditional_hint('intruders.form.comment.hint')