mailcatcher 0.3.1 → 0.3.2

data/lib/mail_catcher/mail.rb

@@ -6,7 +6,7 @@ module MailCatcher::Mail
   class << self
     def db
       @@__db ||= begin
-        SQLite3::Database.new(':memory:', :results_as_hash => true, :type_translation => true).tap do |db|
+        SQLite3::Database.new(':memory:', :type_translation => true).tap do |db|
           db.execute(<<-SQL)
             CREATE TABLE message (
               id INTEGER PRIMARY KEY ASC,
@@ -15,6 +15,7 @@ module MailCatcher::Mail
               subject TEXT,
               source BLOB,
               size TEXT,
+              type TEXT,
               created_at DATETIME DEFAULT CURRENT_DATETIME
             )
           SQL
@@ -37,10 +38,10 @@ module MailCatcher::Mail
     end
     
     def add_message(message)
-      @@add_message_query ||= db.prepare("INSERT INTO message (sender, recipients, subject, source, size, created_at) VALUES (?, ?, ?, ?, ?, datetime('now'))")
+      @@add_message_query ||= db.prepare("INSERT INTO message (sender, recipients, subject, source, type, size, created_at) VALUES (?, ?, ?, ?, ?, ?, datetime('now'))")
       
       mail = Mail.new(message[:source])
-      result = @@add_message_query.execute(message[:sender], message[:recipients].to_json, mail.subject, message[:source], message[:source].length)
+      result = @@add_message_query.execute(message[:sender], message[:recipients].to_json, mail.subject, message[:source], mail.mime_type || 'text/plain', message[:source].length)
       message_id = db.last_insert_row_id
       parts = mail.all_parts
       parts = [mail] if parts.empty?
@@ -69,8 +70,8 @@ module MailCatcher::Mail
     
     def messages
       @@messages_query ||= db.prepare "SELECT id, sender, recipients, subject, size, created_at FROM message ORDER BY created_at DESC"
-      @@messages_query.execute.to_a.tap do |messages|
-        messages.each do |message|
+      @@messages_query.execute.map do |row|
+        Hash[row.fields.zip(row)].tap do |message|
           message["recipients"] &&= ActiveSupport::JSON.decode message["recipients"]
         end
       end
@@ -78,43 +79,55 @@ module MailCatcher::Mail
     
     def message(id)
       @@message_query ||= db.prepare "SELECT * FROM message WHERE id = ? LIMIT 1"
-      @@message_query.execute(id).next.to_hash.tap do |message|
+      row = @@message_query.execute(id).next
+      row && Hash[row.fields.zip(row)].tap do |message|
         message["recipients"] &&= ActiveSupport::JSON.decode message["recipients"]
       end
     end
     
     def message_has_html?(id)
-      @@message_has_html_query ||= db.prepare "SELECT 1 FROM message_part WHERE message_id = ? AND is_attachment = 0 AND type = 'text/html' LIMIT 1"
-      !!@@message_has_html_query.execute(id).next
+      @@message_has_html_query ||= db.prepare "SELECT 1 FROM message_part WHERE message_id = ? AND is_attachment = 0 AND type IN ('application/xhtml+xml', 'text/html') LIMIT 1"
+      (!!@@message_has_html_query.execute(id).next) || ['text/html', 'application/xhtml+xml'].include?(message(id)["type"])
     end
     
     def message_has_plain?(id)
-      @@message_has_html_query ||= db.prepare "SELECT 1 FROM message_part WHERE message_id = ? AND is_attachment = 0 AND type = 'text/plain' LIMIT 1"
-      !!@@message_has_html_query.execute(id).next
+      @@message_has_plain_query ||= db.prepare "SELECT 1 FROM message_part WHERE message_id = ? AND is_attachment = 0 AND type = 'text/plain' LIMIT 1"
+      (!!@@message_has_plain_query.execute(id).next) || message(id)["type"] == "text/plain"
     end
     
     def message_parts(id)
       @@message_parts_query ||= db.prepare "SELECT cid, type, filename, size FROM message_part WHERE message_id = ? ORDER BY filename ASC"
-      @@message_parts_query.execute(id).to_a
+      @@message_parts_query.execute(id).map do |row|
+        Hash[row.fields.zip(row)]
+      end
     end
     
     def message_attachments(id)
       @@message_parts_query ||= db.prepare "SELECT cid, type, filename, size FROM message_part WHERE message_id = ? AND is_attachment = 1 ORDER BY filename ASC"
-      @@message_parts_query.execute(id).to_a
+      @@message_parts_query.execute(id).map do |row|
+        Hash[row.fields.zip(row)]
+      end
     end
     
     def message_part(message_id, part_id)
       @@message_part_query ||= db.prepare "SELECT * FROM message_part WHERE message_id = ? AND id = ? LIMIT 1"
-      @@message_part_query.execute(message_id, part_id).next
+      row = @@message_part_query.execute(message_id, part_id).next
+      row && Hash[row.fields.zip(row)]
     end
     
     def message_part_type(message_id, part_type)
       @@message_part_type_query ||= db.prepare "SELECT * FROM message_part WHERE message_id = ? AND type = ? AND is_attachment = 0 LIMIT 1"
-      @@message_part_type_query.execute(message_id, part_type).next
+      row = @@message_part_type_query.execute(message_id, part_type).next
+      row && Hash[row.fields.zip(row)]
     end
     
     def message_part_html(message_id)
-      message_part_type message_id, "text/html"
+      part = message_part_type(message_id, "text/html")
+      part ||= message_part_type(message_id, "application/xhtml+xml")
+      part ||= begin
+        message = message(message_id)
+        message if ['text/html', 'application/xhtml+xml'].include? message["type"]
+      end
     end
     
     def message_part_plain(message_id)
@@ -123,7 +136,11 @@ module MailCatcher::Mail
     
     def message_part_cid(message_id, cid)
       @@message_part_cid_query ||= db.prepare 'SELECT * FROM message_part WHERE message_id = ?'
-      @@message_part_cid_query.execute(message_id).find { |part| part["cid"] == cid }
+      @@message_part_cid_query.execute(message_id).map do |row|
+        part = Hash[row.fields.zip(row)]
+      end.find do |part|
+        part["cid"] == cid
+      end
     end
   end
 end

data/lib/mail_catcher/web.rb

@@ -40,7 +40,7 @@ module MailCatcher
             "source",
             ("html" if MailCatcher::Mail.message_has_html? id),
             ("plain" if MailCatcher::Mail.message_has_plain? id),
-          ].flatten,
+          ].compact,
           "attachments" => MailCatcher::Mail.message_attachments(id).map do |attachment|
             attachment.merge({"href" => "/messages/#{escape(id)}/#{escape(attachment['cid'])}"})
           end,

data/public/javascripts/application.js

@@ -1,98 +1,124 @@
-var MailCatcher = {
-  init: function() {
-    $('#mail tr').live('click', function() {
-      MailCatcher.load($(this).attr('data-message-id'));
-    });
-
-    $('#message .actions ul li.tab').live('click', function() {
-      MailCatcher.loadBody($('#mail tr.selected').attr('data-message-id'), $(this).attr('data-message-format'));
-    });
-
-    MailCatcher.refresh();
-    
-    MailCatcher.subscribe();
-  },
-  
-  addMessage: function(message) {
-    $('#mail tbody').append(
-      $('<tr />').attr('data-message-id', message.id.toString())
-        .append($('<td/>').text(message.sender))
-        .append($('<td/>').text((message.recipients || []).join(', ')))
-        .append($('<td/>').text(message.subject))
-        .append($('<td/>').text((new Date(message.created_at)).toString("dddd, d MMM yyyy h:mm:ss tt")))
-    );
-  },
-  
-  refresh: function() {
-    $.getJSON('/messages', function(mail) {
-      $.each(mail, function(i, message) {
-        MailCatcher.addMessage(message);
-      });
-    });
-  },
-  
-  subscribe: function () {
-    if (WebSocket !== undefined) {
-      MailCatcher.websocket = new WebSocket("ws" + (window.location.scheme == 'https' ? 's' : '') + "://" + window.location.host + "/messages");
-      MailCatcher.websocket.onmessage = function (event) {
-        MailCatcher.addMessage($.parseJSON(event.data));
-      };
-    } else {
-      if (!MailCatcher.refreshInterval) {
-        MailCatcher.refreshInterval = setInterval(MailCatcher.refresh, 30000);
-      }
+(function() {
+  var MailCatcher;
+  var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+  MailCatcher = (function() {
+    function MailCatcher() {
+      $('#mail tr').live('click', __bind(function(e) {
+        return this.loadMessage($(e.currentTarget).attr('data-message-id'));
+      }, this));
+      $('#message .actions ul li.tab').live('click', __bind(function(e) {
+        return this.loadMessageBody($('#mail tr.selected').attr('data-message-id'), $(e.currentTarget).attr('data-message-format'));
+      }, this));
+      this.refresh();
+      this.subscribe();
     }
-  },
-  
-  load: function(id) {
-    id = id || $('#mail tr.selected').attr('data-message-id');
-    
-    if (id !== null) {
-      $('#mail tbody tr:not([data-message-id="'+id+'"])').removeClass('selected');
-      $('#mail tbody tr[data-message-id="'+id+'"]').addClass('selected');
-      
-      $.getJSON('/messages/' + id + '.json', function(message) {  
-        $('#message .received span').text((new Date(message.created_at)).toString("dddd, d MMM yyyy h:mm:ss tt"));
-        $('#message .from span').text(message.sender);
-        $('#message .to span').text((message.recipients || []).join(', '));
-        $('#message .subject span').text(message.subject);
-        $('#message .actions ul li.format').each(function(i, el) {
-          var $el = $(el),
+    MailCatcher.prototype.parseDateRegexp = /^(\d{4})[-\/\\](\d{2})[-\/\\](\d{2})(?:\s+|T)(\d{2})[:-](\d{2})[:-](\d{2})(?:([ +-]\d{2}:\d{2}|\s*\S+|Z?))?$/;
+    MailCatcher.prototype.parseDate = function(date) {
+      var match;
+      if (match = this.parseDateRegexp.exec(date)) {
+        return new Date(match[1], match[2], match[3], match[4], match[5], match[6], 0);
+      }
+    };
+    MailCatcher.prototype.formatDate = function(date) {
+      if (typeof date === "string") {
+        date && (date = this.parseDate(date));
+      }
+      return date && (date = date.toString("dddd, d MMM yyyy h:mm:ss tt"));
+    };
+    MailCatcher.prototype.haveMessage = function(message) {
+      if (message.id != null) {
+        message = message.id;
+      }
+      return $("#mail tbody tr[data-message-id=\"" + message + "\"]").length > 0;
+    };
+    MailCatcher.prototype.addMessage = function(message) {
+      return $('#mail tbody').append($('<tr />').attr('data-message-id', message.id.toString()).append($('<td/>').text(message.sender)).append($('<td/>').text((message.recipients || []).join(', '))).append($('<td/>').text(message.subject)).append($('<td/>').text(this.formatDate(message.created_at))));
+    };
+    MailCatcher.prototype.loadMessage = function(id) {
+      if ((id != null ? id.id : void 0) != null) {
+        id = id.id;
+      }
+      id || (id = $('#mail tr.selected').attr('data-message-id'));
+      if (id != null) {
+        $('#mail tbody tr:not([data-message-id="' + id + '"])').removeClass('selected');
+        $('#mail tbody tr[data-message-id="' + id + '"]').addClass('selected');
+        return $.getJSON('/messages/' + id + '.json', __bind(function(message) {
+          $('#message .received span').text(this.formatDate(message.created_at));
+          $('#message .from span').text(message.sender);
+          $('#message .to span').text((message.recipients || []).join(', '));
+          $('#message .subject span').text(message.subject);
+          $('#message .actions ul li.format').each(function(i, el) {
+            var $el, format;
+            $el = $(el);
             format = $el.attr('data-message-format');
-          if ($.inArray(format, message.formats) >= 0) {
-            $el.show();
+            if ($.inArray(format, message.formats) >= 0) {
+              return $el.show();
+            } else {
+              return $el.hide();
+            }
+          });
+          if ($("#message .actions ul li.tab.selected:not(:visible)").length) {
+            $("#message .actions ul li.tab.selected").removeClass("selected");
+            $("#message .actions ul li.tab:visible:first").addClass("selected");
+          }
+          if (message.attachments.length) {
+            $('#message .metadata .attachments ul').empty();
+            $.each(message.attachments, function(i, attachment) {
+              return $('#message .metadata .attachments ul').append($('<li>').append($('<a>').attr('href', attachment['href']).addClass(attachment['type'].split('/', 1)[0]).addClass(attachment['type'].replace('/', '-')).text(attachment['filename'])));
+            });
+            $('#message .metadata .attachments').show();
           } else {
-            $el.hide();
+            $('#message .metadata .attachments').hide();
           }
-        });
-        if ($("#message .actions ul li.tab.selected:not(:visible)")) {
-          $("#message .actions ul li.tab.selected").removeClass("selected");
-          $("#message .actions ul li.tab:visible:first").addClass("selected");
-        }
-        if (message.attachments.length > 0) {
-          $('#message .metadata .attachments ul').empty();
-          $.each(message.attachments, function (i, attachment) {
-            $('#message .metadata .attachments ul').append($('<li>').append($('<a>').attr('href', attachment['href']).addClass(attachment['type'].split('/', 1)[0]).addClass(attachment['type'].replace('/', '-')).text(attachment['filename'])));
-          });
-          $('#message .metadata .attachments').show();
-        } else {
-          $('#message .metadata .attachments').hide();
-        }
-        $('#message .actions ul li.download a').attr('href', '/messages/' + id + '.eml');
-        MailCatcher.loadBody();
-      });
-    }
-  },
-  
-  loadBody: function(id, format) {
-    id = id || $('#mail tr.selected').attr('data-message-id');
-    format = format || $('#message .actions ul li.selected').first().attr('data-message-format') || 'html';
-    
-    $('#message .actions ul li.tab[data-message-format="'+format+'"]').addClass('selected');
-    $('#message .actions ul li.tab:not([data-message-format="'+format+'"])').removeClass('selected');
-    
-    if (id !== undefined && id !== null) {
-      $('#message iframe').attr('src', '/messages/' + id + '.' + format);
-    }
-  }
-};
+          $('#message .actions ul li.download a').attr('href', "/messages/" + id + ".eml");
+          return this.loadMessageBody();
+        }, this));
+      }
+    };
+    MailCatcher.prototype.loadMessageBody = function(id, format) {
+      id || (id = $('#mail tr.selected').attr('data-message-id'));
+      format || (format = $('#message .actions ul li.format.selected').attr('data-message-format'));
+      format || (format = 'html');
+      $("#message .actions ul li.tab[data-message-format=\"" + format + "\"]:not(.selected)").addClass('selected');
+      $("#message .actions ul li.tab:not([data-message-format=\"" + format + "\"]).selected").removeClass('selected');
+      if (id != null) {
+        return $('#message iframe').attr("src", "/messages/" + id + "." + format);
+      }
+    };
+    MailCatcher.prototype.refresh = function() {
+      return $.getJSON('/messages', __bind(function(messages) {
+        return $.each(messages, __bind(function(i, message) {
+          if (!this.haveMessage(message)) {
+            return this.addMessage(message);
+          }
+        }, this));
+      }, this));
+    };
+    MailCatcher.prototype.subscribe = function() {
+      if (typeof WebSocket !== "undefined" && WebSocket !== null) {
+        return this.subscribeWebSocket();
+      } else {
+        return this.subscribePoll();
+      }
+    };
+    MailCatcher.prototype.subscribeWebSocket = function() {
+      var secure;
+      secure = window.location.scheme === 'https';
+      this.websocket = new WebSocket("" + (secure ? 'wss' : 'ws') + "://" + window.location.host + "/messages");
+      return this.websocket.onmessage = __bind(function(event) {
+        return this.addMessage($.parseJSON(event.data));
+      }, this);
+    };
+    MailCatcher.prototype.subscribePoll = function() {
+      if (this.refreshInterval == null) {
+        return this.refreshInterval = setInterval((__bind(function() {
+          return this.refresh();
+        }, this)), 1000);
+      }
+    };
+    return MailCatcher;
+  })();
+  $(function() {
+    return window.MailCatcher = new MailCatcher;
+  });
+}).call(this);

data/public/stylesheets/application.css

@@ -75,6 +75,8 @@ body {
   padding: .25em;
   font-weight: bold;
   color: #666;
+  -moz-text-shadow: 0 1px 0 #fff;
+  -webkit-text-shadow: 0 1px 0 #fff;
   text-shadow: 0 1px 0 #fff; }
 
 #mail table tbody tr:nth-child(even) {
@@ -101,6 +103,8 @@ body {
   text-align: right;
   font-weight: bold;
   color: #666;
+  -moz-text-shadow: 0 1px 0 #fff;
+  -webkit-text-shadow: 0 1px 0 #fff;
   text-shadow: 0 1px 0 #fff; }
 
 #message .metadata .subject span {
@@ -128,6 +132,8 @@ body {
   color: #333;
   border-width: 1px 1px 0 1px;
   cursor: pointer;
+  -moz-text-shadow: 0 1px 0 #eee;
+  -webkit-text-shadow: 0 1px 0 #eee;
   text-shadow: 0 1px 0 #eee; }
 
 #message .actions ul li.tab:not(.selected):hover {
@@ -137,7 +143,10 @@ body {
   background: #fff;
   color: #000;
   height: 13px;
-  margin-bottom: -1px; }
+  -moz-box-shadow: 1px 1px 0 #ccc;
+  -webkit-box-shadow: 1px 1px 0 #ccc;
+  box-shadow: 1px 1px 0 #ccc;
+  margin-bottom: -2px; }
 
 #message .actions ul li.button {
   display: inline-block;
@@ -148,19 +157,26 @@ body {
   display: inline-block;
   padding: .25em .5em;
   border: 1px solid #999;
-  border-radius: .35em;
   background: #ddd;
   color: #333;
   text-decoration: none;
+  -moz-text-shadow: 1px 1px 0 #eee;
+  -webkit-text-shadow: 1px 1px 0 #eee;
   text-shadow: 1px 1px 0 #eee;
+  -moz-box-shadow: none;
+  -webkit-box-shadow: none;
   box-shadow: 1px 1px 0 #ccc; }
 
 #message .actions ul li.button a:hover {
   background: #fff;
-  text-shadow: none; }
+  -moz-box-shadow: none;
+  -webkit-box-shadow: none;
+  box-shadow: none; }
 
 #message .actions ul li.button a:active {
   margin: 1px -1px -1px 1px;
+  -moz-box-shadow: none;
+  -webkit-box-shadow: none;
   box-shadow: none; }
 
 #message .body {

data/views/index.haml

@@ -6,16 +6,15 @@
     %script{:src => "/javascripts/jquery.js"}
     %script{:src => "/javascripts/date.js"}
     %script{:src => "/javascripts/application.js"}
-    :javascript
-      $(MailCatcher.init);
   %body
     #mail
       %table
         %thead
-          %th From
-          %th To
-          %th Subject
-          %th Received
+          %tr
+            %th From
+            %th To
+            %th Subject
+            %th Received
         %tbody
     #message
       .metadata

metadata

@@ -2,7 +2,7 @@
 name: mailcatcher
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Samuel Cochran
@@ -122,6 +122,17 @@ dependencies:
         version: "3.1"
   type: :development
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: coffee-script
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "2.2"
+  type: :development
+  version_requirements: *id011
 description: "    MailCatcher runs a super simple SMTP server which catches any\n    message sent to it to display in a web interface. Run\n    mailcatcher, set your favourite app to deliver to\n    smtp://127.0.0.1:1025 instead of your default SMTP server,\n    then check out http://127.0.0.1:1080 to see the mail.\n"
 email: sj26@sj26.com
 executables: