mailcatcher 0.5.1 → 0.5.2

data/VERSION

@@ -0,0 +1 @@
+0.5.2

data/lib/mail_catcher.rb

@@ -55,6 +55,7 @@ module_function
     @@defaults.dup.tap do |options|
       OptionParser.new do |parser|
         parser.banner = "Usage: mailcatcher [options]"
+        parser.version = File.read(File.expand_path("../../VERSION", __FILE__))
 
         parser.on("--ip IP", "Set the ip address of both servers") do |ip|
           options[:smtp_ip] = options[:http_ip] = ip

data/lib/mail_catcher/events.rb

@@ -1,7 +1,5 @@
 require 'eventmachine'
 
-module MailCatcher
-  module Events
-    MessageAdded = EventMachine::Channel.new
-  end
+module MailCatcher::Events
+  MessageAdded = EventMachine::Channel.new
 end

data/lib/mail_catcher/growl.rb

@@ -6,7 +6,8 @@ module MailCatcher
     end
 
     def notify message
-      system "growlnotify", "--name", "MailCatcher", "--message", "Message received:\n#{message["subject"]}"
+      image_path = File.expand_path(File.join(__FILE__, '..', '..', '..', 'public', 'images', 'logo_large.png'))
+      system "growlnotify", "--image", image_path, "--name", "MailCatcher", "--message", "Message received:\n#{message["subject"]}"
     end
 
     # TODO: Native support on MacRuby with click backs

data/lib/mail_catcher/mail.rb

@@ -3,152 +3,152 @@ require 'sqlite3'
 require 'eventmachine'
 
 module MailCatcher::Mail
-  class << self
-    def db
-      @@__db ||= begin
-        SQLite3::Database.new(':memory:', :type_translation => true).tap do |db|
-          db.execute(<<-SQL)
-            CREATE TABLE message (
-              id INTEGER PRIMARY KEY ASC,
-              sender TEXT,
-              recipients TEXT,
-              subject TEXT,
-              source BLOB,
-              size TEXT,
-              type TEXT,
-              created_at DATETIME DEFAULT CURRENT_DATETIME
-            )
-          SQL
-          db.execute(<<-SQL)
-            CREATE TABLE message_part (
-              id INTEGER PRIMARY KEY ASC,
-              message_id INTEGER NOT NULL,
-              cid TEXT,
-              type TEXT,
-              is_attachment INTEGER,
-              filename TEXT,
-              charset TEXT,
-              body BLOB,
-              size INTEGER,
-              created_at DATETIME DEFAULT CURRENT_DATETIME
-            )
-          SQL
-        end
+module_function
+
+  def db
+    @@__db ||= begin
+      SQLite3::Database.new(':memory:', :type_translation => true).tap do |db|
+        db.execute(<<-SQL)
+          CREATE TABLE message (
+            id INTEGER PRIMARY KEY ASC,
+            sender TEXT,
+            recipients TEXT,
+            subject TEXT,
+            source BLOB,
+            size TEXT,
+            type TEXT,
+            created_at DATETIME DEFAULT CURRENT_DATETIME
+          )
+        SQL
+        db.execute(<<-SQL)
+          CREATE TABLE message_part (
+            id INTEGER PRIMARY KEY ASC,
+            message_id INTEGER NOT NULL,
+            cid TEXT,
+            type TEXT,
+            is_attachment INTEGER,
+            filename TEXT,
+            charset TEXT,
+            body BLOB,
+            size INTEGER,
+            created_at DATETIME DEFAULT CURRENT_DATETIME
+          )
+        SQL
       end
     end
+  end
 
-    def add_message(message)
-      @@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], mail.mime_type || 'text/plain', message[:source].length)
-      message_id = db.last_insert_row_id
-      parts = mail.all_parts
-      parts = [mail] if parts.empty?
-      parts.each do |part|
-        body = part.body.to_s
-        # Only parts have CIDs, not mail
-        cid = part.cid if part.respond_to? :cid
-        add_message_part(message_id, cid, part.mime_type || 'text/plain', part.attachment? ? 1 : 0, part.filename, part.charset, body, body.length)
-      end
+  def add_message(message)
+    @@add_message_query ||= db.prepare("INSERT INTO message (sender, recipients, subject, source, type, size, created_at) VALUES (?, ?, ?, ?, ?, ?, datetime('now'))")
 
-      EventMachine.next_tick do
-        message = MailCatcher::Mail.message message_id
-        MailCatcher::Events::MessageAdded.push message
-      end
+    mail = Mail.new(message[:source])
+    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?
+    parts.each do |part|
+      body = part.body.to_s
+      # Only parts have CIDs, not mail
+      cid = part.cid if part.respond_to? :cid
+      add_message_part(message_id, cid, part.mime_type || 'text/plain', part.attachment? ? 1 : 0, part.filename, part.charset, body, body.length)
     end
 
-    def add_message_part(*args)
-      @@add_message_part_query ||= db.prepare "INSERT INTO message_part (message_id, cid, type, is_attachment, filename, charset, body, size, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, datetime('now'))"
-      @@add_message_part_query.execute(*args)
+    EventMachine.next_tick do
+      message = MailCatcher::Mail.message message_id
+      MailCatcher::Events::MessageAdded.push message
     end
+  end
 
-    def latest_created_at
-      @@latest_created_at_query ||= db.prepare "SELECT created_at FROM message ORDER BY created_at DESC LIMIT 1"
-      @@latest_created_at_query.execute.next
-    end
+  def add_message_part(*args)
+    @@add_message_part_query ||= db.prepare "INSERT INTO message_part (message_id, cid, type, is_attachment, filename, charset, body, size, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, datetime('now'))"
+    @@add_message_part_query.execute(*args)
+  end
 
-    def messages
-      @@messages_query ||= db.prepare "SELECT id, sender, recipients, subject, size, created_at FROM message ORDER BY created_at ASC"
-      @@messages_query.execute.map do |row|
-        Hash[row.fields.zip(row)].tap do |message|
-          message["recipients"] &&= ActiveSupport::JSON.decode message["recipients"]
-        end
-      end
-    end
+  def latest_created_at
+    @@latest_created_at_query ||= db.prepare "SELECT created_at FROM message ORDER BY created_at DESC LIMIT 1"
+    @@latest_created_at_query.execute.next
+  end
 
-    def message(id)
-      @@message_query ||= db.prepare "SELECT * FROM message WHERE id = ? LIMIT 1"
-      row = @@message_query.execute(id).next
-      row && Hash[row.fields.zip(row)].tap do |message|
+  def messages
+    @@messages_query ||= db.prepare "SELECT id, sender, recipients, subject, size, created_at FROM message ORDER BY created_at ASC"
+    @@messages_query.execute.map do |row|
+      Hash[row.fields.zip(row)].tap do |message|
         message["recipients"] &&= ActiveSupport::JSON.decode message["recipients"]
       end
     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 IN ('application/xhtml+xml', 'text/html') LIMIT 1"
-      (!!@@message_has_html_query.execute(id).next) || ['text/html', 'application/xhtml+xml'].include?(message(id)["type"])
+  def message(id)
+    @@message_query ||= db.prepare "SELECT * FROM message WHERE id = ? LIMIT 1"
+    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_plain?(id)
-      @@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_has_html?(id)
+    @@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_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).map do |row|
-        Hash[row.fields.zip(row)]
-      end
-    end
+  def message_has_plain?(id)
+    @@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_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).map do |row|
-        Hash[row.fields.zip(row)]
-      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).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"
-      row = @@message_part_query.execute(message_id, part_id).next
-      row && Hash[row.fields.zip(row)]
+  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).map do |row|
+      Hash[row.fields.zip(row)]
     end
+  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"
-      row = @@message_part_type_query.execute(message_id, part_type).next
-      row && Hash[row.fields.zip(row)]
-    end
+  def message_part(message_id, part_id)
+    @@message_part_query ||= db.prepare "SELECT * FROM message_part WHERE message_id = ? AND id = ? LIMIT 1"
+    row = @@message_part_query.execute(message_id, part_id).next
+    row && Hash[row.fields.zip(row)]
+  end
 
-    def message_part_html(message_id)
-      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 message.present? and ['text/html', 'application/xhtml+xml'].include? message["type"]
-      end
-    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"
+    row = @@message_part_type_query.execute(message_id, part_type).next
+    row && Hash[row.fields.zip(row)]
+  end
 
-    def message_part_plain(message_id)
-      message_part_type message_id, "text/plain"
+  def message_part_html(message_id)
+    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 message.present? and ['text/html', 'application/xhtml+xml'].include? message["type"]
     end
+  end
 
-    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).map do |row|
-        part = Hash[row.fields.zip(row)]
-      end.find do |part|
-        part["cid"] == cid
-      end
+  def message_part_plain(message_id)
+    message_part_type message_id, "text/plain"
+  end
+
+  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).map do |row|
+      part = Hash[row.fields.zip(row)]
+    end.find do |part|
+      part["cid"] == cid
     end
+  end
 
-    def delete!
-      @@delete_messages_query ||= db.prepare 'DELETE FROM message'
-      @@delete_message_parts_query ||= db.prepare 'DELETE FROM message_part'
+  def delete!
+    @@delete_messages_query ||= db.prepare 'DELETE FROM message'
+    @@delete_message_parts_query ||= db.prepare 'DELETE FROM message_part'
 
-      @@delete_messages_query.execute and
-      @@delete_message_parts_query.execute
-    end
+    @@delete_messages_query.execute and
+    @@delete_message_parts_query.execute
   end
 end

data/lib/mail_catcher/smtp.rb

@@ -1,48 +1,46 @@
 require 'eventmachine'
 
-module MailCatcher
-  class Smtp < EventMachine::Protocols::SmtpServer
-    def current_message
-      @current_message ||= {}
-    end
+class MailCatcher::Smtp < EventMachine::Protocols::SmtpServer
+  def current_message
+    @current_message ||= {}
+  end
 
-    def receive_reset
-      @current_message = nil
-      true
-    end
+  def receive_reset
+    @current_message = nil
+    true
+  end
 
-    def receive_sender(sender)
-      current_message[:sender] = sender
-      true
-    end
+  def receive_sender(sender)
+    current_message[:sender] = sender
+    true
+  end
 
-    def receive_recipient(recipient)
-      current_message[:recipients] ||= []
-      current_message[:recipients] << recipient
-      true
-    end
+  def receive_recipient(recipient)
+    current_message[:recipients] ||= []
+    current_message[:recipients] << recipient
+    true
+  end
 
-    def receive_data_chunk(lines)
-      current_message[:source] ||= ""
-      current_message[:source] += lines.join("\n")
-      true
-    end
+  def receive_data_chunk(lines)
+    current_message[:source] ||= ""
+    current_message[:source] += lines.join("\n")
+    true
+  end
 
-    def receive_message
-      MailCatcher::Mail.add_message current_message
-      puts "==> SMTP: Received message from '#{current_message[:sender]}' (#{current_message[:source].length} bytes)"
-      true
-    rescue
-      puts "*** Error receiving message: #{current_message.inspect}"
-      puts "    Exception: #{$!}"
-      puts "    Backtrace:"
-      $!.backtrace.each do |line|
-        puts "       #{line}"
-      end
-      puts "    Please submit this as an issue at http://github.com/sj26/mailcatcher/issues"
-      false
-    ensure
-      @current_message = nil
+  def receive_message
+    MailCatcher::Mail.add_message current_message
+    puts "==> SMTP: Received message from '#{current_message[:sender]}' (#{current_message[:source].length} bytes)"
+    true
+  rescue
+    puts "*** Error receiving message: #{current_message.inspect}"
+    puts "    Exception: #{$!}"
+    puts "    Backtrace:"
+    $!.backtrace.each do |line|
+      puts "       #{line}"
     end
+    puts "    Please submit this as an issue at http://github.com/sj26/mailcatcher/issues"
+    false
+  ensure
+    @current_message = nil
   end
 end

data/lib/mail_catcher/web.rb

@@ -1,5 +1,7 @@
 require 'sinatra'
 require 'pathname'
+require 'net/http'
+require 'uri'
 
 require 'skinny'
 
@@ -7,120 +9,132 @@ class Sinatra::Request
   include Skinny::Helpers
 end
 
-module MailCatcher
-  class Web < Sinatra::Base
-    set :root, Pathname.new(__FILE__).dirname.parent.parent
-    set :haml, :format => :html5
+class MailCatcher::Web < Sinatra::Base
+  set :root, Pathname.new(__FILE__).dirname.parent.parent
+  set :haml, :format => :html5
 
-    get '/' do
-      haml :index
-    end
+  get '/' do
+    haml :index
+  end
 
-    delete '/' do
-      MailCatcher.quit!
-      status 204
-    end
+  delete '/' do
+    MailCatcher.quit!
+    status 204
+  end
 
-    get '/messages' do
-      if request.websocket?
-        request.websocket!(
-          :protocol => "MailCatcher 0.2 Message Push",
-          :on_start => proc do |websocket|
-            subscription = MailCatcher::Events::MessageAdded.subscribe { |message| websocket.send_message message.to_json }
-            websocket.on_close do |websocket|
-              MailCatcher::Events::MessageAdded.unsubscribe subscription
-            end
-          end)
-      else
-        MailCatcher::Mail.messages.to_json
-      end
+  get '/messages' do
+    if request.websocket?
+      puts "Gots a websocket"
+      request.websocket!(
+        :protocol => "MailCatcher 0.2 Message Push",
+        :on_start => proc do |websocket|
+          subscription = MailCatcher::Events::MessageAdded.subscribe { |message| websocket.send_message message.to_json }
+          websocket.on_close do |websocket|
+            MailCatcher::Events::MessageAdded.unsubscribe subscription
+          end
+        end)
+    else
+      MailCatcher::Mail.messages.to_json
     end
+  end
 
-    delete '/messages' do
-      MailCatcher::Mail.delete!
-      status 204
-    end
+  delete '/messages' do
+    MailCatcher::Mail.delete!
+    status 204
+  end
 
-    get '/messages/:id.json' do
-      id = params[:id].to_i
-      if message = MailCatcher::Mail.message(id)
-        message.merge({
-          "formats" => [
-            "source",
-            ("html" if MailCatcher::Mail.message_has_html? id),
-            ("plain" if MailCatcher::Mail.message_has_plain? id),
-          ].compact,
-          "attachments" => MailCatcher::Mail.message_attachments(id).map do |attachment|
-            attachment.merge({"href" => "/messages/#{escape(id)}/#{escape(attachment['cid'])}"})
-          end,
-        }).to_json
-      else
-        not_found
-      end
+  get '/messages/:id.json' do
+    id = params[:id].to_i
+    if message = MailCatcher::Mail.message(id)
+      message.merge({
+        "formats" => [
+          "source",
+          ("html" if MailCatcher::Mail.message_has_html? id),
+          ("plain" if MailCatcher::Mail.message_has_plain? id),
+        ].compact,
+        "attachments" => MailCatcher::Mail.message_attachments(id).map do |attachment|
+          attachment.merge({"href" => "/messages/#{escape(id)}/#{escape(attachment['cid'])}"})
+        end,
+      }).to_json
+    else
+      not_found
     end
+  end
 
-    get '/messages/:id.html' do
-      id = params[:id].to_i
-      if part = MailCatcher::Mail.message_part_html(id)
-        content_type part["type"], :charset => (part["charset"] || "utf8")
+  get '/messages/:id.html' do
+    id = params[:id].to_i
+    if part = MailCatcher::Mail.message_part_html(id)
+      content_type part["type"], :charset => (part["charset"] || "utf8")
 
-        body = part["body"]
+      body = part["body"]
 
-        # Rewrite body to link to embedded attachments served by cid
-        body.gsub! /cid:([^'"> ]+)/, "#{id}/\\1"
+      # Rewrite body to link to embedded attachments served by cid
+      body.gsub! /cid:([^'"> ]+)/, "#{id}/parts/\\1"
 
-        # Rewrite body to open links in a new window
-        body.gsub! /<a\s+/, '<a target="_blank" '
+      # Rewrite body to open links in a new window
+      body.gsub! /<a\s+/, '<a target="_blank" '
 
-        body
-      else
-        not_found
-      end
+      body
+    else
+      not_found
     end
+  end
 
-    get "/messages/:id.plain" do
-      id = params[:id].to_i
-      if part = MailCatcher::Mail.message_part_plain(id)
-        content_type part["type"], :charset => (part["charset"] || "utf8")
-        part["body"]
-      else
-        not_found
-      end
+  get "/messages/:id.plain" do
+    id = params[:id].to_i
+    if part = MailCatcher::Mail.message_part_plain(id)
+      content_type part["type"], :charset => (part["charset"] || "utf8")
+      part["body"]
+    else
+      not_found
     end
+  end
 
-    get "/messages/:id.source" do
-      id = params[:id].to_i
-      if message = MailCatcher::Mail.message(id)
-        content_type "text/plain"
-        message["source"]
-      else
-        not_found
-      end
+  get "/messages/:id.source" do
+    id = params[:id].to_i
+    if message = MailCatcher::Mail.message(id)
+      content_type "text/plain"
+      message["source"]
+    else
+      not_found
     end
+  end
 
-    get "/messages/:id.eml" do
-      id = params[:id].to_i
-      if message = MailCatcher::Mail.message(id)
-        content_type "message/rfc822"
-        message["source"]
-      else
-        not_found
-      end
+  get "/messages/:id.eml" do
+    id = params[:id].to_i
+    if message = MailCatcher::Mail.message(id)
+      content_type "message/rfc822"
+      message["source"]
+    else
+      not_found
     end
+  end
 
-    get "/messages/:id/:cid" do
-      id = params[:id].to_i
-      if part = MailCatcher::Mail.message_part_cid(id, params[:cid])
-        content_type part["type"], :charset => (part["charset"] || "utf8")
-        attachment part["filename"] if part["is_attachment"] == 1
-        body part["body"].to_s
-      else
-        not_found
-      end
+  get "/messages/:id/parts/:cid" do
+    id = params[:id].to_i
+    if part = MailCatcher::Mail.message_part_cid(id, params[:cid])
+      content_type part["type"], :charset => (part["charset"] || "utf8")
+      attachment part["filename"] if part["is_attachment"] == 1
+      body part["body"].to_s
+    else
+      not_found
     end
+  end
 
-    not_found do
-      "<html><body><h1>No Dice</h1><p>The message you were looking for does not exist, or doesn't have content of this type.</p></body></html>"
+  get "/messages/:id/analysis.?:format?" do
+    id = params[:id].to_i
+    if part = MailCatcher::Mail.message_part_html(id)
+      # TODO: Server-side cache? Make the browser cache based on message create time? Hmm.
+      uri = URI.parse("http://api.getfractal.com/api/v2/validate#{"/format/#{params[:format]}" if params[:format].present?}")
+      response = Net::HTTP.post_form(uri, api_key: "5c463877265251386f516f7428", html: part["body"])
+      content_type ".#{params[:format]}" if params[:format].present?
+      body response.body
+    else
+      not_found
     end
   end
+
+  not_found do
+    "<html><body><h1>No Dice</h1><p>The message you were looking for does not exist, or doesn't have content of this type.</p></body></html>"
+  end
 end

data/public/javascripts/application.js

@@ -34,6 +34,7 @@
         }
       });
       $('nav.app .clear a').live('click', __bind(function(e) {
+        e.preventDefault();
         if (confirm("You will lose all your received messages.\n\nAre you sure you want to clear all messages?")) {
           return $.ajax({
             url: '/messages',
@@ -50,6 +51,7 @@
         }
       }, this));
       $('nav.app .quit a').live('click', __bind(function(e) {
+        e.preventDefault();
         if (confirm("You will lose all your received messages.\n\nAre you sure you want to quit?")) {
           return $.ajax({
             type: 'DELETE',
@@ -148,15 +150,22 @@
       }
     };
     MailCatcher.prototype.loadMessageAnalysis = function(id) {
-      var $iframe;
+      var $form, $iframe;
       id || (id = this.selectedMessage());
       $("#message .views .analysis.tab:not(.selected)").addClass('selected');
       $("#message .views :not(.analysis).tab.selected").removeClass('selected');
       if (id != null) {
-        $iframe = $('#message iframe').contents().children().html("<html class=\"mailcatcher\"><head>" + ($('link[rel="stylesheet"]')[0].outerHTML) + "</head><body><iframe></iframe></body></html>").find("head").append($('link[rel="stylesheet"]').clone()).end().find('iframe').contents().children().html("<html>\n<head>\n<title>Analysis</title>\n" + ($('link[rel="stylesheet"]')[0].outerHTML) + "\n</head>\n<body class=\"iframe\">\n<h1>Analyse your email with Fractal</h1>\n<p><a href=\"http://getfractal.com/\" target=\"_blank\">Fractal</a> is a really neat service that applies common email design and development knowledge from <a href=\"http://www.email-standards.org/\" target=\"_blank\">Email Standards Project</a> to your HTML email and tells you what you've done wrong or what you should do instead.</p>\n<p>Please note that this <strong>sends your email to the Fractal service</strong> for analysis. Read their <a href=\"http://getfractal.com/terms\" target=\"_blank\">terms of service</a> if you're paranoid.</p>\n<form action=\"http://getfractal.com/validate\" method=\"POST\">\n<input type=\"hidden\" name=\"html\" />\n<input type=\"submit\" value=\"Analyse\" disabled=\"disabled\" /><span class=\"loading\" style=\"color: #999\">Loading your email...</span>\n</form>\n</body>\n</html>");
-        return $.get("/messages/" + id + ".html", function(html) {
-          return $iframe.find('input[name="html"]').attr('value', html).end().find('.loading').hide().end().find('input[type="submit"]').attr('disabled', null).end().find('form').submit(function() {
-            return $(this).find('input[type="submit"]').attr('disabled', 'disabled').end().find('.loading').text('Analysing...').show();
+        $iframe = $('#message iframe').contents().children().html("<html>\n<head>\n<title>Analysis</title>\n" + ($('link[rel="stylesheet"]')[0].outerHTML) + "\n</head>\n<body class=\"iframe\">\n<h1>Analyse your email with Fractal</h1>\n<p><a href=\"http://getfractal.com/\" target=\"_blank\">Fractal</a> is a really neat service that applies common email design and development knowledge from <a href=\"http://www.email-standards.org/\" target=\"_blank\">Email Standards Project</a> to your HTML email and tells you what you've done wrong or what you should do instead.</p>\n<p>Please note that this <strong>sends your email to the Fractal service</strong> for analysis. Read their <a href=\"http://getfractal.com/terms\" target=\"_blank\">terms of service</a> if you're paranoid.</p>\n<p>(This output is still just raw XML. Someone keen to transform this into something prettier would be greatly appreciated!)</p>\n<form>\n<input type=\"submit\" value=\"Analyse\" /><span class=\"loading\" style=\"color: #999; display: none\">Analysing&hellip;</span>\n</form>\n</body>\n</html>");
+        return $form = $iframe.find('form').submit(function(e) {
+          e.preventDefault();
+          $(this).find('input[type="submit"]').attr('disabled', 'disabled').end().find('.loading').show();
+          return $.ajax({
+            url: "/messages/" + id + "/analysis.xml",
+            dataType: "text",
+            success: function(data) {
+              $form.replaceWith('<h2>Results</h2><pre id="result"></pre>');
+              return $iframe.find("#result").text(data);
+            }
           });
         });
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailcatcher
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-08 00:00:00.000000000 +08:00
-default_executable: 
+date: 2011-10-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70179531391440 !ruby/object:Gem::Requirement
+  requirement: &70205943804660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179531391440
+  version_requirements: *70205943804660
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70179531390940 !ruby/object:Gem::Requirement
+  requirement: &70205943804020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,32 +32,32 @@ dependencies:
         version: '0.12'
   type: :runtime
   prerelease: false
-  version_requirements: *70179531390940
+  version_requirements: *70205943804020
 - !ruby/object:Gem::Dependency
-  name: mail
-  requirement: &70179531390440 !ruby/object:Gem::Requirement
+  name: haml
+  requirement: &70205943803120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70179531390440
+  version_requirements: *70205943803120
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &70179531389940 !ruby/object:Gem::Requirement
+  name: mail
+  requirement: &70205943802440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70179531389940
+  version_requirements: *70205943802440
 - !ruby/object:Gem::Dependency
-  name: thin
-  requirement: &70179531389460 !ruby/object:Gem::Requirement
+  name: sinatra
+  requirement: &70205943801860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,54 +65,54 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70179531389460
+  version_requirements: *70205943801860
 - !ruby/object:Gem::Dependency
   name: skinny
-  requirement: &70179531384340 !ruby/object:Gem::Requirement
+  requirement: &70205943790820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70179531384340
+  version_requirements: *70205943790820
 - !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: &70179531383760 !ruby/object:Gem::Requirement
+  name: sqlite3
+  requirement: &70205943790260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70179531383760
+  version_requirements: *70205943790260
 - !ruby/object:Gem::Dependency
-  name: haml
-  requirement: &70179531383120 !ruby/object:Gem::Requirement
+  name: thin
+  requirement: &70205943789560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70179531383120
+  version_requirements: *70205943789560
 - !ruby/object:Gem::Dependency
-  name: sass
-  requirement: &70179531382540 !ruby/object:Gem::Requirement
+  name: coffee-script
+  requirement: &70205943788860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '2.2'
   type: :development
   prerelease: false
-  version_requirements: *70179531382540
+  version_requirements: *70205943788860
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70179531381980 !ruby/object:Gem::Requirement
+  requirement: &70205943788140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,18 +120,40 @@ dependencies:
         version: 0.11.1
   type: :development
   prerelease: false
-  version_requirements: *70179531381980
+  version_requirements: *70205943788140
 - !ruby/object:Gem::Dependency
-  name: coffee-script
-  requirement: &70179531381400 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &70205943787700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70205943787700
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70205943787160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70205943787160
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: &70205943786420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70179531381400
+  version_requirements: *70205943786420
 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
@@ -148,6 +169,7 @@ extra_rdoc_files:
 files:
 - README.md
 - LICENSE
+- VERSION
 - bin/catchmail
 - bin/mailcatcher
 - lib/mail_catcher/events.rb
@@ -157,14 +179,14 @@ files:
 - lib/mail_catcher/web.rb
 - lib/mail_catcher.rb
 - public/images/logo.png
+- public/images/logo_large.png
 - public/javascripts/application.js
 - public/javascripts/date.js
 - public/javascripts/jquery.js
 - public/javascripts/modernizr.js
 - public/stylesheets/application.css
 - views/index.haml
-has_rdoc: true
-homepage: http://github.com/sj26/mailcatcher
+homepage: http://mailcatcher.me
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -184,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Runs an SMTP server, catches and displays email in a web interface.