move active and expired to license status namespace.

3 files changed, 4 insertions, 12 deletions

diff --git a/app/models/license_status.rb b/app/models/license_status.rb
index 82af2fd..998792f 100644
--- a/app/models/license_status.rb
+++ b/app/models/license_status.rb
@@ -1,6 +1,6 @@
 class LicenseStatus
-  ACTIVE=ActiveStatus.new("active")
-  EXPIRED=ExpiredStatus.new("expired")
+  ACTIVE=Active.new
+  EXPIRED=Expired.new
   CONFIDENTIAL=Confidential.new
 
   ALL=[ACTIVE, EXPIRED, CONFIDENTIAL]
diff --git a/app/models/active_status.rb b/app/models/license_status/active.rb
index efb2db4..80d950d 100644
--- a/app/models/active_status.rb
+++ b/app/models/license_status/active.rb
@@ -1,8 +1,4 @@
-class ActiveStatus
-  def initialize(name)
-    @name = name
-  end
-
+class LicenseStatus::Active
   def filter(licenses)
     today = DateTime.now
     licenses.where('issued_at < ? AND expired_at > ?', today, today)
diff --git a/app/models/expired_status.rb b/app/models/license_status/expired.rb
index 11ee7f7..1b339c6 100644
--- a/app/models/expired_status.rb
+++ b/app/models/license_status/expired.rb
@@ -1,8 +1,4 @@
-class ExpiredStatus
-  def initialize(name)
-    @name = name
-  end
-
+class LicenseStatus::Expired
   def filter(licenses)
     today = DateTime.now
     licenses.where('expired_at < ?', today)