Merge pull request #63 from internetee/15-disputed-status

Allow WhoisRecord with reserved status to be both active/inactive

app/models/whois_record.rb

@@ -7,12 +7,15 @@ class WhoisRecord < ActiveRecord::Base
   DISCARDED = 'deleteCandidate'.freeze
   AT_AUCTION = 'AtAuction'.freeze
   PENDING_REGISTRATION = 'PendingRegistration'.freeze
+  DISPUTED = 'Disputed'.freeze
 
   TEMPLATE_DIR = File.join(File.dirname(__FILE__), '../views/whois_record/').freeze
   TEMPLATE_INACTIVE = (TEMPLATE_DIR + "inactive.erb").freeze
   LEGAL_PERSON_TEMPLATE = (TEMPLATE_DIR + "legal_person.erb").freeze
   PRIVATE_PERSON_TEMPLATE = (TEMPLATE_DIR + "private_person.erb").freeze
 
+  INACTIVE_STATUSES = [BLOCKED, DISCARDED, AT_AUCTION, PENDING_REGISTRATION].freeze
+
   def unix_body
     file = File.new(template)
     ERB.new(file.read, nil, "-").result(binding)
@@ -38,6 +41,12 @@ def tech_contacts
     json['tech_contacts'].map { |serialized_contact| deserialize_contact(serialized_contact) }
   end
 
+  def active?
+    return false if json['registered'].nil?
+
+    (json['status'] & INACTIVE_STATUSES).empty?
+  end
+
   private
 
   def deserialize_registrant
@@ -61,8 +70,4 @@ def private_or_legal_person_template
       LEGAL_PERSON_TEMPLATE
     end
   end
-
-  def active?
-    (([BLOCKED, RESERVED, DISCARDED, AT_AUCTION, PENDING_REGISTRATION] & json['status']).empty?)
-  end
 end

test/models/whois_record_test.rb

@@ -65,4 +65,35 @@ def test_returns_inactive_record_unix_body_when_domain_is_pending_registration
 
     assert_equal expected_output, @whois_record.unix_body
   end
+
+  def test_reserved_record_is_active_if_registered
+    @whois_record = WhoisRecord.new(name: 'shop.test',
+      json: { name: 'shop.test',
+              registered: Time.now,
+              status: [WhoisRecord::RESERVED] })
+    assert @whois_record.active?
+  end
+
+  def test_reserved_record_is_inactive_if_unregistered
+    @whois_record = WhoisRecord.new(name: 'shop.test',
+      json: { name: 'shop.test',
+              status: [WhoisRecord::RESERVED] })
+    assert !@whois_record.active?
+  end
+
+  def test_disputed_record_is_active_if_registered
+    @whois_record = WhoisRecord.new(name: 'shop.test',
+      json: { name: 'shop.test',
+              registered: Time.now,
+              status: [WhoisRecord::DISPUTED] })
+    assert @whois_record.active?
+  end
+
+  def test_disputed_record_is_inactive_if_unregistered
+    @whois_record = WhoisRecord.new(name: 'shop.test',
+      json: { name: 'shop.test',
+              status: [WhoisRecord::DISPUTED] })
+    assert !@whois_record.active?
+  end
+
 end