From 57170cae301215b992f398853732d00e7efe3119 Mon Sep 17 00:00:00 2001
From: mo khan <mo@mokhan.ca>
Date: Fri, 21 Feb 2014 20:30:42 -0700
Subject: move active and expired to license status namespace.

---
 app/models/active_status.rb          | 11 -----------
 app/models/expired_status.rb         | 10 ----------
 app/models/license_status.rb         |  4 ++--
 app/models/license_status/active.rb  |  7 +++++++
 app/models/license_status/expired.rb |  6 ++++++
 5 files changed, 15 insertions(+), 23 deletions(-)
 delete mode 100644 app/models/active_status.rb
 delete mode 100644 app/models/expired_status.rb
 create mode 100644 app/models/license_status/active.rb
 create mode 100644 app/models/license_status/expired.rb

diff --git a/app/models/active_status.rb b/app/models/active_status.rb
deleted file mode 100644
index efb2db4..0000000
--- a/app/models/active_status.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class ActiveStatus
-  def initialize(name)
-    @name = name
-  end
-
-  def filter(licenses)
-    today = DateTime.now
-    licenses.where('issued_at < ? AND expired_at > ?', today, today)
-  end
-end
-
diff --git a/app/models/expired_status.rb b/app/models/expired_status.rb
deleted file mode 100644
index 11ee7f7..0000000
--- a/app/models/expired_status.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class ExpiredStatus
-  def initialize(name)
-    @name = name
-  end
-
-  def filter(licenses)
-    today = DateTime.now
-    licenses.where('expired_at < ?', today)
-  end
-end
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/license_status/active.rb b/app/models/license_status/active.rb
new file mode 100644
index 0000000..80d950d
--- /dev/null
+++ b/app/models/license_status/active.rb
@@ -0,0 +1,7 @@
+class LicenseStatus::Active
+  def filter(licenses)
+    today = DateTime.now
+    licenses.where('issued_at < ? AND expired_at > ?', today, today)
+  end
+end
+
diff --git a/app/models/license_status/expired.rb b/app/models/license_status/expired.rb
new file mode 100644
index 0000000..1b339c6
--- /dev/null
+++ b/app/models/license_status/expired.rb
@@ -0,0 +1,6 @@
+class LicenseStatus::Expired
+  def filter(licenses)
+    today = DateTime.now
+    licenses.where('expired_at < ?', today)
+  end
+end
-- 
cgit v1.2.3