mailcatcher-jruby 1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db3de1ac2c71a4f2527f8fc89ca04dd393c8e7dd
-  data.tar.gz: 1d6b9017bc94386eb14694308f1557e75d388cbe
+  metadata.gz: ee3b2fdd291a0f4ef4bf0a7d223577cab7f90f2d
+  data.tar.gz: 22679dba081b3b6b08b7d03633634514067edc3e
 SHA512:
-  metadata.gz: fd21fcae35b466de0d78d8fac33bfea6509903a8609122b8e3334ee0f018da3c3f5ec90629789f78167b14d5831f90dd1601c33e7e4da5ac4541d6cddb103290
-  data.tar.gz: d431ef8c32c497efa82f1604f886eb9ed118125b722841641467d8e953cec27e079117ded31064f65390a153459237e853390ab0c2e11977cb9b1e391e90c691
+  metadata.gz: a59ff3bc7c83df67c3c4b74545fb0724ecdcf4f1e2701ea48337b5e15582e2aa8e5989a0a7761b0b782e1e4639cb2ba5c21ffc66bd9c1ec7baf9b6581d0b895a
+  data.tar.gz: 56340005b69b5893f443c550fe064873ad55c97625dc1bba6b1f9a93f5ac114053696cd4a2afbc35f9d336ec9376571315c238bf67673641ceeb1cd4cc3c46a6

data/README.md

@@ -1,22 +1,32 @@
-# MailCatcher
+# MailCatcher for JRuby
 
-## JRuby Support
-1. Configure rails.
-To set up your rails app, I recommend adding this to your `environment/development.rb`:
+## Usage for JRuby on Rails.
 
-    config.action_mailer.delivery_method = :smtp
-    config.action_mailer.smtp_settings = { :address => "localhost", :port => 1025 }
+1. `gem install mailcatcher-jruby`
 
-2. Start the smpt server at port 1025
-`jruby server.rb`
+2. Start the smpt server at port 9000
+`mailcatcher`
 
-3. Start Puma rack server to host web pages of emails.
-`puma`
+use `--smtp-port 1080` to change the port to 1080
+
+3. Start Puma rack server to host web pages of emails at port 9090.
+`mailweb`
 add `-p 1080` to use port 1080
 
-Open [http://127.0.0.1:9292](http://127.0.0.1:9292) to see emails.
+Open [http://127.0.0.1:9090](http://127.0.0.1:9090) to see emails.
+
 
-# Original Document
+4. Configure rails.
+To set up your rails app, I recommend adding this to your `environment/development.rb`:
+
+    config.action_mailer.delivery_method = :smtp
+    config.action_mailer.smtp_settings = { :address => "127.0.0.1", :port =>
+    9000 }
+
+
+# Original Documentation
+
+# MailCatcher
 
 
 Catches mail and serves it through a dream.

data/bin/catchmail

@@ -9,7 +9,7 @@ end
 
 require 'optparse'
 
-options = {:smtp_ip => '127.0.0.1', :smtp_port => 1025}
+options = {:smtp_ip => '127.0.0.1', :smtp_port => 9000}
 
 OptionParser.new do |parser|
   parser.banner = <<-BANNER.gsub /^ +/, ""
@@ -32,7 +32,7 @@ OptionParser.new do |parser|
   parser.on('-f FROM', 'Set the sending address') do |from|
     options[:from] = from
   end
-  
+
   parser.on('-oi', 'Ignored option -oi') do |ignored|
   end
   parser.on('-t', 'Ignored option -t') do |ignored|
@@ -58,4 +58,5 @@ end
 
 message = Mail.new ARGF.read
 message.return_path = options[:from] if options[:from]
+puts 'Got email input, sending...'
 message.deliver

data/bin/mailweb

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+require 'puma/cli'
+
+rack_path = File.expand_path('../../config.ru', __FILE__)
+default_params = ARGV.include?('-p') ? [rack_path] : [rack_path, '-p', '9090']
+cli = Puma::CLI.new (default_params + ARGV)
+cli.run

data/lib/mail_catcher/version.rb

@@ -1,3 +1,3 @@
 module MailCatcher
-  VERSION = "1.0"
+  VERSION = "1.1.1"
 end

data/lib/mail_catcher/web.rb

@@ -5,30 +5,6 @@ require 'uri'
 #require 'skinny'
 
 
-# #-=--------------------
-# module MailCatcher
-# end
-
-# DB_CONF = { adapter: 'jdbcsqlite3', database: 'db' }
-
-# class Message < ActiveRecord::Base
-#   establish_connection DB_CONF
-#   has_many :message_parts, dependent: :destroy
-#   self.inheritance_column = nil
-
-#   def recipients
-#     self[:recipients] &&= ActiveSupport::JSON.decode self[:recipients]
-#   end
-# end
-# class MessagePart < ActiveRecord::Base
-#   establish_connection DB_CONF
-#   belongs_to :message
-#   self.inheritance_column = nil
-# end
-
-# #---------------------------
-
-
 class Sinatra::Request
   #include Skinny::Helpers
 end

data/public/javascripts/application.js

@@ -1,6 +1,6 @@
 (function() {
   var MailCatcher,
-    __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+    _this = this;
 
   jQuery.expr[':'].icontains = function(a, i, m) {
     var _ref, _ref1;
@@ -8,13 +8,24 @@
   };
 
   MailCatcher = (function() {
+
     function MailCatcher() {
-      this.nextTab = __bind(this.nextTab, this);
-      this.previousTab = __bind(this.previousTab, this);
-      this.openTab = __bind(this.openTab, this);
-      this.selectedTab = __bind(this.selectedTab, this);
-      this.getTab = __bind(this.getTab, this);
       var _this = this;
+      this.nextTab = function(tab) {
+        return MailCatcher.prototype.nextTab.apply(_this, arguments);
+      };
+      this.previousTab = function(tab) {
+        return MailCatcher.prototype.previousTab.apply(_this, arguments);
+      };
+      this.openTab = function(i) {
+        return MailCatcher.prototype.openTab.apply(_this, arguments);
+      };
+      this.selectedTab = function() {
+        return MailCatcher.prototype.selectedTab.apply(_this, arguments);
+      };
+      this.getTab = function(i) {
+        return MailCatcher.prototype.getTab.apply(_this, arguments);
+      };
       $('#messages tr').live('click', function(e) {
         e.preventDefault();
         return _this.loadMessage($(e.currentTarget).attr('data-message-id'));
@@ -249,7 +260,7 @@
     };
 
     MailCatcher.prototype.addMessage = function(message) {
-      return $('#messages tbody').prepend($('<tr />').attr('data-message-id', message.id.toString()).append($('<td/>').text(message.sender || "No sender").toggleClass("blank", !message.sender)).append($('<td/>').text((message.recipients || []).join(', ') || "No receipients").toggleClass("blank", !message.recipients.length)).append($('<td/>').text(message.subject || "No subject").toggleClass("blank", !message.subject)).append($('<td/>').text(this.formatDate(message.created_at))));
+      return $('#messages tbody').prepend($('<tr />').attr('data-message-id', message.id.toString()).append($('<td/>').text(message.sender || "No sender").toggleClass("blank", !message.sender)).append($('<td/>').text((message.recipients || []).join(', ') || "No recipients").toggleClass("blank", !message.recipients.length)).append($('<td/>').text(message.subject || "No subject").toggleClass("blank", !message.subject)).append($('<td/>').text(this.formatDate(message.created_at))));
     };
 
     MailCatcher.prototype.scrollToRow = function(row) {
@@ -285,12 +296,10 @@
         messageRow.addClass('selected');
         this.scrollToRow(messageRow);
         return $.getJSON("/messages/" + id + ".json", function(message) {
-          //----- change recipients to array
-          if(typeof message.recipients != 'undefined') {
+          var $ul;
+          if (message.recipients != null) {
             message.recipients = JSON.parse(message.recipients);
           }
-          //--------------------------------
-          var $ul;
           $('#message .metadata dd.created_at').text(_this.formatDate(message.created_at));
           $('#message .metadata dd.from').text(message.sender);
           $('#message .metadata dd.to').text((message.recipients || []).join(', '));
@@ -378,11 +387,9 @@
       return $.getJSON('/messages', function(messages) {
         return $.each(messages, function(i, message) {
           if (!_this.haveMessage(message)) {
-            //----- change recipients to array
-            if(typeof message.recipients != 'undefined') {
+            if (message.recipients != null) {
               message.recipients = JSON.parse(message.recipients);
             }
-            //--------------------------------
             return _this.addMessage(message);
           }
         });

data/public/stylesheets/application.css

@@ -62,8 +62,10 @@ body {
   color: black;
   font-size: 12px;
   font-family: Helvetica, sans-serif; }
+  body * html {
+    font-size: 75%; }
   body html {
-    font-size: 75%;
+    font-size: 12px;
     line-height: 2em; }
   body.iframe {
     background: white; }
@@ -89,7 +91,6 @@ body {
   background: -webkit-linear-gradient(#f4f4f4, #ececec), #ececec;
   background: -moz-linear-gradient(#f4f4f4, #ececec), #ececec;
   background: -o-linear-gradient(#f4f4f4, #ececec), #ececec;
-  background: -ms-linear-gradient(#f4f4f4, #ececec), #ececec;
   background: linear-gradient(#f4f4f4, #ececec), #ececec;
   color: #666666;
   text-shadow: 1px 1px 0 white;
@@ -101,7 +102,6 @@ body {
     background: -webkit-linear-gradient(#eeeeee, #dddddd), #dddddd;
     background: -moz-linear-gradient(#eeeeee, #dddddd), #dddddd;
     background: -o-linear-gradient(#eeeeee, #dddddd), #dddddd;
-    background: -ms-linear-gradient(#eeeeee, #dddddd), #dddddd;
     background: linear-gradient(#eeeeee, #dddddd), #dddddd;
     color: #333333;
     text-decoration: none; }
@@ -112,7 +112,6 @@ body {
     background: -webkit-linear-gradient(#dddddd, #eeeeee), #eeeeee;
     background: -moz-linear-gradient(#dddddd, #eeeeee), #eeeeee;
     background: -o-linear-gradient(#dddddd, #eeeeee), #eeeeee;
-    background: -ms-linear-gradient(#dddddd, #eeeeee), #eeeeee;
     background: linear-gradient(#dddddd, #eeeeee), #eeeeee;
     color: #333333;
     text-decoration: none;
@@ -136,7 +135,6 @@ body > header {
       text-shadow: 0 1px 0 white;
       -webkit-transition: 0.1s ease;
       -moz-transition: 0.1s ease;
-      -ms-transition: 0.1s ease;
       -o-transition: 0.1s ease;
       transition: 0.1s ease; }
       body > header h1 a:hover {
@@ -163,7 +161,6 @@ body > header {
         background: -webkit-linear-gradient(#f4f4f4, #ececec), #ececec;
         background: -moz-linear-gradient(#f4f4f4, #ececec), #ececec;
         background: -o-linear-gradient(#f4f4f4, #ececec), #ececec;
-        background: -ms-linear-gradient(#f4f4f4, #ececec), #ececec;
         background: linear-gradient(#f4f4f4, #ececec), #ececec;
         color: #666666;
         text-shadow: 1px 1px 0 white;
@@ -173,7 +170,6 @@ body > header {
           background: -webkit-linear-gradient(#eeeeee, #dddddd), #dddddd;
           background: -moz-linear-gradient(#eeeeee, #dddddd), #dddddd;
           background: -o-linear-gradient(#eeeeee, #dddddd), #dddddd;
-          background: -ms-linear-gradient(#eeeeee, #dddddd), #dddddd;
           background: linear-gradient(#eeeeee, #dddddd), #dddddd;
           color: #333333;
           text-decoration: none; }
@@ -182,7 +178,6 @@ body > header {
           background: -webkit-linear-gradient(#dddddd, #eeeeee), #eeeeee;
           background: -moz-linear-gradient(#dddddd, #eeeeee), #eeeeee;
           background: -o-linear-gradient(#dddddd, #eeeeee), #eeeeee;
-          background: -ms-linear-gradient(#dddddd, #eeeeee), #eeeeee;
           background: linear-gradient(#dddddd, #eeeeee), #eeeeee;
           color: #333333;
           text-decoration: none;
@@ -211,7 +206,6 @@ body > header {
       cursor: pointer;
       -webkit-transition: 0.1s ease;
       -moz-transition: 0.1s ease;
-      -ms-transition: 0.1s ease;
       -o-transition: 0.1s ease;
       transition: 0.1s ease;
       color: #333333; }
@@ -274,31 +268,30 @@ body > header {
         #message > header .metadata .attachments ul {
           display: inline; }
           #message > header .metadata .attachments ul li {
-            display: -moz-inline-box;
-            -moz-box-orient: vertical;
+            display: -moz-inline-stack;
             display: inline-block;
             vertical-align: middle;
             *vertical-align: auto;
+            zoom: 1;
+            *display: inline;
             margin-right: 0.5em; }
-            #message > header .metadata .attachments ul li {
-              *display: inline; }
     #message > header .views ul {
       padding: 0 0.5em;
       border-bottom: 1px solid #cccccc; }
     #message > header .views .tab {
-      display: -moz-inline-box;
-      -moz-box-orient: vertical;
+      display: -moz-inline-stack;
       display: inline-block;
       vertical-align: middle;
-      *vertical-align: auto; }
-      #message > header .views .tab {
-        *display: inline; }
+      *vertical-align: auto;
+      zoom: 1;
+      *display: inline; }
       #message > header .views .tab a {
-        display: -moz-inline-box;
-        -moz-box-orient: vertical;
+        display: -moz-inline-stack;
         display: inline-block;
         vertical-align: middle;
         *vertical-align: auto;
+        zoom: 1;
+        *display: inline;
         padding: 0.5em;
         border: 1px solid #cccccc;
         background: #dddddd;
@@ -307,8 +300,6 @@ body > header {
         cursor: pointer;
         text-shadow: 0 1px 0 #eeeeee;
         text-decoration: none; }
-        #message > header .views .tab a {
-          *display: inline; }
       #message > header .views .tab:not(.selected):hover a {
         background-color: #eeeeee; }
       #message > header .views .tab.selected a {
@@ -321,15 +312,14 @@ body > header {
         margin-bottom: -2px;
         cursor: default; }
     #message > header .views .action {
-      display: -moz-inline-box;
-      -moz-box-orient: vertical;
+      display: -moz-inline-stack;
       display: inline-block;
       vertical-align: middle;
       *vertical-align: auto;
+      zoom: 1;
+      *display: inline;
       float: right;
       margin: 0 0.25em; }
-      #message > header .views .action {
-        *display: inline; }
 
 .fractal-analysis {
   margin: 12px 0; }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailcatcher-jruby
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.1.1
 platform: ruby
 authors:
-- Samuel Cochran
+- Samuel Cochran, Cam Song
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2013-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -211,15 +211,17 @@ dependencies:
   prerelease: false
   type: :development
 description: |2
+      [JRuby portion] of the original MailCatcher.
       MailCatcher runs a super simple SMTP server which catches any
       message sent to it to display in a web interface. Run
       mailcatcher, set your favourite app to deliver to
-      smtp://127.0.0.1:1025 instead of your default SMTP server,
-      then check out http://127.0.0.1:1080 to see the mail.
-email: sj26@sj26.com
+      smtp://127.0.0.1:9000 instead of your default SMTP server,
+      then check out http://127.0.0.1:9090 to see the mail.
+email: neosoyn@gmail.com
 executables:
 - mailcatcher
 - catchmail
+- mailweb
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -229,6 +231,7 @@ files:
 - LICENSE
 - bin/catchmail
 - bin/mailcatcher
+- bin/mailweb
 - lib/mail_catcher.rb
 - lib/mail_catcher/events.rb
 - lib/mail_catcher/growl.rb
@@ -249,7 +252,7 @@ files:
 - public/stylesheets/application.css
 - public/stylesheets/analysis.xsl
 - views/index.haml
-homepage: https://github.com/camsong/mailcatcher
+homepage: https://github.com/camsong/mailcatcher-jruby
 licenses:
 - MIT
 metadata: {}