Removed smtpClient

Author: andris9

README.md

@@ -10,8 +10,7 @@ Dependencies for `firemail`:
   * [mimetypes](https://github.com/Kreata/mimetypes) - Convert extensions to Content-Type values and vice versa 
   * [addressparser](https://github.com/Kreata/addressparser) - Parse e-mail address lists
   * [mailcomposer](https://github.com/Kreata/mailcomposer) - Compose e-mails
-
-`firemail` includes a built in SMTP client which is used to deliver a RFC2822 message composed with the help of the beforementioned modules.
+  * [smtpclient](https://github.com/Kreata/smtpclient) - SMTP client for FirefoxOS
 
 ## tl;dr - send an email using firemail
 
@@ -62,7 +61,6 @@ Opening TCP sockets to a SMTP server requires special privileges. You need to se
 ## Documentation
 
   * [Firemail API](docs/firemail.md#api)
-  * [SMTP Client](docs/smtpClient.md)
 
 ## Tests
 

docs/smtpClient.md

@@ -18,11 +18,11 @@
 // AMD shim
 (function(root, factory) {
     if (typeof define === 'function' && define.amd) {
-        define(['../../mailcomposer/mailcomposer', './smtpClient/smtpClient'], factory);
+        define(['../../mailcomposer/mailcomposer', '../../smtpclient/smtpclient'], factory);
     } else {
-        root.firemail = factory(root.mailcomposer, root.smtpClient);
+        root.firemail = factory(root.mailcomposer, root.smtpclient);
     }
-}(this, function(mailcomposer, smtpClient) {
+}(this, function(mailcomposer, smtpclient) {
 
     "use strict";
 
@@ -49,15 +49,15 @@
         /**
          * SMTP client
          */
-        this._smtpClient = smtpClient(this.mail.smtp.host, this.mail.smtp.port, this.mail.smtp);
+        this._smtpclient = smtpclient(this.mail.smtp.host, this.mail.smtp.port, this.mail.smtp);
 
         // Setup SMTP events
-        this._smtpClient.onidle = this._smtpClientOnIdle.bind(this);
-        this._smtpClient.onclose = this._smtpClientOnClose.bind(this);
-        this._smtpClient.onerror = this._smtpClientOnError.bind(this);
-        this._smtpClient.ondrain = this._smtpClientOnDrain.bind(this);
-        this._smtpClient.onready = this._smtpClientOnReady.bind(this);
-        this._smtpClient.ondone = this._smtpClientOnDone.bind(this);
+        this._smtpclient.onidle = this._smtpclientOnIdle.bind(this);
+        this._smtpclient.onclose = this._smtpclientOnClose.bind(this);
+        this._smtpclient.onerror = this._smtpclientOnError.bind(this);
+        this._smtpclient.ondrain = this._smtpclientOnDrain.bind(this);
+        this._smtpclient.onready = this._smtpclientOnReady.bind(this);
+        this._smtpclient.ondone = this._smtpclientOnDone.bind(this);
 
         // Setup mail composer
 
@@ -71,14 +71,14 @@
         this._composer.onend = this._composerOnEnd.bind(this);
 
         // Initiate mail sending by connecting to SMTP
-        this._smtpClient.connect();
+        this._smtpclient.connect();
     }
 
     /**
      * Fired when SMTP client enters idled state (after successfull auth)
      * Setups the mail and transfers the envelope to SMTP
      */
-    Sendmail.prototype._smtpClientOnIdle = function(){
+    Sendmail.prototype._smtpclientOnIdle = function(){
         // Set default options
         ["subject", "from", "sender", "to", "cc", "bcc", "reply-to", "in-reply-to", "references"].forEach((function(key){
             if(key in this.mail){
@@ -114,21 +114,21 @@
         }).bind(this));
 
         // send envelope to smtp
-        this._smtpClient.useEnvelope(this._composer.getEnvelope());
+        this._smtpclient.useEnvelope(this._composer.getEnvelope());
     };
 
     /**
      * Fired when SMTP client enters Ready state (envelope has been set up and data can be sent)
      * Starts streaming by the mail composer
      */
-    Sendmail.prototype._smtpClientOnReady = function(){
+    Sendmail.prototype._smtpclientOnReady = function(){
         this._composer.stream();
     };
 
     /**
      * Fired when SMTP client emits ondrain event. Mail composer can resume streaming
      */
-    Sendmail.prototype._smtpClientOnDrain = function(){
+    Sendmail.prototype._smtpclientOnDrain = function(){
         this._composer.resume();
     };
 
@@ -137,9 +137,9 @@
      *
      * @param {Boolean} success If true, the mail was sent successfully
      */
-    Sendmail.prototype._smtpClientOnDone = function(success){
-        this._smtpClient.onidle = function(){}; // prevent sending the mail again
-        this._smtpClient.quit(); // QUIT
+    Sendmail.prototype._smtpclientOnDone = function(success){
+        this._smtpclient.onidle = function(){}; // prevent sending the mail again
+        this._smtpclient.quit(); // QUIT
         this._returned = true;
         this.callback(null, success);
     };
@@ -149,7 +149,7 @@
      *
      * @param {Error} err Error received
      */
-    Sendmail.prototype._smtpClientOnError = function(err){
+    Sendmail.prototype._smtpclientOnError = function(err){
         if(!this._returned){
             this._returned = true;
             this.callback(err);
@@ -161,7 +161,7 @@
     /**
      * Connection to the SMTP server has been closed
      */
-    Sendmail.prototype._smtpClientOnClose = function(){
+    Sendmail.prototype._smtpclientOnClose = function(){
         //console.log("Connection closed");
     };
 
@@ -173,7 +173,7 @@
      * @param {String} data Chunk to be sent to the SMTP server
      */
     Sendmail.prototype._composerOnData = function(chunk){
-        if(!this._smtpClient.send(chunk)){
+        if(!this._smtpclient.send(chunk)){
             this._composer.suspend();
         }
     };
@@ -182,7 +182,7 @@
      * Fired when mail cposer has emitted the entire message
      */
     Sendmail.prototype._composerOnEnd = function(){
-        this._smtpClient.end();
+        this._smtpclient.end();
     };
 
     return function(mail, callback){