4 files changed, 31 insertions, 24 deletions
diff --git a/app/designs/identity/cert_fingerprints_by_expiry.js b/app/designs/identity/cert_fingerprints_by_expiry.js
new file mode 100644
index 0000000..995219b
--- /dev/null
+++ b/app/designs/identity/cert_fingerprints_by_expiry.js
@@ -0,0 +1,12 @@
+function(doc) {
+  if (doc.type != 'Identity') {
+    return;
+  }
+  if (typeof doc.cert_fingerprints === "object") {
+    for (fp in doc.cert_fingerprints) {
+      if (doc.cert_fingerprints.hasOwnProperty(fp)) {
+        emit(doc.cert_fingerprints[fp], fp);
+      }
+    }
+  }
+}
diff --git a/app/designs/identity/disabled.js b/app/designs/identity/disabled.js
new file mode 100644
index 0000000..5509575
--- /dev/null
+++ b/app/designs/identity/disabled.js
@@ -0,0 +1,8 @@
+function(doc) {
+  if (doc.type != 'Identity') {
+    return;
+  }
+  if (typeof doc.user_id === "undefined") {
+    emit(doc._id, 1);
+  }
+}
diff --git a/app/designs/identity/pgp_key_by_email.js b/app/designs/identity/pgp_key_by_email.js
new file mode 100644
index 0000000..f783908
--- /dev/null
+++ b/app/designs/identity/pgp_key_by_email.js
@@ -0,0 +1,8 @@
+function(doc) {
+  if (doc.type != 'Identity') {
+    return;
+  }
+  if (typeof doc.keys === "object") {
+    emit(doc.address, doc.keys["pgp"]);
+  }
+}
diff --git a/app/models/identity.rb b/app/models/identity.rb
index 1d69437..9dc9c7a 100644
--- a/app/models/identity.rb
+++ b/app/models/identity.rb
@@ -18,32 +18,11 @@ class Identity < CouchRest::Model::Base
   validate :destination_email
 
   design do
+    own_path = Pathname.new(File.dirname(__FILE__))
+    load_views(own_path.join('..', 'designs', 'identity'), nil)
     view :by_user_id
     view :by_address_and_destination
     view :by_address
-    view :pgp_key_by_email,
-      map: <<-EOJS
-      function(doc) {
-        if (doc.type != 'Identity') {
-          return;
-        }
-        if (typeof doc.keys === "object") {
-          emit(doc.address, doc.keys["pgp"]);
-        }
-      }
-    EOJS
-    view :disabled,
-      map: <<-EOJS
-      function(doc) {
-        if (doc.type != 'Identity') {
-          return;
-        }
-        if (typeof doc.user_id === "undefined") {
-          emit(doc._id, 1);
-        }
-      }
-    EOJS
-
   end
 
   def self.address_starts_with(query)
@@ -146,7 +125,7 @@ class Identity < CouchRest::Model::Base
   end
 
   def register_cert(cert)
-    expiry = cert.expiry.to_data.to_s
+    expiry = cert.expiry.to_date.to_s
     write_attribute 'cert_fingerprints',
       cert_fingerprints.merge(cert.fingerprint => expiry)
   end