Bump up release version to 0.0.46

Unit tests

assets/css/src/newsletter_editor/components/heading.styl

@@ -4,7 +4,7 @@
 
 .mailpoet_input_title,
 .mailpoet_input_preheader
-  width: 400px
+  width: 500px
   padding: 3px
   line-height: normal
 

assets/js/src/form/form.jsx

@@ -66,22 +66,22 @@ define(
         MailPoet.Ajax.post({
           endpoint: this.props.endpoint,
           action: 'get',
-          data: id
-        }).done(function(response) {
-          if(response === false) {
-            this.setState({
-              loading: false,
-              item: {}
-            }, function() {
-              this.context.router.push('/new');
-            }.bind(this));
-          } else {
-            this.setState({
-              loading: false,
-              item: response
-            });
+          data: {
+            id: id
           }
-        }.bind(this));
+        }).done((response) => {
+          this.setState({
+            loading: false,
+            item: response.data
+          });
+        }).fail((response) => {
+          this.setState({
+            loading: false,
+            item: {}
+          }, function() {
+            this.context.router.push('/new');
+          });
+        });
       },
       handleSubmit: function(e) {
         e.preventDefault();
@@ -115,29 +115,25 @@ define(
           endpoint: this.props.endpoint,
           action: 'save',
           data: item
-        }).done(function(response) {
+        }).always(() => {
           this.setState({ loading: false });
-
-          if(response.result === true) {
-            if(this.props.onSuccess !== undefined) {
-              this.props.onSuccess();
-            } else {
-              this.context.router.push('/');
-            }
-
-            if(this.props.params.id !== undefined) {
-              this.props.messages.onUpdate();
-            } else {
-              this.props.messages.onCreate();
-            }
+        }).done((response) => {
+          if(this.props.onSuccess !== undefined) {
+            this.props.onSuccess();
           } else {
-            if(response.result === false) {
-              if(response.errors.length > 0) {
-                this.setState({ errors: response.errors });
-              }
-            }
+            this.context.router.push('/');
           }
-        }.bind(this));
+
+          if(this.props.params.id !== undefined) {
+            this.props.messages.onUpdate();
+          } else {
+            this.props.messages.onCreate();
+          }
+        }).fail((response) => {
+          if(response.errors.length > 0) {
+            this.setState({ errors: response.errors });
+          }
+        });
       },
       handleValueChange: function(e) {
         if (this.props.onChange) {
@@ -159,7 +155,7 @@ define(
           var errors = this.getErrors().map(function(error, index) {
             return (
               <p key={ 'error-'+index } className="mailpoet_error">
-                { error }
+                { error.message }
               </p>
             );
           });

assets/js/src/forms/list.jsx

@@ -27,48 +27,48 @@ const columns = [
 ];
 
 const messages = {
-  onTrash: function(response) {
-    var count = ~~response;
-    var message = null;
+  onTrash: (response) => {
+    const count = ~~response.meta.count;
+    let message = null;
 
-    if(count === 1) {
+    if (count === 1) {
       message = (
         MailPoet.I18n.t('oneFormTrashed')
       );
     } else {
       message = (
         MailPoet.I18n.t('multipleFormsTrashed')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   },
-  onDelete: function(response) {
-    var count = ~~response;
-    var message = null;
+  onDelete: (response) => {
+    const count = ~~response.meta.count;
+    let message = null;
 
-    if(count === 1) {
+    if (count === 1) {
       message = (
         MailPoet.I18n.t('oneFormDeleted')
       );
     } else {
       message = (
         MailPoet.I18n.t('multipleFormsDeleted')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   },
-  onRestore: function(response) {
-    var count = ~~response;
-    var message = null;
+  onRestore: (response) => {
+    const count = ~~response.meta.count;
+    let message = null;
 
-    if(count === 1) {
+    if (count === 1) {
       message = (
         MailPoet.I18n.t('oneFormRestored')
       );
     } else {
       message = (
         MailPoet.I18n.t('multipleFormsRestored')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   }
@@ -99,14 +99,21 @@ const item_actions = [
       return MailPoet.Ajax.post({
         endpoint: 'forms',
         action: 'duplicate',
-        data: item.id
-      }).done(function(response) {
-        if (response !== false && response['name'] !== undefined) {
-          MailPoet.Notice.success(
-            (MailPoet.I18n.t('formDuplicated')).replace('%$1s', response.name)
+        data: {
+          id: item.id
+        }
+      }).done((response) => {
+        MailPoet.Notice.success(
+          (MailPoet.I18n.t('formDuplicated')).replace('%$1s', response.data.name)
+        );
+        refresh();
+      }).fail((response) => {
+        if (response.errors.length > 0) {
+          MailPoet.Notice.error(
+            response.errors.map(function(error) { return error.message; }),
+            { scroll: true }
           );
         }
-        refresh();
       });
     }
   },
@@ -120,9 +127,14 @@ const FormList = React.createClass({
     MailPoet.Ajax.post({
       endpoint: 'forms',
       action: 'create'
-    }).done(function(response) {
-      if(response.result && response.form_id) {
-        window.location = mailpoet_form_edit_url + response.form_id;
+    }).done((response) => {
+      window.location = mailpoet_form_edit_url + response.data.id;
+    }).fail((response) => {
+      if (response.errors.length > 0) {
+        MailPoet.Notice.error(
+          response.errors.map(function(error) { return error.message; }),
+          { scroll: true }
+        );
       }
     });
   },
@@ -139,6 +151,10 @@ const FormList = React.createClass({
       return segment.name;
     }).join(', ');
 
+    if (form.settings.segments_selected_by === 'user') {
+      segments = MailPoet.I18n.t('userChoice') + ' ' + segments;
+    }
+
     return (
       <div>
         <td className={ row_classes }>

assets/js/src/listing/bulk_actions.jsx

@@ -53,7 +53,10 @@ function(
       }
 
       if(data.action) {
-        this.props.onBulkAction(selected_ids, data).then(onSuccess);
+        const promise = this.props.onBulkAction(selected_ids, data);
+        if (promise !== false) {
+          promise.then(onSuccess);
+        };
       }
 
       this.setState({

assets/js/src/listing/listing.jsx

@@ -456,22 +456,29 @@ const Listing = React.createClass({
           sort_by: this.state.sort_by,
           sort_order: this.state.sort_order
         }
-      }).done(function(response) {
+      }).always(() => {
+        this.setState({ loading: false });
+      }).done((response) => {
         this.setState({
-          items: response.items || [],
-          filters: response.filters || {},
-          groups: response.groups || [],
-          count: response.count || 0,
-          loading: false
-        }, function() {
-          if (this.props['onGetItems'] !== undefined) {
-            const count = (response.groups[0] !== undefined)
-              ? ~~(response.groups[0].count)
-              : 0;
-            this.props.onGetItems(count);
+          items: response.data || [],
+          filters: response.meta.filters || {},
+          groups: response.meta.groups || [],
+          count: response.meta.count || 0
+        }, () => {
+          // if viewing an empty trash
+          if (this.state.group === 'trash' && response.meta.count === 0) {
+            // redirect to default group
+            this.handleGroup('all');
           }
-        }.bind(this));
-      }.bind(this));
+        });
+      }).fail(function(response) {
+        if (response.errors.length > 0) {
+          MailPoet.Notice.error(
+            response.errors.map(function(error) { return error.message; }),
+            { scroll: true }
+          );
+        }
+      });
     }
   },
   handleRestoreItem: function(id) {
@@ -483,8 +490,10 @@ const Listing = React.createClass({
     MailPoet.Ajax.post({
       endpoint: this.props.endpoint,
       action: 'restore',
-      data: id
-    }).done(function(response) {
+      data: {
+        id: id
+      }
+    }).done((response) => {
       if (
         this.props.messages !== undefined
         && this.props.messages['onRestore'] !== undefined
@@ -492,7 +501,12 @@ const Listing = React.createClass({
         this.props.messages.onRestore(response);
       }
       this.getItems();
-    }.bind(this));
+    }).fail((response) => {
+      MailPoet.Notice.error(
+        response.errors.map(function(error) { return error.message; }),
+        { scroll: true }
+      );
+    });
   },
   handleTrashItem: function(id) {
     this.setState({
@@ -503,8 +517,10 @@ const Listing = React.createClass({
     MailPoet.Ajax.post({
       endpoint: this.props.endpoint,
       action: 'trash',
-      data: id
-    }).done(function(response) {
+      data: {
+        id: id
+      }
+    }).done((response) => {
       if (
         this.props.messages !== undefined
         && this.props.messages['onTrash'] !== undefined
@@ -512,7 +528,12 @@ const Listing = React.createClass({
         this.props.messages.onTrash(response);
       }
       this.getItems();
-    }.bind(this));
+    }).fail((response) => {
+      MailPoet.Notice.error(
+        response.errors.map(function(error) { return error.message; }),
+        { scroll: true }
+      );
+    });
   },
   handleDeleteItem: function(id) {
     this.setState({
@@ -523,8 +544,10 @@ const Listing = React.createClass({
     MailPoet.Ajax.post({
       endpoint: this.props.endpoint,
       action: 'delete',
-      data: id
-    }).done(function(response) {
+      data: {
+        id: id
+      }
+    }).done((response) => {
       if (
         this.props.messages !== undefined
         && this.props.messages['onDelete'] !== undefined
@@ -532,22 +555,29 @@ const Listing = React.createClass({
         this.props.messages.onDelete(response);
       }
       this.getItems();
-    }.bind(this));
+    }).fail((response) => {
+      MailPoet.Notice.error(
+        response.errors.map(function(error) { return error.message; }),
+        { scroll: true }
+      );
+    });
   },
   handleEmptyTrash: function() {
     return this.handleBulkAction('all', {
       action: 'delete',
       group: 'trash'
-    }).then(function(response) {
-      if (~~(response) > 0) {
-        MailPoet.Notice.success(
-          MailPoet.I18n.t('permanentlyDeleted').replace('%d', response)
-        );
-      }
-
+    }).done((response) => {
+      MailPoet.Notice.success(
+        MailPoet.I18n.t('permanentlyDeleted').replace('%d', response.meta.count)
+      );
       // redirect to default group
       this.handleGroup('all');
-    }.bind(this));
+    }).fail((response) => {
+      MailPoet.Notice.error(
+        response.errors.map(function(error) { return error.message; }),
+        { scroll: true }
+      );
+    });
   },
   handleBulkAction: function(selected_ids, params) {
     if (
@@ -555,7 +585,7 @@ const Listing = React.createClass({
       && this.state.selected_ids.length === 0
       && selected_ids !== 'all'
     ) {
-      return;
+      return false;
     }
 
     this.setState({ loading: true });

assets/js/src/newsletter_editor/blocks/footer.js

@@ -71,11 +71,17 @@ define([
             that.model.set('text', editor.getContent());
           });
 
+          editor.on('click', function(e) {
+            editor.focus();
+          });
+
           editor.on('focus', function(e) {
+            that.disableDragging();
             that.disableShowingTools();
           });
 
           editor.on('blur', function(e) {
+            that.enableDragging();
             that.enableShowingTools();
           });
         },
@@ -84,6 +90,12 @@ define([
         mailpoet_shortcodes_window_title: MailPoet.I18n.t('shortcodesWindowTitle'),
       });
     },
+    disableDragging: function() {
+      this.$('.mailpoet_content').addClass('mailpoet_ignore_drag');
+    },
+    enableDragging: function() {
+      this.$('.mailpoet_content').removeClass('mailpoet_ignore_drag');
+    },
   });
 
   Module.FooterBlockToolsView = base.BlockToolsView.extend({

assets/js/src/newsletter_editor/blocks/header.js

@@ -71,11 +71,17 @@ define([
             that.model.set('text', editor.getContent());
           });
 
+          editor.on('click', function(e) {
+            editor.focus();
+          });
+
           editor.on('focus', function(e) {
+            that.disableDragging();
             that.disableShowingTools();
           });
 
           editor.on('blur', function(e) {
+            that.enableDragging();
             that.enableShowingTools();
           });
         },
@@ -84,6 +90,12 @@ define([
         mailpoet_shortcodes_window_title: MailPoet.I18n.t('shortcodesWindowTitle'),
       });
     },
+    disableDragging: function() {
+      this.$('.mailpoet_content').addClass('mailpoet_ignore_drag');
+    },
+    enableDragging: function() {
+      this.$('.mailpoet_content').removeClass('mailpoet_ignore_drag');
+    },
   });
 
   Module.HeaderBlockToolsView = base.BlockToolsView.extend({

assets/js/src/newsletter_editor/blocks/text.js

@@ -69,11 +69,17 @@ define([
               that.model.set('text', editor.getContent());
             });
 
+            editor.on('click', function(e) {
+              editor.focus();
+            });
+
             editor.on('focus', function(e) {
+              that.disableDragging();
               that.disableShowingTools();
             });
 
             editor.on('blur', function(e) {
+              that.enableDragging();
               that.enableShowingTools();
             });
           },
@@ -83,6 +89,12 @@ define([
         });
       }
     },
+    disableDragging: function() {
+      this.$('.mailpoet_content').addClass('mailpoet_ignore_drag');
+    },
+    enableDragging: function() {
+      this.$('.mailpoet_content').removeClass('mailpoet_ignore_drag');
+    },
   });
 
   Module.TextBlockToolsView = base.BlockToolsView.extend({

assets/js/src/newsletter_editor/components/communication.js

@@ -11,7 +11,7 @@ define([
     return MailPoet.Ajax.post({
       endpoint: 'automatedLatestContent',
       action: args.action,
-      data: args.options || {},
+      data: args.options || {}
     });
   };
   Module._cachedQuery = _.memoize(Module._query, JSON.stringify);
@@ -19,14 +19,14 @@ define([
   Module.getNewsletter = function(options) {
     return Module._query({
       action: 'get',
-      options: options,
+      options: options
     });
   };
 
   Module.getPostTypes = function() {
     return Module._cachedQuery({
       action: 'getPostTypes',
-      options: {},
+      options: {}
     }).then(function(response) {
       return _.values(response.data);
     });
@@ -83,7 +83,7 @@ define([
     return MailPoet.Ajax.post({
       endpoint: 'newsletters',
       action: 'save',
-      data: options || {},
+      data: options || {}
     });
   };
 
@@ -91,7 +91,7 @@ define([
     return MailPoet.Ajax.post({
       endpoint: 'newsletters',
       action: 'sendPreview',
-      data: options || {},
+      data: options || {}
     });
   };
 

assets/js/src/newsletter_editor/components/sidebar.js

@@ -252,32 +252,31 @@ define([
         endpoint: 'newsletters',
         action: 'showPreview',
         data: json,
-      }).done(function(response) {
-        if (response.result === true) {
-          this.previewView = new Module.NewsletterPreviewView({
-            previewUrl: response.data.url
-          });
-
-          var view = this.previewView.render();
-
-          MailPoet.Modal.popup({
-            template: '',
-            element: this.previewView.$el,
-            title: MailPoet.I18n.t('newsletterPreview'),
-            onCancel: function() {
-              this.previewView.destroy();
-              this.previewView = null;
-            }.bind(this)
-          });
-        } else {
-          MailPoet.Notice.error(response.errors);
-        }
-      }.bind(this)).fail(function(error) {
-        MailPoet.Notice.error(
-          MailPoet.I18n.t('newsletterPreviewFailed')
-        );
       }).always(function() {
         MailPoet.Modal.loading(false);
+      }).done(function(response) {
+        this.previewView = new Module.NewsletterPreviewView({
+          previewUrl: response.meta.preview_url
+        });
+
+        var view = this.previewView.render();
+
+        MailPoet.Modal.popup({
+          template: '',
+          element: this.previewView.$el,
+          title: MailPoet.I18n.t('newsletterPreview'),
+          onCancel: function() {
+            this.previewView.destroy();
+            this.previewView = null;
+          }.bind(this)
+        });
+      }.bind(this)).fail(function(response) {
+        if (response.errors.length > 0) {
+          MailPoet.Notice.error(
+            response.errors.map(function(error) { return error.message; }),
+            { scroll: true }
+          );
+        }
       });
     },
     sendPreview: function() {
@@ -302,28 +301,19 @@ define([
       // send test email
       MailPoet.Modal.loading(true);
 
-      CommunicationComponent.previewNewsletter(data).done(function(response) {
-        if(response.result !== undefined && response.result === true) {
-          MailPoet.Notice.success(MailPoet.I18n.t('newsletterPreviewSent'), { scroll: true });
-        } else {
-          if (_.isArray(response.errors)) {
-            response.errors.map(function(error) {
-              MailPoet.Notice.error(error, { scroll: true });
-            });
-          } else {
-            MailPoet.Notice.error(
-              MailPoet.I18n.t('newsletterPreviewFailedToSend'),
-              {
-                scroll: true,
-                static: true,
-              }
-            );
-          }
-        }
+      CommunicationComponent.previewNewsletter(data).always(function() {
         MailPoet.Modal.loading(false);
+      }).done(function(response) {
+        MailPoet.Notice.success(
+          MailPoet.I18n.t('newsletterPreviewSent'),
+          { scroll: true });
       }).fail(function(response) {
-        // an error occurred
-        MailPoet.Modal.loading(false);
+        if (response.errors.length > 0) {
+          MailPoet.Notice.error(
+            response.errors.map(function(error) { return error.message; }),
+            { scroll: true, static: true }
+          );
+        }
       });
     },
   });

assets/js/src/newsletters/listings/notification.jsx

@@ -17,8 +17,8 @@ import {
 } from 'newsletters/scheduling/common.jsx'
 
 const messages = {
-  onTrash(response) {
-    const count = ~~response;
+  onTrash: (response) => {
+    const count = ~~response.meta.count;
     let message = null;
 
     if (count === 1) {
@@ -28,12 +28,12 @@ const messages = {
     } else {
       message = (
         MailPoet.I18n.t('multipleNewslettersTrashed')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   },
-  onDelete(response) {
-    const count = ~~response;
+  onDelete: (response) => {
+    const count = ~~response.meta.count;
     let message = null;
 
     if (count === 1) {
@@ -43,12 +43,12 @@ const messages = {
     } else {
       message = (
         MailPoet.I18n.t('multipleNewslettersDeleted')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   },
-  onRestore(response) {
-    const count = ~~response;
+  onRestore: (response) => {
+    const count = ~~response.meta.count;
     let message = null;
 
     if (count === 1) {
@@ -58,7 +58,7 @@ const messages = {
     } else {
       message = (
         MailPoet.I18n.t('multipleNewslettersRestored')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   }
@@ -127,16 +127,23 @@ const newsletter_actions = [
       return MailPoet.Ajax.post({
         endpoint: 'newsletters',
         action: 'duplicate',
-        data: newsletter.id
-      }).done(function(response) {
-        if (response !== false && response.subject !== undefined) {
-          MailPoet.Notice.success(
-            (MailPoet.I18n.t('newsletterDuplicated')).replace(
-              '%$1s', response.subject
-            )
+        data: {
+          id: newsletter.id
+        }
+      }).done((response) => {
+        MailPoet.Notice.success(
+          (MailPoet.I18n.t('newsletterDuplicated')).replace(
+            '%$1s', response.data.subject
+          )
+        );
+        refresh();
+      }).fail((response) => {
+        if (response.errors.length > 0) {
+          MailPoet.Notice.error(
+            response.errors.map(function(error) { return error.message; }),
+            { scroll: true }
           );
         }
-        refresh();
       });
     }
   },

assets/js/src/newsletters/listings/standard.jsx

@@ -12,8 +12,8 @@ import { QueueMixin, StatisticsMixin } from 'newsletters/listings/mixins.jsx'
 const mailpoet_tracking_enabled = (!!(window['mailpoet_tracking_enabled']));
 
 const messages = {
-  onTrash(response) {
-    const count = ~~response;
+  onTrash: (response) => {
+    const count = ~~response.meta.count;
     let message = null;
 
     if (count === 1) {
@@ -23,12 +23,12 @@ const messages = {
     } else {
       message = (
         MailPoet.I18n.t('multipleNewslettersTrashed')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   },
-  onDelete(response) {
-    const count = ~~response;
+  onDelete: (response) => {
+    const count = ~~response.meta.count;
     let message = null;
 
     if (count === 1) {
@@ -38,12 +38,12 @@ const messages = {
     } else {
       message = (
         MailPoet.I18n.t('multipleNewslettersDeleted')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   },
-  onRestore(response) {
-    const count = ~~response;
+  onRestore: (response) => {
+    const count = ~~response.meta.count;
     let message = null;
 
     if (count === 1) {
@@ -53,7 +53,7 @@ const messages = {
     } else {
       message = (
         MailPoet.I18n.t('multipleNewslettersRestored')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   }
@@ -122,16 +122,23 @@ const newsletter_actions = [
       return MailPoet.Ajax.post({
         endpoint: 'newsletters',
         action: 'duplicate',
-        data: newsletter.id
-      }).done(function(response) {
-        if (response !== false && response.subject !== undefined) {
-          MailPoet.Notice.success(
-            (MailPoet.I18n.t('newsletterDuplicated')).replace(
-              '%$1s', response.subject
-            )
+        data: {
+          id: newsletter.id
+        }
+      }).done((response) => {
+        MailPoet.Notice.success(
+          (MailPoet.I18n.t('newsletterDuplicated')).replace(
+            '%$1s', response.data.subject
+          )
+        );
+        refresh();
+      }).fail((response) => {
+        if (response.errors.length > 0) {
+          MailPoet.Notice.error(
+            response.errors.map(function(error) { return error.message; }),
+            { scroll: true }
           );
         }
-        refresh();
       });
     }
   },

assets/js/src/newsletters/listings/welcome.jsx

@@ -15,8 +15,8 @@ const mailpoet_segments = window.mailpoet_segments || {};
 const mailpoet_tracking_enabled = (!!(window['mailpoet_tracking_enabled']));
 
 const messages = {
-  onTrash(response) {
-    const count = ~~response;
+  onTrash: (response) => {
+    const count = ~~response.meta.count;
     let message = null;
 
     if (count === 1) {
@@ -26,12 +26,12 @@ const messages = {
     } else {
       message = (
         MailPoet.I18n.t('multipleNewslettersTrashed')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   },
-  onDelete(response) {
-    const count = ~~response;
+  onDelete: (response) => {
+    const count = ~~response.meta.count;
     let message = null;
 
     if (count === 1) {
@@ -41,12 +41,12 @@ const messages = {
     } else {
       message = (
         MailPoet.I18n.t('multipleNewslettersDeleted')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   },
-  onRestore(response) {
-    const count = ~~response;
+  onRestore: (response) => {
+    const count = ~~response.meta.count;
     let message = null;
 
     if (count === 1) {
@@ -56,7 +56,7 @@ const messages = {
     } else {
       message = (
         MailPoet.I18n.t('multipleNewslettersRestored')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   }
@@ -125,16 +125,23 @@ const newsletter_actions = [
       return MailPoet.Ajax.post({
         endpoint: 'newsletters',
         action: 'duplicate',
-        data: newsletter.id
-      }).done(function(response) {
-        if (response !== false && response.subject !== undefined) {
-          MailPoet.Notice.success(
-            (MailPoet.I18n.t('newsletterDuplicated')).replace(
-              '%$1s', response.subject
-            )
+        data: {
+          id: newsletter.id
+        }
+      }).done((response) => {
+        MailPoet.Notice.success(
+          (MailPoet.I18n.t('newsletterDuplicated')).replace(
+            '%$1s', response.data.subject
+          )
+        );
+        refresh();
+      }).fail((response) => {
+        if (response.errors.length > 0) {
+          MailPoet.Notice.error(
+            response.errors.map(function(error) { return error.message; }),
+            { scroll: true }
           );
         }
-        refresh();
       });
     }
   },

assets/js/src/newsletters/send.jsx

@@ -66,22 +66,22 @@ define(
         MailPoet.Ajax.post({
           endpoint: 'newsletters',
           action: 'get',
-          data: id
-        }).done((response) => {
-          if(response === false) {
-            this.setState({
-              loading: false,
-              item: {},
-            }, function() {
-              this.context.router.push('/new');
-            }.bind(this));
-          } else {
-            this.setState({
-              loading: false,
-              item: response,
-              fields: this.getFieldsByNewsletter(response),
-            });
+          data: {
+            id: id
           }
+        }).done((response) => {
+          this.setState({
+            loading: false,
+            item: response.data,
+            fields: this.getFieldsByNewsletter(response.data)
+          });
+        }).fail((response) => {
+          this.setState({
+            loading: false,
+            item: {}
+          }, () => {
+            this.context.router.push('/new');
+          });
         });
       },
       handleSend: function(e) {

assets/js/src/newsletters/types.jsx

@@ -28,17 +28,16 @@ define(
             type: type,
             subject: MailPoet.I18n.t('draftNewsletterTitle'),
           }
-        }).done(function(response) {
-          if(response.result && response.newsletter.id) {
-            this.context.router.push(`/template/${response.newsletter.id}`);
-          } else {
-            if(response.errors.length > 0) {
-              response.errors.map(function(error) {
-                MailPoet.Notice.error(error);
-              });
-            }
+        }).done((response) => {
+          this.context.router.push(`/template/${response.data.id}`);
+        }).fail((response) => {
+          if (response.errors.length > 0) {
+            MailPoet.Notice.error(
+              response.errors.map(function(error) { return error.message; }),
+              { scroll: true }
+            );
           }
-        }.bind(this));
+        });
       },
       render: function() {
         return (

assets/js/src/newsletters/types/notification/notification.jsx

@@ -50,17 +50,16 @@ define(
             type: 'notification',
             subject: MailPoet.I18n.t('draftNewsletterTitle'),
           }),
-        }).done(function(response) {
-          if(response.result && response.newsletter.id) {
-            this.showTemplateSelection(response.newsletter.id);
-          } else {
-            if(response.errors.length > 0) {
-              response.errors.map(function(error) {
-                MailPoet.Notice.error(error);
-              });
-            }
+        }).done((response) => {
+          this.showTemplateSelection(response.data.id);
+        }).fail((response) => {
+          if (response.errors.length > 0) {
+            MailPoet.Notice.error(
+              response.errors.map(function(error) { return error.message; }),
+              { scroll: true }
+            );
           }
-        }.bind(this));
+        });
       },
       showTemplateSelection: function(newsletterId) {
         this.context.router.push(`/template/${newsletterId}`);

assets/js/src/newsletters/types/standard.jsx

@@ -25,19 +25,18 @@ define(
           endpoint: 'newsletters',
           action: 'create',
           data: {
-            type: 'standard',
+            type: 'standard'
           }
-        }).done(function(response) {
-          if(response.result && response.newsletter.id) {
-            this.showTemplateSelection(response.newsletter.id);
-          } else {
-            if(response.errors.length > 0) {
-              response.errors.map(function(error) {
-                MailPoet.Notice.error(error);
-              });
-            }
+        }).done((response) => {
+          this.showTemplateSelection(response.data.id);
+        }).fail((response) => {
+          if (response.errors.length > 0) {
+            MailPoet.Notice.error(
+              response.errors.map(function(error) { return error.message; }),
+              { scroll: true }
+            );
           }
-        }.bind(this));
+        });
       },
       render: function() {
         return (

assets/js/src/newsletters/types/welcome/scheduling.jsx

@@ -113,17 +113,16 @@ const WelcomeScheduling = React.createClass({
         type: 'welcome',
         options: this.state
       }
-    }).done(function(response) {
-      if (response.result && response.newsletter.id) {
-        this.showTemplateSelection(response.newsletter.id);
-      } else {
+    }).done((response) => {
+        this.showTemplateSelection(response.data.id);
+      }).fail((response) => {
         if (response.errors.length > 0) {
-          response.errors.map(function(error) {
-            MailPoet.Notice.error(error);
-          });
+          MailPoet.Notice.error(
+            response.errors.map(function(error) { return error.message; }),
+            { scroll: true }
+          );
         }
-      }
-    }.bind(this));
+      });
   },
   showTemplateSelection: function(newsletterId) {
     this.context.router.push(`/template/${ newsletterId }`);

assets/js/src/newsletters/types/welcome/welcome.jsx

@@ -57,18 +57,17 @@ define(
           data: _.extend({}, this.state, {
             type: 'welcome',
             subject: MailPoet.I18n.t('draftNewsletterTitle'),
-          }),
-        }).done(function(response) {
-          if(response.result && response.newsletter.id) {
-            this.showTemplateSelection(response.newsletter.id);
-          } else {
-            if(response.errors.length > 0) {
-              response.errors.map(function(error) {
-                MailPoet.Notice.error(error);
-              });
-            }
+          })
+        }).done((response) => {
+          this.showTemplateSelection(response.data.id);
+        }).fail((response) => {
+          if (response.errors.length > 0) {
+            MailPoet.Notice.error(
+              response.errors.map(function(error) { return error.message; }),
+              { scroll: true }
+            );
           }
-        }.bind(this));
+        });
       },
       showTemplateSelection: function(newsletterId) {
         this.context.router.push(`/template/${newsletterId}`);

assets/js/src/public.js

@@ -44,29 +44,36 @@ function(
               endpoint: 'subscribers',
               action: 'subscribe',
               data: data
+            }).fail(function(response) {
+              form.find('.mailpoet_validate_error').html(
+                response.errors.map(function(error) {
+                  return error.message;
+                }).join('<br />')
+              ).show();
             }).done(function(response) {
-              if(response.result === false) {
-                form.find('.mailpoet_validate_error').html(
-                  response.errors.join('<br />')
-                ).show();
+              // successfully subscribed
+              if (
+                response.meta !== undefined
+                && response.meta.redirect_url !== undefined
+              ) {
+                // go to page
+                window.location.href = response.meta.redirect_url;
               } else {
-                // successfully subscribed
-                if(response.page !== undefined) {
-                  // go to page
-                  window.location.href = response.page;
-                } else {
-                  // display success message
-                  form.find('.mailpoet_validate_success').show();
-                }
-
-                // reset form
-                form.trigger('reset');
-                // reset validation
-                parsley.reset();
+                // display success message
+                form.find('.mailpoet_validate_success').show();
               }
 
+              // reset form
+              form.trigger('reset');
+              // reset validation
+              parsley.reset();
+
               // resize iframe
-              if(window.frameElement !== null) {
+              if (
+                window.frameElement !== null
+                && MailPoet !== undefined
+                && MailPoet['Iframe']
+              ) {
                 MailPoet.Iframe.autoSize(window.frameElement);
               }
             });

assets/js/src/segments/list.jsx

@@ -36,48 +36,48 @@ var columns = [
 ];
 
 const messages = {
-  onTrash: function(response) {
-    var count = ~~response;
-    var message = null;
+  onTrash: (response) => {
+    const count = ~~response.meta.count;
+    let message = null;
 
-    if(count === 1) {
+    if (count === 1) {
       message = (
         MailPoet.I18n.t('oneSegmentTrashed')
       );
     } else {
       message = (
         MailPoet.I18n.t('multipleSegmentsTrashed')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   },
-  onDelete: function(response) {
-    var count = ~~response;
-    var message = null;
+  onDelete: (response) => {
+    const count = ~~response.meta.count;
+    let message = null;
 
-    if(count === 1) {
+    if (count === 1) {
       message = (
         MailPoet.I18n.t('oneSegmentDeleted')
       );
     } else {
       message = (
         MailPoet.I18n.t('multipleSegmentsDeleted')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   },
-  onRestore: function(response) {
-    var count = ~~response;
-    var message = null;
+  onRestore: (response) => {
+    const count = ~~response.meta.count;
+    let message = null;
 
-    if(count === 1) {
+    if (count === 1) {
       message = (
         MailPoet.I18n.t('oneSegmentRestored')
       );
     } else {
       message = (
         MailPoet.I18n.t('multipleSegmentsRestored')
-      ).replace('%$1d', count);
+      ).replace('%$1d', count.toLocaleString());
     }
     MailPoet.Notice.success(message);
   }
@@ -106,16 +106,23 @@ const item_actions = [
   {
     name: 'duplicate_segment',
     label: MailPoet.I18n.t('duplicate'),
-    onClick: function(item, refresh) {
+    onClick: (item, refresh) => {
       return MailPoet.Ajax.post({
         endpoint: 'segments',
         action: 'duplicate',
-        data: item.id
-      }).done(function(response) {
+        data: {
+          id: item.id
+        }
+      }).done((response) => {
         MailPoet.Notice.success(
-          (MailPoet.I18n.t('listDuplicated')).replace('%$1s', response.name)
+          MailPoet.I18n.t('listDuplicated').replace('%$1s', response.data.name)
         );
         refresh();
+      }).fail((response) => {
+        MailPoet.Notice.error(
+          response.errors.map(function(error) { return error.message; }),
+          { scroll: true }
+        );
       });
     },
     display: function(segment) {

assets/js/src/subscribers/list.jsx

@@ -37,59 +37,50 @@ const columns = [
 ];
 
 const messages = {
-  onTrash: function(response) {
-    if (response) {
-      var message = null;
-      if (~~response === 1) {
-        message = (
-          MailPoet.I18n.t('oneSubscriberTrashed')
-        );
-      } else if (~~response > 1) {
-        message = (
-          MailPoet.I18n.t('multipleSubscribersTrashed')
-        ).replace('%$1d', (~~response).toLocaleString());
-      }
+  onTrash: (response) => {
+    const count = ~~response.meta.count;
+    let message = null;
 
-      if (message !== null) {
-        MailPoet.Notice.success(message);
-      }
+    if (count === 1) {
+      message = (
+        MailPoet.I18n.t('oneSubscriberTrashed')
+      );
+    } else {
+      message = (
+        MailPoet.I18n.t('multipleSubscribersTrashed')
+      ).replace('%$1d', count.toLocaleString());
     }
+    MailPoet.Notice.success(message);
   },
-  onDelete: function(response) {
-    if (response) {
-      var message = null;
-      if (~~response === 1) {
-        message = (
-          MailPoet.I18n.t('oneSubscriberDeleted')
-        );
-      } else if (~~response > 1) {
-        message = (
-          MailPoet.I18n.t('multipleSubscribersDeleted')
-        ).replace('%$1d', ~~response);
-      }
+  onDelete: (response) => {
+    const count = ~~response.meta.count;
+    let message = null;
 
-      if (message !== null) {
-        MailPoet.Notice.success(message);
-      }
+    if (count === 1) {
+      message = (
+        MailPoet.I18n.t('oneSubscriberDeleted')
+      );
+    } else {
+      message = (
+        MailPoet.I18n.t('multipleSubscribersDeleted')
+      ).replace('%$1d', count.toLocaleString());
     }
+    MailPoet.Notice.success(message);
   },
-  onRestore: function(response) {
-    if (response) {
-      var message = null;
-      if (~~response === 1) {
-        message = (
-          MailPoet.I18n.t('oneSubscriberRestored')
-        );
-      } else if (~~response > 1) {
-        message = (
-          MailPoet.I18n.t('multipleSubscribersRestored')
-        ).replace('%$1d', (~~response).toLocaleString());
-      }
+  onRestore: (response) => {
+    const count = ~~response.meta.count;
+    let message = null;
 
-      if (message !== null) {
-        MailPoet.Notice.success(message);
-      }
+    if (count === 1) {
+      message = (
+        MailPoet.I18n.t('oneSubscriberRestored')
+      );
+    } else {
+      message = (
+        MailPoet.I18n.t('multipleSubscribersRestored')
+      ).replace('%$1d', count.toLocaleString());
     }
+    MailPoet.Notice.success(message);
   }
 };
 
@@ -120,8 +111,8 @@ const bulk_actions = [
     onSuccess: function(response) {
       MailPoet.Notice.success(
         MailPoet.I18n.t('multipleSubscribersMovedToList')
-        .replace('%$1d', (~~(response.subscribers)).toLocaleString())
-        .replace('%$2s', response.segment)
+        .replace('%$1d', (~~(response.meta.count)).toLocaleString())
+        .replace('%$2s', response.meta.segment)
       );
     }
   },
@@ -151,8 +142,8 @@ const bulk_actions = [
     onSuccess: function(response) {
       MailPoet.Notice.success(
         MailPoet.I18n.t('multipleSubscribersAddedToList')
-        .replace('%$1d', (~~response.subscribers).toLocaleString())
-        .replace('%$2s', response.segment)
+        .replace('%$1d', (~~response.meta.count).toLocaleString())
+        .replace('%$2s', response.meta.segment)
       );
     }
   },
@@ -182,8 +173,8 @@ const bulk_actions = [
     onSuccess: function(response) {
       MailPoet.Notice.success(
         MailPoet.I18n.t('multipleSubscribersRemovedFromList')
-        .replace('%$1d', (~~response.subscribers).toLocaleString())
-        .replace('%$2s', response.segment)
+        .replace('%$1d', (~~response.meta.count).toLocaleString())
+        .replace('%$2s', response.meta.segment)
       );
     }
   },
@@ -193,7 +184,7 @@ const bulk_actions = [
     onSuccess: function(response) {
       MailPoet.Notice.success(
         MailPoet.I18n.t('multipleSubscribersRemovedFromAllLists')
-        .replace('%$1d', (~~response).toLocaleString())
+        .replace('%$1d', (~~response.meta.count).toLocaleString())
       );
     }
   },
@@ -203,7 +194,7 @@ const bulk_actions = [
     onSuccess: function(response) {
       MailPoet.Notice.success(
         MailPoet.I18n.t('multipleConfirmationEmailsSent')
-        .replace('%$1d', (~~response).toLocaleString())
+        .replace('%$1d', (~~response.meta.count).toLocaleString())
       );
     }
   },
@@ -330,16 +321,23 @@ const SubscriberList = React.createClass({
       </div>
     );
   },
-  onGetItems: function(count) {
-    jQuery('#mailpoet_export_button')[(count > 0) ? 'show' : 'hide']();
-  },
   render: function() {
     return (
       <div>
         <h1 className="title">
-          {MailPoet.I18n.t('pageTitle')} <Link className="page-title-action" to="/new">{MailPoet.I18n.t('new')}</Link>
-          <a className="page-title-action" href="?page=mailpoet-import#step1">{MailPoet.I18n.t('import')}</a>
-          <a id="mailpoet_export_button" className="page-title-action" href="?page=mailpoet-export">{MailPoet.I18n.t('export')}</a>
+          {MailPoet.I18n.t('pageTitle')} <Link
+            className="page-title-action"
+            to="/new"
+          >{MailPoet.I18n.t('new')}</Link>
+          <a
+            className="page-title-action"
+            href="?page=mailpoet-import#step1"
+          >{MailPoet.I18n.t('import')}</a>
+          <a
+            id="mailpoet_export_button"
+            className="page-title-action"
+            href="?page=mailpoet-export"
+          >{MailPoet.I18n.t('export')}</a>
         </h1>
 
         <Listing
@@ -352,7 +350,6 @@ const SubscriberList = React.createClass({
           bulk_actions={ bulk_actions }
           item_actions={ item_actions }
           messages={ messages }
-          onGetItems={ this.onGetItems }
           sort_by={ 'created_at' }
           sort_order={ 'desc' }
         />

lib/API/API.php

@@ -6,9 +6,6 @@ use \MailPoet\Util\Security;
 if(!defined('ABSPATH')) exit;
 
 class API {
-  function __construct() {
-  }
-
   function init() {
     // security token
     add_action(
@@ -27,32 +24,29 @@ class API {
       'wp_ajax_nopriv_mailpoet',
       array($this, 'setupPublic')
     );
-    // Public API (Post)
-    add_action(
-      'admin_post_nopriv_mailpoet',
-      array($this, 'setupPublic')
-    );
   }
 
   function setupAdmin() {
     if($this->checkToken() === false) {
-      (new ErrorResponse(
+      $error_response = new ErrorResponse(
         array(
           Error::UNAUTHORIZED => __('You need to specify a valid API token.')
         ),
         array(),
         Response::STATUS_UNAUTHORIZED
-      ))->send();
+      );
+      $error_response->send();
     }
 
     if($this->checkPermissions() === false) {
-      (new ErrorResponse(
+      $error_response = new ErrorResponse(
         array(
           Error::FORBIDDEN => __('You do not have the required permissions.')
         ),
         array(),
         Response::STATUS_FORBIDDEN
-      ))->send();
+      );
+      $error_response->send();
     }
 
     $this->processRoute();
@@ -60,13 +54,14 @@ class API {
 
   function setupPublic() {
     if($this->checkToken() === false) {
-      (new ErrorResponse(
+      $error_response = new ErrorResponse(
         array(
           Error::UNAUTHORIZED => __('You need to specify a valid API token.')
         ),
         array(),
         Response::STATUS_UNAUTHORIZED
-      ))->send();
+      );
+      $error_response->send();
     }
 
     $this->processRoute();
@@ -76,14 +71,7 @@ class API {
     $class = ucfirst($_POST['endpoint']);
     $endpoint =  __NAMESPACE__ . "\\Endpoints\\" . $class;
     $method = $_POST['method'];
-
-    $doing_ajax = (bool)(defined('DOING_AJAX') && DOING_AJAX);
-
-    if($doing_ajax) {
-      $data = isset($_POST['data']) ? stripslashes_deep($_POST['data']) : array();
-    } else {
-      $data = $_POST;
-    }
+    $data = isset($_POST['data']) ? stripslashes_deep($_POST['data']) : array();
 
     if(is_array($data) && !empty($data)) {
       // filter out reserved keywords from data
@@ -99,18 +87,12 @@ class API {
     try {
       $endpoint = new $endpoint();
       $response = $endpoint->$method($data);
-
-      // TODO: remove this condition once the API unification is complete
-      if(is_object($response)) {
-        $response->send();
-      } else {
-        // LEGACY API
-        wp_send_json($response);
-      }
+      $response->send();
     } catch(\Exception $e) {
-      (new ErrorResponse(
+      $error_response = new ErrorResponse(
         array($e->getCode() => $e->getMessage())
-      ))->send();
+      );
+      $error_response->send();
     }
   }
 

lib/API/Endpoints/CustomFields.php

@@ -8,7 +8,7 @@ if(!defined('ABSPATH')) exit;
 
 class CustomFields extends APIEndpoint {
   function getAll() {
-    $collection = CustomField::findMany();
+    $collection = CustomField::orderByAsc('created_at')->findMany();
     $custom_fields = array_map(function($custom_field) {
       return $custom_field->asArray();
     }, $collection);

lib/API/Endpoints/Forms.php

@@ -1,5 +1,7 @@
 <?php
 namespace MailPoet\API\Endpoints;
+use MailPoet\API\Endpoint as APIEndpoint;
+use MailPoet\API\Error as APIError;
 
 use \MailPoet\Models\Form;
 use \MailPoet\Models\StatisticsForms;
@@ -9,16 +11,17 @@ use \MailPoet\Form\Util;
 
 if(!defined('ABSPATH')) exit;
 
-class Forms {
-  function __construct() {
-  }
-
-  function get($id = false) {
+class Forms extends APIEndpoint {
+  function get($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $form = Form::findOne($id);
-    if($form !== false) {
-      $form = $form->asArray();
+    if($form === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This form does not exist.')
+      ));
+    } else {
+      return $this->successResponse($form->asArray());
     }
-    return $form;
   }
 
   function listing($data = array()) {
@@ -29,8 +32,8 @@ class Forms {
 
     $listing_data = $listing->get();
 
-    // fetch segments relations for each returned item
-    foreach($listing_data['items'] as $key => $form) {
+    $data = array();
+    foreach($listing_data['items'] as $form) {
       $form = $form->asArray();
 
       $form['signups'] = StatisticsForms::getTotalSignups($form['id']);
@@ -40,10 +43,15 @@ class Forms {
         ? $form['settings']['segments']
         : array()
       );
-      $listing_data['items'][$key] = $form;
+
+      $data[] = $form;
     }
 
-    return $listing_data;
+    return $this->successResponse($data, array(
+      'count' => $listing_data['count'],
+      'filters' => $listing_data['filters'],
+      'groups' => $listing_data['groups']
+    ));
   }
 
   function create() {
@@ -87,14 +95,10 @@ class Forms {
     $errors = $form->getErrors();
 
     if(!empty($errors)) {
-      return array(
-        'result' => false,
-        'errors' => $errors
-      );
+      return $this->badRequest($errors);
     } else {
-      return array(
-        'result' => true,
-        'form_id' => $form->id()
+      return $this->successResponse(
+        Form::findOne($form->id)->asArray()
       );
     }
   }
@@ -109,76 +113,74 @@ class Forms {
     // styles
     $css = new Util\Styles(FormRenderer::getStyles($data));
 
-    return array(
+    return $this->successResponse(array(
       'html' => $html,
       'css' => $css->render()
-    );
+    ));
   }
 
-  function exportsEditor($id) {
-    $exports = false;
-
+  function exportsEditor($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $form = Form::findOne($id);
-
-    if($form !== false) {
+    if($form === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This form does not exist.')
+      ));
+    } else {
       $exports = Util\Export::getAll($form->asArray());
+      return $this->successResponse($exports);
     }
-
-    return $exports;
   }
 
   function saveEditor($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
+
     $form_id = (isset($data['id']) ? (int)$data['id'] : 0);
     $name = (isset($data['name']) ? $data['name'] : __('New form'));
     $body = (isset($data['body']) ? $data['body'] : array());
     $settings = (isset($data['settings']) ? $data['settings'] : array());
     $styles = (isset($data['styles']) ? $data['styles'] : '');
 
-    if(empty($body) || empty($settings)) {
-      // error
-      return false;
-    } else {
-      // check if the form is used as a widget
-      $is_widget = false;
-      $widgets = get_option('widget_mailpoet_form');
-      if(!empty($widgets)) {
-        foreach($widgets as $widget) {
-          if(isset($widget['form']) && (int)$widget['form'] === $form_id) {
-            $is_widget = true;
-            break;
-          }
-        }
-      }
-
-      // check if the user gets to pick his own lists
-      // or if it's selected by the admin
-      $has_segment_selection = false;
-
-      foreach($body as $i => $block) {
-        if($block['type'] === 'segment') {
-          $has_segment_selection = true;
-          if(!empty($block['params']['values'])) {
-            $list_selection = array_filter(
-              array_map(function($segment) {
-                return (isset($segment['id'])
-                  ? (int)$segment['id']
-                  : null
-                );
-              }, $block['params']['values'])
-            );
-          }
+    // check if the form is used as a widget
+    $is_widget = false;
+    $widgets = get_option('widget_mailpoet_form');
+    if(!empty($widgets)) {
+      foreach($widgets as $widget) {
+        if(isset($widget['form']) && (int)$widget['form'] === $form_id) {
+          $is_widget = true;
           break;
         }
       }
+    }
 
-      // check list selection
-      if($has_segment_selection === true) {
-        $settings['segments_selected_by'] = 'user';
-      } else {
-        $settings['segments_selected_by'] = 'admin';
+    // check if the user gets to pick his own lists
+    // or if it's selected by the admin
+    $has_segment_selection = false;
+    foreach($body as $i => $block) {
+      if($block['type'] === 'segment') {
+        $has_segment_selection = true;
+        if(!empty($block['params']['values'])) {
+          $list_selection = array_filter(
+            array_map(function($segment) {
+              return (isset($segment['id'])
+                ? $segment['id']
+                : null
+              );
+            }, $block['params']['values'])
+          );
+        }
+        break;
       }
     }
 
+    // check list selection
+    if($has_segment_selection === true) {
+      $settings['segments_selected_by'] = 'user';
+      $settings['segments'] = $list_selection;
+    } else {
+      $settings['segments_selected_by'] = 'admin';
+    }
+
     $form = Form::createOrUpdate(array(
       'id' => $form_id,
       'name' => $name,
@@ -187,64 +189,101 @@ class Forms {
       'styles' => $styles
     ));
 
-    if($form->getErrors() === false) {
-      return array(
-        'result' => true,
-        'is_widget' => $is_widget
-      );
+    $errors = $form->getErrors();
+
+    if(!empty($errors)) {
+      return $this->badRequest($errors);
     } else {
-      return array(
-        'result' => false,
-        'errors' => $form->getErrors()
+      return $this->successResponse(
+        Form::findOne($form->id)->asArray(),
+        array('is_widget' => $is_widget)
       );
     }
   }
 
-  function restore($id) {
+  function restore($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $form = Form::findOne($id);
-    if($form !== false) {
+    if($form === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This form does not exist.')
+      ));
+    } else {
       $form->restore();
+      return $this->successResponse(
+        Form::findOne($form->id)->asArray(),
+        array('count' => 1)
+      );
     }
-    return ($form->getErrors() === false);
   }
 
-  function trash($id) {
+  function trash($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $form = Form::findOne($id);
-    if($form !== false) {
+    if($form === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This form does not exist.')
+      ));
+    } else {
       $form->trash();
+      return $this->successResponse(
+        Form::findOne($form->id)->asArray(),
+        array('count' => 1)
+      );
     }
-    return ($form->getErrors() === false);
   }
 
-  function delete($id) {
+  function delete($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $form = Form::findOne($id);
-    if($form !== false) {
+    if($form === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This form does not exist.')
+      ));
+    } else {
       $form->delete();
-      return 1;
+      return $this->successResponse(null, array('count' => 1));
     }
-    return false;
   }
 
-  function duplicate($id) {
-    $result = false;
-
+  function duplicate($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $form = Form::findOne($id);
-    if($form !== false) {
+
+    if($form === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This form does not exist.')
+      ));
+    } else {
       $data = array(
         'name' => sprintf(__('Copy of %s'), $form->name)
       );
-      $result = $form->duplicate($data)->asArray();
-    }
+      $duplicate = $form->duplicate($data);
+      $errors = $duplicate->getErrors();
 
-    return $result;
+      if(!empty($errors)) {
+        return $this->errorResponse($errors);
+      } else {
+        return $this->successResponse(
+          Form::findOne($duplicate->id)->asArray(),
+          array('count' => 1)
+        );
+      }
+    }
   }
 
   function bulkAction($data = array()) {
-    $bulk_action = new Listing\BulkAction(
-      '\MailPoet\Models\Form',
-      $data
-    );
-
-    return $bulk_action->apply();
+    try {
+      $bulk_action = new Listing\BulkAction(
+        '\MailPoet\Models\Form',
+        $data
+      );
+      $meta = $bulk_action->apply();
+      return $this->successResponse(null, $meta);
+    } catch(\Exception $e) {
+      return $this->errorResponse(array(
+        $e->getCode() => $e->getMessage()
+      ));
+    }
   }
 }

lib/API/Endpoints/Newsletters.php

@@ -22,19 +22,20 @@ if(!defined('ABSPATH')) exit;
 require_once(ABSPATH . 'wp-includes/pluggable.php');
 
 class Newsletters extends APIEndpoint {
-  function get($id = false) {
+  function get($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $newsletter = Newsletter::findOne($id);
     if($newsletter === false) {
-      return false;
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This newsletter does not exist.')
+      ));
     } else {
-      $segments = $newsletter->segments()->findArray();
-      $options = $newsletter->options()->findArray();
-      $newsletter = $newsletter->asArray();
-      $newsletter['segments'] = array_map(function($segment) {
-        return $segment['id'];
-      }, $segments);
-      $newsletter['options'] = Helpers::arrayColumn($options, 'value', 'name');
-      return $newsletter;
+      return $this->successResponse(
+        $newsletter
+        ->withSegments()
+        ->withOptions()
+        ->asArray()
+      );
     }
   }
 
@@ -96,8 +97,6 @@ class Newsletters extends APIEndpoint {
   }
 
   function setStatus($data = array()) {
-    $id = (isset($data['id'])) ? (int)$data['id'] : false;
-    $newsletter = Newsletter::findOne($id);
     $status = (isset($data['status']) ? $data['status'] : null);
 
     if(!$status) {
@@ -106,6 +105,9 @@ class Newsletters extends APIEndpoint {
       ));
     }
 
+    $id = (isset($data['id'])) ? (int)$data['id'] : false;
+    $newsletter = Newsletter::findOne($id);
+
     if($newsletter === false) {
       return $this->errorResponse(array(
         APIError::NOT_FOUND => __('This newsletter does not exist.')
@@ -119,143 +121,178 @@ class Newsletters extends APIEndpoint {
       return $this->errorResponse($errors);
     } else {
       return $this->successResponse(
-        $newsletter->asArray()
+        Newsletter::findOne($newsletter->id)->asArray()
       );
     }
   }
 
-  function restore($id) {
+  function restore($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $newsletter = Newsletter::findOne($id);
-    if($newsletter !== false) {
-      $newsletter->restore();
-    }
-    return ($newsletter->getErrors() === false);
-  }
-
-  function trash($id) {
-    $newsletter = Newsletter::findOne($id);
-    if($newsletter !== false) {
-      $newsletter->trash();
-    }
-    return ($newsletter->getErrors() === false);
-  }
-
-  function delete($id) {
-    $newsletter = Newsletter::findOne($id);
-    if($newsletter !== false) {
-      $newsletter->delete();
-      return 1;
-    }
-    return false;
-  }
-
-  function duplicate($id = false) {
-    $result = false;
-
-    $newsletter = Newsletter::findOne($id);
-    if($newsletter !== false) {
-      $duplicate = $newsletter->duplicate(array(
-        'subject' => sprintf(__('Copy of %s'), $newsletter->subject)
+    if($newsletter === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This newsletter does not exist.')
       ));
+    } else {
+      $newsletter->restore();
+      return $this->successResponse(
+        Newsletter::findOne($newsletter->id)->asArray(),
+        array('count' => 1)
+      );
+    }
+  }
 
-      if($duplicate !== false && $duplicate->getErrors() === false) {
-        $result = $duplicate->asArray();
+  function trash($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
+    $newsletter = Newsletter::findOne($id);
+    if($newsletter === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This newsletter does not exist.')
+      ));
+    } else {
+      $newsletter->trash();
+      return $this->successResponse(
+        Newsletter::findOne($newsletter->id)->asArray(),
+        array('count' => 1)
+      );
+    }
+  }
+
+  function delete($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
+    $newsletter = Newsletter::findOne($id);
+    if($newsletter === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This newsletter does not exist.')
+      ));
+    } else {
+      $newsletter->delete();
+      return $this->successResponse(null, array('count' => 1));
+    }
+  }
+
+  function duplicate($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
+    $newsletter = Newsletter::findOne($id);
+
+    if($newsletter === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This newsletter does not exist.')
+      ));
+    } else {
+      $data = array(
+        'subject' => sprintf(__('Copy of %s'), $newsletter->subject)
+      );
+      $duplicate = $newsletter->duplicate($data);
+      $errors = $duplicate->getErrors();
+
+      if(!empty($errors)) {
+        return $this->errorResponse($errors);
+      } else {
+        return $this->successResponse(
+          Newsletter::findOne($duplicate->id)->asArray(),
+          array('count' => 1)
+        );
       }
     }
-    return $result;
   }
 
   function showPreview($data = array()) {
-    if(!isset($data['body'])) {
-      return array(
-        'result' => false,
-        'errors' => array(__('Newsletter data is missing'))
-      );
+    if(empty($data['body'])) {
+      return $this->badRequest(array(
+        APIError::BAD_REQUEST => __('Newsletter data is missing.')
+      ));
     }
-    $newsletter_id = (isset($data['id'])) ? (int)$data['id'] : null;
-    $newsletter = Newsletter::findOne($newsletter_id);
-    if(!$newsletter) {
-      return array(
-        'result' => false,
-        'errors' => array(__('Newsletter could not be read'))
-      );
-    }
-    $newsletter->body = $data['body'];
-    $newsletter->save();
-    $subscriber = Subscriber::getCurrentWPUser();
-    $preview_url = NewsletterUrl::getViewInBrowserUrl(
-      $data, $subscriber, $queue = false, $preview = true
-    );
-    return array(
-      'result' => true,
-      'data' => array('url' => $preview_url)
-    );
-  }
 
-  function sendPreview($data = array()) {
     $id = (isset($data['id'])) ? (int)$data['id'] : false;
     $newsletter = Newsletter::findOne($id);
 
     if($newsletter === false) {
-      return array(
-        'result' => false
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This newsletter does not exist.')
+      ));
+    } else {
+      $newsletter->body = $data['body'];
+      $newsletter->save();
+      $subscriber = Subscriber::getCurrentWPUser();
+      $preview_url = NewsletterUrl::getViewInBrowserUrl(
+        $data, $subscriber, $queue = false, $preview = true
       );
-    }
-    if(empty($data['subscriber'])) {
-      return array(
-        'result' => false,
-        'errors' => array(__('Please specify receiver information.'))
-      );
-    }
 
-    $newsletter = $newsletter->asArray();
-
-    $renderer = new Renderer($newsletter, $preview = true);
-    $rendered_newsletter = $renderer->render();
-    $divider = '***MailPoet***';
-    $data_for_shortcodes =
-      array_merge(array($newsletter['subject']), $rendered_newsletter);
-    $body = implode($divider, $data_for_shortcodes);
-
-    $subscriber = Subscriber::getCurrentWPUser();
-    $subscriber = ($subscriber) ? $subscriber->asArray() : false;
-
-    $shortcodes = new \MailPoet\Newsletter\Shortcodes\Shortcodes(
-      $newsletter,
-      $subscriber
-    );
-    list($newsletter['subject'],
-      $newsletter['body']['html'],
-      $newsletter['body']['text']
-      ) = explode($divider, $shortcodes->replace($body));
-
-    try {
-      $mailer = new \MailPoet\Mailer\Mailer(
-        $mailer = false,
-        $sender = false,
-        $reply_to = false
-      );
-      $result = $mailer->send($newsletter, $data['subscriber']);
-
-      return array('result' => $result);
-    } catch(\Exception $e) {
-      return array(
-        'result' => false,
-        'errors' => array($e->getMessage()),
+      return $this->successResponse(
+        Newsletter::findOne($newsletter->id)->asArray(),
+        array('preview_url' => $preview_url)
       );
     }
   }
 
-  function listing($data = array()) {
+  function sendPreview($data = array()) {
+    if(empty($data['subscriber'])) {
+      return $this->badRequest(array(
+        APIError::BAD_REQUEST => __('Please specify receiver information.')
+      ));
+    }
 
+    $id = (isset($data['id'])) ? (int)$data['id'] : false;
+    $newsletter = Newsletter::findOne($id);
+
+    if($newsletter === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This newsletter does not exist.')
+      ));
+    } else {
+      $newsletter = $newsletter->asArray();
+
+      $renderer = new Renderer($newsletter, $preview = true);
+      $rendered_newsletter = $renderer->render();
+      $divider = '***MailPoet***';
+      $data_for_shortcodes = array_merge(
+        array($newsletter['subject']),
+        $rendered_newsletter
+      );
+
+      $body = implode($divider, $data_for_shortcodes);
+
+      $subscriber = Subscriber::getCurrentWPUser();
+      $subscriber = ($subscriber) ? $subscriber->asArray() : false;
+
+      $shortcodes = new \MailPoet\Newsletter\Shortcodes\Shortcodes(
+        $newsletter,
+        $subscriber
+      );
+      list(
+        $newsletter['subject'],
+        $newsletter['body']['html'],
+        $newsletter['body']['text']
+      ) = explode($divider, $shortcodes->replace($body));
+
+      try {
+        $mailer = new \MailPoet\Mailer\Mailer(
+          $mailer = false,
+          $sender = false,
+          $reply_to = false
+        );
+        $mailer->send($newsletter, $data['subscriber']);
+        return $this->successResponse(
+          Newsletter::findOne($id)->asArray()
+        );
+      } catch(\Exception $e) {
+        return $this->errorResponse(array(
+          $e->getCode() => $e->getMessage()
+        ));
+      }
+    }
+  }
+
+  function listing($data = array()) {
     $listing = new Listing\Handler(
       '\MailPoet\Models\Newsletter',
       $data
     );
     $listing_data = $listing->get();
-    $subscriber = Subscriber::getCurrentWPUser();
 
-    foreach($listing_data['items'] as $key => $newsletter) {
+    $data = array();
+    foreach($listing_data['items'] as $newsletter) {
       $queue = false;
 
       if($newsletter->type === Newsletter::TYPE_STANDARD) {
@@ -287,22 +324,33 @@ class Newsletters extends APIEndpoint {
       }
 
       // get preview url
+      $subscriber = Subscriber::getCurrentWPUser();
       $newsletter->preview_url = NewsletterUrl::getViewInBrowserUrl(
         $newsletter, $subscriber, $queue, $preview = true);
 
-      // convert object to array
-      $listing_data['items'][$key] = $newsletter->asArray();
+      $data[] = $newsletter->asArray();
     }
 
-    return $listing_data;
+    return $this->successResponse($data, array(
+      'count' => $listing_data['count'],
+      'filters' => $listing_data['filters'],
+      'groups' => $listing_data['groups']
+    ));
   }
 
   function bulkAction($data = array()) {
-    $bulk_action = new Listing\BulkAction(
-      '\MailPoet\Models\Newsletter',
-      $data
-    );
-    return $bulk_action->apply();
+    try {
+      $bulk_action = new Listing\BulkAction(
+        '\MailPoet\Models\Newsletter',
+        $data
+      );
+      $meta = $bulk_action->apply();
+      return $this->successResponse(null, $meta);
+    } catch(\Exception $e) {
+      return $this->errorResponse(array(
+        $e->getCode() => $e->getMessage()
+      ));
+    }
   }
 
   function create($data = array()) {
@@ -313,23 +361,25 @@ class Newsletters extends APIEndpoint {
     }
 
     $newsletter = Newsletter::createOrUpdate($data);
+    $errors = $newsletter->getErrors();
 
-    // try to load template data
-    $template_id = (!empty($data['template']) ? (int)$data['template'] : false);
-    $template = NewsletterTemplate::findOne($template_id);
-    if($template !== false) {
-      $newsletter->body = $template->body;
+    if(!empty($errors)) {
+      return $this->badRequest($errors);
     } else {
-      $newsletter->body = array();
+      // try to load template data
+      $template_id = (isset($data['template']) ? (int)$data['template'] : false);
+      $template = NewsletterTemplate::findOne($template_id);
+      if($template === false) {
+        $newsletter->body = array();
+      } else {
+        $newsletter->body = $template->body;
+      }
     }
 
     $newsletter->save();
     $errors = $newsletter->getErrors();
     if(!empty($errors)) {
-      return array(
-        'result' => false,
-        'errors' =>$errors
-      );
+      return $this->badRequest($errors);
     } else {
       if(!empty($options)) {
         $option_fields = NewsletterOptionField::where(
@@ -346,15 +396,20 @@ class Newsletters extends APIEndpoint {
           }
         }
       }
-      if(!isset($data['id']) &&
-        isset($data['type']) &&
-        $data['type'] === 'notification'
+
+      if(
+        empty($data['id'])
+        &&
+        isset($data['type'])
+        &&
+        $data['type'] === Newsletter::TYPE_NOTIFICATION
       ) {
-        Scheduler::processPostNotificationSchedule($newsletter->id);
+        $newsletter = Newsletter::filter('filterWithOptions')->findOne($newsletter->id);
+        Scheduler::processPostNotificationSchedule($newsletter);
       }
-      return array(
-        'result' => true,
-        'newsletter' => $newsletter->asArray()
+
+      return $this->successResponse(
+        Newsletter::findOne($newsletter->id)->asArray()
       );
     }
   }

lib/API/Endpoints/Segments.php

@@ -1,5 +1,7 @@
 <?php
 namespace MailPoet\API\Endpoints;
+use \MailPoet\API\Endpoint as APIEndpoint;
+use \MailPoet\API\Error as APIError;
 
 use \MailPoet\Models\Segment;
 use \MailPoet\Models\SubscriberSegment;
@@ -9,16 +11,16 @@ use \MailPoet\Segments\WP;
 
 if(!defined('ABSPATH')) exit;
 
-class Segments {
-  function __construct() {
-  }
-
-  function get($id = false) {
+class Segments extends APIEndpoint {
+  function get($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $segment = Segment::findOne($id);
     if($segment === false) {
-      return false;
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This list does not exist.')
+      ));
     } else {
-      return $segment->asArray();
+      return $this->successResponse($segment->asArray());
     }
   }
 
@@ -30,18 +32,22 @@ class Segments {
 
     $listing_data = $listing->get();
 
-    // fetch segments relations for each returned item
-    foreach($listing_data['items'] as $key => $segment) {
+    $data = array();
+    foreach($listing_data['items'] as $segment) {
       $segment->subscribers_url = admin_url(
         'admin.php?page=mailpoet-subscribers#/filter[segment='.$segment->id.']'
       );
 
-      $listing_data['items'][$key] = $segment
+      $data[] = $segment
         ->withSubscribersCount()
         ->asArray();
     }
 
-    return $listing_data;
+    return $this->successResponse($data, array(
+      'count' => $listing_data['count'],
+      'filters' => $listing_data['filters'],
+      'groups' => $listing_data['groups']
+    ));
   }
 
   function save($data = array()) {
@@ -49,68 +55,109 @@ class Segments {
     $errors = $segment->getErrors();
 
     if(!empty($errors)) {
-      return array(
-        'result' => false,
-        'errors' => $errors
-      );
+      return $this->badRequest($errors);
     } else {
-      return array(
-        'result' => true
+      return $this->successResponse(
+        Segment::findOne($segment->id)->asArray()
       );
     }
   }
 
-  function restore($id) {
+  function restore($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $segment = Segment::findOne($id);
-    if($segment !== false) {
+    if($segment === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This list does not exist.')
+      ));
+    } else {
       $segment->restore();
+      return $this->successResponse(
+        Segment::findOne($segment->id)->asArray(),
+        array('count' => 1)
+      );
     }
-    return ($segment->getErrors() === false);
   }
 
-  function trash($id) {
+  function trash($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $segment = Segment::findOne($id);
-    if($segment !== false) {
+    if($segment === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This list does not exist.')
+      ));
+    } else {
       $segment->trash();
+      return $this->successResponse(
+        Segment::findOne($segment->id)->asArray(),
+        array('count' => 1)
+      );
     }
-    return ($segment->getErrors() === false);
   }
 
-  function delete($id) {
+  function delete($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $segment = Segment::findOne($id);
-    if($segment !== false) {
+    if($segment === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This list does not exist.')
+      ));
+    } else {
       $segment->delete();
-      return 1;
+      return $this->successResponse(null, array('count' => 1));
     }
-    return false;
   }
 
-  function duplicate($id) {
-    $result = false;
-
+  function duplicate($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $segment = Segment::findOne($id);
-    if($segment !== false) {
+
+    if($segment === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This list does not exist.')
+      ));
+    } else {
       $data = array(
         'name' => sprintf(__('Copy of %s'), $segment->name)
       );
-      $result = $segment->duplicate($data)->asArray();
-    }
+      $duplicate = $segment->duplicate($data);
+      $errors = $duplicate->getErrors();
 
-    return $result;
+      if(!empty($errors)) {
+        return $this->errorResponse($errors);
+      } else {
+        return $this->successResponse(
+          Segment::findOne($duplicate->id)->asArray(),
+          array('count' => 1)
+        );
+      }
+    }
   }
 
   function synchronize() {
-    $result = WP::synchronizeUsers();
+    try {
+      WP::synchronizeUsers();
+    } catch(\Exception $e) {
+      return $this->errorResponse(array(
+        $e->getCode() => $e->getMessage()
+      ));
+    }
 
-    return $result;
+    return $this->successResponse(null);
   }
 
   function bulkAction($data = array()) {
-    $bulk_action = new Listing\BulkAction(
-      '\MailPoet\Models\Segment',
-      $data
-    );
-
-    return $bulk_action->apply();
+    try {
+      $bulk_action = new Listing\BulkAction(
+        '\MailPoet\Models\Segment',
+        $data
+      );
+      $meta = $bulk_action->apply();
+      return $this->successResponse(null, $meta);
+    } catch(\Exception $e) {
+      return $this->errorResponse(array(
+        $e->getCode() => $e->getMessage()
+      ));
+    }
   }
 }

lib/API/Endpoints/SendingQueue.php

@@ -67,7 +67,7 @@ class SendingQueue extends APIEndpoint {
 
       // set queue status
       $queue->status = SendingQueueModel::STATUS_SCHEDULED;
-      $queue->scheduled_at = Scheduler::scheduleFromTimestamp(
+      $queue->scheduled_at = Scheduler::formatDatetimeString(
         $newsletter->scheduledAt
       );
       $queue->subscribers = null;

lib/API/Endpoints/Subscribers.php

@@ -1,5 +1,7 @@
 <?php
 namespace MailPoet\API\Endpoints;
+use \MailPoet\API\Endpoint as APIEndpoint;
+use \MailPoet\API\Error as APIError;
 
 use MailPoet\Listing;
 use MailPoet\Models\Subscriber;
@@ -9,23 +11,25 @@ use MailPoet\Models\Segment;
 use MailPoet\Models\Setting;
 use MailPoet\Models\Form;
 use MailPoet\Models\StatisticsForms;
-use MailPoet\Util\Url;
 
 if(!defined('ABSPATH')) exit;
 
-class Subscribers {
-  function __construct() {
-  }
-
-  function get($id = null) {
+class Subscribers extends APIEndpoint {
+  function get($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $subscriber = Subscriber::findOne($id);
-    if($subscriber !== false) {
-      $subscriber = $subscriber
-        ->withCustomFields()
-        ->withSubscriptions()
-        ->asArray();
+    if($subscriber === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This subscriber does not exist.')
+      ));
+    } else {
+      return $this->successResponse(
+        $subscriber
+          ->withCustomFields()
+          ->withSubscriptions()
+          ->asArray()
+      );
     }
-    return $subscriber;
   }
 
   function listing($data = array()) {
@@ -36,41 +40,24 @@ class Subscribers {
 
     $listing_data = $listing->get();
 
-    // fetch segments relations for each returned item
-    foreach($listing_data['items'] as $key => $subscriber) {
-      $listing_data['items'][$key] = $subscriber
+    $data = array();
+    foreach($listing_data['items'] as $subscriber) {
+      $data[] = $subscriber
         ->withSubscriptions()
         ->asArray();
     }
 
-    return $listing_data;
-  }
-
-  function save($data = array()) {
-    $subscriber = Subscriber::createOrUpdate($data);
-    $errors = $subscriber->getErrors();
-
-    if(!empty($errors)) {
-      return array(
-        'result' => false,
-        'errors' => $errors
-      );
-    } else {
-      return array(
-        'result' => true
-      );
-    }
+    return $this->successResponse($data, array(
+      'count' => $listing_data['count'],
+      'filters' => $listing_data['filters'],
+      'groups' => $listing_data['groups']
+    ));
   }
 
   function subscribe($data = array()) {
-    $doing_ajax = (bool)(defined('DOING_AJAX') && DOING_AJAX);
-    $errors = array();
-
-    $form = Form::findOne($data['form_id']);
+    $form_id = (isset($data['form_id']) ? (int)$data['form_id'] : false);
+    $form = Form::findOne($form_id);
     unset($data['form_id']);
-    if($form === false || !$form->id()) {
-      $errors[] = __('This form does not exist');
-    }
 
     $segment_ids = (!empty($data['segments'])
       ? (array)$data['segments']
@@ -79,106 +66,110 @@ class Subscribers {
     unset($data['segments']);
 
     if(empty($segment_ids)) {
-      $errors[] = __('Please select a list');
-    }
-
-    if(!empty($errors)) {
-      return array(
-        'result' => false,
-        'errors' => $errors
-      );
+      return $this->badRequest(array(
+        APIError::BAD_REQUEST => __('Please select a list')
+      ));
     }
 
     $subscriber = Subscriber::subscribe($data, $segment_ids);
     $errors = $subscriber->getErrors();
-    $result = ($errors === false && $subscriber->id() > 0);
 
-    // record form statistics
-    if($result === true && $form !== false && $form->id > 0) {
-      StatisticsForms::record($form->id, $subscriber->id);
-    }
+    if($errors !== false) {
+      return $this->badRequest($errors);
+    } else {
+      $meta = array();
 
-    // get success message to display after subscription
-    $form_settings = (
-      isset($form->settings)
-      ? unserialize($form->settings)
-      : null
-    );
+      if($form !== false) {
+        // record form statistics
+        StatisticsForms::record($form->id, $subscriber->id);
 
-    if($form_settings !== null) {
-      switch($form_settings['on_success']) {
-        case 'page':
-          $success_page_url = get_permalink($form_settings['success_page']);
+        $form = $form->asArray();
 
-          // response depending on context
-          if($doing_ajax === true) {
-            return array(
-              'result' => $result,
-              'page' => $success_page_url,
-              'errors' => $errors
-            );
-          } else {
-            if($result === false) {
-              Url::redirectBack();
-            } else {
-              Url::redirectTo($success_page_url);
-            }
-          }
-          break;
-
-        case 'message':
-        default:
-          // response depending on context
-          if($doing_ajax === true) {
-            return array(
-              'result' => $result,
-              'errors' => $errors
-            );
-          } else {
-            $params = (
-              ($result === true)
-              ? array('mailpoet_success' => $form->id)
-              : array()
-            );
-
-            Url::redirectBack($params);
-          }
-          break;
+        if($form['settings']['on_success'] === 'page') {
+          // redirect to a page on a success, pass the page url in the meta
+          $meta['redirect_url'] = get_permalink($form['settings']['success_page']);
+        } else if($form['settings']['on_success'] === 'url') {
+          $meta['redirect_url'] = $form['settings']['success_url'];
+        }
       }
+
+      return $this->successResponse(
+        Subscriber::findOne($subscriber->id)->asArray(),
+        $meta
+      );
     }
   }
 
-  function restore($id) {
+  function save($data = array()) {
+    $subscriber = Subscriber::createOrUpdate($data);
+    $errors = $subscriber->getErrors();
+
+    if(!empty($errors)) {
+      return $this->badRequest($errors);
+    } else {
+      return $this->successResponse(
+        Subscriber::findOne($subscriber->id)->asArray()
+      );
+    }
+  }
+
+  function restore($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $subscriber = Subscriber::findOne($id);
-    if($subscriber !== false) {
+    if($subscriber === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This subscriber does not exist.')
+      ));
+    } else {
       $subscriber->restore();
+      return $this->successResponse(
+        Subscriber::findOne($subscriber->id)->asArray(),
+        array('count' => 1)
+      );
     }
-    return ($subscriber->getErrors() === false);
   }
 
-  function trash($id) {
+  function trash($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $subscriber = Subscriber::findOne($id);
-    if($subscriber !== false) {
+    if($subscriber === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This subscriber does not exist.')
+      ));
+    } else {
       $subscriber->trash();
+      return $this->successResponse(
+        Subscriber::findOne($subscriber->id)->asArray(),
+        array('count' => 1)
+      );
     }
-    return ($subscriber->getErrors() === false);
   }
 
-  function delete($id) {
+  function delete($data = array()) {
+    $id = (isset($data['id']) ? (int)$data['id'] : false);
     $subscriber = Subscriber::findOne($id);
-    if($subscriber !== false) {
+    if($subscriber === false) {
+      return $this->errorResponse(array(
+        APIError::NOT_FOUND => __('This subscriber does not exist.')
+      ));
+    } else {
       $subscriber->delete();
-      return 1;
+      return $this->successResponse(null, array('count' => 1));
     }
-    return false;
   }
 
   function bulkAction($data = array()) {
-    $bulk_action = new Listing\BulkAction(
-      '\MailPoet\Models\Subscriber',
-      $data
-    );
-
-    return $bulk_action->apply();
+    try {
+      $bulk_action = new Listing\BulkAction(
+        '\MailPoet\Models\Subscriber',
+        $data
+      );
+      $meta = $bulk_action->apply();
+      return $this->successResponse(null, $meta);
+    } catch(\Exception $e) {
+      return $this->errorResponse(array(
+        $e->getCode() => $e->getMessage()
+      ));
+    }
   }
 }

lib/API/Response.php

@@ -31,11 +31,11 @@ abstract class Response {
       $response = array_merge($response, $data);
     }
 
-    if(empty($response)) {
-      die();
-    } else {
-      wp_send_json($response);
+    if(!empty($response)) {
+      @header('Content-Type: application/json; charset='.get_option('blog_charset'));
+      echo wp_json_encode($response);
     }
+    die();
   }
 
   abstract function getData();

lib/Config/Env.php

@@ -27,6 +27,7 @@ class Env {
   static $db_password;
   static $db_charset;
   static $db_timezone_offset;
+  static $subscribers_limit = 2000;
 
   static function init($file, $version) {
     global $wpdb;

lib/Config/Hooks.php

@@ -91,6 +91,16 @@ class Hooks {
       'admin_post_nopriv_mailpoet_subscription_update',
       '\MailPoet\Subscription\Manage::onSave'
     );
+
+    // Subscription form
+    add_action(
+      'admin_post_mailpoet_subscription_form',
+      '\MailPoet\Subscription\Form::onSubmit'
+    );
+    add_action(
+      'admin_post_nopriv_mailpoet_subscription_form',
+      '\MailPoet\Subscription\Form::onSubmit'
+    );
   }
 
   function setupWPUsers() {

lib/Config/Menu.php

@@ -34,6 +34,16 @@ class Menu {
     );
   }
 
+  function checkSubscribersLimit() {
+    $subscribers_count = Subscriber::getTotalSubscribers();
+    if($subscribers_count > Env::$subscribers_limit) {
+      echo $this->renderer->render('limit.html', array(
+        'limit' => Env::$subscribers_limit
+      ));
+      exit;
+    }
+  }
+
   function setup() {
     $main_page_slug = 'mailpoet-newsletters';
 
@@ -242,6 +252,8 @@ class Menu {
   }
 
   function settings() {
+    $this->checkSubscribersLimit();
+
     $settings = Setting::getAll();
     $flags = $this->_getFlags();
 
@@ -314,12 +326,16 @@ class Menu {
   }
 
   function segments() {
+    $this->checkSubscribersLimit();
+
     $data = array();
     $data['items_per_page'] = $this->getLimitPerPage('segments');
     echo $this->renderer->render('segments.html', $data);
   }
 
   function forms() {
+    $this->checkSubscribersLimit();
+
     $data = array();
 
     $data['items_per_page'] = $this->getLimitPerPage('forms');
@@ -329,6 +345,8 @@ class Menu {
   }
 
   function newsletters() {
+    $this->checkSubscribersLimit();
+
     global $wp_roles;
 
     $data = array();

lib/Config/Populator.php

@@ -1,18 +1,6 @@
 <?php
 namespace MailPoet\Config;
 
-use MailPoet\Config\PopulatorData\Templates\FranksRoastHouseTemplate;
-use MailPoet\Config\PopulatorData\Templates\NewsletterBlank1Column;
-use MailPoet\Config\PopulatorData\Templates\NewsletterBlank12Column;
-use MailPoet\Config\PopulatorData\Templates\NewsletterBlank121Column;
-use MailPoet\Config\PopulatorData\Templates\NewsletterBlank13Column;
-use MailPoet\Config\PopulatorData\Templates\PostNotificationsBlank1Column;
-use MailPoet\Config\PopulatorData\Templates\WelcomeBlank1Column;
-use MailPoet\Config\PopulatorData\Templates\WelcomeBlank12Column;
-use MailPoet\Config\PopulatorData\Templates\SimpleText;
-use MailPoet\Config\PopulatorData\Templates\Restaurant;
-use MailPoet\Config\PopulatorData\Templates\StoreDiscount;
-use MailPoet\Config\PopulatorData\Templates\TravelEmail;
 use MailPoet\Cron\CronTrigger;
 use \MailPoet\Models\Segment;
 use \MailPoet\Segments\WP;
@@ -25,12 +13,31 @@ if(!defined('ABSPATH')) exit;
 require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
 class Populator {
+  public $prefix;
+  public $models;
+  public $templates;
+  const TEMPLATES_NAMESPACE = '\MailPoet\Config\PopulatorData\Templates\\';
+
   function __construct() {
     $this->prefix = Env::$db_prefix;
     $this->models = array(
       'newsletter_option_fields',
       'newsletter_templates',
     );
+    $this->templates = array(
+      "FranksRoastHouseTemplate",
+      "NewsletterBlank1Column",
+      "NewsletterBlank12Column",
+      "NewsletterBlank121Column",
+      "NewsletterBlank13Column",
+      "PostNotificationsBlank1Column",
+      "WelcomeBlank1Column",
+      "WelcomeBlank12Column",
+      "SimpleText",
+      "Restaurant",
+      "StoreDiscount",
+      "TravelEmail"
+    );
   }
 
   function up() {
@@ -191,20 +198,13 @@ class Populator {
   }
 
   private function newsletterTemplates() {
-    return array(
-      (new FranksRoastHouseTemplate(Env::$assets_url))->get(),
-      (new NewsletterBlank1Column(Env::$assets_url))->get(),
-      (new NewsletterBlank12Column(Env::$assets_url))->get(),
-      (new NewsletterBlank121Column(Env::$assets_url))->get(),
-      (new NewsletterBlank13Column(Env::$assets_url))->get(),
-      (new PostNotificationsBlank1Column(Env::$assets_url))->get(),
-      (new WelcomeBlank1Column(Env::$assets_url))->get(),
-      (new WelcomeBlank12Column(Env::$assets_url))->get(),
-      (new SimpleText(Env::$assets_url))->get(),
-      (new Restaurant(Env::$assets_url))->get(),
-      (new StoreDiscount(Env::$assets_url))->get(),
-      (new TravelEmail(Env::$assets_url))->get(),
-    );
+    $templates = array();
+    foreach($this->templates as $template) {
+      $template = self::TEMPLATES_NAMESPACE . $template;
+      $template = new $template(Env::$assets_url);
+      $templates[] = $template->get();
+    }
+    return $templates;
   }
 
   private function populate($model) {

lib/Cron/CronHelper.php

@@ -16,7 +16,6 @@ class CronHelper {
 
   static function createDaemon($token) {
     $daemon = array(
-      'status' => Daemon::STATUS_STARTING,
       'token' => $token
     );
     self::saveDaemon($daemon);
@@ -39,12 +38,6 @@ class CronHelper {
     );
   }
 
-  static function stopDaemon() {
-    $daemon = self::getDaemon();
-    $daemon['status'] = Daemon::STATUS_STOPPED;
-    return self::saveDaemon($daemon);
-  }
-
   static function deleteDaemon() {
     return Setting::deleteValue(self::DAEMON_SETTING);
   }

lib/Cron/Daemon.php

@@ -10,77 +10,75 @@ if(!defined('ABSPATH')) exit;
 
 class Daemon {
   public $daemon;
-  public $data;
-  public $refreshed_token;
-  const STATUS_STOPPED = 'stopped';
-  const STATUS_STOPPING = 'stopping';
-  const STATUS_STARTED = 'started';
-  const STATUS_STARTING = 'starting';
+  public $request_data;
+  public $timer;
   const REQUEST_TIMEOUT = 5;
-  private $timer;
 
-  function __construct($data) {
-    if(empty($data)) $this->abortWithError(__('Invalid or missing Cron data.'));
-    ignore_user_abort();
+  function __construct($request_data = false) {
+    $this->request_data = $request_data;
     $this->daemon = CronHelper::getDaemon();
     $this->token = CronHelper::createToken();
-    $this->data = $data;
     $this->timer = microtime(true);
   }
 
   function run() {
+    ignore_user_abort(true);
+    if(!$this->request_data) {
+      $error = __('Invalid or missing request data.');
+    } else {
+      if(!$this->daemon) {
+        $error = __('Daemon does not exist.');
+      } else {
+        if(!isset($this->request_data['token']) ||
+          $this->request_data['token'] !== $this->daemon['token']
+        ) {
+          $error = 'Invalid or missing token.';
+        }
+      }
+    }
+    if(!empty($error)) {
+      return $this->abortWithError($error);
+    }
     $daemon = $this->daemon;
-    if(!$daemon) {
-      $this->abortWithError(__('Daemon does not exist.'));
-    }
-    if(!isset($this->data['token']) ||
-      $this->data['token'] !== $daemon['token']
-    ) {
-      $this->abortWithError(__('Invalid or missing token.'));
-    }
     $daemon['token'] = $this->token;
     CronHelper::saveDaemon($daemon);
-    $this->abortIfStopped($daemon);
     try {
-      $scheduler = new SchedulerWorker($this->timer);
-      $scheduler->process();
-      $queue = new SendingQueueWorker($this->timer);
-      $queue->process();
+      $this->executeScheduleWorker();
+      $this->executeQueueWorker();
     } catch(\Exception $e) {
       // continue processing, no need to handle errors
     }
+    // if workers took less time to execute than the daemon execution limit,
+    // pause daemon execution to ensure that daemon runs only once every X seconds
     $elapsed_time = microtime(true) - $this->timer;
     if($elapsed_time < CronHelper::DAEMON_EXECUTION_LIMIT) {
-      sleep(CronHelper::DAEMON_EXECUTION_LIMIT - $elapsed_time);
+      $this->pauseExecution(CronHelper::DAEMON_EXECUTION_LIMIT - $elapsed_time);
     }
-    // after each execution, re-read daemon data in case its status was changed
-    // its status has changed
+    // after each execution, re-read daemon data in case it changed
     $daemon = CronHelper::getDaemon();
     if(!$daemon || $daemon['token'] !== $this->token) {
-      $this->terminateRequest();
+      return $this->terminateRequest();
     }
-    $this->abortIfStopped($daemon);
-    if($daemon['status'] === self::STATUS_STARTING) {
-      $daemon['status'] = self::STATUS_STARTED;
-    }
-    CronHelper::saveDaemon($daemon);
-    $this->callSelf();
+    return $this->callSelf();
   }
 
-  function abortIfStopped($daemon) {
-    if($daemon['status'] === self::STATUS_STOPPED) {
-      $this->terminateRequest();
-    }
-    if($daemon['status'] === self::STATUS_STOPPING) {
-      $daemon['status'] = self::STATUS_STOPPED;
-      CronHelper::saveDaemon($daemon);
-      $this->terminateRequest();
-    }
+  function pauseExecution($pause_time) {
+    return sleep($pause_time);
+  }
+
+  function executeScheduleWorker() {
+    $scheduler = new SchedulerWorker($this->timer);
+    return $scheduler->process();
+  }
+
+  function executeQueueWorker() {
+    $queue = new SendingQueueWorker($this->timer);
+    return $queue->process();
   }
 
   function callSelf() {
     CronHelper::accessDaemon($this->token, self::REQUEST_TIMEOUT);
-    $this->terminateRequest();
+    return $this->terminateRequest();
   }
 
   function abortWithError($message) {

lib/Cron/Workers/Scheduler.php

@@ -26,7 +26,7 @@ class Scheduler {
 
   function process() {
     $scheduled_queues = self::getScheduledQueues();
-    if(!count($scheduled_queues)) return;
+    if(!count($scheduled_queues)) return false;
     foreach($scheduled_queues as $i => $queue) {
       $newsletter = Newsletter::filter('filterWithOptions')
         ->findOne($queue->newsletter_id);
@@ -47,30 +47,30 @@ class Scheduler {
     $subscriber = unserialize($queue->subscribers);
     if(empty($subscriber['to_process'][0])) {
       $queue->delete();
-      return;
+      return false;
     }
     $subscriber_id = (int)$subscriber['to_process'][0];
     if($newsletter->event === 'segment') {
-      if($this->verifyMailPoetSubscriber($subscriber_id, $newsletter, $queue) === false) {
-        return;
+      if($this->verifyMailpoetSubscriber($subscriber_id, $newsletter, $queue) === false) {
+        return false;
       }
     } else {
       if($newsletter->event === 'user') {
         if($this->verifyWPSubscriber($subscriber_id, $newsletter, $queue) === false) {
-          return;
+          return false;
         }
       }
     }
     $queue->status = null;
     $queue->save();
+    return true;
   }
 
   function processPostNotificationNewsletter($newsletter, $queue) {
     // ensure that segments exist
     $segments = $newsletter->segments()->findArray();
     if(empty($segments)) {
-      $this->deleteQueueOrUpdateNextRunDate($queue, $newsletter);
-      return;
+      return $this->deleteQueueOrUpdateNextRunDate($queue, $newsletter);
     }
     $segment_ids = array_map(function($segment) {
       return (int)$segment['id'];
@@ -83,13 +83,12 @@ class Scheduler {
     $subscribers = array_unique($subscribers);
 
     if(empty($subscribers)) {
-      $this->deleteQueueOrUpdateNextRunDate($queue, $newsletter);
-      return;
+      return $this->deleteQueueOrUpdateNextRunDate($queue, $newsletter);
     }
 
     // create a duplicate newsletter that acts as a history record
     $notification_history = $this->createNotificationHistory($newsletter->id);
-    if(!$notification_history) return;
+    if(!$notification_history) return false;
 
     // queue newsletter for delivery
     $queue->newsletter_id = $notification_history->id;
@@ -101,6 +100,7 @@ class Scheduler {
     $queue->count_total = $queue->count_to_process = count($subscribers);
     $queue->status = null;
     $queue->save();
+    return true;
   }
 
   function processScheduledStandardNewsletter($newsletter, $queue) {
@@ -108,7 +108,6 @@ class Scheduler {
     $segment_ids = array_map(function($segment) {
       return $segment['id'];
     }, $segments);
-
     $subscribers = Subscriber::getSubscribedInSegments($segment_ids)
       ->findArray();
     $subscribers = Helpers::arrayColumn($subscribers, 'subscriber_id');
@@ -123,9 +122,10 @@ class Scheduler {
     $queue->count_total = $queue->count_to_process = count($subscribers);
     $queue->status = null;
     $queue->save();
+    return true;
   }
 
-  function verifyMailPoetSubscriber($subscriber_id, $newsletter, $queue) {
+  function verifyMailpoetSubscriber($subscriber_id, $newsletter, $queue) {
     $subscriber = Subscriber::findOne($subscriber_id);
     // check if subscriber is in proper segment
     $subscriber_in_segment =
@@ -184,7 +184,7 @@ class Scheduler {
       $notification_history :
       false;
   }
-  
+
   static function getScheduledQueues() {
     return SendingQueue::where('status', 'scheduled')
       ->whereLte('scheduled_at', Carbon::createFromTimestamp(current_time('timestamp')))

lib/Cron/Workers/SendingQueue/SendingQueue.php

@@ -4,24 +4,22 @@ namespace MailPoet\Cron\Workers\SendingQueue;
 use MailPoet\Cron\CronHelper;
 use MailPoet\Cron\Workers\SendingQueue\Tasks\Mailer as MailerTask;
 use MailPoet\Cron\Workers\SendingQueue\Tasks\Newsletter as NewsletterTask;
-use MailPoet\Cron\Workers\SendingQueue\Tasks\Subscribers as SubscribersTask;
 use MailPoet\Mailer\MailerLog;
 use MailPoet\Models\SendingQueue as SendingQueueModel;
 use MailPoet\Models\StatisticsNewsletters as StatisticsNewslettersModel;
 use MailPoet\Models\Subscriber as SubscriberModel;
-use MailPoet\Util\Helpers;
 
 if(!defined('ABSPATH')) exit;
 
 class SendingQueue {
   public $mailer_task;
   public $newsletter_task;
-  private $timer;
+  public $timer;
   const BATCH_SIZE = 50;
 
-  function __construct($timer = false) {
-    $this->mailer_task = new MailerTask();
-    $this->newsletter_task = new NewsletterTask();
+  function __construct($timer = false, $mailer_task = false, $newsletter_task = false) {
+    $this->mailer_task = ($mailer_task) ? $mailer_task : new MailerTask();
+    $this->newsletter_task = ($newsletter_task) ? $newsletter_task : new NewsletterTask();
     $this->timer = ($timer) ? $timer : microtime(true);
     // abort if execution or sending limit are reached
     CronHelper::enforceExecutionLimit($this->timer);
@@ -32,17 +30,13 @@ class SendingQueue {
       // abort if sending limit is reached
       MailerLog::enforceSendingLimit();
       // get and pre-process newsletter (render, replace shortcodes/links, etc.)
-      $newsletter = $this->newsletter_task->getAndPreProcess($queue->asArray());
+      $newsletter = $this->newsletter_task->getAndPreProcess($queue);
       if(!$newsletter) {
         $queue->delete();
         continue;
       }
       // configure mailer
       $this->mailer_task->configureMailer($newsletter);
-      if(is_null($queue->newsletter_rendered_body)) {
-        $queue->newsletter_rendered_body = json_encode($newsletter['rendered_body']);
-        $queue->save();
-      }
       // get subscribers
       $queue->subscribers = $queue->getSubscribers();
       $subscriber_batches = array_chunk(
@@ -50,20 +44,24 @@ class SendingQueue {
         self::BATCH_SIZE
       );
       foreach($subscriber_batches as $subscribers_to_process_ids) {
+        // abort if execution limit is reached
+        CronHelper::enforceExecutionLimit($this->timer);
         $found_subscribers = SubscriberModel::whereIn('id', $subscribers_to_process_ids)
-          ->findArray();
-        $found_subscribers_ids = Helpers::arrayColumn($found_subscribers, 'id');
+          ->findMany();
+        $found_subscribers_ids = array_map(function($subscriber) {
+          return $subscriber->id;
+        }, $found_subscribers);
         // if some subscribers weren't found, remove them from the processing list
         if(count($found_subscribers_ids) !== count($subscribers_to_process_ids)) {
-          $queue->subscribers = SubscribersTask::updateToProcessList(
-            $found_subscribers_ids,
+          $subscibers_to_remove = array_diff(
             $subscribers_to_process_ids,
-            $queue->subscribers
+            $found_subscribers_ids
           );
-        }
-        if(!count($queue->subscribers['to_process'])) {
-          $this->updateQueue($queue);
-          continue;
+          $queue->removeNonexistentSubscribers($subscibers_to_remove);
+          if(!count($queue->subscribers['to_process'])) {
+            $this->newsletter_task->markNewsletterAsSent($newsletter);
+            continue;
+          }
         }
         $queue = $this->processQueue(
           $queue,
@@ -71,10 +69,8 @@ class SendingQueue {
           $found_subscribers
         );
         if($queue->status === SendingQueueModel::STATUS_COMPLETED) {
-          $this->newsletter_task->markNewsletterAsSent($queue->newsletter_id);
+          $this->newsletter_task->markNewsletterAsSent($newsletter);
         }
-        // abort if execution limit is reached
-        CronHelper::enforceExecutionLimit($this->timer);
       }
     }
   }
@@ -92,7 +88,7 @@ class SendingQueue {
         $this->newsletter_task->prepareNewsletterForSending(
           $newsletter,
           $subscriber,
-          $queue->asArray()
+          $queue
         );
       if(!$queue->newsletter_rendered_subject) {
         $queue->newsletter_rendered_subject = $prepared_newsletters[0]['subject'];
@@ -101,11 +97,11 @@ class SendingQueue {
       $prepared_subscribers[] = $this->mailer_task->prepareSubscriberForSending(
         $subscriber
       );
-      $prepared_subscribers_ids[] = $subscriber['id'];
+      $prepared_subscribers_ids[] = $subscriber->id;
       // keep track of values for statistics purposes
       $statistics[] = array(
-        'newsletter_id' => $newsletter['id'],
-        'subscriber_id' => $subscriber['id'],
+        'newsletter_id' => $newsletter->id,
+        'subscriber_id' => $subscriber->id,
         'queue_id' => $queue->id
       );
       if($processing_method === 'individual') {
@@ -145,22 +141,14 @@ class SendingQueue {
     );
     if(!$send_result) {
       // update failed/to process list
-      $queue->subscribers = SubscribersTask::updateFailedList(
-        $prepared_subscribers_ids,
-        $queue->subscribers
-      );
-      $queue = $this->updateQueue($queue);
+      $queue->updateFailedSubscribers($prepared_subscribers_ids);
     } else {
       // update processed/to process list
-      $queue->subscribers = SubscribersTask::updateProcessedList(
-        $prepared_subscribers_ids,
-        $queue->subscribers
-      );
+      $queue->updateProcessedSubscribers($prepared_subscribers_ids);
       // log statistics
       StatisticsNewslettersModel::createMultiple($statistics);
       // update the sent count
       $this->mailer_task->updateSentCount();
-      $queue = $this->updateQueue($queue);
       // enforce sending limit if there are still subscribers left to process
       if($queue->count_to_process) {
         MailerLog::enforceSendingLimit();
@@ -175,18 +163,4 @@ class SendingQueue {
       ->whereNull('status')
       ->findMany();
   }
-
-  function updateQueue($queue) {
-    $queue->count_processed =
-      count($queue->subscribers['processed']) + count($queue->subscribers['failed']);
-    $queue->count_to_process = count($queue->subscribers['to_process']);
-    $queue->count_failed = count($queue->subscribers['failed']);
-    $queue->count_total =
-      $queue->count_processed + $queue->count_to_process;
-    if(!$queue->count_to_process) {
-      $queue->processed_at = current_time('mysql');
-      $queue->status = SendingQueueModel::STATUS_COMPLETED;
-    }
-    return $queue->save();
-  }
 }

lib/Cron/Workers/SendingQueue/Tasks/Links.php

@@ -7,27 +7,27 @@ use MailPoet\Util\Helpers;
 if(!defined('ABSPATH')) exit;
 
 class Links {
-  static function process(array $newsletter, array $queue) {
-    list($newsletter, $links) = self::hashAndReplaceLinks($newsletter, $queue);
+  static function process($rendered_newsletter, $newsletter, $queue) {
+    list($rendered_newsletter, $links) =
+      self::hashAndReplaceLinks($rendered_newsletter);
     self::saveLinks($links, $newsletter, $queue);
-    return $newsletter;
+    return $rendered_newsletter;
   }
 
-  static function hashAndReplaceLinks(array $newsletter, array $queue) {
+  static function hashAndReplaceLinks($rendered_newsletter) {
     // join HTML and TEXT rendered body into a text string
-    $content = Helpers::joinObject($newsletter['rendered_body']);
+    $content = Helpers::joinObject($rendered_newsletter);
     list($content, $links) = NewsletterLinks::process($content);
     // split the processed body with hashed links back to HTML and TEXT
-    list($newsletter['rendered_body']['html'], $newsletter['rendered_body']['text'])
+    list($rendered_newsletter['html'], $rendered_newsletter['text'])
       = Helpers::splitObject($content);
     return array(
-      $newsletter,
+      $rendered_newsletter,
       $links
     );
   }
 
   static function saveLinks($links, $newsletter, $queue) {
-    return NewsletterLinks::save($links, $newsletter['id'], $queue['id']);
+    return NewsletterLinks::save($links, $newsletter->id, $queue->id);
   }
-}
-
+}

lib/Cron/Workers/SendingQueue/Tasks/Mailer.php

@@ -9,22 +9,22 @@ if(!defined('ABSPATH')) exit;
 class Mailer {
   public $mailer;
 
-  function __construct() {
-    $this->mailer = $this->configureMailer();
+  function __construct($mailer = false) {
+    $this->mailer = ($mailer) ? $mailer : $this->configureMailer();
   }
 
-  function configureMailer(array $newsletter = null) {
-    $sender['address'] = (!empty($newsletter['sender_address'])) ?
-      $newsletter['sender_address'] :
+  function configureMailer($newsletter = null) {
+    $sender['address'] = (!empty($newsletter->sender_address)) ?
+      $newsletter->sender_address :
       false;
-    $sender['name'] = (!empty($newsletter['sender_name'])) ?
-      $newsletter['sender_name'] :
+    $sender['name'] = (!empty($newsletter->sender_name)) ?
+      $newsletter->sender_name :
       false;
-    $reply_to['address'] = (!empty($newsletter['reply_to_address'])) ?
-      $newsletter['reply_to_address'] :
+    $reply_to['address'] = (!empty($newsletter->reply_to_address)) ?
+      $newsletter->reply_to_address :
       false;
-    $reply_to['name'] = (!empty($newsletter['reply_to_name'])) ?
-      $newsletter['reply_to_name'] :
+    $reply_to['name'] = (!empty($newsletter->reply_to_name)) ?
+      $newsletter->reply_to_name :
       false;
     if(!$sender['address']) {
       $sender = false;
@@ -50,8 +50,8 @@ class Mailer {
       'individual';
   }
 
-  function prepareSubscriberForSending(array $subscriber) {
-    return $this->mailer->transformSubscriber($subscriber);
+  function prepareSubscriberForSending($subscriber) {
+    return $this->mailer->formatSubscriberNameAndEmailAddress($subscriber);
   }
 
   function send($prepared_newsletters, $prepared_subscribers) {

lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php

@@ -19,65 +19,52 @@ class Newsletter {
 
   function __construct() {
     $this->tracking_enabled = (boolean)Setting::getValue('tracking.enabled');
-    $this->tracking_image_inserted = false;
   }
 
-  function get($newsletter_id) {
-    $newsletter = NewsletterModel::findOne($newsletter_id);
-    return ($newsletter) ? $newsletter->asArray() : false;
-  }
-
-  function getAndPreProcess(array $queue) {
-    $newsletter = $this->get($queue['newsletter_id']);
+  function getAndPreProcess($queue) {
+    $newsletter = $queue->newsletter()->findOne();
     if(!$newsletter) {
       return false;
     }
     // if the newsletter was previously rendered, return it
     // otherwise, process/render it
-    if(!is_null($queue['newsletter_rendered_body'])) {
-      $newsletter['rendered_body'] = json_decode($queue['newsletter_rendered_body'], true);
+    if(!is_null($queue->getNewsletterRenderedBody())) {
       return $newsletter;
     }
     // if tracking is enabled, do additional processing
     if($this->tracking_enabled) {
-      // hook once to the newsletter post-processing filter and add tracking image
-      if(!$this->tracking_image_inserted) {
-        $this->tracking_image_inserted = OpenTracking::addTrackingImage();
-      }
-      // render newsletter
-      $newsletter = $this->render($newsletter);
+      // hook to the newsletter post-processing filter and add tracking image
+      $this->tracking_image_inserted = OpenTracking::addTrackingImage();
+      // render newsletter and save its
+      $rendered_newsletter = $newsletter->render();
       // hash and save all links
-      $newsletter = LinksTask::process($newsletter, $queue);
+      $rendered_newsletter = LinksTask::process($rendered_newsletter, $newsletter, $queue);
     } else {
       // render newsletter
-      $newsletter = $this->render($newsletter);
+      $rendered_newsletter = $newsletter->render();
     }
     // check if this is a post notification and if it contains posts
-    $newsletter_contains_posts = strpos($newsletter['rendered_body']['html'], 'data-post-id');
-    if($newsletter['type'] === 'notification' && !$newsletter_contains_posts) {
+    $newsletter_contains_posts = strpos($rendered_newsletter['html'], 'data-post-id');
+    if($newsletter->type === 'notification' && !$newsletter_contains_posts) {
       return false;
     }
     // extract and save newsletter posts
-    PostsTask::extractAndSave($newsletter);
+    PostsTask::extractAndSave($rendered_newsletter, $newsletter);
+    // update queue with the rendered and pre-processed newsletter
+    $queue->newsletter_rendered_body = $rendered_newsletter;
+    $queue->save();
     return $newsletter;
   }
 
-  function render(array $newsletter) {
-    $renderer = new Renderer($newsletter);
-    $newsletter['rendered_body'] = $renderer->render();
-    return $newsletter;
-  }
-
-  function prepareNewsletterForSending(
-    array $newsletter, array $subscriber, array $queue
-  ) {
+  function prepareNewsletterForSending($newsletter, $subscriber, $queue) {
     // shortcodes and links will be replaced in the subject, html and text body
     // to speed the processing, join content into a continuous string
+    $rendered_newsletter = $queue->getNewsletterRenderedBody();
     $prepared_newsletter = Helpers::joinObject(
       array(
-        $newsletter['subject'],
-        $newsletter['rendered_body']['html'],
-        $newsletter['rendered_body']['text']
+        $newsletter->subject,
+        $rendered_newsletter['html'],
+        $rendered_newsletter['text']
       )
     );
     $prepared_newsletter = ShortcodesTask::process(
@@ -88,8 +75,8 @@ class Newsletter {
     );
     if($this->tracking_enabled) {
       $prepared_newsletter = NewsletterLinks::replaceSubscriberData(
-        $subscriber['id'],
-        $queue['id'],
+        $subscriber->id,
+        $queue->id,
         $prepared_newsletter
       );
     }
@@ -103,8 +90,7 @@ class Newsletter {
     );
   }
 
-  function markNewsletterAsSent($newsletter_id) {
-    $newsletter = NewsletterModel::findOne($newsletter_id);
+  function markNewsletterAsSent($newsletter) {
     // if it's a standard newsletter, update its status
     if($newsletter->type === NewsletterModel::TYPE_STANDARD) {
       $newsletter->setStatus(NewsletterModel::STATUS_SENT);

lib/Cron/Workers/SendingQueue/Tasks/Posts.php

@@ -7,26 +7,24 @@ use MailPoet\Models\NewsletterPost;
 if(!defined('ABSPATH')) exit;
 
 class Posts {
-  static function extractAndSave(array $newsletter) {
-    if(empty($newsletter['rendered_body']['html']) || empty($newsletter['id'])) {
-      return;
-    }
+  static function extractAndSave($rendered_newsletter, $newsletter) {
     preg_match_all(
       '/data-post-id="(\d+)"/ism',
-      $newsletter['rendered_body']['html'],
+      $rendered_newsletter['html'],
       $matched_posts_ids);
     $matched_posts_ids = $matched_posts_ids[1];
     if(!count($matched_posts_ids)) {
-      return $newsletter;
+      return false;
     }
-    $newsletter_id = ($newsletter['type'] === NewsletterModel::TYPE_NOTIFICATION_HISTORY) ?
-      $newsletter['parent_id'] :
-      $newsletter['id'];
+    $newsletter_id = ($newsletter->type === NewsletterModel::TYPE_NOTIFICATION_HISTORY) ?
+      $newsletter->parent_id :
+      $newsletter->id;
     foreach($matched_posts_ids as $post_id) {
       $newletter_post = NewsletterPost::create();
       $newletter_post->newsletter_id = $newsletter_id;
       $newletter_post->post_id = $post_id;
       $newletter_post->save();
     }
+    return true;
   }
 }

lib/Cron/Workers/SendingQueue/Tasks/Shortcodes.php

@@ -6,9 +6,8 @@ use MailPoet\Newsletter\Shortcodes\Shortcodes as NewsletterShortcodes;
 if(!defined('ABSPATH')) exit;
 
 class Shortcodes {
-  static function process($content, array $newsletter, array $subscriber, array $queue) {
+  static function process($content, $newsletter, $subscriber, $queue) {
     $shortcodes = new NewsletterShortcodes($newsletter, $subscriber, $queue);
     return $shortcodes->replace($content);
   }
-}
-
+}

lib/Cron/Workers/SendingQueue/Tasks/Subscribers.php

@@ -1,52 +0,0 @@
-<?php
-namespace MailPoet\Cron\Workers\SendingQueue\Tasks;
-
-if(!defined('ABSPATH')) exit;
-
-class Subscribers {
-  static function updateToProcessList(
-    array $found_subscribers_ids,
-    array $subscribers_to_process_ids,
-    array $queue_subscribers
-  ) {
-    // compare existing subscriber to the ones that queued for processing
-    $subscibers_to_exclude = array_diff(
-      $subscribers_to_process_ids,
-      $found_subscribers_ids
-    );
-    // remove nonexistent subscribers from the processing list
-    $queue_subscribers['to_process'] = array_diff(
-      $subscibers_to_exclude,
-      $queue_subscribers['to_process']
-    );
-    return $queue_subscribers;
-  }
-
-  static function updateFailedList(
-    array $failed_subscribers, array $queue_subscribers
-  ) {
-    $queue_subscribers['failed'] = array_merge(
-      $queue_subscribers['failed'],
-      $failed_subscribers
-    );
-    $queue_subscribers['to_process'] = array_diff(
-      $queue_subscribers['to_process'],
-      $failed_subscribers
-    );
-    return $queue_subscribers;
-  }
-
-  static function updateProcessedList(
-    array $processed_subscribers, array $queue_subscribers
-  ) {
-    $queue_subscribers['processed'] = array_merge(
-      $queue_subscribers['processed'],
-      $processed_subscribers
-    );
-    $queue_subscribers['to_process'] = array_diff(
-      $queue_subscribers['to_process'],
-      $processed_subscribers
-    );
-    return $queue_subscribers;
-  }
-}

lib/Form/Block/Checkbox.php

@@ -22,7 +22,6 @@ class Checkbox extends Base {
 
     foreach($options as $option) {
       $html .= '<label class="mailpoet_checkbox_label">';
-      $html .= '<input type="hidden" name="'.$field_name.'" value="0" />';
       $html .= '<input type="checkbox" class="mailpoet_checkbox" ';
 
       $html .= 'name="'.$field_name.'" ';

lib/Form/Util/Export.php

@@ -24,13 +24,14 @@ class Export {
         return join(' ', array(
           '<iframe',
           'width="100%"',
+          'height="100%"',
           'scrolling="no"',
           'frameborder="0"',
           'src="'.$iframe_url.'"',
           'class="mailpoet_form_iframe"',
           'vspace="0"',
           'tabindex="0"',
-          'onload="MailPoet.Iframe.autoSize(this);"',
+          'onload="if(window[\'MailPoet\']) MailPoet.Iframe.autoSize(this);"',
           'marginwidth="0"',
           'marginheight="0"',
           'hspace="0"',

lib/Form/Widget.php

@@ -148,12 +148,17 @@ class Widget extends \WP_Widget {
           'after_title' => (!empty($after_title) ? $after_title : '')
         );
 
-        // check if the form was successfully submitted via POST (non ajax)
+        // (POST) non ajax success/error variables
         $data['success'] = (
           (isset($_GET['mailpoet_success']))
           &&
           ((int)$_GET['mailpoet_success'] === (int)$form['id'])
         );
+        $data['error'] = (
+          (isset($_GET['mailpoet_error']))
+          &&
+          ((int)$_GET['mailpoet_error'] === (int)$form['id'])
+        );
 
         // generate security token
         $data['token'] = Security::generateToken();

lib/Listing/BulkAction.php

@@ -26,7 +26,7 @@ class BulkAction {
 
     if(!method_exists($this->model_class, $bulk_action_method)) {
       throw new \Exception(
-        $this->model_class. ' has not method "'.$bulk_action_method.'"'
+        $this->model_class. ' has no method "'.$bulk_action_method.'"'
       );
     }
 

lib/Listing/Handler.php

@@ -106,6 +106,7 @@ class Handler {
       );
     }
 
+    // get items and total count
     if(method_exists($this->model_class, 'listingQuery')) {
       $custom_query = call_user_func_array(
         array($this->model_class, 'listingQuery'),
@@ -135,7 +136,6 @@ class Handler {
         ->findMany();
     }
 
-
     return array(
       'count' => $count,
       'filters' => $filters,

lib/Mailer/Mailer.php

@@ -12,7 +12,7 @@ class Mailer {
   public $sender;
   public $reply_to;
   public $mailer_instance;
-  const MAILER_CONFIG = 'mta';
+  const MAILER_CONFIG_SETTING_NAME = 'mta';
   const SENDING_LIMIT_INTERVAL_MULTIPLIER = 60;
   const METHOD_MAILPOET = 'MailPoet';
   const METHOD_MAILGUN = 'MailGun';
@@ -24,13 +24,13 @@ class Mailer {
 
   function __construct($mailer = false, $sender = false, $reply_to = false) {
     $this->mailer_config = self::getMailerConfig($mailer);
-    $this->sender = $this->getSender($sender);
-    $this->reply_to = $this->getReplyTo($reply_to);
+    $this->sender = $this->getSenderNameAndAddress($sender);
+    $this->reply_to = $this->getReplyToNameAndAddress($reply_to);
     $this->mailer_instance = $this->buildMailer();
   }
 
   function send($newsletter, $subscriber) {
-    $subscriber = $this->transformSubscriber($subscriber);
+    $subscriber = $this->formatSubscriberNameAndEmailAddress($subscriber);
     return $this->mailer_instance->send($newsletter, $subscriber);
   }
 
@@ -100,7 +100,7 @@ class Mailer {
 
   static function getMailerConfig($mailer = false) {
     if(!$mailer) {
-      $mailer = Setting::getValue(self::MAILER_CONFIG);
+      $mailer = Setting::getValue(self::MAILER_CONFIG_SETTING_NAME);
       if(!$mailer || !isset($mailer['method'])) throw new \Exception(__('Mailer is not configured'));
     }
     if(empty($mailer['frequency'])) {
@@ -115,7 +115,7 @@ class Mailer {
     return $mailer;
   }
 
-  function getSender($sender = false) {
+  function getSenderNameAndAddress($sender = false) {
     if(empty($sender)) {
       $sender = Setting::getValue('sender', array());
       if(empty($sender['address'])) throw new \Exception(__('Sender name and email are not configured'));
@@ -127,15 +127,15 @@ class Mailer {
     );
   }
 
-  function getReplyTo($reply_to = false) {
+  function getReplyToNameAndAddress($reply_to = array()) {
     if(!$reply_to) {
       $reply_to = Setting::getValue('reply_to', null);
-      if(!$reply_to) {
-        $reply_to = array(
-          'name' => $this->sender['from_name'],
-          'address' => $this->sender['from_email']
-        );
-      }
+      $reply_to['name'] = (!empty($reply_to['name'])) ?
+        $reply_to['name'] :
+        $this->sender['from_name'];
+      $reply_to['address'] = (!empty($reply_to['address'])) ?
+        $reply_to['address'] :
+        $this->sender['from_email'];
     }
     if(empty($reply_to['address'])) {
       $reply_to['address'] = $this->sender['from_email'];
@@ -147,7 +147,8 @@ class Mailer {
     );
   }
 
-  function transformSubscriber($subscriber) {
+  function formatSubscriberNameAndEmailAddress($subscriber) {
+    $subscriber = (is_object($subscriber)) ? $subscriber->asArray() : $subscriber;
     if(!is_array($subscriber)) return $subscriber;
     if(isset($subscriber['address'])) $subscriber['email'] = $subscriber['address'];
     $first_name = (isset($subscriber['first_name'])) ? $subscriber['first_name'] : '';

lib/Mailer/MailerLog.php

@@ -34,8 +34,8 @@ class MailerLog {
     return $mailer_log;
   }
 
-  static function incrementSentCount($mailer_log = false) {
-    $mailer_log = ($mailer_log) ? $mailer_log : self::getMailerLog();
+  static function incrementSentCount() {
+    $mailer_log = self::getMailerLog();
     (int)$mailer_log['sent']++;
     return self::updateMailerLog($mailer_log);
   }
@@ -54,7 +54,7 @@ class MailerLog {
 
   static function enforceSendingLimit() {
     if(self::isSendingLimitReached()) {
-      throw new \Exception(__('Sending frequency limit has been reached'));
+      throw new \Exception(__('Sending frequency limit has been reached.'));
     }
   }
 }

lib/Models/Model.php

@@ -77,7 +77,7 @@ class Model extends \Sudzy\ValidModel {
 
   static function bulkTrash($orm) {
     $model = get_called_class();
-    return self::bulkAction($orm, function($ids) use($model) {
+    $count = self::bulkAction($orm, function($ids) use($model) {
       self::rawExecute(join(' ', array(
           'UPDATE `'.$model::$_table.'`',
           'SET `deleted_at` = NOW()',
@@ -86,13 +86,17 @@ class Model extends \Sudzy\ValidModel {
         $ids
       );
     });
+
+    return array('count' => $count);
   }
 
   static function bulkDelete($orm) {
     $model = get_called_class();
-    return self::bulkAction($orm, function($ids) use($model) {
+    $count = self::bulkAction($orm, function($ids) use($model) {
       $model::whereIn('id', $ids)->deleteMany();
     });
+
+    return array('count' => $count);
   }
 
   function restore() {
@@ -101,7 +105,7 @@ class Model extends \Sudzy\ValidModel {
 
   static function bulkRestore($orm) {
     $model = get_called_class();
-    return self::bulkAction($orm, function($ids) use($model) {
+    $count = self::bulkAction($orm, function($ids) use($model) {
       self::rawExecute(join(' ', array(
           'UPDATE `'.$model::$_table.'`',
           'SET `deleted_at` = NULL',
@@ -110,6 +114,8 @@ class Model extends \Sudzy\ValidModel {
         $ids
       );
     });
+
+    return array('count' => $count);
   }
 
   static function bulkAction($orm, $callback = false) {
@@ -145,14 +151,11 @@ class Model extends \Sudzy\ValidModel {
     $duplicate->set_expr('updated_at', 'NOW()');
     $duplicate->set_expr('deleted_at', 'NULL');
 
-    if($duplicate->save()) {
-      return $duplicate;
-    } else {
-      return false;
-    }
+    $duplicate->save();
+    return $duplicate;
   }
 
-  private function setTimestamp() {
+  function setTimestamp() {
     if($this->created_at === null) {
       $this->set_expr('created_at', 'NOW()');
     }

lib/Models/Newsletter.php

@@ -1,12 +1,12 @@
 <?php
 namespace MailPoet\Models;
+use MailPoet\Newsletter\Renderer\Renderer;
 use MailPoet\Util\Helpers;
 
 if(!defined('ABSPATH')) exit;
 
 class Newsletter extends Model {
   public static $_table = MP_NEWSLETTERS_TABLE;
-
   const TYPE_STANDARD = 'standard';
   const TYPE_WELCOME = 'welcome';
   const TYPE_NOTIFICATION = 'notification';
@@ -22,7 +22,6 @@ class Newsletter extends Model {
 
   function __construct() {
     parent::__construct();
-
     $this->addValidations('type', array(
       'required' => __('Please specify a type')
     ));
@@ -246,6 +245,11 @@ class Newsletter extends Model {
     return $this;
   }
 
+  function render() {
+    $renderer = new Renderer($this);
+    return $renderer->render();
+  }
+
   function getStatistics() {
     $statistics_query = SendingQueue::tableAlias('queues')
       ->selectExpr(

lib/Models/Segment.php

@@ -212,7 +212,7 @@ class Segment extends Model {
   }
 
   static function bulkTrash($orm) {
-    return parent::bulkAction($orm, function($ids) {
+    $count = parent::bulkAction($orm, function($ids) {
       parent::rawExecute(join(' ', array(
         'UPDATE `'.self::$_table.'`',
         'SET `deleted_at` = NOW()',
@@ -220,14 +220,18 @@ class Segment extends Model {
         'AND `type` = "default"'
       )), $ids);
     });
+
+    return array('count' => $count);
   }
 
   static function bulkDelete($orm) {
-    return parent::bulkAction($orm, function($ids) {
+    $count = parent::bulkAction($orm, function($ids) {
       // delete segments (only default)
       Segment::whereIn('id', $ids)
         ->where('type', 'default')
         ->deleteMany();
     });
+
+    return array('count' => $count);
   }
 }

lib/Models/SendingQueue.php

@@ -5,11 +5,14 @@ if(!defined('ABSPATH')) exit;
 
 class SendingQueue extends Model {
   public static $_table = MP_SENDING_QUEUES_TABLE;
-
   const STATUS_COMPLETED = 'completed';
   const STATUS_SCHEDULED = 'scheduled';
   const STATUS_PAUSED = 'paused';
 
+  function newsletter() {
+    return $this->has_one(__NAMESPACE__ . '\Newsletter', 'id', 'newsletter_id');
+  }
+
   function pause() {
     if($this->count_processed === $this->count_total) {
       return false;
@@ -40,8 +43,12 @@ class SendingQueue extends Model {
     if(!is_serialized($this->subscribers)) {
       $this->set('subscribers', serialize($this->subscribers));
     }
+    if(!is_serialized($this->newsletter_rendered_body)) {
+      $this->set('newsletter_rendered_body', serialize($this->newsletter_rendered_body));
+    }
     parent::save();
     $this->subscribers = $this->getSubscribers();
+    $this->newsletter_rendered_body = $this->getNewsletterRenderedBody();
     return $this;
   }
 
@@ -59,8 +66,10 @@ class SendingQueue extends Model {
     return $subscribers;
   }
 
-  function getRenderedNewsletterBody() {
-    return json_decode($this->newsletter_rendered_body, true);
+  function getNewsletterRenderedBody() {
+    return (!is_serialized($this->newsletter_rendered_body)) ?
+      $this->newsletter_rendered_body :
+      unserialize($this->newsletter_rendered_body);
   }
 
   function isSubscriberProcessed($subscriber_id) {
@@ -75,4 +84,62 @@ class SendingQueue extends Model {
       : $this->subscribers;
     return $model;
   }
-}
+
+  function removeNonexistentSubscribers($subscribers_to_remove) {
+    $subscribers = $this->getSubscribers();
+    $subscribers['to_process'] = array_values(
+      array_diff(
+        $subscribers['to_process'],
+        $subscribers_to_remove
+      )
+    );
+    $this->subscribers = $subscribers;
+    $this->updateCount();
+  }
+
+  function updateFailedSubscribers($failed_subscribers) {
+    $subscribers = $this->getSubscribers();
+    $subscribers['failed'] = array_merge(
+      $subscribers['failed'],
+      $failed_subscribers
+    );
+    $subscribers['to_process'] = array_values(
+      array_diff(
+        $subscribers['to_process'],
+        $failed_subscribers
+      )
+    );
+    $this->subscribers = $subscribers;
+    $this->updateCount();
+  }
+
+  function updateProcessedSubscribers($processed_subscribers) {
+    $subscribers = $this->getSubscribers();
+    $subscribers['processed'] = array_merge(
+      $subscribers['processed'],
+      $processed_subscribers
+    );
+    $subscribers['to_process'] = array_values(
+      array_diff(
+        $subscribers['to_process'],
+        $processed_subscribers
+      )
+    );
+    $this->subscribers = $subscribers;
+    $this->updateCount();
+  }
+
+  function updateCount() {
+    $this->subscribers = $this->getSubscribers();
+    $this->count_processed =
+      count($this->subscribers['processed']) + count($this->subscribers['failed']);
+    $this->count_to_process = count($this->subscribers['to_process']);
+    $this->count_failed = count($this->subscribers['failed']);
+    $this->count_total = $this->count_processed + $this->count_to_process;
+    if(!$this->count_to_process) {
+      $this->processed_at = current_time('mysql');
+      $this->status = self::STATUS_COMPLETED;
+    }
+    return $this->save();
+  }
+}

lib/Models/Subscriber.php

@@ -23,12 +23,13 @@ class Subscriber extends Model {
     ));
   }
 
-  static function findOne($id = null) {
+  static function findOne($id = false) {
     if(is_int($id) || (string)(int)$id === $id) {
       return parent::findOne($id);
-    } else {
+    } else if(strlen(trim($id)) > 0) {
       return parent::where('email', $id)->findOne();
     }
+    return false;
   }
 
   function segments() {
@@ -72,72 +73,69 @@ class Subscriber extends Model {
   }
 
   function sendConfirmationEmail() {
-    if($this->status === self::STATUS_UNCONFIRMED) {
-      $signup_confirmation = Setting::getValue('signup_confirmation');
+    $signup_confirmation = Setting::getValue('signup_confirmation');
 
-      $segments = $this->segments()->findMany();
-      $segment_names = array_map(function($segment) {
-        return $segment->name;
-      }, $segments);
+    $segments = $this->segments()->findMany();
+    $segment_names = array_map(function($segment) {
+      return $segment->name;
+    }, $segments);
 
-      $body = nl2br($signup_confirmation['body']);
+    $body = nl2br($signup_confirmation['body']);
 
-      // replace list of segments shortcode
-      $body = str_replace(
-        '[lists_to_confirm]',
-        '<strong>'.join(', ', $segment_names).'</strong>',
-        $body
-      );
+    // replace list of segments shortcode
+    $body = str_replace(
+      '[lists_to_confirm]',
+      '<strong>'.join(', ', $segment_names).'</strong>',
+      $body
+    );
 
-      // replace activation link
-      $body = str_replace(
-        array(
-          '[activation_link]',
-          '[/activation_link]'
-        ),
-        array(
-          '<a href="'.esc_attr(Subscription\Url::getConfirmationUrl($this)).'">',
-          '</a>'
-        ),
-        $body
-      );
+    // replace activation link
+    $body = str_replace(
+      array(
+        '[activation_link]',
+        '[/activation_link]'
+      ),
+      array(
+        '<a href="'.esc_attr(Subscription\Url::getConfirmationUrl($this)).'">',
+        '</a>'
+      ),
+      $body
+    );
 
-      // build email data
-      $email = array(
-        'subject' => $signup_confirmation['subject'],
-        'body' => array(
-          'html' => $body,
-          'text' => $body
-        )
-      );
+    // build email data
+    $email = array(
+      'subject' => $signup_confirmation['subject'],
+      'body' => array(
+        'html' => $body,
+        'text' => $body
+      )
+    );
 
-      // convert subscriber to array
-      $subscriber = $this->asArray();
+    // convert subscriber to array
+    $subscriber = $this->asArray();
 
-      // set from
-      $from = (
-        !empty($signup_confirmation['from'])
-        && !empty($signup_confirmation['from']['address'])
-      ) ? $signup_confirmation['from']
-        : false;
+    // set from
+    $from = (
+      !empty($signup_confirmation['from'])
+      && !empty($signup_confirmation['from']['address'])
+    ) ? $signup_confirmation['from']
+      : false;
 
-      // set reply to
-      $reply_to = (
-        !empty($signup_confirmation['reply_to'])
-        && !empty($signup_confirmation['reply_to']['address'])
-      ) ? $signup_confirmation['reply_to']
-        : false;
+    // set reply to
+    $reply_to = (
+      !empty($signup_confirmation['reply_to'])
+      && !empty($signup_confirmation['reply_to']['address'])
+    ) ? $signup_confirmation['reply_to']
+      : false;
 
-      // send email
-      try {
-        $mailer = new Mailer(false, $from, $reply_to);
-        return $mailer->send($email, $subscriber);
-      } catch(\Exception $e) {
-        $this->setError($e->getMessage());
-        return false;
-      }
+    // send email
+    try {
+      $mailer = new Mailer(false, $from, $reply_to);
+      return $mailer->send($email, $subscriber);
+    } catch(\Exception $e) {
+      $this->setError($e->getMessage());
+      return false;
     }
-    return false;
   }
 
   static function generateToken($email = null) {
@@ -152,49 +150,48 @@ class Subscriber extends Model {
   }
 
   static function subscribe($subscriber_data = array(), $segment_ids = array()) {
-    if(empty($subscriber_data) or empty($segment_ids)) {
-      return false;
-    }
-
     $signup_confirmation_enabled = (bool)Setting::getValue(
       'signup_confirmation.enabled'
     );
 
-    $subscriber = self::createOrUpdate($subscriber_data);
-    $errors = $subscriber->getErrors();
+    $subscriber = self::findOne($subscriber_data['email']);
+
+    if($subscriber === false) {
+      // create new subscriber
+      $subscriber = self::createOrUpdate($subscriber_data);
+      if($subscriber->getErrors() !== false) {
+        return $subscriber;
+      }
 
-    if($errors === false && $subscriber->id > 0) {
       $subscriber = self::findOne($subscriber->id);
+    }
 
-      // restore deleted subscriber
-      if($subscriber->deleted_at !== null) {
-        $subscriber->setExpr('deleted_at', 'NULL');
+    // restore trashed subscriber
+    if($subscriber->deleted_at !== null) {
+      $subscriber->setExpr('deleted_at', 'NULL');
+    }
+
+    // set status depending on signup confirmation setting
+    if($subscriber->status !== self::STATUS_SUBSCRIBED) {
+      if($signup_confirmation_enabled === true) {
+        $subscriber->set('status', self::STATUS_UNCONFIRMED);
+      } else {
+        $subscriber->set('status', self::STATUS_SUBSCRIBED);
       }
+    }
 
-      if($subscriber->status !== self::STATUS_SUBSCRIBED) {
-        // auto subscribe when signup confirmation is disabled
-        if($signup_confirmation_enabled === true) {
-          $subscriber->set('status', self::STATUS_UNCONFIRMED);
-        } else {
-          $subscriber->set('status', self::STATUS_SUBSCRIBED);
-        }
-      }
+    if($subscriber->save()) {
+      // link subscriber to segments
+      SubscriberSegment::subscribeToSegments($subscriber, $segment_ids);
 
-      if($subscriber->save()) {
-        // link subscriber to segments
-        SubscriberSegment::subscribeToSegments($subscriber, $segment_ids);
+      // signup confirmation
+      $subscriber->sendConfirmationEmail();
 
-        // signup confirmation
-        if($subscriber->status !== self::STATUS_SUBSCRIBED) {
-          $subscriber->sendConfirmationEmail();
-        }
-
-        // welcome email
-        Scheduler::scheduleSubscriberWelcomeNotification(
-          $subscriber->id,
-          $segment_ids
-        );
-      }
+      // welcome email
+      Scheduler::scheduleSubscriberWelcomeNotification(
+        $subscriber->id,
+        $segment_ids
+      );
     }
 
     return $subscriber;
@@ -537,7 +534,7 @@ class Subscriber extends Model {
 
     if($segment === false) return false;
 
-    $subscribers_count = parent::bulkAction($orm,
+    $count = parent::bulkAction($orm,
       function($subscriber_ids) use($segment) {
         SubscriberSegment::subscribeManyToSegments(
           $subscriber_ids, array($segment->id)
@@ -546,7 +543,7 @@ class Subscriber extends Model {
     );
 
     return array(
-      'subscribers' => $subscribers_count,
+      'count' => $count,
       'segment' => $segment->name
     );
   }
@@ -557,7 +554,7 @@ class Subscriber extends Model {
 
     if($segment === false) return false;
 
-    $subscribers_count = parent::bulkAction($orm,
+    $count = parent::bulkAction($orm,
       function($subscriber_ids) use($segment) {
         SubscriberSegment::deleteManySubscriptions($subscriber_ids);
         SubscriberSegment::subscribeManyToSegments(
@@ -567,7 +564,7 @@ class Subscriber extends Model {
     );
 
     return array(
-      'subscribers' => $subscribers_count,
+      'count' => $count,
       'segment' => $segment->name
     );
   }
@@ -578,7 +575,7 @@ class Subscriber extends Model {
 
     if($segment === false) return false;
 
-    $subscribers_count = $orm->count();
+    $count = $orm->count();
 
     parent::bulkAction($orm, function($subscriber_ids) use($segment) {
       SubscriberSegment::deleteManySubscriptions(
@@ -587,19 +584,21 @@ class Subscriber extends Model {
     });
 
     return array(
-      'subscribers' => $subscribers_count,
+      'count' => $count,
       'segment' => $segment->name
     );
   }
 
   static function bulkRemoveFromAllLists($orm, $data = array()) {
-    $subscribers_count = $orm->count();
+    $count = $orm->count();
 
     parent::bulkAction($orm, function($subscriber_ids) {
       SubscriberSegment::deleteManySubscriptions($subscriber_ids);
     });
 
-    return $subscribers_count;
+    return array(
+      'count' => $count
+    );
   }
 
   static function bulkSendConfirmationEmail($orm) {
@@ -614,13 +613,22 @@ class Subscriber extends Model {
           $emails_sent++;
         }
       }
-      return $emails_sent;
     }
-    return false;
+
+    return array(
+      'count' => $emails_sent
+    );
+  }
+
+  static function getTotalSubscribers() {
+    return self::whereIn('status', array(
+      self::STATUS_SUBSCRIBED,
+      self::STATUS_UNCONFIRMED
+    ))->count();
   }
 
   static function bulkTrash($orm) {
-    return parent::bulkAction($orm, function($subscriber_ids) {
+    $count = parent::bulkAction($orm, function($subscriber_ids) {
       self::rawExecute(join(' ', array(
           'UPDATE `'.self::$_table.'`',
           'SET `deleted_at` = NOW()',
@@ -632,10 +640,12 @@ class Subscriber extends Model {
         $subscriber_ids
       );
     });
+
+    return array('count' => $count);
   }
 
   static function bulkDelete($orm) {
-    return parent::bulkAction($orm, function($subscriber_ids) {
+    $count = parent::bulkAction($orm, function($subscriber_ids) {
       // delete all subscriber/segment relationships
       SubscriberSegment::deleteManySubscriptions($subscriber_ids);
 
@@ -644,6 +654,8 @@ class Subscriber extends Model {
         ->whereNull('wp_user_id')
         ->deleteMany();
     });
+
+    return array('count' => $count);
   }
 
   static function subscribed($orm) {

lib/Newsletter/Scheduler/Scheduler.php

@@ -19,81 +19,22 @@ class Scheduler {
   const INTERVAL_MONTHLY = 'monthly';
   const INTERVAL_NTHWEEKDAY = 'nthWeekDay';
 
-  static function processPostNotificationSchedule($newsletter_id) {
-    $newsletter = Newsletter::filter('filterWithOptions')
-      ->findOne($newsletter_id);
-    if(!$newsletter) return;
-    $newsletter = $newsletter->asArray();
-    $interval_type = $newsletter['intervalType'];
-    $hour = (int)$newsletter['timeOfDay'] / self::SECONDS_IN_HOUR;
-    $week_day = $newsletter['weekDay'];
-    $month_day = $newsletter['monthDay'];
-    $nth_week_day = ($newsletter['nthWeekDay'] === self::LAST_WEEKDAY_FORMAT) ?
-      $newsletter['nthWeekDay'] :
-      '#' . $newsletter['nthWeekDay'];
-    switch($interval_type) {
-      case self::INTERVAL_IMMEDIATELY:
-        $schedule = '* * * * *';
-        break;
-      case self::INTERVAL_IMMEDIATE:
-      case self::INTERVAL_DAILY:
-        $schedule = sprintf('0 %s * * *', $hour);
-        break;
-      case self::INTERVAL_WEEKLY:
-        $schedule = sprintf('0 %s * * %s', $hour, $week_day);
-        break;
-      case self::INTERVAL_NTHWEEKDAY:
-        $schedule = sprintf('0 %s ? * %s%s', $hour, $week_day, $nth_week_day);
-        break;
-      case self::INTERVAL_MONTHLY:
-        $schedule = sprintf('0 %s %s * *', $hour, $month_day);
-        break;
-    }
-    $option_field = NewsletterOptionField::where('name', 'schedule')
-      ->findOne()
-      ->asArray();
-    $relation = NewsletterOption::where('newsletter_id', $newsletter_id)
-      ->where('option_field_id', $option_field['id'])
-      ->findOne();
-    if(!$relation) {
-      $relation = NewsletterOption::create();
-      $relation->newsletter_id = $newsletter['id'];
-      $relation->option_field_id = $option_field['id'];
-    }
-    $relation->value = $schedule;
-    $relation->save();
-    return Newsletter::filter('filterWithOptions')
-      ->findOne($newsletter_id);
-  }
-
   static function schedulePostNotification($post_id) {
     $newsletters = self::getNewsletters(Newsletter::TYPE_NOTIFICATION);
-    if(!count($newsletters)) return;
+    if(!count($newsletters)) return false;
     foreach($newsletters as $newsletter) {
       $post = NewsletterPost::where('newsletter_id', $newsletter->id)
         ->where('post_id', $post_id)
         ->findOne();
       if($post === false) {
-        $scheduled_notification = self::createPostNotificationQueue($newsletter);
+        self::createPostNotificationQueue($newsletter);
       }
     }
   }
 
-  /**
-   * Create a properly formatted timestamp for use in Scheduler from
-   * arbitrarily formatted timestamp strings.
-   */
-  static function scheduleFromTimestamp($timestamp) {
-    return Carbon::parse($timestamp)->format('Y-m-d H:i:s');
-  }
-
-  static function scheduleSubscriberWelcomeNotification(
-    $subscriber_id,
-    array $segments
-  ) {
+  static function scheduleSubscriberWelcomeNotification($subscriber_id, $segments) {
     $newsletters = self::getNewsletters(Newsletter::TYPE_WELCOME);
-    if(empty($newsletters)) return;
-
+    if(empty($newsletters)) return false;
     foreach($newsletters as $newsletter) {
       if($newsletter->event === 'segment' &&
         in_array($newsletter->segment, $segments)
@@ -105,19 +46,17 @@ class Scheduler {
 
   static function scheduleWPUserWelcomeNotification(
     $subscriber_id,
-    array $wp_user,
-    $old_user_data
+    $wp_user,
+    $old_user_data = false
   ) {
     $newsletters = self::getNewsletters(Newsletter::TYPE_WELCOME);
-    if(empty($newsletters)) return;
-
+    if(empty($newsletters)) return false;
     foreach($newsletters as $newsletter) {
       if($newsletter->event === 'user') {
         if($old_user_data) {
           // do not schedule welcome newsletter if roles have not changed
           $old_role = (array)$old_user_data->roles;
           $new_role = (array)$wp_user->roles;
-
           if($newsletter->role === self::WORDPRESS_ALL_ROLES ||
             !array_diff($old_role, $new_role)
           ) {
@@ -125,7 +64,7 @@ class Scheduler {
           }
         }
         if($newsletter->role === self::WORDPRESS_ALL_ROLES ||
-          in_array($newsletter->role, $wp_user['roles'])
+          in_array($newsletter->role, (array)$wp_user->roles)
         ) {
           self::createWelcomeNotificationQueue($newsletter, $subscriber_id);
         }
@@ -133,14 +72,6 @@ class Scheduler {
     }
   }
 
-  static function getNewsletters($type) {
-    return Newsletter::getPublished()
-      ->filter('filterType', $type)
-      ->filter('filterStatus', Newsletter::STATUS_ACTIVE)
-      ->filter('filterWithOptions')
-      ->findMany();
-  }
-
   static function createWelcomeNotificationQueue($newsletter, $subscriber_id) {
     $queue = SendingQueue::create();
     $queue->newsletter_id = $newsletter->id;
@@ -169,7 +100,7 @@ class Scheduler {
     }
     $queue->status = SendingQueue::STATUS_SCHEDULED;
     $queue->scheduled_at = $scheduled_at;
-    $queue->save();
+    return $queue->save();
   }
 
   static function createPostNotificationQueue($newsletter) {
@@ -187,9 +118,60 @@ class Scheduler {
     return $queue;
   }
 
+  static function processPostNotificationSchedule($newsletter) {
+    $interval_type = $newsletter->intervalType;
+    $hour = (int)$newsletter->timeOfDay / self::SECONDS_IN_HOUR;
+    $week_day = $newsletter->weekDay;
+    $month_day = $newsletter->monthDay;
+    $nth_week_day = ($newsletter->nthWeekDay === self::LAST_WEEKDAY_FORMAT) ?
+      $newsletter->nthWeekDay :
+      '#' . $newsletter->nthWeekDay;
+    switch($interval_type) {
+      case self::INTERVAL_IMMEDIATELY:
+        $schedule = '* * * * *';
+        break;
+      case self::INTERVAL_IMMEDIATE:
+      case self::INTERVAL_DAILY:
+        $schedule = sprintf('0 %s * * *', $hour);
+        break;
+      case self::INTERVAL_WEEKLY:
+        $schedule = sprintf('0 %s * * %s', $hour, $week_day);
+        break;
+      case self::INTERVAL_NTHWEEKDAY:
+        $schedule = sprintf('0 %s ? * %s%s', $hour, $week_day, $nth_week_day);
+        break;
+      case self::INTERVAL_MONTHLY:
+        $schedule = sprintf('0 %s %s * *', $hour, $month_day);
+        break;
+    }
+    $option_field = NewsletterOptionField::where('name', 'schedule')->findOne();
+    $relation = NewsletterOption::where('newsletter_id', $newsletter->id)
+      ->where('option_field_id', $option_field->id)
+      ->findOne();
+    if(!$relation) {
+      $relation = NewsletterOption::create();
+      $relation->newsletter_id = $newsletter->id;
+      $relation->option_field_id = $option_field->id;
+    }
+    $relation->value = $schedule;
+    $relation->save();
+  }
+
   static function getNextRunDate($schedule) {
     $schedule = \Cron\CronExpression::factory($schedule);
-    return $schedule->getNextRunDate(current_time('mysql'))
+    return $schedule->getNextRunDate(Carbon::createFromTimestamp(current_time('timestamp')))
       ->format('Y-m-d H:i:s');
   }
-}
+
+  static function getNewsletters($type) {
+    return Newsletter::getPublished()
+      ->filter('filterType', $type)
+      ->filter('filterStatus', Newsletter::STATUS_ACTIVE)
+      ->filter('filterWithOptions')
+      ->findMany();
+  }
+
+  static function formatDatetimeString($datetime_string) {
+    return Carbon::parse($datetime_string)->format('Y-m-d H:i:s');
+  }
+}

lib/Newsletter/ViewInBrowser.php

@@ -19,7 +19,7 @@ class ViewInBrowser {
 
   function renderNewsletter($newsletter, $subscriber, $queue, $wp_user_preview) {
     if($queue && $queue->newsletter_rendered_body) {
-      $newsletter_body = $queue->getRenderedNewsletterBody();
+      $newsletter_body = $queue->getNewsletterRenderedBody();
     } else {
       $renderer = new Renderer($newsletter, $wp_user_preview);
       $newsletter_body = $renderer->render();

lib/Subscription/Form.php

@@ -0,0 +1,42 @@
+<?php
+namespace MailPoet\Subscription;
+use \MailPoet\API\Endpoints\Subscribers;
+use \MailPoet\API\Response as APIResponse;
+use \MailPoet\Models\Subscriber;
+use \MailPoet\Models\StatisticsForms;
+use \MailPoet\Models\Form as FormModel;
+use \MailPoet\Util\Url;
+
+class Form {
+  static function onSubmit() {
+    $reserved_keywords = array(
+      'token',
+      'endpoint',
+      'method',
+      'mailpoet_redirect'
+    );
+
+    $data = array_diff_key($_POST, array_flip($reserved_keywords));
+    $form_id = isset($data['form_id']) ? $data['form_id'] : 0;
+
+    $endpoint = new Subscribers();
+
+    $response = $endpoint->subscribe($data);
+
+    if($response->status !== APIResponse::STATUS_OK) {
+      Url::redirectBack(array(
+        'mailpoet_error' => isset($data['form_id']) ? $data['form_id'] : true,
+        'mailpoet_success' => null
+      ));
+    } else {
+      if(isset($response->meta['redirect_url'])) {
+        Url::redirectTo($response->meta['redirect_url']);
+      } else {
+        Url::redirectBack(array(
+          'mailpoet_success' => $form_id,
+          'mailpoet_error' => null
+        ));
+      }
+    }
+  }
+}

mailpoet.php

@@ -4,7 +4,7 @@ if(!defined('ABSPATH')) exit;
 use \MailPoet\Config\Initializer;
 /*
  * Plugin Name: MailPoet
- * Version: 0.0.43
+ * Version: 0.0.46
  * Plugin URI: http://www.mailpoet.com
  * Description: MailPoet Newsletters.
  * Author: MailPoet
@@ -22,7 +22,7 @@ use \MailPoet\Config\Initializer;
 
 require 'vendor/autoload.php';
 
-define('MAILPOET_VERSION', '0.0.43');
+define('MAILPOET_VERSION', '0.0.46');
 
 $initializer = new Initializer(array(
   'file' => __FILE__,

tests/_bootstrap.php

@@ -1,16 +1,18 @@
 <?php
 
-$wp_load_file = getenv('WP_TEST_PATH').'/wp-load.php';
+$wp_load_file = getenv('WP_TEST_PATH') . '/wp-load.php';
 require_once($wp_load_file);
 
 $console = new \Codeception\Lib\Console\Output([]);
-$console->writeln('Loading WP core... ('.$wp_load_file.')');
+$console->writeln('Loading WP core... (' . $wp_load_file . ')');
 
 $console->writeln('Cleaning up database...');
 $models = array(
   'CustomField',
   'Form',
   'Newsletter',
+  'NewsletterLink',
+  'NewsletterPost',
   'NewsletterSegment',
   'NewsletterTemplate',
   'NewsletterOption',
@@ -26,12 +28,12 @@ $models = array(
   'StatisticsNewsletters',
   'StatisticsUnsubscribes'
 );
-$destroy = function ($model) {
+$destroy = function($model) {
   $class = new \ReflectionClass('\MailPoet\Models\\' . $model);
   $table = $class->getStaticPropertyValue('_table');
   $db = ORM::getDb();
   $db->beginTransaction();
-  $db->exec('TRUNCATE '.$table);
+  $db->exec('TRUNCATE ' . $table);
   $db->commit();
 };
 array_map($destroy, $models);

tests/unit/API/FormsTest.php

@@ -1,54 +1,60 @@
 <?php
 use \MailPoet\API\Endpoints\Forms;
+use \MailPoet\API\Response as APIResponse;
 use \MailPoet\Models\Form;
 use \MailPoet\Models\Segment;
 
 class FormsTest extends MailPoetTest {
   function _before() {
-    Form::createOrUpdate(array('name' => 'Form 1'));
-    Form::createOrUpdate(array('name' => 'Form 2'));
-    Form::createOrUpdate(array('name' => 'Form 3'));
+    $this->form_1 = Form::createOrUpdate(array('name' => 'Form 1'));
+    $this->form_2 = Form::createOrUpdate(array('name' => 'Form 2'));
+    $this->form_3 = Form::createOrUpdate(array('name' => 'Form 3'));
     Segment::createOrUpdate(array('name' => 'Segment 1'));
     Segment::createOrUpdate(array('name' => 'Segment 2'));
   }
 
   function testItCanGetAForm() {
-    $form = Form::where('name', 'Form 1')->findOne();
-
     $router = new Forms();
 
     $response = $router->get(/* missing id */);
-    expect($response)->false();
+    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    expect($response->errors[0]['message'])->equals('This form does not exist.');
 
-    $response = $router->get('not_an_id');
-    expect($response)->false();
+    $response = $router->get(array('id' => 'not_an_id'));
+    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    expect($response->errors[0]['message'])->equals('This form does not exist.');
 
-    $response = $router->get($form->id);
-    expect($response['id'])->equals($form->id);
-    expect($response['name'])->equals($form->name);
+    $response = $router->get(array('id' => $this->form_1->id));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Form::findOne($this->form_1->id)->asArray()
+    );
   }
 
   function testItCanGetListingData() {
     $router = new Forms();
     $response = $router->listing();
-    expect($response)->hasKey('filters');
-    expect($response)->hasKey('groups');
-    expect($response['count'])->equals(3);
-    expect($response['items'])->count(3);
-    expect($response['items'][0]['name'])->equals('Form 1');
-    expect($response['items'][1]['name'])->equals('Form 2');
-    expect($response['items'][2]['name'])->equals('Form 3');
+
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+
+    expect($response->meta)->hasKey('filters');
+    expect($response->meta)->hasKey('groups');
+    expect($response->meta['count'])->equals(3);
+
+    expect($response->data)->count(3);
+    expect($response->data[0]['name'])->equals('Form 1');
+    expect($response->data[1]['name'])->equals('Form 2');
+    expect($response->data[2]['name'])->equals('Form 3');
   }
 
   function testItCanCreateANewForm() {
     $router = new Forms();
     $response = $router->create();
-    expect($response['result'])->true();
-    expect($response['form_id'] > 0)->true();
-    expect($response)->hasntKey('errors');
-
-    $created_form = Form::findOne($response['form_id']);
-    expect($created_form->name)->equals('New form');
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Form::findOne($response->data['id'])->asArray()
+    );
+    expect($response->data['name'])->equals('New form');
   }
 
   function testItCanSaveAForm() {
@@ -58,133 +64,127 @@ class FormsTest extends MailPoetTest {
 
     $router = new Forms();
     $response = $router->save(/* missing data */);
-    expect($response['result'])->false();
-    expect($response['errors'][0])->equals('Please specify a name');
+    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    expect($response->errors[0]['message'])->equals('Please specify a name');
 
     $response = $router->save($form_data);
-    expect($response['result'])->true();
-    expect($response['form_id'] > 0)->true();
-
-    $form = Form::where('name', 'My first form')->findOne();
-    expect($form->id)->equals($response['form_id']);
-    expect($form->name)->equals('My first form');
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Form::where('name', 'My first form')->findOne()->asArray()
+    );
   }
 
   function testItCanPreviewAForm() {
     $router = new Forms();
 
     $response = $router->create();
-    expect($response['result'])->true();
-    expect($response['form_id'] > 0)->true();
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Form::where('name', 'New form')->findOne()->asArray()
+    );
 
-    $form = Form::findOne($response['form_id']);
-    $response = $router->previewEditor($form->asArray());
-    expect($response['html'])->notEmpty();
-    expect($response['css'])->notEmpty();
+    $response = $router->previewEditor($response->data);
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data['html'])->notEmpty();
+    expect($response->data['css'])->notEmpty();
   }
 
   function testItCanExportAForm() {
     $router = new Forms();
 
     $response = $router->create();
-    expect($response['result'])->true();
-    expect($response['form_id'] > 0)->true();
+    expect($response->status)->equals(APIResponse::STATUS_OK);
 
-    $response = $router->exportsEditor($response['form_id']);
-    expect($response['html'])->notEmpty();
-    expect($response['php'])->notEmpty();
-    expect($response['iframe'])->notEmpty();
-    expect($response['shortcode'])->notEmpty();
+    $response = $router->exportsEditor($response->data);
+    expect($response->data['html'])->notEmpty();
+    expect($response->data['php'])->notEmpty();
+    expect($response->data['iframe'])->notEmpty();
+    expect($response->data['shortcode'])->notEmpty();
   }
 
   function testItCanSaveFormEditor() {
     $router = new Forms();
 
     $response = $router->create();
-    expect($response['result'])->true();
-    expect($response['form_id'] > 0)->true();
+    expect($response->status)->equals(APIResponse::STATUS_OK);
 
-    $form = Form::findOne($response['form_id'])->asArray();
+    $form = Form::findOne($response->data['id'])->asArray();
     $form['name'] = 'Updated form';
 
     $response = $router->saveEditor($form);
-    expect($response['result'])->true();
-    expect($response['is_widget'])->false();
-
-    $saved_form = Form::findOne($form['id']);
-    expect($saved_form->name)->equals('Updated form');
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->meta['is_widget'])->false();
+    expect($response->data['name'])->equals('Updated form');
   }
 
   function testItCanRestoreAForm() {
-    $form = Form::where('name', 'Form 1')->findOne();
-    $form->trash();
+    $this->form_1->trash();
 
-    $trashed_form = Form::findOne($form->id);
+    $trashed_form = Form::findOne($this->form_1->id);
     expect($trashed_form->deleted_at)->notNull();
 
     $router = new Forms();
-    $response = $router->restore($form->id);
-    expect($response)->true();
-
-    $restored_form = Form::findOne($form->id);
-    expect($restored_form->deleted_at)->null();
+    $response = $router->restore(array('id' => $this->form_1->id));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Form::findOne($this->form_1->id)->asArray()
+    );
+    expect($response->data['deleted_at'])->null();
+    expect($response->meta['count'])->equals(1);
   }
 
   function testItCanTrashAForm() {
-    $form = Form::where('name', 'Form 1')->findOne();
-    expect($form->deleted_at)->null();
-
     $router = new Forms();
-    $response = $router->trash($form->id);
-    expect($response)->true();
-
-    $trashed_form = Form::findOne($form->id);
-    expect($trashed_form->deleted_at)->notNull();
+    $response = $router->trash(array('id' => $this->form_2->id));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Form::findOne($this->form_2->id)->asArray()
+    );
+    expect($response->data['deleted_at'])->notNull();
+    expect($response->meta['count'])->equals(1);
   }
 
   function testItCanDeleteAForm() {
-    $form = Form::where('name', 'Form 2')->findOne();
-    expect($form->deleted_at)->null();
-
     $router = new Forms();
-    $response = $router->delete($form->id);
-    expect($response)->equals(1);
-
-    $deleted_form = Form::findOne($form->id);
-    expect($deleted_form)->false();
+    $response = $router->delete(array('id' => $this->form_3->id));
+    expect($response->data)->isEmpty();
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->meta['count'])->equals(1);
   }
 
   function testItCanDuplicateAForm() {
-    $form = Form::where('name', 'Form 3')->findOne();
-
     $router = new Forms();
-    $response = $router->duplicate($form->id);
-    expect($response['name'])->equals('Copy of '.$form->name);
-
-    $duplicated_form = Form::findOne($response['id']);
-    expect($duplicated_form->name)->equals('Copy of '.$form->name);
+    $response = $router->duplicate(array('id' => $this->form_1->id));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Form::where('name', 'Copy of Form 1')->findOne()->asArray()
+    );
+    expect($response->meta['count'])->equals(1);
   }
 
   function testItCanBulkDeleteForms() {
-    expect(Form::count())->equals(3);
-
-    $forms = Form::findMany();
-    foreach($forms as $form) {
-      $form->trash();
-    }
+    $router = new Forms();
+    $response = $router->bulkAction(array(
+      'action' => 'trash',
+      'listing' => array('group' => 'all')
+    ));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->meta['count'])->equals(3);
 
     $router = new Forms();
     $response = $router->bulkAction(array(
       'action' => 'delete',
       'listing' => array('group' => 'trash')
     ));
-    expect($response)->equals(3);
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->meta['count'])->equals(3);
 
     $response = $router->bulkAction(array(
       'action' => 'delete',
       'listing' => array('group' => 'trash')
     ));
-    expect($response)->equals(0);
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->meta['count'])->equals(0);
   }
 
   function _after() {

tests/unit/API/NewslettersTest.php

@@ -23,14 +23,24 @@ class NewslettersTest extends MailPoetTest {
   function testItCanGetANewsletter() {
     $router = new Newsletters();
 
-    $response = $router->get($this->newsletter->id());
-    expect($response['id'])->equals($this->newsletter->id());
+    $response = $router->get(/* missing id */);
+    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    expect($response->errors[0]['message'])
+      ->equals('This newsletter does not exist.');
 
-    $response = $router->get('not_an_id');
-    expect($response)->false();
+    $response = $router->get(array('id' => 'not_an_id'));
+    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    expect($response->errors[0]['message'])
+      ->equals('This newsletter does not exist.');
 
-    $response = $router->get(/* missing argument */);
-    expect($response)->false();
+    $response = $router->get(array('id' => $this->newsletter->id));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Newsletter::findOne($this->newsletter->id)
+        ->withSegments()
+        ->withOptions()
+        ->asArray()
+    );
   }
 
   function testItCanSaveANewNewsletter() {
@@ -110,43 +120,57 @@ class NewslettersTest extends MailPoetTest {
   function testItCanRestoreANewsletter() {
     $this->newsletter->trash();
 
-    expect($this->newsletter->deleted_at)->notNull();
+    $trashed_newsletter = Newsletter::findOne($this->newsletter->id);
+    expect($trashed_newsletter->deleted_at)->notNull();
 
     $router = new Newsletters();
-    $router->restore($this->newsletter->id());
-
-    $restored_subscriber = Newsletter::findOne($this->newsletter->id());
-    expect($restored_subscriber->deleted_at)->null();
+    $response = $router->restore(array('id' => $this->newsletter->id));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Newsletter::findOne($this->newsletter->id)->asArray()
+    );
+    expect($response->data['deleted_at'])->null();
+    expect($response->meta['count'])->equals(1);
   }
 
   function testItCanTrashANewsletter() {
     $router = new Newsletters();
-    $response = $router->trash($this->newsletter->id());
-    expect($response)->true();
-
-    $trashed_subscriber = Newsletter::findOne($this->newsletter->id());
-    expect($trashed_subscriber->deleted_at)->notNull();
+    $response = $router->trash(array('id' => $this->newsletter->id));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Newsletter::findOne($this->newsletter->id)->asArray()
+    );
+    expect($response->data['deleted_at'])->notNull();
+    expect($response->meta['count'])->equals(1);
   }
 
   function testItCanDeleteANewsletter() {
     $router = new Newsletters();
-    $response = $router->delete($this->newsletter->id());
-    expect($response)->equals(1);
-
-    expect(Newsletter::findOne($this->newsletter->id()))->false();
+    $response = $router->delete(array('id' => $this->newsletter->id));
+    expect($response->data)->isEmpty();
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->meta['count'])->equals(1);
   }
 
   function testItCanDuplicateANewsletter() {
     $router = new Newsletters();
-    $response = $router->duplicate($this->newsletter->id());
-    expect($response['subject'])->equals('Copy of My Standard Newsletter');
-    expect($response['type'])->equals(Newsletter::TYPE_STANDARD);
-    expect($response['body'])->equals($this->newsletter->body);
+    $response = $router->duplicate(array('id' => $this->newsletter->id));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Newsletter::where('subject', 'Copy of My Standard Newsletter')
+        ->findOne()
+        ->asArray()
+    );
+    expect($response->meta['count'])->equals(1);
 
-    $response = $router->duplicate($this->post_notification->id());
-    expect($response['subject'])->equals('Copy of My Post Notification');
-    expect($response['type'])->equals(Newsletter::TYPE_NOTIFICATION);
-    expect($response['body'])->equals($this->post_notification->body);
+    $response = $router->duplicate(array('id' => $this->post_notification->id));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Newsletter::where('subject', 'Copy of My Post Notification')
+        ->findOne()
+        ->asArray()
+    );
+    expect($response->meta['count'])->equals(1);
   }
 
   function testItCanCreateANewsletter() {
@@ -156,16 +180,16 @@ class NewslettersTest extends MailPoetTest {
     );
     $router = new Newsletters();
     $response = $router->create($data);
-    expect($response['result'])->true();
-    expect($response['newsletter']['id'] > 0)->true();
-    expect($response['newsletter']['subject'])->equals('My New Newsletter');
-    expect($response['newsletter']['type'])->equals(Newsletter::TYPE_STANDARD);
-    expect($response['newsletter']['body'])->equals(array());
-    expect($response)->hasntKey('errors');
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Newsletter::where('subject', 'My New Newsletter')
+        ->findOne()
+        ->asArray()
+    );
 
     $response = $router->create();
-    expect($response['result'])->false();
-    expect($response['errors'][0])->equals('Please specify a type');
+    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    expect($response->errors[0]['message'])->equals('Please specify a type');
   }
 
   function testItCanGetListingData() {
@@ -174,47 +198,48 @@ class NewslettersTest extends MailPoetTest {
 
     $newsletter_segment = NewsletterSegment::create();
     $newsletter_segment->hydrate(array(
-      'newsletter_id' => $this->newsletter->id(),
-      'segment_id' => $segment_1->id()
+      'newsletter_id' => $this->newsletter->id,
+      'segment_id' => $segment_1->id
     ));
     $newsletter_segment->save();
 
     $newsletter_segment = NewsletterSegment::create();
     $newsletter_segment->hydrate(array(
-      'newsletter_id' => $this->newsletter->id(),
-      'segment_id' => $segment_2->id()
+      'newsletter_id' => $this->newsletter->id,
+      'segment_id' => $segment_2->id
     ));
     $newsletter_segment->save();
 
     $newsletter_segment = NewsletterSegment::create();
     $newsletter_segment->hydrate(array(
-      'newsletter_id' => $this->post_notification->id(),
-      'segment_id' => $segment_2->id()
+      'newsletter_id' => $this->post_notification->id,
+      'segment_id' => $segment_2->id
     ));
     $newsletter_segment->save();
 
     $router = new Newsletters();
     $response = $router->listing();
 
-    expect($response)->hasKey('filters');
-    expect($response)->hasKey('groups');
+    expect($response->status)->equals(APIResponse::STATUS_OK);
 
-    expect($response['count'])->equals(2);
-    expect($response['items'])->count(2);
+    expect($response->meta)->hasKey('filters');
+    expect($response->meta)->hasKey('groups');
+    expect($response->meta['count'])->equals(2);
 
-    expect($response['items'][0]['subject'])->equals('My Standard Newsletter');
-    expect($response['items'][1]['subject'])->equals('My Post Notification');
+    expect($response->data)->count(2);
+    expect($response->data[0]['subject'])->equals('My Standard Newsletter');
+    expect($response->data[1]['subject'])->equals('My Post Notification');
 
     // 1st subscriber has 2 segments
-    expect($response['items'][0]['segments'])->count(2);
-    expect($response['items'][0]['segments'][0]['id'])
+    expect($response->data[0]['segments'])->count(2);
+    expect($response->data[0]['segments'][0]['id'])
       ->equals($segment_1->id);
-    expect($response['items'][0]['segments'][1]['id'])
+    expect($response->data[0]['segments'][1]['id'])
       ->equals($segment_2->id);
 
     // 2nd subscriber has 1 segment
-    expect($response['items'][1]['segments'])->count(1);
-    expect($response['items'][1]['segments'][0]['id'])
+    expect($response->data[1]['segments'])->count(1);
+    expect($response->data[1]['segments'][0]['id'])
       ->equals($segment_2->id);
   }
 
@@ -226,23 +251,23 @@ class NewslettersTest extends MailPoetTest {
     // link standard newsletter to the 2 segments
     $newsletter_segment = NewsletterSegment::create();
     $newsletter_segment->hydrate(array(
-      'newsletter_id' => $this->newsletter->id(),
-      'segment_id' => $segment_1->id()
+      'newsletter_id' => $this->newsletter->id,
+      'segment_id' => $segment_1->id
     ));
     $newsletter_segment->save();
 
     $newsletter_segment = NewsletterSegment::create();
     $newsletter_segment->hydrate(array(
-      'newsletter_id' => $this->newsletter->id(),
-      'segment_id' => $segment_2->id()
+      'newsletter_id' => $this->newsletter->id,
+      'segment_id' => $segment_2->id
     ));
     $newsletter_segment->save();
 
     // link post notification to the 2nd segment
     $newsletter_segment = NewsletterSegment::create();
     $newsletter_segment->hydrate(array(
-      'newsletter_id' => $this->post_notification->id(),
-      'segment_id' => $segment_2->id()
+      'newsletter_id' => $this->post_notification->id,
+      'segment_id' => $segment_2->id
     ));
     $newsletter_segment->save();
 
@@ -255,9 +280,11 @@ class NewslettersTest extends MailPoetTest {
       )
     ));
 
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+
     // we should only get the standard newsletter
-    expect($response['count'])->equals(1);
-    expect($response['items'][0]['subject'])->equals($this->newsletter->subject);
+    expect($response->meta['count'])->equals(1);
+    expect($response->data[0]['subject'])->equals($this->newsletter->subject);
 
     // filter by 2nd segment
     $response = $router->listing(array(
@@ -266,8 +293,10 @@ class NewslettersTest extends MailPoetTest {
       )
     ));
 
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+
     // we should have the 2 newsletters
-    expect($response['count'])->equals(2);
+    expect($response->meta['count'])->equals(2);
   }
 
   function testItCanLimitListing() {
@@ -279,9 +308,11 @@ class NewslettersTest extends MailPoetTest {
       'sort_order' => 'asc'
     ));
 
-    expect($response['count'])->equals(2);
-    expect($response['items'])->count(1);
-    expect($response['items'][0]['subject'])->equals(
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+
+    expect($response->meta['count'])->equals(2);
+    expect($response->data)->count(1);
+    expect($response->data[0]['subject'])->equals(
       $this->post_notification->subject
     );
 
@@ -293,22 +324,17 @@ class NewslettersTest extends MailPoetTest {
       'sort_order' => 'asc'
     ));
 
-    expect($response['count'])->equals(2);
-    expect($response['items'])->count(1);
-    expect($response['items'][0]['subject'])->equals(
+    expect($response->meta['count'])->equals(2);
+    expect($response->data)->count(1);
+    expect($response->data[0]['subject'])->equals(
       $this->newsletter->subject
     );
   }
 
   function testItCanBulkDeleteSelectionOfNewsletters() {
-    $newsletter = Newsletter::createOrUpdate(array(
-      'subject' => 'To be deleted',
-      'type' => Newsletter::TYPE_STANDARD
-    ));
-
     $selection_ids = array(
-      $newsletter->id,
-      $this->newsletter->id
+      $this->newsletter->id,
+      $this->post_notification->id
     );
 
     $router = new Newsletters();
@@ -319,29 +345,33 @@ class NewslettersTest extends MailPoetTest {
       'action' => 'delete'
     ));
 
-    expect($response)->equals(count($selection_ids));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->meta['count'])->equals(count($selection_ids));
   }
 
   function testItCanBulkDeleteNewsletters() {
-    expect(Newsletter::count())->equals(2);
-
-    $newsletters = Newsletter::findMany();
-    foreach($newsletters as $newsletter) {
-      $newsletter->trash();
-    }
+    $router = new Newsletters();
+    $response = $router->bulkAction(array(
+      'action' => 'trash',
+      'listing' => array('group' => 'all')
+    ));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->meta['count'])->equals(2);
 
     $router = new Newsletters();
     $response = $router->bulkAction(array(
       'action' => 'delete',
       'listing' => array('group' => 'trash')
     ));
-    expect($response)->equals(2);
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->meta['count'])->equals(2);
 
     $response = $router->bulkAction(array(
       'action' => 'delete',
       'listing' => array('group' => 'trash')
     ));
-    expect($response)->equals(0);
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->meta['count'])->equals(0);
   }
 
   function _after() {

tests/unit/API/SegmentsTest.php

@@ -1,5 +1,6 @@
 <?php
 use \MailPoet\API\Endpoints\Segments;
+use \MailPoet\API\Response as APIResponse;
 use \MailPoet\Models\Segment;
 
 class SegmentsTest extends MailPoetTest {
@@ -13,27 +14,34 @@ class SegmentsTest extends MailPoetTest {
     $router = new Segments();
 
     $response = $router->get(/* missing id */);
-    expect($response)->false();
+    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    expect($response->errors[0]['message'])->equals('This list does not exist.');
 
-    $response = $router->get('not_an_id');
-    expect($response)->false();
+    $response = $router->get(array('id' => 'not_an_id'));
+    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    expect($response->errors[0]['message'])->equals('This list does not exist.');
 
-    $response = $router->get($this->segment_1->id());
-    expect($response['name'])->equals($this->segment_1->name);
+    $response = $router->get(array('id' => $this->segment_1->id));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Segment::findOne($this->segment_1->id)->asArray()
+    );
   }
 
   function testItCanGetListingData() {
     $router = new Segments();
     $response = $router->listing();
-    expect($response)->hasKey('filters');
-    expect($response)->hasKey('groups');
 
-    expect($response['count'])->equals(3);
-    expect($response['items'])->count(3);
+    expect($response->status)->equals(APIResponse::STATUS_OK);
 
-    expect($response['items'][0]['name'])->equals($this->segment_1->name);
-    expect($response['items'][1]['name'])->equals($this->segment_2->name);
-    expect($response['items'][2]['name'])->equals($this->segment_3->name);
+    expect($response->meta)->hasKey('filters');
+    expect($response->meta)->hasKey('groups');
+    expect($response->meta['count'])->equals(3);
+
+    expect($response->data)->count(3);
+    expect($response->data[0]['name'])->equals($this->segment_1->name);
+    expect($response->data[1]['name'])->equals($this->segment_2->name);
+    expect($response->data[2]['name'])->equals($this->segment_3->name);
   }
 
   function testItCanSaveASegment() {
@@ -43,14 +51,14 @@ class SegmentsTest extends MailPoetTest {
 
     $router = new Segments();
     $response = $router->save(/* missing data */);
-    expect($response['result'])->false();
-    expect($response['errors'][0])->equals('Please specify a name');
+    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    expect($response->errors[0]['message'])->equals('Please specify a name');
 
     $response = $router->save($segment_data);
-    expect($response['result'])->true();
-
-    $segment = Segment::where('name', 'New Segment')->findOne();
-    expect($segment->name)->equals($segment_data['name']);
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Segment::where('name', 'New Segment')->findOne()->asArray()
+    );
   }
 
   function testItCannotSaveDuplicate() {
@@ -60,8 +68,8 @@ class SegmentsTest extends MailPoetTest {
 
     $router = new Segments();
     $response = $router->save($duplicate_entry);
-    expect($response['result'])->false();
-    expect($response['errors'][0])->equals(
+    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    expect($response->errors[0]['message'])->equals(
       'Another record already exists. Please specify a different "name".'
     );
   }
@@ -69,64 +77,71 @@ class SegmentsTest extends MailPoetTest {
   function testItCanRestoreASegment() {
     $this->segment_1->trash();
 
-    $trashed_segment = Segment::findOne($this->segment_1->id());
+    $trashed_segment = Segment::findOne($this->segment_1->id);
     expect($trashed_segment->deleted_at)->notNull();
 
     $router = new Segments();
-    $response = $router->restore($this->segment_1->id());
-    expect($response)->true();
-
-    $restored_segment = Segment::findOne($this->segment_1->id());
-    expect($restored_segment->deleted_at)->null();
+    $response = $router->restore(array('id' => $this->segment_1->id));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Segment::findOne($this->segment_1->id)->asArray()
+    );
+    expect($response->data['deleted_at'])->null();
+    expect($response->meta['count'])->equals(1);
   }
 
   function testItCanTrashASegment() {
     $router = new Segments();
-    $response = $router->trash($this->segment_2->id());
-    expect($response)->true();
-
-    $trashed_segment = Segment::findOne($this->segment_2->id());
-    expect($trashed_segment->deleted_at)->notNull();
+    $response = $router->trash(array('id' => $this->segment_2->id));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Segment::findOne($this->segment_2->id)->asArray()
+    );
+    expect($response->data['deleted_at'])->notNull();
+    expect($response->meta['count'])->equals(1);
   }
 
   function testItCanDeleteASegment() {
     $router = new Segments();
-    $response = $router->delete($this->segment_3->id());
-    expect($response)->equals(1);
-
-    $deleted_segment = Segment::findOne($this->segment_3->id());
-    expect($deleted_segment)->false();
+    $response = $router->delete(array('id' => $this->segment_3->id));
+    expect($response->data)->isEmpty();
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->meta['count'])->equals(1);
   }
 
   function testItCanDuplicateASegment() {
     $router = new Segments();
-    $response = $router->duplicate($this->segment_1->id());
-    expect($response['name'])->equals('Copy of '.$this->segment_1->name);
-
-    $duplicated_segment = Segment::findOne($response['id']);
-    expect($duplicated_segment->name)->equals('Copy of '.$this->segment_1->name);
+    $response = $router->duplicate(array('id' => $this->segment_1->id));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Segment::where('name', 'Copy of Segment 1')->findOne()->asArray()
+    );
+    expect($response->meta['count'])->equals(1);
   }
 
   function testItCanBulkDeleteSegments() {
-    expect(Segment::count())->equals(3);
-
-    $segments = Segment::findMany();
-    foreach($segments as $segment) {
-      $segment->trash();
-    }
+    $router = new Segments();
+    $response = $router->bulkAction(array(
+      'action' => 'trash',
+      'listing' => array('group' => 'all')
+    ));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->meta['count'])->equals(3);
 
     $router = new Segments();
     $response = $router->bulkAction(array(
       'action' => 'delete',
       'listing' => array('group' => 'trash')
     ));
-    expect($response)->equals(3);
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->meta['count'])->equals(3);
 
     $response = $router->bulkAction(array(
       'action' => 'delete',
       'listing' => array('group' => 'trash')
     ));
-    expect($response)->equals(0);
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->meta['count'])->equals(0);
   }
 
   function _after() {

tests/unit/API/SubscribersTest.php

@@ -1,6 +1,7 @@
 <?php
 
 use \MailPoet\API\Endpoints\Subscribers;
+use \MailPoet\API\Response as APIResponse;
 use \MailPoet\Models\Subscriber;
 use \MailPoet\Models\Segment;
 
@@ -21,8 +22,8 @@ class SubscribersTest extends MailPoetTest {
       'last_name' => 'Doe',
       'status' => Subscriber::STATUS_SUBSCRIBED,
       'segments' => array(
-        $this->segment_1->id(),
-        $this->segment_2->id()
+        $this->segment_1->id,
+        $this->segment_2->id
       )
     ));
   }
@@ -30,17 +31,26 @@ class SubscribersTest extends MailPoetTest {
   function testItCanGetASubscriber() {
     $router = new Subscribers();
 
-    $response = $router->get($this->subscriber_1->id());
-    expect($response['id'])->equals($this->subscriber_1->id());
-    expect($response['email'])->equals($this->subscriber_1->email);
-    expect($response['first_name'])->equals($this->subscriber_1->first_name);
-    expect($response['last_name'])->equals($this->subscriber_1->last_name);
-
-    $response = $router->get('not_an_id');
-    expect($response)->false();
+    $response = $router->get(array('id' => 'not_an_id'));
+    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    expect($response->errors[0]['message'])->equals(
+      'This subscriber does not exist.'
+    );
 
     $response = $router->get(/* missing argument */);
-    expect($response)->false();
+    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    expect($response->errors[0]['message'])->equals(
+      'This subscriber does not exist.'
+    );
+
+    $response = $router->get(array('id' => $this->subscriber_1->id));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Subscriber::findOne($this->subscriber_1->id)
+        ->withCustomFields()
+        ->withSubscriptions()
+        ->asArray()
+    );
   }
 
   function testItCanSaveANewSubscriber() {
@@ -49,15 +59,19 @@ class SubscribersTest extends MailPoetTest {
       'first_name' => 'Raul',
       'last_name' => 'Doe',
       'segments' => array(
-        $this->segment_1->id(),
-        $this->segment_2->id()
+        $this->segment_1->id,
+        $this->segment_2->id
       )
     );
 
     $router = new Subscribers();
     $response = $router->save($valid_data);
-    expect($response['result'])->true();
-    expect($response)->hasntKey('errors');
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Subscriber::where('email', 'raul.doe@mailpoet.com')
+        ->findOne()
+        ->asArray()
+    );
 
     $subscriber = Subscriber::where('email', 'raul.doe@mailpoet.com')->findOne();
     $subscriber_segments = $subscriber->segments()->findMany();
@@ -66,60 +80,68 @@ class SubscribersTest extends MailPoetTest {
     expect($subscriber_segments[1]->name)->equals($this->segment_2->name);
 
     $response = $router->save(/* missing data */);
-    expect($response['result'])->false();
-    expect($response['errors'][0])->equals('Please enter your email address');
+    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    expect($response->errors[0]['message'])
+      ->equals('Please enter your email address');
 
     $invalid_data = array(
       'email' => 'john.doe@invalid'
     );
 
     $response = $router->save($invalid_data);
-    expect($response['result'])->false();
-    expect($response['errors'][0])->equals('Your email address is invalid!');
+    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    expect($response->errors[0]['message'])
+      ->equals('Your email address is invalid!');
   }
 
   function testItCanSaveAnExistingSubscriber() {
     $router = new Subscribers();
     $subscriber_data = $this->subscriber_2->asArray();
     unset($subscriber_data['created_at']);
-    $subscriber_data['segments'] = array($this->segment_1->id());
+    $subscriber_data['segments'] = array($this->segment_1->id);
     $subscriber_data['first_name'] = 'Super Jane';
 
     $response = $router->save($subscriber_data);
-    expect($response['result'])->true();
-
-    $updated_subscriber = Subscriber::findOne($this->subscriber_2->id());
-    expect($updated_subscriber->email)->equals($this->subscriber_2->email);
-    expect($updated_subscriber->first_name)->equals('Super Jane');
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Subscriber::findOne($this->subscriber_2->id)->asArray()
+    );
+    expect($response->data['first_name'])->equals('Super Jane');
   }
 
   function testItCanRestoreASubscriber() {
     $this->subscriber_1->trash();
 
-    expect($this->subscriber_1->deleted_at)->notNull();
+    $trashed_subscriber = Subscriber::findOne($this->subscriber_1->id);
+    expect($trashed_subscriber->deleted_at)->notNull();
 
     $router = new Subscribers();
-    $router->restore($this->subscriber_1->id());
-
-    $restored_subscriber = Subscriber::findOne($this->subscriber_1->id());
-    expect($restored_subscriber->deleted_at)->null();
+    $response = $router->restore(array('id' => $this->subscriber_1->id));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Subscriber::findOne($this->subscriber_1->id)->asArray()
+    );
+    expect($response->data['deleted_at'])->null();
+    expect($response->meta['count'])->equals(1);
   }
 
   function testItCanTrashASubscriber() {
     $router = new Subscribers();
-    $response = $router->trash($this->subscriber_2->id());
-    expect($response)->true();
-
-    $trashed_subscriber = Subscriber::findOne($this->subscriber_2->id());
-    expect($trashed_subscriber->deleted_at)->notNull();
+    $response = $router->trash(array('id' => $this->subscriber_2->id));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->equals(
+      Subscriber::findOne($this->subscriber_2->id)->asArray()
+    );
+    expect($response->data['deleted_at'])->notNull();
+    expect($response->meta['count'])->equals(1);
   }
 
   function testItCanDeleteASubscriber() {
     $router = new Subscribers();
-    $response = $router->delete($this->subscriber_1->id());
-    expect($response)->equals(1);
-
-    expect(Subscriber::findOne($this->subscriber_1->id()))->false();
+    $response = $router->delete(array('id' => $this->subscriber_1->id));
+    expect($response->data)->isEmpty();
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->meta['count'])->equals(1);
   }
 
   function testItCanFilterListing() {
@@ -133,7 +155,7 @@ class SubscribersTest extends MailPoetTest {
     ));
 
     // it should return all subscribers
-    expect($response['count'])->equals(2);
+    expect($response->meta['count'])->equals(2);
 
     // filter by 1st segment
     $response = $router->listing(array(
@@ -142,8 +164,8 @@ class SubscribersTest extends MailPoetTest {
       )
     ));
 
-    expect($response['count'])->equals(1);
-    expect($response['items'][0]['email'])->equals($this->subscriber_2->email);
+    expect($response->meta['count'])->equals(1);
+    expect($response->data[0]['email'])->equals($this->subscriber_2->email);
 
     // filter by 2nd segment
     $response = $router->listing(array(
@@ -152,8 +174,8 @@ class SubscribersTest extends MailPoetTest {
       )
     ));
 
-    expect($response['count'])->equals(1);
-    expect($response['items'][0]['email'])->equals($this->subscriber_2->email);
+    expect($response->meta['count'])->equals(1);
+    expect($response->data[0]['email'])->equals($this->subscriber_2->email);
   }
 
   function testItCanSearchListing() {
@@ -169,29 +191,29 @@ class SubscribersTest extends MailPoetTest {
     $response = $router->listing(array(
       'search' => ''
     ));
-    expect($response['count'])->equals(3);
+    expect($response->meta['count'])->equals(3);
 
     // search by email
     $response = $router->listing(array(
       'search' => '.me'
     ));
-    expect($response['count'])->equals(1);
-    expect($response['items'][0]['email'])->equals($new_subscriber->email);
+    expect($response->meta['count'])->equals(1);
+    expect($response->data[0]['email'])->equals($new_subscriber->email);
 
     // search by last name
     $response = $router->listing(array(
       'search' => 'doe'
     ));
-    expect($response['count'])->equals(2);
-    expect($response['items'][0]['email'])->equals($this->subscriber_1->email);
-    expect($response['items'][1]['email'])->equals($this->subscriber_2->email);
+    expect($response->meta['count'])->equals(2);
+    expect($response->data[0]['email'])->equals($this->subscriber_1->email);
+    expect($response->data[1]['email'])->equals($this->subscriber_2->email);
 
     // search by first name
     $response = $router->listing(array(
       'search' => 'billy'
     ));
-    expect($response['count'])->equals(1);
-    expect($response['items'][0]['email'])->equals($new_subscriber->email);
+    expect($response->meta['count'])->equals(1);
+    expect($response->data[0]['email'])->equals($new_subscriber->email);
   }
 
   function testItCanGroupListing() {
@@ -200,28 +222,28 @@ class SubscribersTest extends MailPoetTest {
     $subscribed_group = $router->listing(array(
       'group' => Subscriber::STATUS_SUBSCRIBED
     ));
-    expect($subscribed_group['count'])->equals(1);
-    expect($subscribed_group['items'][0]['email'])->equals(
+    expect($subscribed_group->meta['count'])->equals(1);
+    expect($subscribed_group->data[0]['email'])->equals(
       $this->subscriber_2->email
     );
 
     $unsubscribed_group = $router->listing(array(
       'group' => Subscriber::STATUS_UNSUBSCRIBED
     ));
-    expect($unsubscribed_group['count'])->equals(0);
+    expect($unsubscribed_group->meta['count'])->equals(0);
 
     $unconfirmed_group = $router->listing(array(
       'group' => Subscriber::STATUS_UNCONFIRMED
     ));
-    expect($unconfirmed_group['count'])->equals(1);
-    expect($unconfirmed_group['items'][0]['email'])->equals(
+    expect($unconfirmed_group->meta['count'])->equals(1);
+    expect($unconfirmed_group->data[0]['email'])->equals(
       $this->subscriber_1->email
     );
 
     $trashed_group = $router->listing(array(
       'group' => 'trash'
     ));
-    expect($trashed_group['count'])->equals(0);
+    expect($trashed_group->meta['count'])->equals(0);
 
     // trash 1st subscriber
     $this->subscriber_1->trash();
@@ -229,8 +251,8 @@ class SubscribersTest extends MailPoetTest {
     $trashed_group = $router->listing(array(
       'group' => 'trash'
     ));
-    expect($trashed_group['count'])->equals(1);
-    expect($trashed_group['items'][0]['email'])->equals(
+    expect($trashed_group->meta['count'])->equals(1);
+    expect($trashed_group->data[0]['email'])->equals(
       $this->subscriber_1->email
     );
   }
@@ -244,9 +266,9 @@ class SubscribersTest extends MailPoetTest {
       'sort_order' => 'asc'
     ));
 
-    expect($response['count'])->equals(2);
-    expect($response['items'])->count(1);
-    expect($response['items'][0]['email'])->equals(
+    expect($response->meta['count'])->equals(2);
+    expect($response->data)->count(1);
+    expect($response->data[0]['email'])->equals(
       $this->subscriber_2->email
     );
 
@@ -258,9 +280,9 @@ class SubscribersTest extends MailPoetTest {
       'sort_order' => 'asc'
     ));
 
-    expect($response['count'])->equals(2);
-    expect($response['items'])->count(1);
-    expect($response['items'][0]['email'])->equals(
+    expect($response->meta['count'])->equals(2);
+    expect($response->data)->count(1);
+    expect($response->data[0]['email'])->equals(
       $this->subscriber_1->email
     );
   }
@@ -282,8 +304,9 @@ class SubscribersTest extends MailPoetTest {
       ),
       'action' => 'delete'
     ));
-
-    expect($response)->equals(count($selection_ids));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->data)->isEmpty();
+    expect($response->meta['count'])->equals(count($selection_ids));
 
     $is_subscriber_1_deleted = (
       Subscriber::findOne($this->subscriber_1->id) === false
@@ -297,40 +320,38 @@ class SubscribersTest extends MailPoetTest {
   }
 
   function testItCanBulkDeleteSubscribers() {
-    expect(Subscriber::count())->equals(2);
-
-    $subscribers = Subscriber::findMany();
-    foreach($subscribers as $subscriber) {
-      $subscriber->trash();
-    }
+    $router = new Subscribers();
+    $response = $router->bulkAction(array(
+      'action' => 'trash',
+      'listing' => array('group' => 'all')
+    ));
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->meta['count'])->equals(2);
 
     $router = new Subscribers();
     $response = $router->bulkAction(array(
       'action' => 'delete',
       'listing' => array('group' => 'trash')
     ));
-    expect($response)->equals(2);
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->meta['count'])->equals(2);
 
     $response = $router->bulkAction(array(
       'action' => 'delete',
       'listing' => array('group' => 'trash')
     ));
-    expect($response)->equals(0);
+    expect($response->status)->equals(APIResponse::STATUS_OK);
+    expect($response->meta['count'])->equals(0);
   }
 
   function testItCannotRunAnInvalidBulkAction() {
-    try {
-      $router = new Subscribers();
-      $response = $router->bulkAction(array(
-        'action' => 'invalidAction',
-        'listing' => array()
-      ));
-      $this->fail('Bulk Action class did not throw an exception');
-    } catch(Exception $e) {
-      expect($e->getMessage())->equals(
-        '\MailPoet\Models\Subscriber has not method "bulkInvalidAction"'
-      );
-    }
+    $router = new Subscribers();
+    $response = $router->bulkAction(array(
+      'action' => 'invalidAction',
+      'listing' => array()
+    ));
+    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    expect($response->errors[0]['message'])->contains('has no method');
   }
 
   function _after() {

tests/unit/Cron/CronHelperTest.php

@@ -20,7 +20,6 @@ class CronHelperTest extends MailPoetTest {
     $daemon = Setting::getValue(CronHelper::DAEMON_SETTING);
     expect($daemon)->equals(
       array(
-        'status' => Daemon::STATUS_STARTING,
         'token' => $token,
         'updated_at' => $time
       )
@@ -34,7 +33,6 @@ class CronHelperTest extends MailPoetTest {
     $daemon = Setting::getValue(CronHelper::DAEMON_SETTING);
     expect($daemon)->equals(
       array(
-        'status' => Daemon::STATUS_STARTING,
         'token' => $token,
         'updated_at' => $time
       )
@@ -43,7 +41,6 @@ class CronHelperTest extends MailPoetTest {
 
   function testItLoadDaemon() {
     $daemon = array(
-      'status' => 'created',
       'token' => 'some_token',
       'updated_at' => '12345678'
     );
@@ -57,7 +54,6 @@ class CronHelperTest extends MailPoetTest {
   function testItCanSaveDaemon() {
     // when saving daemon, 'updated_at' value should change
     $daemon = array(
-      'status' => 'created',
       'token' => 'some_token',
       'updated_at' => '12345678'
     );

tests/unit/Cron/DaemonTest.php

@@ -0,0 +1,201 @@
+<?php
+
+use Codeception\Util\Stub;
+use MailPoet\API\Endpoints\Cron;
+use MailPoet\Cron\CronHelper;
+use MailPoet\Cron\Daemon;
+use MailPoet\Models\Setting;
+
+class DaemonTest extends MailPoetTest {
+  function testItDefinesConstants() {
+    expect(Daemon::REQUEST_TIMEOUT)->equals(5);
+  }
+
+  function testItConstructs() {
+    Setting::setValue(
+      CronHelper::DAEMON_SETTING,
+      'daemon object'
+    );
+    $daemon = new Daemon($request_data = 'request data');
+    expect($daemon->daemon)->equals('daemon object');
+    expect($daemon->request_data)->equals('request data');
+    expect(strlen($daemon->timer))->greaterOrEquals(5);
+    expect(strlen($daemon->token))->greaterOrEquals(5);
+  }
+
+  function testItDoesNotRunWithoutRequestData() {
+    $daemon = Stub::construct(
+      new Daemon(),
+      array(),
+      array(
+        'abortWithError' => function($message) {
+          return $message;
+        }
+      )
+    );
+    $daemon->request_data = false;
+    expect($daemon->run())->equals('Invalid or missing request data.');
+  }
+
+  function testItDoesNotRunWhenDaemonIsNotFound() {
+    $daemon = Stub::construct(
+      new Daemon(),
+      array(),
+      array(
+        'abortWithError' => function($message) {
+          return $message;
+        }
+      )
+    );
+    $daemon->request_data = true;
+    expect($daemon->run())->equals('Daemon does not exist.');
+  }
+
+  function testItDoesNotRunWhenThereIsInvalidOrMissingToken() {
+    $daemon = Stub::construct(
+      new Daemon(),
+      array(),
+      array(
+        'abortWithError' => function($message) {
+          return $message;
+        }
+      )
+    );
+    $daemon->daemon = array(
+      'token' => 123
+    );
+    $daemon->request_data = array('token' => 456);
+    expect($daemon->run())->equals('Invalid or missing token.');
+  }
+
+  function testItCanExecuteWorkers() {
+    $daemon = Stub::make(new Daemon(true), array(
+      'executeScheduleWorker' => Stub::exactly(1, function() { }),
+      'executeQueueWorker' => Stub::exactly(1, function() { }),
+      'pauseExecution' => function($a) { },
+      'callSelf' => function() { }
+    ), $this);
+    $data = array(
+      'token' => 123
+    );
+    Setting::setValue(CronHelper::DAEMON_SETTING, $data);
+    $daemon->__construct($data);
+    $daemon->run();
+  }
+
+  function testItContinuesExecutionWhenWorkersThrowException() {
+    $daemon = Stub::make(new Daemon(true), array(
+      'executeScheduleWorker' => function() {
+        throw new \Exception();
+      },
+      'executeQueueWorker' => function() {
+        throw new \Exception();
+      },
+      'pauseExecution' => function($a) { },
+      'callSelf' => function() { }
+    ), $this);
+    $data = array(
+      'token' => 123
+    );
+    Setting::setValue(CronHelper::DAEMON_SETTING, $data);
+    $daemon->__construct($data);
+    $daemon->run();
+  }
+
+  function testItCanPauseExecution() {
+    $daemon = Stub::make(new Daemon(true), array(
+      'executeScheduleWorker' => function() { },
+      'executeQueueWorker' => function() { },
+      'pauseExecution' => Stub::exactly(1, function($pause_delay) {
+        expect($pause_delay)->lessThan(CronHelper::DAEMON_EXECUTION_LIMIT);
+        expect($pause_delay)->greaterThan(CronHelper::DAEMON_EXECUTION_LIMIT - 1);
+      }),
+      'callSelf' => function() { }
+    ), $this);
+    $data = array(
+      'token' => 123
+    );
+    Setting::setValue(CronHelper::DAEMON_SETTING, $data);
+    $daemon->__construct($data);
+    $daemon->run();
+  }
+
+
+  function testItTerminatesExecutionWhenDaemonIsDeleted() {
+    $daemon = Stub::make(new Daemon(true), array(
+      'executeScheduleWorker' => function() {
+        Setting::deleteValue(CronHelper::DAEMON_SETTING);
+      },
+      'executeQueueWorker' => function() { },
+      'pauseExecution' => function() { },
+      'terminateRequest' => Stub::exactly(1, function() { })
+    ), $this);
+    $data = array(
+      'token' => 123
+    );
+    Setting::setValue(CronHelper::DAEMON_SETTING, $data);
+    $daemon->__construct($data);
+    $daemon->run();
+  }
+
+  function testItTerminatesExecutionWhenDaemonTokenChanges() {
+    $daemon = Stub::make(new Daemon(true), array(
+      'executeScheduleWorker' => function() {
+        Setting::setValue(
+          CronHelper::DAEMON_SETTING,
+          array('token' => 567)
+        );
+      },
+      'executeQueueWorker' => function() { },
+      'pauseExecution' => function() { },
+      'terminateRequest' => Stub::exactly(1, function() { })
+    ), $this);
+    $data = array(
+      'token' => 123
+    );
+    Setting::setValue(CronHelper::DAEMON_SETTING, $data);
+    $daemon->__construct($data);
+    $daemon->run();
+  }
+
+  function testItUpdatesDaemonTokenDuringExecution() {
+    $daemon = Stub::make(new Daemon(true), array(
+      'executeScheduleWorker' => function() { },
+      'executeQueueWorker' => function() { },
+      'pauseExecution' => function() { },
+      'callSelf' => function() { }
+    ), $this);
+    $data = array(
+      'token' => 123
+    );
+    Setting::setValue(CronHelper::DAEMON_SETTING, $data);
+    $daemon->__construct($data);
+    $daemon->run();
+    $updated_daemon = Setting::getValue(CronHelper::DAEMON_SETTING);
+    expect($updated_daemon['token'])->equals($daemon->token);
+  }
+
+  function testItCanRun() {
+    ignore_user_abort(0);
+    expect(ignore_user_abort())->equals(0);
+    $daemon = Stub::make(new Daemon(true), array(
+      'pauseExecution' => function() { },
+      // workers should be executed
+      'executeScheduleWorker' => Stub::exactly(1, function() { }),
+      'executeQueueWorker' => Stub::exactly(1, function() { }),
+      // daemon should call itself
+      'callSelf' => Stub::exactly(1, function() { }),
+    ), $this);
+    $data = array(
+      'token' => 123
+    );
+    Setting::setValue(CronHelper::DAEMON_SETTING, $data);
+    $daemon->__construct($data);
+    $daemon->run();
+    expect(ignore_user_abort())->equals(1);
+  }
+
+  function _after() {
+    ORM::raw_execute('TRUNCATE ' . Setting::$_table);
+  }
+}

tests/unit/Cron/Triggers/MailPoetTest.php

@@ -0,0 +1,28 @@
+<?php
+
+use MailPoet\API\Endpoints\Cron;
+use MailPoet\Cron\CronHelper;
+use MailPoet\Cron\Triggers\MailPoet;
+use MailPoet\Models\Setting;
+
+class MailPoetCronTriggerTest extends MailPoetTest {
+  function _before() {
+    // cron trigger is by default set to 'WordPress'; when it runs and does not
+    // detect any queues to process, it deletes the daemon setting, so Supervisor that's
+    // called by the MailPoet cron trigger does not work. for that matter, we need to set
+    // the trigger setting to anything but 'WordPress'.
+    Setting::setValue('cron_trigger', array(
+      'method' => 'none'
+    ));
+  }
+
+  function testItCanRun() {
+    expect(Setting::getValue(CronHelper::DAEMON_SETTING))->null();
+    MailPoet::run();
+    expect(Setting::getValue(CronHelper::DAEMON_SETTING))->notEmpty();
+  }
+
+  function _after() {
+    ORM::raw_execute('TRUNCATE ' . Setting::$_table);
+  }
+}

tests/unit/Cron/Triggers/WordPressTest.php

@@ -0,0 +1,113 @@
+<?php
+
+use Carbon\Carbon;
+use MailPoet\API\Endpoints\Cron;
+use MailPoet\Cron\CronHelper;
+use MailPoet\Cron\Triggers\WordPress;
+use MailPoet\Mailer\Mailer;
+use MailPoet\Mailer\MailerLog;
+use MailPoet\Models\SendingQueue;
+use MailPoet\Models\Setting;
+
+class WordPressCronTriggerTest extends MailPoetTest {
+  function _before() {
+    // cron trigger is by default set to 'WordPress'; when it runs and does not
+    // detect any queues to process, it deletes the daemon setting, so Supervisor that's
+    // called by the MailPoet cron trigger does not work. for that matter, we need to set
+    // the trigger setting to anything but 'WordPress'.
+    Setting::setValue('cron_trigger', array(
+      'method' => 'none'
+    ));
+  }
+
+  function testItRequiresScheduledQueuesToExecute() {
+    expect(WordPress::checkExecutionRequirements())->false();
+    $this->_addQueue($status = SendingQueue::STATUS_SCHEDULED);
+    expect(WordPress::checkExecutionRequirements())->true();
+  }
+
+  function testItRequiresRunningQueuesToExecute() {
+    expect(WordPress::checkExecutionRequirements())->false();
+    // status of 'null' indicates that queue is running
+    $this->_addQueue($status = null);
+    expect(WordPress::checkExecutionRequirements())->true();
+  }
+
+
+  function testItFailsExecutionRequiremenetsCheckWhenQueueStatusIsCompleted() {
+    expect(WordPress::checkExecutionRequirements())->false();
+    $this->_addQueue($status = 'completed');
+    expect(WordPress::checkExecutionRequirements())->false();
+  }
+
+  function testItRequiresSendingLimitNotToBeReachedToExecute() {
+    $this->_addQueue($status = null);
+    $this->_addMTAConfigAndLog($sent = null);
+    expect(WordPress::checkExecutionRequirements())->true();
+    $this->_addMTAConfigAndLog($sent = 1);
+    expect(WordPress::checkExecutionRequirements())->false();
+  }
+
+  function testItCanDeleteRunningDaemon() {
+    Setting::setValue(CronHelper::DAEMON_SETTING, true);
+    expect(Setting::getValue(CronHelper::DAEMON_SETTING))->notNull();
+    WordPress::cleanup();
+    expect(Setting::getValue(CronHelper::DAEMON_SETTING))->null();
+  }
+
+  function testItRunsWhenExecutionRequirementsAreMet() {
+    // status of 'null' indicates that queue is running
+    $this->_addQueue($status = null);
+    // check that cron daemon does not exist
+    expect(Setting::getValue(CronHelper::DAEMON_SETTING))->null();
+    WordPress::run();
+    expect(Setting::getValue(CronHelper::DAEMON_SETTING))->notNull();
+  }
+
+  function testItDeletesCronDaemonWhenExecutionRequirementsAreNotMet() {
+    Setting::setValue(CronHelper::DAEMON_SETTING, true);
+    expect(Setting::getValue(CronHelper::DAEMON_SETTING))->notNull();
+    WordPress::run();
+    expect(Setting::getValue(CronHelper::DAEMON_SETTING))->null();
+  }
+
+  function _addMTAConfigAndLog($sent) {
+    $mta_config = array(
+      'frequency' => array(
+        'emails' => 1,
+        'interval' => 1
+      )
+    );
+    Setting::setValue(
+      Mailer::MAILER_CONFIG_SETTING_NAME,
+      $mta_config
+    );
+    $mta_log = array(
+      'sent' => $sent,
+      'started' => time()
+    );
+    Setting::setValue(
+      MailerLog::SETTING_NAME,
+      $mta_log
+    );
+  }
+
+  function _addQueue($status) {
+    $queue = SendingQueue::create();
+    $queue->hydrate(
+      array(
+        'newsletter_id' => 1,
+        'status' => $status,
+        'scheduled_at' => ($status === SendingQueue::STATUS_SCHEDULED) ?
+          Carbon::createFromTimestamp(current_time('timestamp')) :
+          null
+      )
+    );
+    return $queue->save();
+  }
+
+  function _after() {
+    ORM::raw_execute('TRUNCATE ' . Setting::$_table);
+    ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);
+  }
+}

tests/unit/Cron/Workers/SchedulerTest.php

@@ -0,0 +1,608 @@
+<?php
+
+use Carbon\Carbon;
+use Codeception\Util\Stub;
+use MailPoet\API\Endpoints\Cron;
+use MailPoet\Cron\CronHelper;
+use MailPoet\Cron\Workers\Scheduler;
+use MailPoet\Models\Newsletter;
+use MailPoet\Models\NewsletterOption;
+use MailPoet\Models\NewsletterOptionField;
+use MailPoet\Models\NewsletterSegment;
+use MailPoet\Models\Segment;
+use MailPoet\Models\SendingQueue;
+use MailPoet\Models\Setting;
+use MailPoet\Models\Subscriber;
+use MailPoet\Models\SubscriberSegment;
+
+class SchedulerTest extends MailPoetTest {
+  function testItDefinesConstants() {
+    expect(Scheduler::UNCONFIRMED_SUBSCRIBER_RESCHEDULE_TIMEOUT)->equals(5);
+  }
+
+  function testItConstructs() {
+    $scheduler = new Scheduler();
+    expect($scheduler->timer)->greaterOrEquals(5);
+    $timer = microtime(true) - 2;
+    $scheduler = new Scheduler($timer);
+    expect($scheduler->timer)->equals($timer);
+  }
+
+  function testItThrowsExceptionWhenExecutionLimitIsReached() {
+    try {
+      $scheduler = new Scheduler(microtime(true) - CronHelper::DAEMON_EXECUTION_LIMIT);
+      self::fail('Maximum execution time limit exception was not thrown.');
+    } catch(\Exception $e) {
+      expect($e->getMessage())->equals('Maximum execution time has been reached.');
+    }
+  }
+
+  function testItCanGetScheduledQueues() {
+    expect(Scheduler::getScheduledQueues())->isEmpty();
+    $queue = SendingQueue::create();
+    $queue->newsletter_id = 1;
+    $queue->status = SendingQueue::STATUS_SCHEDULED;
+    $queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
+    $queue->save();
+    expect(Scheduler::getScheduledQueues())->notEmpty();
+  }
+
+  function testItCanCreateNotificationHistory() {
+    $newsletter = Newsletter::create();
+    $newsletter->type = Newsletter::TYPE_NOTIFICATION;
+    $newsletter->save();
+
+    // ensure that notification history does not exist
+    $notification_history = Newsletter::where('type', Newsletter::TYPE_NOTIFICATION_HISTORY)
+      ->where('parent_id', $newsletter->id)
+      ->findOne();
+    expect($notification_history)->isEmpty();
+
+    // create notification history and ensure that it exists
+    $scheduler = new Scheduler();
+    $scheduler->createNotificationHistory($newsletter->id);
+    $notification_history = Newsletter::where('type', Newsletter::TYPE_NOTIFICATION_HISTORY)
+      ->where('parent_id', $newsletter->id)
+      ->findOne();
+    expect($notification_history)->notEmpty();
+  }
+
+  function testItCanDeleteQueueOrChangeItsNextRunDate() {
+    $WP_user = $this->_createOrUpdateWPUser('editor');
+    $newsletter = $this->_createNewsletter();
+    $newsletter_option_field = $this->_createNewsletterOptionField('intervalType', Newsletter::TYPE_WELCOME);
+    $newsletter_option = $this->_createNewsletterOption($newsletter_option_field->id, $newsletter->id, 'immediately');
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    $queue = $this->_createQueue($newsletter->id);
+    $scheduler = new Scheduler();
+
+    // queue should be deleted when interval type is set to "immediately"
+    expect(SendingQueue::findMany())->notEmpty();
+    $scheduler->deleteQueueOrUpdateNextRunDate($queue, $newsletter);
+    expect(count(SendingQueue::findMany()))->equals(0);
+
+    // queue's next run date should change when interval type is set to anything
+    // other than "immediately"
+    $queue = $this->_createQueue($newsletter->id);
+    $newsletter_option->value = 'daily';
+    $newsletter_option->save();
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    expect($queue->scheduled_at)->null();
+    $newsletter->schedule = '0 5 * * *'; // set it to daily at 5
+    $scheduler->deleteQueueOrUpdateNextRunDate($queue, $newsletter);
+    $queue = SendingQueue::findOne($queue->id);
+    expect($queue->scheduled_at)->notNull();
+  }
+
+  function testItFailsWPSubscriberVerificationWhenSubscriberIsNotAWPUser() {
+    $WP_user = $this->_createOrUpdateWPUser('editor');
+    $subscriber = $this->_createSubscriber();
+    $newsletter = $this->_createNewsletter(Newsletter::TYPE_WELCOME);
+    $newsletter_option_field = $this->_createNewsletterOptionField(
+      'role',
+      Newsletter::TYPE_WELCOME
+    );
+    $newsletter_option = $this->_createNewsletterOption(
+      $newsletter_option_field->id,
+      $newsletter->id, 'author'
+    );
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    $queue = $this->_createQueue($newsletter->id);
+    $scheduler = new Scheduler();
+
+    // return false and delete queue when subscriber is not a WP user
+    $result = $scheduler->verifyWPSubscriber($subscriber->id, $newsletter, $queue);
+    expect($result)->false();
+    expect(count(SendingQueue::findMany()))->equals(0);
+  }
+
+  function testItFailsWPSubscriberVerificationWhenSubscriberRoleDoesNotMatch() {
+    $WP_user = $this->_createOrUpdateWPUser('editor');
+    $subscriber = $this->_createSubscriber($WP_user->ID);
+    $newsletter = $this->_createNewsletter(Newsletter::TYPE_WELCOME);
+    $newsletter_option_field = $this->_createNewsletterOptionField(
+      'role',
+      Newsletter::TYPE_WELCOME
+    );
+    $newsletter_option = $this->_createNewsletterOption(
+      $newsletter_option_field->id,
+      $newsletter->id, 'author'
+    );
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    $queue = $this->_createQueue($newsletter->id);
+    $scheduler = new Scheduler();
+
+    // return false and delete queue when subscriber role is different from the one
+    // specified for the welcome email
+    $result = $scheduler->verifyWPSubscriber($subscriber->id, $newsletter, $queue);
+    expect($result)->false();
+    expect(count(SendingQueue::findMany()))->equals(0);
+  }
+
+  function testItPassesWPSubscriberVerificationWhenSubscriberExistsAndRoleMatches() {
+    $WP_user = $this->_createOrUpdateWPUser('author');
+    $subscriber = $this->_createSubscriber($WP_user->ID);
+    $newsletter = $this->_createNewsletter(Newsletter::TYPE_WELCOME);
+    $newsletter_option_field =
+      $this->_createNewsletterOptionField('role', Newsletter::TYPE_WELCOME);
+    $newsletter_option = $this->_createNewsletterOption(
+      $newsletter_option_field->id,
+      $newsletter->id, 'author'
+    );
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    $queue = $this->_createQueue($newsletter->id);
+    $scheduler = new Scheduler();
+
+    // return true when user exists and WP role matches the one specified for the welcome email
+    $result = $scheduler->verifyWPSubscriber($subscriber->id, $newsletter, $queue);
+    expect($result)->true();
+    expect(count(SendingQueue::findMany()))->greaterOrEquals(1);
+  }
+
+  function testItPassesWPSubscriberVerificationWhenSubscriberHasAnyRole() {
+    $WP_user = $this->_createOrUpdateWPUser('author');
+    $subscriber = $this->_createSubscriber($WP_user->ID);
+    $newsletter = $this->_createNewsletter(Newsletter::TYPE_WELCOME);
+    $newsletter_option_field =
+      $this->_createNewsletterOptionField('role', Newsletter::TYPE_WELCOME);
+    $newsletter_option = $this->_createNewsletterOption(
+      $newsletter_option_field->id, $newsletter->id,
+      \MailPoet\Newsletter\Scheduler\Scheduler::WORDPRESS_ALL_ROLES);
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    $queue = $this->_createQueue($newsletter->id);
+    $scheduler = new Scheduler();
+
+    // true when user exists and has any role
+    $result = $scheduler->verifyWPSubscriber($subscriber->id, $newsletter, $queue);
+    expect($result)->true();
+    expect(count(SendingQueue::findMany()))->greaterOrEquals(1);
+  }
+
+  function testItDoesNotProcessWelcomeNewsletterWhenThereAreNoSubscribersToProcess() {
+    $newsletter = $this->_createNewsletter();
+    $queue = $this->_createQueue($newsletter->id);
+    $queue->subscribers = serialize(array());
+
+    // delete queue when the list of subscribers to process is blank
+    $scheduler = new Scheduler();
+    $result = $scheduler->processWelcomeNewsletter($newsletter, $queue);
+    expect($result)->false();
+    expect(count(SendingQueue::findMany()))->equals(0);
+  }
+
+  function testItDoesNotProcessWelcomeNewsletterWhenWPUserCannotBeVerified() {
+    $newsletter = $this->_createNewsletter();
+    $newsletter->event = 'user';
+    $queue = $this->_createQueue($newsletter->id);
+    $queue->subscribers = serialize(array('to_process' => array(1)));
+
+    // return false when WP user cannot be verified
+    $scheduler = Stub::make(new Scheduler(), array(
+      'verifyWPSubscriber' => Stub::exactly(1, function() { return false; })
+    ), $this);
+    expect($scheduler->processWelcomeNewsletter($newsletter, $queue))->false();
+  }
+
+  function testItDoesNotProcessWelcomeNewsletterWhenSubscriberCannotBeVerified() {
+    $newsletter = $this->_createNewsletter();
+    $newsletter->event = 'segment';
+    $queue = $this->_createQueue($newsletter->id);
+    $queue->subscribers = serialize(array('to_process' => array(1)));
+
+    // return false when subscriber cannot be verified
+    $scheduler = Stub::make(new Scheduler(), array(
+      'verifyMailpoetSubscriber' => Stub::exactly(1, function() { return false; })
+    ), $this);
+    expect($scheduler->processWelcomeNewsletter($newsletter, $queue))->false();
+  }
+
+  function testItProcessesWelcomeNewsletterWhenSubscriberIsVerified() {
+    $newsletter = $this->_createNewsletter();
+    $newsletter->event = 'segment';
+
+    // return true when subsriber is verified and update the queue's status to null
+    $queue = $this->_createQueue($newsletter->id);
+    $queue->subscribers = serialize(array('to_process' => array(1)));
+    $scheduler = Stub::make(new Scheduler(), array(
+      'verifyMailpoetSubscriber' => Stub::exactly(1, function() { })
+    ), $this);
+    expect($queue->status)->notNull();
+    expect($scheduler->processWelcomeNewsletter($newsletter, $queue))->true();
+    $updated_queue = SendingQueue::findOne($queue->id);
+    expect($updated_queue->status)->null();
+  }
+
+  function testItProcessesWelcomeNewsletterWhenWPUserIsVerified() {
+    $newsletter = $this->_createNewsletter();
+    $newsletter->event = 'user';
+
+    // return true when WP user is verified
+    $queue = $this->_createQueue($newsletter->id);
+    $queue->subscribers = serialize(array('to_process' => array(1)));
+    $scheduler = Stub::make(new Scheduler(), array(
+      'verifyWPSubscriber' => Stub::exactly(1, function() { })
+    ), $this);
+    expect($queue->status)->notNull();
+    expect($scheduler->processWelcomeNewsletter($newsletter, $queue))->true();
+    // update queue's status to null
+    $updated_queue = SendingQueue::findOne($queue->id);
+    expect($updated_queue->status)->null();
+  }
+
+  function testItFailsMailpoetSubscriberVerificationWhenSubscriberDoesNotExist() {
+    $scheduler = new Scheduler();
+    $newsletter = $this->_createNewsletter();
+    $queue = $this->_createQueue($newsletter->id);
+
+    // return false
+    $result = $scheduler->verifyMailpoetSubscriber(null, $newsletter, $queue);
+    expect($result)->false();
+    // delete queue when subscriber can't be found
+    expect(count(SendingQueue::findMany()))->equals(0);
+  }
+
+  function testItFailsMailpoetSubscriberVerificationWhenSubscriberIsNotInSegment() {
+    $subscriber = $this->_createSubscriber();
+    $segment = $this->_createSegment();
+    $newsletter = $this->_createNewsletter();
+    $newsletter_option_field = $this->_createNewsletterOptionField('segment', Newsletter::TYPE_NOTIFICATION);
+    $newsletter_option = $this->_createNewsletterOption($newsletter_option_field->id, $newsletter->id, $segment->id);
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    $queue = $this->_createQueue($newsletter->id);
+    $scheduler = new Scheduler();
+
+    // return false
+    $result = $scheduler->verifyMailpoetSubscriber($subscriber->id, $newsletter, $queue);
+    expect($result)->false();
+    // delete queue when subscriber is not in segment specified for the newsletter
+    expect(count(SendingQueue::findMany()))->equals(0);
+  }
+
+  function testItReschedulesQueueDeliveryWhenMailpoetSubscriberHasNotConfirmedSubscription() {
+    $subscriber = $this->_createSubscriber($wp_user_id = null, 'unsubscribed');
+    $segment = $this->_createSegment();
+    $subscriber_segment = $this->_createSubscriberSegment($subscriber->id, $segment->id);
+    $newsletter = $this->_createNewsletter();
+    $newsletter_option_field =
+      $this->_createNewsletterOptionField('segment', Newsletter::TYPE_NOTIFICATION);
+    $newsletter_option = $this->_createNewsletterOption(
+      $newsletter_option_field->id, $newsletter->id,
+      $segment->id
+    );
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    $queue = $this->_createQueue($newsletter->id);
+    $scheduler = new Scheduler();
+
+    // return false
+    $result = $scheduler->verifyMailpoetSubscriber($subscriber->id, $newsletter, $queue);
+    expect($result)->false();
+    // update the time queue is scheduled to run at
+    $updated_queue = SendingQueue::findOne($queue->id);
+    expect(Carbon::parse($updated_queue->scheduled_at))->equals(
+      Carbon::createFromTimestamp(current_time('timestamp'))
+        ->addMinutes(Scheduler::UNCONFIRMED_SUBSCRIBER_RESCHEDULE_TIMEOUT)
+    );
+  }
+
+  function testItCanVerifyMailpoetSubscriber() {
+    $subscriber = $this->_createSubscriber();
+    $segment = $this->_createSegment();
+    $subscriber_segment = $this->_createSubscriberSegment($subscriber->id, $segment->id);
+    $newsletter = $this->_createNewsletter();
+    $newsletter_option_field =
+      $this->_createNewsletterOptionField('segment', Newsletter::TYPE_NOTIFICATION);
+    $newsletter_option = $this->_createNewsletterOption(
+      $newsletter_option_field->id, $newsletter->id,
+      $segment->id
+    );
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    $queue = $this->_createQueue($newsletter->id);
+    $scheduler = new Scheduler();
+
+    // return true after successful verification
+    $result = $scheduler->verifyMailpoetSubscriber($subscriber->id, $newsletter, $queue);
+    expect($result)->true();
+  }
+
+  function testItProcessesScheduledStandardNewsletter() {
+    $subscriber = $this->_createSubscriber();
+    $segment = $this->_createSegment();
+    $subscriber_segment = $this->_createSubscriberSegment($subscriber->id, $segment->id);
+    $newsletter = $this->_createNewsletter();
+    $newsletter_segment = $this->_createNewsletterSegment($newsletter->id, $segment->id);
+    $newsletter_option_field =
+      $this->_createNewsletterOptionField('segment', Newsletter::TYPE_NOTIFICATION);
+    $newsletter_option = $this->_createNewsletterOption(
+      $newsletter_option_field->id, $newsletter->id,
+      $segment->id
+    );
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    $queue = $this->_createQueue($newsletter->id);
+    $scheduler = new Scheduler();
+
+    // return true
+    expect($scheduler->processScheduledStandardNewsletter($newsletter, $queue))->true();
+    // update queue's list of subscribers to process
+    $updated_queue = SendingQueue::findOne($queue->id);
+    $updated_queue_subscribers = $updated_queue->getSubscribers();
+    expect($updated_queue_subscribers['to_process'])->equals(array($subscriber->id));
+    // set queue's status to null
+    expect($updated_queue->status)->null();
+  }
+
+  function testItFailsToProcessPostNotificationNewsletterWhenSegmentsDontExist() {
+    $newsletter = $this->_createNewsletter();
+    $queue = $this->_createQueue($newsletter->id);
+
+    // delete or reschedule queue when segments don't exist
+    $scheduler = Stub::make(new Scheduler(), array(
+      'deleteQueueOrUpdateNextRunDate' => Stub::exactly(1, function() { return false; })
+    ), $this);
+    expect($scheduler->processPostNotificationNewsletter($newsletter, $queue))->false();
+  }
+
+  function testItFailsToProcessPostNotificationNewsletterWhenSubscribersNotInSegment() {
+    $newsletter = $this->_createNewsletter();
+    $queue = $this->_createQueue($newsletter->id);
+    $segment = $this->_createSegment();
+    $newsletter_segment = $this->_createNewsletterSegment($newsletter->id, $segment->id);
+
+    // delete or reschedule queue when there are no subscribers in segments
+    $scheduler = Stub::make(new Scheduler(), array(
+      'deleteQueueOrUpdateNextRunDate' => Stub::exactly(1, function() { return false; })
+    ), $this);
+    expect($scheduler->processPostNotificationNewsletter($newsletter, $queue))->false();
+  }
+
+  function testItCanProcessPostNotificationNewsletter() {
+    $newsletter = $this->_createNewsletter();
+    $queue = $this->_createQueue($newsletter->id);
+    $segment = $this->_createSegment();
+    $newsletter_segment = $this->_createNewsletterSegment($newsletter->id, $segment->id);
+    $subscriber = $this->_createSubscriber();
+    $subscriber_segment = $this->_createSubscriberSegment($subscriber->id, $segment->id);
+    $newsletter_option_field =
+      $this->_createNewsletterOptionField('segment', Newsletter::TYPE_NOTIFICATION);
+    $newsletter_option = $this->_createNewsletterOption(
+      $newsletter_option_field->id, $newsletter->id,
+      $segment->id
+    );
+    $newsletter = Newsletter::filter('filterWithOptions')
+      ->findOne($newsletter->id);
+    $scheduler = new Scheduler();
+
+    // return true
+    expect($scheduler->processPostNotificationNewsletter($newsletter, $queue))->true();
+    // create notification history
+    $notification_history = Newsletter::where('parent_id', $newsletter->id)
+      ->findOne();
+    expect($notification_history)->notEmpty();
+    // update queue with a list of subscribers to process and change newsletter id
+    // to that of the notification history
+    $updated_queue = SendingQueue::findOne($queue->id);
+    $updated_queue_subscribers = $updated_queue->getSubscribers();
+    expect($updated_queue_subscribers['to_process'])->equals(array($subscriber->id));
+    expect($updated_queue->newsletter_id)->equals($notification_history->id);
+  }
+
+  function testItFailsToProcessWhenScheduledQueuesNotFound() {
+    $scheduler = new Scheduler();
+    expect($scheduler->process())->false();
+  }
+
+  function testItDeletesQueueDuringProcessingWhenNewsletterNotFound() {
+    $queue = $this->_createQueue(1);
+    $queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
+    $queue->save();
+    $scheduler = new Scheduler();
+    $scheduler->process();
+    expect(count(SendingQueue::findMany()))->equals(0);
+  }
+
+  function testItDeletesQueueDuringProcessingWhenNewsletterIsSoftDeleted() {
+    $newsletter = $this->_createNewsletter();
+    $newsletter->deleted_at = Carbon::createFromTimestamp(current_time('timestamp'));
+    $newsletter->save();
+    $queue = $this->_createQueue($newsletter->id);
+    $queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
+    $queue->save();
+    $scheduler = new Scheduler();
+    $scheduler->process();
+    expect(count(SendingQueue::findMany()))->equals(0);
+  }
+
+  function testItProcessesWelcomeNewsletters() {
+    $newsletter = $this->_createNewsletter(Newsletter::TYPE_WELCOME);
+    $queue = $this->_createQueue($newsletter->id);
+    $queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
+    $queue->save();
+    $scheduler = Stub::make(new Scheduler(), array(
+      'processWelcomeNewsletter' => Stub::exactly(1, function($newsletter, $queue) { })
+    ), $this);
+    $scheduler->timer = microtime(true);
+    $scheduler->process();
+  }
+
+  function testItProcessesNotificationNewsletters() {
+    $newsletter = $this->_createNewsletter();
+    $queue = $this->_createQueue($newsletter->id);
+    $queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
+    $queue->save();
+    $scheduler = Stub::make(new Scheduler(), array(
+      'processPostNotificationNewsletter' => Stub::exactly(1, function($newsletter, $queue) { })
+    ), $this);
+    $scheduler->timer = microtime(true);
+    $scheduler->process();
+  }
+
+  function testItProcessesStandardScheduledNewsletters() {
+    $newsletter = $this->_createNewsletter(Newsletter::TYPE_STANDARD);
+    $queue = $this->_createQueue($newsletter->id);
+    $queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
+    $queue->save();
+    $scheduler = Stub::make(new Scheduler(), array(
+      'processScheduledStandardNewsletter' => Stub::exactly(1, function($newsletter, $queue) { })
+    ), $this);
+    $scheduler->timer = microtime(true);
+    $scheduler->process();
+  }
+
+  function testItEnforcesExecutionLimitDuringProcessing() {
+    $newsletter = $this->_createNewsletter();
+    $queue = $this->_createQueue($newsletter->id);
+    $queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
+    $queue->save();
+    $scheduler = Stub::make(new Scheduler(), array(
+      'processPostNotificationNewsletter' => Stub::exactly(1, function($newsletter, $queue) { })
+    ), $this);
+    $scheduler->timer = microtime(true) - CronHelper::DAEMON_EXECUTION_LIMIT;
+    try {
+      $scheduler->process();
+      self::fail('Maximum execution time limit exception was not thrown.');
+    } catch(\Exception $e) {
+      expect($e->getMessage())->equals('Maximum execution time has been reached.');
+    }
+  }
+
+  function _createNewsletterSegment($newsletter_id, $segment_id) {
+    $newsletter_segment = NewsletterSegment::create();
+    $newsletter_segment->newsletter_id = $newsletter_id;
+    $newsletter_segment->segment_id = $segment_id;
+    $newsletter_segment->save();
+    expect($newsletter_segment->getErrors())->false();
+    return $newsletter_segment;
+  }
+
+  function _createSubscriberSegment($subscriber_id, $segment_id, $status = 'subscribed') {
+    $subscriber_segment = SubscriberSegment::create();
+    $subscriber_segment->subscriber_id = $subscriber_id;
+    $subscriber_segment->segment_id = $segment_id;
+    $subscriber_segment->status = $status;
+    $subscriber_segment->save();
+    expect($subscriber_segment->getErrors())->false();
+    return $subscriber_segment;
+  }
+
+
+  function _createSegment() {
+    $segment = Segment::create();
+    $segment->name = 'test';
+    $segment->type = 'default';
+    $segment->save();
+    expect($segment->getErrors())->false();
+    return $segment;
+  }
+
+  function _createSubscriber($wp_user_id = null, $status = 'subscribed') {
+    $subscriber = Subscriber::create();
+    $subscriber->email = 'john@doe.com';
+    $subscriber->first_name = 'John';
+    $subscriber->last_name = 'Doe';
+    $subscriber->wp_user_id = $wp_user_id;
+    $subscriber->status = $status;
+    $subscriber->save();
+    expect($subscriber->getErrors())->false();
+    return $subscriber;
+  }
+
+  function _createNewsletter($type = Newsletter::TYPE_NOTIFICATION) {
+    $newsletter = Newsletter::create();
+    $newsletter->type = $type;
+    $newsletter->save();
+    expect($newsletter->getErrors())->false();
+    return $newsletter;
+  }
+
+  function _createNewsletterOptionField($name, $type) {
+    $newsletter_option_field = NewsletterOptionField::create();
+    $newsletter_option_field->name = $name;
+    $newsletter_option_field->newsletter_type = $type;
+    $newsletter_option_field->save();
+    expect($newsletter_option_field->getErrors())->false();
+    return $newsletter_option_field;
+  }
+
+  function _createNewsletterOption($option_field_id, $newsletter_id, $value) {
+    $newsletter_option = NewsletterOption::create();
+    $newsletter_option->option_field_id = $option_field_id;
+    $newsletter_option->newsletter_id = $newsletter_id;
+    $newsletter_option->value = $value;
+    $newsletter_option->save();
+    expect($newsletter_option->getErrors())->false();
+    return $newsletter_option;
+  }
+
+  function _createQueue($newsletter_id, $status = SendingQueue::STATUS_SCHEDULED) {
+    $queue = SendingQueue::create();
+    $queue->status = $status;
+    $queue->newsletter_id = $newsletter_id;
+    $queue->save();
+    expect($queue->getErrors())->false();
+    return $queue;
+  }
+
+  function _createOrUpdateWPUser($role = null) {
+    $email = 'test@example.com';
+    $username = 'phoenix_test_user';
+    if(email_exists($email) === false) {
+      wp_insert_user(
+        array(
+          'user_login' => $username,
+          'user_email' => $email,
+          'user_pass' => null
+        )
+      );
+    }
+    $user = get_user_by('login', $username);
+    wp_update_user(
+      array(
+        'ID' => $user->ID,
+        'role' => $role
+      )
+    );
+    expect($user->ID)->notNull();
+    return $user;
+  }
+
+  function _after() {
+    ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
+    ORM::raw_execute('TRUNCATE ' . Setting::$_table);
+    ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);
+    ORM::raw_execute('TRUNCATE ' . NewsletterOption::$_table);
+    ORM::raw_execute('TRUNCATE ' . NewsletterOptionField::$_table);
+    ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
+    ORM::raw_execute('TRUNCATE ' . SubscriberSegment::$_table);
+    ORM::raw_execute('TRUNCATE ' . Segment::$_table);
+    ORM::raw_execute('TRUNCATE ' . NewsletterSegment::$_table);
+  }
+}

tests/unit/Cron/Workers/SendingQueue/SendingQueueTest.php

@@ -0,0 +1,309 @@
+<?php
+
+use Codeception\Util\Fixtures;
+use Codeception\Util\Stub;
+use MailPoet\API\Endpoints\Cron;
+use MailPoet\Config\Populator;
+use MailPoet\Cron\CronHelper;
+use MailPoet\Cron\Workers\SendingQueue\SendingQueue as SendingQueueWorker;
+use MailPoet\Cron\Workers\SendingQueue\Tasks\Mailer as MailerTask;
+use MailPoet\Cron\Workers\SendingQueue\Tasks\Newsletter as NewsletterTask;
+use MailPoet\Models\Newsletter;
+use MailPoet\Models\NewsletterLink;
+use MailPoet\Models\NewsletterPost;
+use MailPoet\Models\SendingQueue;
+use MailPoet\Models\StatisticsNewsletters;
+use MailPoet\Models\Subscriber;
+
+class SendingQueueTest extends MailPoetTest {
+  function _before() {
+    $wp_users = get_users();
+    wp_set_current_user($wp_users[0]->ID);
+    $populator = new Populator();
+    $populator->up();
+    $this->subscriber = Subscriber::create();
+    $this->subscriber->email = 'john@doe.com';
+    $this->subscriber->first_name = 'John';
+    $this->subscriber->last_name = 'Doe';
+    $this->subscriber->save();
+    $this->newsletter = Newsletter::create();
+    $this->newsletter->type = Newsletter::TYPE_STANDARD;
+    $this->newsletter->subject = Fixtures::get('newsletter_subject_template');
+    $this->newsletter->body = Fixtures::get('newsletter_body_template');
+    $this->newsletter->save();
+    $this->queue = SendingQueue::create();
+    $this->queue->newsletter_id = $this->newsletter->id;
+    $this->queue->subscribers = serialize(
+      array(
+        'to_process' => array($this->subscriber->id),
+        'processed' => array(),
+        'failed' => array()
+      )
+    );
+    $this->queue->count_total = 1;
+    $this->queue->save();
+    $this->sending_queue_worker = new SendingQueueWorker();
+  }
+
+  function testItConstructs() {
+    expect($this->sending_queue_worker->mailer_task instanceof MailerTask);
+    expect($this->sending_queue_worker->newsletter_task instanceof NewsletterTask);
+    expect(strlen($this->sending_queue_worker->timer))->greaterOrEquals(5);
+
+    // constructor accepts timer argument
+    $timer = microtime(true) - 5;
+    $sending_queue_worker = new SendingQueueWorker($timer);
+    expect($sending_queue_worker->timer)->equals($timer);
+  }
+
+  function testItEnforcesExecutionLimitBeforeStart() {
+    $timer = microtime(true) - CronHelper::DAEMON_EXECUTION_LIMIT;
+    try {
+      $sending_queue_worker = new SendingQueueWorker($timer);
+      self::fail('Maximum execution time limit exception was not thrown.');
+    } catch(\Exception $e) {
+      expect($e->getMessage())->equals('Maximum execution time has been reached.');
+    }
+  }
+
+  function testItEnforcesExecutionLimitDuringProcessing() {
+    try {
+      $sending_queue_worker = $this->sending_queue_worker;
+      $sending_queue_worker->timer = microtime(true) - CronHelper::DAEMON_EXECUTION_LIMIT;
+      $sending_queue_worker->process();
+      self::fail('Maximum execution time limit exception was not thrown.');
+    } catch(\Exception $e) {
+      expect($e->getMessage())->equals('Maximum execution time has been reached.');
+    }
+  }
+
+  function testItDeletesQueueWhenNewsletterIsNotFound() {
+    // queue exists
+    $queue = SendingQueue::findOne($this->queue->id);
+    expect($queue)->notEquals(false);
+
+    // delete newsletter
+    Newsletter::findOne($this->newsletter->id)
+      ->delete();
+
+    // queue no longer exists
+    $this->sending_queue_worker->process();
+    $queue = SendingQueue::findOne($this->queue->id);
+    expect($queue)->false(false);
+  }
+
+  function testItCanProcessSubscribersOneByOne() {
+    $sending_queue_worker = new SendingQueueWorker(
+      $timer = false,
+      Stub::make(
+        new MailerTask(),
+        array(
+          'send' => Stub::exactly(1, function($newsletter, $subscriber) {
+            // newsletter body should not be empty
+            expect(!empty($newsletter['body']['html']))->true();
+            expect(!empty($newsletter['body']['text']))->true();
+            return true;
+          })
+        )
+      )
+    );
+    $sending_queue_worker->process();
+
+    // newsletter status is set to sent
+    $updated_newsletter = Newsletter::findOne($this->newsletter->id);
+    expect($updated_newsletter->status)->equals(Newsletter::STATUS_SENT);
+
+    // queue status is set to completed
+    $updated_queue = SendingQueue::findOne($this->queue->id);
+    expect($updated_queue->status)->equals(SendingQueue::STATUS_COMPLETED);
+
+    // queue subscriber processed/failed/to process count is updated
+    $updated_queue->subscribers = $updated_queue->getSubscribers();
+    expect($updated_queue->subscribers)->equals(
+      array(
+        'to_process' => array(),
+        'failed' => array(),
+        'processed' => array($this->subscriber->id)
+      )
+    );
+    expect($updated_queue->count_total)->equals(1);
+    expect($updated_queue->count_processed)->equals(1);
+    expect($updated_queue->count_failed)->equals(0);
+    expect($updated_queue->count_to_process)->equals(0);
+
+    // statistics entry should be created
+    $statistics = StatisticsNewsletters::where('newsletter_id', $this->newsletter->id)
+      ->where('subscriber_id', $this->subscriber->id)
+      ->where('queue_id', $this->queue->id)
+      ->findOne();
+    expect($statistics)->notEquals(false);
+  }
+
+  function testItCanProcessSubscribersInBulk() {
+    $sending_queue_worker = new SendingQueueWorker(
+      $timer = false,
+      Stub::make(
+        new MailerTask(),
+        array(
+          'send' => Stub::exactly(1, function($newsletter, $subscriber) {
+            // newsletter body should not be empty
+            expect(!empty($newsletter[0]['body']['html']))->true();
+            expect(!empty($newsletter[0]['body']['text']))->true();
+            return true;
+          }),
+          'getProcessingMethod' => Stub::exactly(1, function() { return 'bulk'; })
+        )
+      )
+    );
+    $sending_queue_worker->process();
+
+    // newsletter status is set to sent
+    $updated_newsletter = Newsletter::findOne($this->newsletter->id);
+    expect($updated_newsletter->status)->equals(Newsletter::STATUS_SENT);
+
+    // queue status is set to completed
+    $updated_queue = SendingQueue::findOne($this->queue->id);
+    expect($updated_queue->status)->equals(SendingQueue::STATUS_COMPLETED);
+
+    // queue subscriber processed/failed/to process count is updated
+    $updated_queue->subscribers = $updated_queue->getSubscribers();
+    expect($updated_queue->subscribers)->equals(
+      array(
+        'to_process' => array(),
+        'failed' => array(),
+        'processed' => array($this->subscriber->id)
+      )
+    );
+    expect($updated_queue->count_total)->equals(1);
+    expect($updated_queue->count_processed)->equals(1);
+    expect($updated_queue->count_failed)->equals(0);
+    expect($updated_queue->count_to_process)->equals(0);
+
+    // statistics entry should be created
+    $statistics = StatisticsNewsletters::where('newsletter_id', $this->newsletter->id)
+      ->where('subscriber_id', $this->subscriber->id)
+      ->where('queue_id', $this->queue->id)
+      ->findOne();
+    expect($statistics)->notEquals(false);
+  }
+
+  function testItRemovesNonexistentSubscribersFromProcessingList() {
+    $queue = $this->queue;
+    $queue->subscribers = serialize(
+      array(
+        'to_process' => array(
+          $this->subscriber->id(),
+          123
+        ),
+        'processed' => array(),
+        'failed' => array()
+      )
+    );
+    $queue->count_total = 2;
+    $queue->save();
+    $sending_queue_worker = $this->sending_queue_worker;
+    $sending_queue_worker->mailer_task = Stub::make(
+      new MailerTask(),
+      array('send' => Stub::exactly(1, function($newsletter, $subscriber) { return true; }))
+    );
+    $sending_queue_worker->process();
+
+    $updated_queue = SendingQueue::findOne($queue->id);
+    // queue subscriber processed/failed/to process count is updated
+    $updated_queue->subscribers = $updated_queue->getSubscribers();
+    expect($updated_queue->subscribers)->equals(
+      array(
+        'to_process' => array(),
+        'failed' => array(),
+        'processed' => array($this->subscriber->id)
+      )
+    );
+    expect($updated_queue->count_total)->equals(1);
+    expect($updated_queue->count_processed)->equals(1);
+    expect($updated_queue->count_failed)->equals(0);
+    expect($updated_queue->count_to_process)->equals(0);
+
+    // statistics entry should be created only for 1 subscriber
+    $statistics = StatisticsNewsletters::findMany();
+    expect(count($statistics))->equals(1);
+  }
+
+  function testItUpdatesQueueSubscriberCountWhenNoneOfSubscribersExist() {
+    $queue = $this->queue;
+    $queue->subscribers = serialize(
+      array(
+        'to_process' => array(
+          123,
+          456
+        ),
+        'processed' => array(),
+        'failed' => array()
+      )
+    );
+    $queue->count_total = 2;
+    $queue->save();
+    $sending_queue_worker = $this->sending_queue_worker;
+    $sending_queue_worker->mailer_task = Stub::make(
+      new MailerTask(),
+      array('send' => Stub::exactly(1, function($newsletter, $subscriber) { return true; }))
+    );
+    $sending_queue_worker->process();
+
+    $updated_queue = SendingQueue::findOne($queue->id);
+    // queue subscriber processed/failed/to process count is updated
+    $updated_queue->subscribers = $updated_queue->getSubscribers();
+    expect($updated_queue->subscribers)->equals(
+      array(
+        'to_process' => array(),
+        'failed' => array(),
+        'processed' => array()
+      )
+    );
+    expect($updated_queue->count_total)->equals(0);
+    expect($updated_queue->count_processed)->equals(0);
+    expect($updated_queue->count_failed)->equals(0);
+    expect($updated_queue->count_to_process)->equals(0);
+  }
+
+  function testItUpdatesFailedListWhenSendingFailed() {
+    $sending_queue_worker = new SendingQueueWorker(
+      $timer = false,
+      Stub::make(
+        new MailerTask(),
+        array('send' => Stub::exactly(1, function($newsletter, $subscriber) { return false; }))
+      )
+    );
+    $sending_queue_worker->process();
+
+    // queue subscriber processed/failed/to process count is updated
+    $updated_queue = SendingQueue::findOne($this->queue->id);
+    $updated_queue->subscribers = $updated_queue->getSubscribers();
+    expect($updated_queue->subscribers)->equals(
+      array(
+        'to_process' => array(),
+        'failed' => array($this->subscriber->id),
+        'processed' => array()
+      )
+    );
+    expect($updated_queue->count_total)->equals(1);
+    expect($updated_queue->count_processed)->equals(1);
+    expect($updated_queue->count_failed)->equals(1);
+    expect($updated_queue->count_to_process)->equals(0);
+
+    // statistics entry should not be created
+    $statistics = StatisticsNewsletters::where('newsletter_id', $this->newsletter->id)
+      ->where('subscriber_id', $this->subscriber->id)
+      ->where('queue_id', $this->queue->id)
+      ->findOne();
+    expect($statistics)->false();
+  }
+
+  function _after() {
+    ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
+    ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);
+    ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
+    ORM::raw_execute('TRUNCATE ' . NewsletterLink::$_table);
+    ORM::raw_execute('TRUNCATE ' . NewsletterPost::$_table);
+    ORM::raw_execute('TRUNCATE ' . StatisticsNewsletters::$_table);
+  }
+}

tests/unit/Cron/Workers/SendingQueue/Tasks/LinksTest.php

@@ -0,0 +1,60 @@
+<?php
+use MailPoet\Cron\Workers\SendingQueue\Tasks\Links;
+use MailPoet\Models\Newsletter;
+use MailPoet\Models\NewsletterLink;
+
+if(!defined('ABSPATH')) exit;
+
+class LinkTaskTest extends MailPoetTest {
+  function testItCanSaveLinks() {
+    $links = array(
+      array(
+        'url' => 'http://example.com',
+        'hash' => 'some_hash'
+      )
+    );
+    $newsletter = (object)array('id' => 1);
+    $queue = (object)array('id' => 2);
+    $result = Links::saveLinks($links, $newsletter, $queue);
+    $newsletter_link = NewsletterLink::where('hash', $links[0]['hash'])
+      ->findOne();
+    expect($newsletter_link->newsletter_id)->equals($newsletter->id);
+    expect($newsletter_link->queue_id)->equals($queue->id);
+    expect($newsletter_link->url)->equals($links[0]['url']);
+  }
+
+  function testItCanHashAndReplaceLinks() {
+    $rendered_newsletter = array(
+      'html' => '<a href="http://example.com">Example Link</a>',
+      'text' => '<a href="http://example.com">Example Link</a>'
+    );
+    $result = Links::hashAndReplaceLinks($rendered_newsletter);
+    $processed_rendered_newsletter_body = $result[0];
+    $processed_and_hashed_links = $result[1];
+    expect($processed_rendered_newsletter_body['html'])
+      ->contains($processed_and_hashed_links[0]['hash']);
+    expect($processed_rendered_newsletter_body['text'])
+      ->contains($processed_and_hashed_links[0]['hash']);
+    expect($processed_and_hashed_links[0]['url'])->equals('http://example.com');
+  }
+
+  function testItCanProcessRenderedBody() {
+    $newsletter = Newsletter::create();
+    $newsletter->type = Newsletter::TYPE_STANDARD;
+    $newsletter->save();
+    $rendered_newsletter = array(
+      'html' => '<a href="http://example.com">Example Link</a>',
+      'text' => '<a href="http://example.com">Example Link</a>'
+    );
+    $queue = (object)array('id' => 2);
+    $result = Links::process($rendered_newsletter, $newsletter, $queue);
+    $newsletter_link = NewsletterLink::where('newsletter_id', $newsletter->id)
+      ->findOne();
+    expect($result['html'])->contains($newsletter_link->hash);
+  }
+
+  function _after() {
+    ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
+    ORM::raw_execute('TRUNCATE ' . NewsletterLink::$_table);
+  }
+}

tests/unit/Cron/Workers/SendingQueue/Tasks/MailerTest.php

@@ -0,0 +1,126 @@
+<?php
+use Codeception\Util\Stub;
+use MailPoet\Config\Populator;
+use MailPoet\Cron\Workers\SendingQueue\Tasks\Mailer as MailerTask;
+use MailPoet\Mailer\Mailer;
+use MailPoet\Models\Setting;
+use MailPoet\Models\Subscriber;
+
+if(!defined('ABSPATH')) exit;
+
+class MailerTaskTest extends MailPoetTest {
+  public $mailer_task;
+  public $sender;
+
+  function _before() {
+    $wp_users = get_users();
+    wp_set_current_user($wp_users[0]->ID);
+    $populator = new Populator();
+    $populator->up();
+    $this->mailer_task = new MailerTask();
+    $this->sender = Setting::getValue('sender');
+  }
+
+  function testConfiguresMailerWhenItConstructs() {
+    expect($this->mailer_task->mailer instanceof MailPoet\Mailer\Mailer)->true();
+  }
+
+  function testItCanConfigureMailerWithSenderAndReplyToAddresses() {
+    $newsletter = new stdClass();
+
+    // when no sender/reply-to information is set, use the sender information
+    // from Settings
+    $mailer = $this->mailer_task->configureMailer($newsletter);
+    expect($mailer->sender['from_name'])->equals($this->sender['name']);
+    expect($mailer->sender['from_email'])->equals($this->sender['address']);
+    expect($mailer->reply_to['reply_to_name'])->equals($this->sender['name']);
+    expect($mailer->reply_to['reply_to_email'])->equals($this->sender['address']);
+    $newsletter->sender_name = 'Sender';
+    $newsletter->sender_address = 'from@example.com';
+    $newsletter->reply_to_name = 'Reply-to';
+    $newsletter->reply_to_address = 'reply-to@example.com';
+
+    // when newsletter's sender/reply-to information is available, use that
+    // to configure mailer
+    $mailer = $this->mailer_task->configureMailer($newsletter);
+    expect($mailer->sender['from_name'])->equals($newsletter->sender_name);
+    expect($mailer->sender['from_email'])->equals($newsletter->sender_address);
+    expect($mailer->reply_to['reply_to_name'])->equals($newsletter->reply_to_name);
+    expect($mailer->reply_to['reply_to_email'])->equals($newsletter->reply_to_address);
+  }
+
+  function testItGetsMailerLog() {
+    $mailer_log = $this->mailer_task->getMailerLog();
+    expect(isset($mailer_log['sent']))->true();
+    expect(isset($mailer_log['started']))->true();
+  }
+
+  function testItUpdatesMailerLogSentCount() {
+    $mailer_log = $this->mailer_task->getMailerLog();
+    expect($mailer_log['sent'])->equals(0);
+    $mailer_log = $this->mailer_task->updateSentCount();
+    expect($mailer_log['sent'])->equals(1);
+  }
+
+  function testItGetsProcessingMethod() {
+    // when using MailPoet method, newsletters should be processed in bulk
+    Setting::setValue(
+      Mailer::MAILER_CONFIG_SETTING_NAME,
+      array(
+        'method' => 'MailPoet',
+        'mailpoet_api_key' => 'some_key',
+      )
+    );
+    $mailer_task = new MailerTask();
+    expect($mailer_task->getProcessingMethod())->equals('bulk');
+
+    // when using other methods, newsletters should be processed individually
+    Setting::setValue(
+      Mailer::MAILER_CONFIG_SETTING_NAME,
+      array(
+        'method' => 'PHPMail'
+      )
+    );
+    $mailer_task = new MailerTask();
+    expect($mailer_task->getProcessingMethod())->equals('individual');
+  }
+
+  function testItCanPrepareSubscriberForSending() {
+    $subscriber = Subscriber::create();
+    $subscriber->email = 'test@example.com';
+    $subscriber->first_name = 'John';
+    $subscriber->last_name = 'Doe';
+    $subscriber->save();
+    $prepared_subscriber = $this->mailer_task->prepareSubscriberForSending($subscriber);
+    expect($prepared_subscriber)->equals('John Doe <test@example.com>');
+  }
+
+  function testItCanSend() {
+    $php_mail_class = 'MailPoet\Mailer\Methods\PHPMail';
+    Setting::setValue(
+      Mailer::MAILER_CONFIG_SETTING_NAME,
+      array(
+        'method' => 'PHPMail'
+      )
+    );
+    // mock mailer instance and ensure that send method is invoked
+    $mailer_task = new MailerTask(
+      (object)array(
+        'mailer_instance' => Stub::make(
+          $php_mail_class,
+          array('send' => Stub::exactly(1, function($newsletter, $subscriber) { return true; }))
+        )
+      )
+    );
+    // mailer instance should be properly configured
+    expect($mailer_task->mailer->mailer_instance instanceof $php_mail_class)
+      ->true();
+    // send method should return true
+    expect($mailer_task->send('Newsletter', 'Subscriber'))->true();
+  }
+
+  function _after() {
+    ORM::raw_execute('TRUNCATE ' . Setting::$_table);
+    ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
+  }
+}

tests/unit/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php

@@ -0,0 +1,149 @@
+<?php
+use Codeception\Util\Fixtures;
+use MailPoet\Cron\Workers\SendingQueue\Tasks\Newsletter as NewsletterTask;
+use MailPoet\Models\Newsletter;
+use MailPoet\Models\NewsletterLink;
+use MailPoet\Models\NewsletterPost;
+use MailPoet\Models\SendingQueue;
+use MailPoet\Models\Subscriber;
+use MailPoet\Router\Router;
+
+if(!defined('ABSPATH')) exit;
+
+class NewsletterTaskTest extends MailPoetTest {
+  function _before() {
+    $this->newsletter_task = new NewsletterTask();
+    $this->subscriber = Subscriber::create();
+    $this->subscriber->email = 'test@example.com';
+    $this->subscriber->first_name = 'John';
+    $this->subscriber->last_name = 'Doe';
+    $this->subscriber->save();
+    $this->newsletter = Newsletter::create();
+    $this->newsletter->type = Newsletter::TYPE_STANDARD;
+    $this->newsletter->subject = Fixtures::get('newsletter_subject_template');
+    $this->newsletter->body = Fixtures::get('newsletter_body_template');
+    $this->newsletter->save();
+    $this->queue = SendingQueue::create();
+    $this->queue->newsletter_id = $this->newsletter->id;
+    $this->queue->save();
+  }
+
+  function testItConstructs() {
+    expect($this->newsletter_task->tracking_enabled)->true();
+  }
+
+  function testItFailsToGetAndProcessNewsletterWhenNewsletterDoesNotExist() {
+    $queue = $this->queue;
+    $queue->newsletter_id = 0;
+    expect($this->newsletter_task->getAndPreProcess($queue))->false();
+  }
+
+  function testItReturnsNewsletterObjectWhenRenderedNewssletterBodyExistsInTheQueue() {
+    $queue = $this->queue;
+    $queue->newsletter_rendered_body = true;
+    $result = $this->newsletter_task->getAndPreProcess($queue);
+    expect($result instanceof \MailPoet\Models\Newsletter)->true();
+  }
+
+  function testItHashesLinksAndInsertsTrackingImageWhenTrackingIsEnabled() {
+    $newsletter_task = $this->newsletter_task;
+    $newsletter_task->tracking_enabled = true;
+    $newsletter_task->getAndPreProcess($this->queue);
+    $link = NewsletterLink::where('newsletter_id', $this->newsletter->id)
+      ->findOne();
+    $updated_queue = SendingQueue::findOne($this->queue->id);
+    $rendered_newsletter = $updated_queue->getNewsletterRenderedBody();
+    expect($rendered_newsletter['html'])
+      ->contains('[mailpoet_click_data]-' . $link->hash);
+    expect($rendered_newsletter['html'])
+      ->contains('[mailpoet_open_data]');
+  }
+
+  function testItDoesNotHashLinksAndInsertTrackingCodeWhenTrackingIsDisabled() {
+    $newsletter_task = $this->newsletter_task;
+    $newsletter_task->tracking_enabled = false;
+    $newsletter_task->getAndPreProcess($this->queue);
+    $link = NewsletterLink::where('newsletter_id', $this->newsletter->id)
+      ->findOne();
+    expect($link)->false();
+    $updated_queue = SendingQueue::findOne($this->queue->id);
+    $rendered_newsletter = $updated_queue->getNewsletterRenderedBody();
+    expect($rendered_newsletter['html'])
+      ->notContains('[mailpoet_click_data]');
+    expect($rendered_newsletter['html'])
+      ->notContains('[mailpoet_open_data]');
+  }
+
+  function testReturnsFalseWhenNewsletterIsANotificationWithoutPosts() {
+    $newsletter = $this->newsletter;
+    $newsletter->type = Newsletter::TYPE_NOTIFICATION;
+    // replace post id data tag with something else
+    $newsletter->body = str_replace('data-post-id', 'id', $newsletter->body);
+    $newsletter->save();
+    $result = $this->newsletter_task->getAndPreProcess($this->queue);
+    expect($result)->false();
+  }
+
+  function testItSavesNewsletterPosts() {
+    $result = $this->newsletter_task->getAndPreProcess($this->queue);
+    $newsletter_post = NewsletterPost::where('newsletter_id', $this->newsletter->id)
+      ->findOne();
+    expect($result)->notEquals(false);
+    expect($newsletter_post->post_id)->equals('10');
+  }
+
+  function testItUpdatesStatusToSentOnlyForStandardNewsletters() {
+    // newsletter type is 'standard'
+    $newsletter = $this->newsletter;
+    expect($newsletter->type)->equals(Newsletter::TYPE_STANDARD);
+    expect($newsletter->status)->notEquals(Newsletter::STATUS_SENT);
+    $this->newsletter_task->markNewsletterAsSent($newsletter);
+    $updated_newsletter = Newsletter::findOne($newsletter->id);
+    expect($updated_newsletter->status)->equals(Newsletter::STATUS_SENT);
+
+    // newsletter type is NOT 'standard'
+    $newsletter->type = Newsletter::TYPE_NOTIFICATION;
+    $newsletter->status = 'not_sent';
+    $newsletter->save();
+    $this->newsletter_task->markNewsletterAsSent($newsletter);
+    $updated_newsletter = Newsletter::findOne($newsletter->id);
+    expect($updated_newsletter->status)->notEquals(Newsletter::STATUS_SENT);
+  }
+
+  function testItRendersShortcodesAndReplacesSubscriberDataInLinks() {
+    $newsletter = $this->newsletter_task->getAndPreProcess($this->queue);
+    $result = $this->newsletter_task->prepareNewsletterForSending(
+      $newsletter,
+      $this->subscriber,
+      $this->queue
+    );
+    expect($result['subject'])->contains($this->subscriber->first_name);
+    expect($result['body']['html'])
+      ->contains(Router::NAME . '&endpoint=track&action=click&data=');
+    expect($result['body']['text'])
+      ->contains(Router::NAME . '&endpoint=track&action=click&data=');
+  }
+
+  function testItDoesNotReplaceSubscriberDataInLinksWhenTrackingIsNotEnabled() {
+    $newsletter_task = $this->newsletter_task;
+    $newsletter_task->tracking_enabled = false;
+    $newsletter = $newsletter_task->getAndPreProcess($this->queue);
+    $result = $newsletter_task->prepareNewsletterForSending(
+      $newsletter,
+      $this->subscriber,
+      $this->queue
+    );
+    expect($result['body']['html'])
+      ->notContains(Router::NAME . '&endpoint=track&action=click&data=');
+    expect($result['body']['text'])
+      ->notContains(Router::NAME . '&endpoint=track&action=click&data=');
+  }
+
+  function _after() {
+    ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
+    ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
+    ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);
+    ORM::raw_execute('TRUNCATE ' . NewsletterLink::$_table);
+    ORM::raw_execute('TRUNCATE ' . NewsletterPost::$_table);
+  }
+}

tests/unit/Cron/Workers/SendingQueue/Tasks/PostsTest.php

@@ -0,0 +1,54 @@
+<?php
+
+use MailPoet\Cron\Workers\SendingQueue\Tasks\Posts as PostsTask;
+use MailPoet\Models\Newsletter;
+use MailPoet\Models\NewsletterPost;
+
+if(!defined('ABSPATH')) exit;
+
+class PostsTaskTest extends MailPoetTest {
+  function testItFailsWhenNoPostsArePresent() {
+    $newsletter = (object)array(
+      'id' => 1,
+    );
+    $rendered_newsletter = array(
+      'html' => 'Sample newsletter'
+    );
+    expect(PostsTask::extractAndSave($rendered_newsletter, $newsletter))->equals(false);
+  }
+
+  function testItCanExtractAndSavePosts() {
+    $post_id = 10;
+    $newsletter = (object)array(
+      'id' => 1,
+      'type' => Newsletter::TYPE_STANDARD
+    );
+    $rendered_newsletter = array(
+      'html' => '<a data-post-id="' . $post_id . '" href="#">sample post</a>'
+    );
+    expect(PostsTask::extractAndSave($rendered_newsletter, $newsletter))->equals(true);
+    $newsletter_post = NewsletterPost::where('newsletter_id', $newsletter->id)
+      ->findOne();
+    expect($newsletter_post->post_id)->equals($post_id);
+  }
+
+  function testItSetsNewsletterIdToParentIdWhenNewsletterIsANotificationHistory() {
+    $post_id = 10;
+    $newsletter = (object)array(
+      'id' => 2,
+      'parent_id' => 1,
+      'type' => Newsletter::TYPE_NOTIFICATION_HISTORY
+    );
+    $rendered_newsletter = array(
+      'html' => '<a data-post-id="' . $post_id . '" href="#">sample post</a>'
+    );
+    expect(PostsTask::extractAndSave($rendered_newsletter, $newsletter))->equals(true);
+    $newsletter_post = NewsletterPost::where('newsletter_id', $newsletter->parent_id)
+      ->findOne();
+    expect($newsletter_post->post_id)->equals($post_id);
+  }
+
+  function _after() {
+    ORM::raw_execute('TRUNCATE ' . NewsletterPost::$_table);
+  }
+}

tests/unit/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php

@@ -0,0 +1,28 @@
+<?php
+use MailPoet\Cron\Workers\SendingQueue\Tasks\Shortcodes;
+use MailPoet\Models\Newsletter;
+use MailPoet\Models\SendingQueue;
+
+if(!defined('ABSPATH')) exit;
+
+class ShortcodesTaskTest extends MailPoetTest {
+  function testItCanReplaceShortcodes() {
+    $queue = $newsletter = array(
+      'id' => 1
+
+    );
+    $subscriber = array(
+      'email' => 'test@xample. com',
+      'first_name' => 'John',
+      'last_name' => 'Doe'
+    );
+    $rendered_body = '[subscriber:firstname] [subscriber:lastname]';
+    $result = Shortcodes::process($rendered_body, $newsletter, $subscriber, $queue);
+    expect($result)->equals('John Doe');
+  }
+
+  function _after() {
+    ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);
+    ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
+  }
+}

tests/unit/Mailer/MailerLogTest.php

@@ -0,0 +1,136 @@
+<?php
+
+use MailPoet\Mailer\Mailer;
+use MailPoet\Mailer\MailerLog;
+use MailPoet\Models\Setting;
+
+class MailerLogTest extends MailPoetTest {
+  function testItGetsMailerLogWhenOneExists() {
+    $mailer_log = array(
+      'sent' => 0,
+      'started' => time()
+    );
+    Setting::setValue(MailerLog::SETTING_NAME, $mailer_log);
+    expect(MailerLog::getMailerLog())->equals($mailer_log);
+  }
+
+  function testItGetsMailerLogWhenOneDoesNotExist() {
+    $mailer_log = MailerLog::getMailerLog();
+    expect($mailer_log['sent'])->equals(0);
+    expect(strlen($mailer_log['started']))->greaterThan(5);
+  }
+
+  function testItCreatesMailer() {
+    $mailer_log = MailerLog::createMailerLog();
+    expect($mailer_log['sent'])->equals(0);
+    expect(strlen($mailer_log['started']))->greaterThan(5);
+  }
+
+  function testItResetsMailerLog() {
+    $mailer_log = array(
+      'sent' => 1,
+      'started' => time() - 10
+    );
+    Setting::setValue(MailerLog::SETTING_NAME, $mailer_log);
+    MailerLog::resetMailerLog();
+    $updated_mailer_log = Setting::getValue(MailerLog::SETTING_NAME);
+    expect($updated_mailer_log['sent'])->equals(0);
+    expect($updated_mailer_log['started'])->greaterThan($mailer_log['started']);
+  }
+
+  function testItUpdatesMailerLog() {
+    $mailer_log = array(
+      'sent' => 1,
+      'started' => time() - 10
+    );
+    MailerLog::updateMailerLog($mailer_log);
+    $updated_mailer_log = Setting::getValue(MailerLog::SETTING_NAME);
+    expect($updated_mailer_log)->equals($mailer_log);
+  }
+
+  function testItIncrementsSentCount() {
+    $mailer_log = array(
+      'sent' => 1,
+      'started' => time()
+    );
+    Setting::setValue(MailerLog::SETTING_NAME, $mailer_log);
+    MailerLog::incrementSentCount();
+    $updated_mailer_log = Setting::getValue(MailerLog::SETTING_NAME);
+    expect($updated_mailer_log['sent'])->equals(2);
+  }
+
+  function testItChecksWhenSendingLimitIsReached() {
+    $mailer_config = array(
+      'frequency' => array(
+        'emails' => 2,
+        'interval' => 1
+      )
+    );
+    Setting::setValue(Mailer::MAILER_CONFIG_SETTING_NAME, $mailer_config);
+
+    // limit is not reached
+    $mailer_log = array(
+      'sent' => 1,
+      'started' => time()
+    );
+    Setting::setValue(MailerLog::SETTING_NAME, $mailer_log);
+    expect(MailerLog::isSendingLimitReached())->false();
+
+    // limit is reached
+    $mailer_log = array(
+      'sent' => 2,
+      'started' => time()
+    );
+    Setting::setValue(MailerLog::SETTING_NAME, $mailer_log);
+    expect(MailerLog::isSendingLimitReached())->true();
+  }
+
+  function testItResetsMailerAfterSendingLimitWaitPeriodIsOver() {
+    $mailer_config = array(
+      'frequency' => array(
+        'emails' => 2,
+        'interval' => 1
+      )
+    );
+    $mailer_log = array(
+      'sent' => 2,
+      // (mailer config's interval * 60 seconds) + 1 second
+      'started' => time() - 61
+    );
+    Setting::setValue(MailerLog::SETTING_NAME, $mailer_log);
+    Setting::setValue(Mailer::MAILER_CONFIG_SETTING_NAME, $mailer_config);
+
+    // limit is not reached
+    expect(MailerLog::isSendingLimitReached())->false();
+    // mailer log is reset
+    $updated_mailer_log = Setting::getValue(MailerLog::SETTING_NAME);
+    expect($updated_mailer_log['sent'])->equals(0);
+  }
+
+  function testItCanEnforceSendingLimit() {
+    $mailer_config = array(
+      'frequency' => array(
+        'emails' => 2,
+        'interval' => 1
+      )
+    );
+    $mailer_log = array(
+      'sent' => 2,
+      'started' => time()
+    );
+    Setting::setValue(MailerLog::SETTING_NAME, $mailer_log);
+    Setting::setValue(Mailer::MAILER_CONFIG_SETTING_NAME, $mailer_config);
+
+    // exception is thrown when sending limit is reached
+    try {
+      MailerLog::enforceSendingLimit();
+      self::fail('Sending frequency exception was not thrown.');
+    } catch(\Exception $e) {
+      expect($e->getMessage())->equals('Sending frequency limit has been reached.');
+    }
+  }
+
+  function _after() {
+    ORM::raw_execute('TRUNCATE ' . Setting::$_table);
+  }
+}

tests/unit/Mailer/MailerTest.php

@@ -116,32 +116,32 @@ class MailerTest extends MailPoetTest {
   function testItSetsReplyToAddressWhenOnlyNameIsAvailable() {
     $reply_to = array('name' => 'test');
     $mailer = new Mailer($this->mailer, $this->sender, $reply_to);
-    $reply_to = $mailer->getReplyTo();
+    $reply_to = $mailer->getReplyToNameAndAddress();
     expect($reply_to['reply_to_email'])->equals($this->sender['address']);
   }
 
   function testItCanTransformSubscriber() {
     $mailer = new Mailer($this->mailer, $this->sender, $this->reply_to);
-    expect($mailer->transformSubscriber('test@email.com'))
+    expect($mailer->formatSubscriberNameAndEmailAddress('test@email.com'))
       ->equals('test@email.com');
-    expect($mailer->transformSubscriber(
+    expect($mailer->formatSubscriberNameAndEmailAddress(
       array(
         'email' => 'test@email.com'
       ))
     )->equals('test@email.com');
-    expect($mailer->transformSubscriber(
+    expect($mailer->formatSubscriberNameAndEmailAddress(
       array(
         'first_name' => 'First',
         'email' => 'test@email.com'
       ))
     )->equals('First <test@email.com>');
-    expect($mailer->transformSubscriber(
+    expect($mailer->formatSubscriberNameAndEmailAddress(
       array(
         'last_name' => 'Last',
         'email' => 'test@email.com'
       ))
     )->equals('Last <test@email.com>');
-    expect($mailer->transformSubscriber(
+    expect($mailer->formatSubscriberNameAndEmailAddress(
       array(
         'first_name' => 'First',
         'last_name' => 'Last',

tests/unit/Models/NewsletterPostTest.php

@@ -0,0 +1,25 @@
+<?php
+
+use Carbon\Carbon;
+use MailPoet\Models\NewsletterPost as NewsletterPost;
+
+class NewsletterPostTest extends MailPoetTest {
+  function testItCanGetLatestNewsletterPost() {
+    foreach(range(1, 5) as $index) {
+      $newsletter_post = NewsletterPost::create();
+      $newsletter_post->newsletter_id = 1;
+      $newsletter_post->post_id = $index;
+      $newsletter_post->save();
+      $newsletter_post->created_at = Carbon::now()
+        ->addMinutes($index);
+      $newsletter_post->save();
+    }
+    $latest_newsletter_post = NewsletterPost::getNewestNewsletterPost(1);
+    expect($latest_newsletter_post->post_id)->equals(5);
+  }
+
+  function _after() {
+    ORM::for_table(NewsletterPost::$_table)
+      ->deleteMany();
+  }
+}

tests/unit/Models/StatisticsUnsubscribesTest.php

@@ -0,0 +1,30 @@
+<?php
+
+use MailPoet\Models\StatisticsUnsubscribes;
+
+class StatisticsUnsubscribesTest extends MailPoetTest {
+  function testItCanGetExistingStatisticsRecord() {
+    $unsubscribe_statistics = StatisticsUnsubscribes::create();
+    $unsubscribe_statistics->newsletter_id = 123;
+    $unsubscribe_statistics->subscriber_id = 456;
+    $unsubscribe_statistics->queue_id = 789;
+    $unsubscribe_statistics->save();
+    $unsubscribe_statistics = StatisticsUnsubscribes::getOrCreate(456, 123, 789);
+    expect($unsubscribe_statistics->newsletter_id)->equals(123);
+    expect($unsubscribe_statistics->subscriber_id)->equals(456);
+    expect($unsubscribe_statistics->queue_id)->equals(789);
+  }
+
+  function testItCanCreateNewStatisticsRecord() {
+    expect(count(StatisticsUnsubscribes::findMany()))->equals(0);
+    $unsubscribe_statistics = StatisticsUnsubscribes::getOrCreate(456, 123, 789);
+    expect($unsubscribe_statistics->newsletter_id)->equals(123);
+    expect($unsubscribe_statistics->subscriber_id)->equals(456);
+    expect($unsubscribe_statistics->queue_id)->equals(789);
+  }
+
+  function _after() {
+    ORM::for_table(StatisticsUnsubscribes::$_table)
+      ->deleteMany();
+  }
+}

tests/unit/Models/SubscriberTest.php

@@ -438,6 +438,36 @@ class SubscriberTest extends MailPoetTest {
     expect($subscriber)->notEquals(false);
   }
 
+  function testItCanGetTheTotalNumberOfSubscribers() {
+    // remove all subscribers
+    Subscriber::deleteMany();
+
+    $subscriber_1 = Subscriber::createOrUpdate(array(
+      'email' => 'subscriber_1@mailpoet.com',
+      'status' => Subscriber::STATUS_SUBSCRIBED
+    ));
+
+    $subscriber_2 = Subscriber::createOrUpdate(array(
+      'email' => 'subscriber_2@mailpoet.com',
+      'status' => Subscriber::STATUS_UNCONFIRMED
+    ));
+
+    $subscriber_3 = Subscriber::createOrUpdate(array(
+      'email' => 'subscriber_3@mailpoet.com',
+      'status' => Subscriber::STATUS_UNSUBSCRIBED
+    ));
+
+    // counts only subscribed & unconfirmed users
+    $total = Subscriber::getTotalSubscribers();
+    expect($total)->equals(2);
+
+    $subscriber_1->status = Subscriber::STATUS_UNSUBSCRIBED;
+    $subscriber_1->save();
+
+    $total = Subscriber::getTotalSubscribers();
+    expect($total)->equals(1);
+  }
+
   function _after() {
     ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
     ORM::raw_execute('TRUNCATE ' . Segment::$_table);

tests/unit/Newsletter/Links/LinksTest.php

@@ -0,0 +1,105 @@
+<?php
+
+use Codeception\Util\Fixtures;
+use MailPoet\Models\NewsletterLink;
+use MailPoet\Models\SendingQueue;
+use MailPoet\Models\Subscriber;
+use MailPoet\Newsletter\Links\Links;
+use MailPoet\Router\Router;
+
+class LinksTest extends MailPoetTest {
+  function testItOnlyExtractsLinksFromHrefs() {
+    $template = '<a href="http://link1.com">some site</a> http://link2.com <img src="http://link3.com">';
+    $result = Links::extract($template);
+
+    expect($result[0])->equals(
+      array(
+        'html' => 'href="http://link1.com"',
+        'link' => 'http://link1.com'
+      )
+    );
+  }
+
+  function testItCanExtactLinkShortcodes() {
+    $template = '[notlink:shortcode] [link:some_link_shortcode]';
+    $result = Links::extract($template);
+
+    expect($result[0])->equals(
+      array(
+        'html' => '[link:some_link_shortcode]',
+        'link' => '[link:some_link_shortcode]'
+      )
+    );
+  }
+
+  function testItHashesAndReplacesLinks() {
+    $template = '<a href="http://link1.com">some site</a> [link:some_link_shortcode]';
+    list($updated_content, $hashed_links) = Links::process($template);
+
+    // 2 links were hashed
+    expect(count($hashed_links))->equals(2);
+    // links in returned content were replaced with hashes
+    expect($updated_content)
+      ->contains(Links::DATA_TAG_CLICK . '-' . $hashed_links[0]['hash']);
+    expect($updated_content)
+      ->contains(Links::DATA_TAG_CLICK . '-' . $hashed_links[1]['hash']);
+    expect($updated_content)->notContains('link');
+  }
+
+  function testItReplacesHashedLinksWithSubscriberData() {
+    $subscriber = Subscriber::create();
+    $subscriber->hydrate(Fixtures::get('subscriber_template'));
+    $subscriber->save();
+    $queue = SendingQueue::create();
+    $queue->newsletter_id = 1;
+    $queue->save();
+    $template = '<a href="[mailpoet_click_data]-1234">some site</a> <img src="[mailpoet_open_data]"/>';
+    $result = Links::replaceSubscriberData($subscriber->id, $queue->id, $template);
+
+    // there are no click/open data tags
+    expect($result)->notContains(Links::DATA_TAG_CLICK);
+    expect($result)->notContains(Links::DATA_TAG_OPEN);
+
+    // data tags were converted to URLs
+    expect($result)
+      ->regExp('/<a href="http.*?' . Router::NAME . '&endpoint=track&action=click&data=.*?>/');
+    expect($result)
+      ->regExp('/<img src="http.*?' . Router::NAME . '&endpoint=track&action=open&data=.*?>/');
+
+    // data was base64encoded, serialized and contains an array of variables
+    preg_match_all('/data=(?P<data>.*?)"/', $result, $result);
+    foreach($result['data'] as $data) {
+      $data = unserialize(base64_decode($data));
+      expect($data['subscriber_id'])->equals($subscriber->id);
+      expect($data['queue_id'])->equals($queue->id);
+      expect(isset($data['subscriber_token']))->true();
+    }
+  }
+
+  function testItCanSaveLinks() {
+    $links = array(
+      array(
+        'url' => 'http://example.com',
+        'hash' => 123
+      )
+    );
+    Links::save(
+      $links,
+      $newletter_id = 1,
+      $queue_id = 1
+    );
+
+    // 1 database record was created
+    $newsltter_link = NewsletterLink::where('newsletter_id', 1)
+      ->where('queue_id', 1)
+      ->findOne();
+    expect($newsltter_link->hash)->equals(123);
+    expect($newsltter_link->url)->equals('http://example.com');
+  }
+
+  function _after() {
+    ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
+    ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table);
+    ORM::raw_execute('TRUNCATE ' . NewsletterLink::$_table);
+  }
+}

tests/unit/Newsletter/ViewInBrowserTest.php

@@ -1,6 +1,5 @@
 <?php
 
-use Codeception\Util\Stub;
 use MailPoet\Models\Newsletter;
 use MailPoet\Models\SendingQueue;
 use MailPoet\Models\Setting;
@@ -57,17 +56,13 @@ class ViewInBrowserTest extends MailPoetTest {
       'type' => 'standard',
       'status' => 'active'
     );
-    $this->queue_rendered_newsletter_without_tracking = json_encode(
-      array(
-        'html' => 'Newsletter from queue. Hello, [subscriber:firstname] & 
+    $this->queue_rendered_newsletter_without_tracking = array(
+      'html' => 'Newsletter from queue. Hello, [subscriber:firstname] & 
         [link:newsletter_view_in_browser_url]'
-      )
     );
-    $this->queue_rendered_newsletter_with_tracking = json_encode(
-      array(
-        'html' => 'Newsletter from queue. Hello, [subscriber:firstname] & 
+    $this->queue_rendered_newsletter_with_tracking = array(
+      'html' => 'Newsletter from queue. Hello, [subscriber:firstname] & 
         [mailpoet_click_data]-90e56'
-      )
     );
     // instantiate class
     $this->view_in_browser = new ViewInBrowser();

tests/unit/_bootstrap.php

@@ -1 +1,46 @@
 <?php
+use Codeception\Util\Fixtures;
+
+Fixtures::add(
+  'newsletter_body_template',
+  '{
+     "content": {
+       "type": "container",
+       "orientation": "vertical",
+       "blocks": [
+         {
+           "type": "container",
+           "styles": { "block": {} },
+           "orientation": "horizontal",
+           "blocks": [
+             {
+               "type": "container",
+               "orientation": "vertical",
+               "styles": { "block": {} },
+               "blocks": [
+                 {
+                   "type": "text",
+                   "text": "<a data-post-id=\"10\" href=\"http://example.com\">Link</a>Hello [subscriber:firstname]"
+                 }
+               ]
+             }
+           ]
+         }
+       ]
+     }
+   }'
+);
+
+Fixtures::add(
+  'newsletter_subject_template',
+  'Newsletter for [subscriber:firstname]'
+);
+
+Fixtures::add(
+  'subscriber_template',
+  array(
+    'first_name' => 'John',
+    'last_name' => 'John',
+    'email' => 'john.doe@example.com'
+  )
+);

views/form/editor.html

@@ -274,18 +274,17 @@
         // form editor: default fields
         var template = Handlebars.compile($('#form_template_fields').html());
 
-        var data = {
-          fields: mailpoet_default_fields
-        };
-
         return MailPoet.Ajax.post({
           endpoint: 'customFields',
           action: 'getAll',
         }).done(function(response) {
-          data.fields  = $.merge(response.data, data.fields);
-
           // render toolbar
-          jQuery('#mailpoet_toolbar_fields').html(template(data));
+          jQuery('#mailpoet_toolbar_fields').html(template({
+            fields: $.merge(
+              $.merge([], mailpoet_default_fields),
+              response.data
+            )
+          }));
 
           setTimeout(function() {
             WysijaForm.init();
@@ -414,6 +413,13 @@
               MailPoet.Notice.success(
                 "<%= __('The form name was successfully updated!') %>"
               );
+            }).fail(function(response) {
+              if (response.errors.length > 0) {
+                MailPoet.Notice.error(
+                  response.errors.map(function(error) { return error.message; }),
+                  { scroll: true }
+                );
+              }
             });
           }
         }
@@ -454,9 +460,16 @@
             MailPoet.Modal.popup({
               title: "<%= __('Form preview') %>",
               template: $('#mailpoet_form_preview_template').html(),
-              data: response
+              data: response.data
             });
-          })
+          }).fail(function(response) {
+            if (response.errors.length > 0) {
+              MailPoet.Notice.error(
+                response.errors.map(function(error) { return error.message; }),
+                { scroll: true }
+              );
+            }
+          });
         }
 
         function mailpoet_form_save(callback) {
@@ -490,7 +503,7 @@
               if(callback !== false) {
                 var message = null;
 
-                if(response.is_widget === true) {
+                if(response.meta.is_widget === true) {
                   message = "<%= __('Saved! The changes are now active in your widget.') %>";
                 } else {
                   message = "<%= __('Saved! Add this form to %1$sa widget%2$s.') | format("<a href='widgets.php' target='_blank'>", '</a>') | raw %>";
@@ -500,7 +513,7 @@
                   MailPoet.Notice.hide();
                   MailPoet.Notice.success(message, {
                     scroll: true,
-                    static: (response.is_widget === false)
+                    static: (response.meta.is_widget === false)
                   });
                 }
 
@@ -539,10 +552,17 @@
           MailPoet.Ajax.post({
             endpoint: 'forms',
             action: 'exportsEditor',
-            data: $('#mailpoet_form_id').val()
+            data: {
+              id: $('#mailpoet_form_id').val()
+            }
           }).done(function(response) {
-            if(response.result !== false) {
-              $('#mailpoet_form_export').html(template({ exports: response }));
+            $('#mailpoet_form_export').html(template({ exports: response.data }));
+          }).fail(function(response) {
+            if (response.errors.length > 0) {
+              MailPoet.Notice.error(
+                response.errors.map(function(error) { return error.message; }),
+                { scroll: true }
+              );
             }
           });
         }

views/form/iframe.html

@@ -20,25 +20,6 @@
     <%= form | raw %>
     <script type="text/javascript">
       var MailPoetForm = <%= json_encode(mailpoet_form) %>;
-      function autoSize() {
-        var iframe = window.frameElement;
-        var height = document.body.scrollHeight;
-        parent.MailPoet.Iframe.setSize(iframe, height);
-      }
-
-      jQuery(function($) {
-        $(function() {
-          autoSize();
-        });
-      });
-
-      jQuery('form').on('submit', function() {
-        setTimeout(function() {
-          // make sure we resize the iframe
-          autoSize();
-        }.bind(this), 1);
-        return true;
-      }.bind(this));
     </script>
   </body>
 </html>

views/form/widget.html

@@ -9,7 +9,7 @@
     <%= styles | raw %>
     <form
       method="post"
-      action="<%= admin_url('admin-post.php?action=mailpoet') | raw %>"
+      action="<%= admin_url('admin-post.php?action=mailpoet_subscription_form') | raw %>"
       class="mailpoet_form mailpoet_form_<%= form_type %>"
       novalidate
     >
@@ -30,11 +30,14 @@
           <% if not(success) %>
           style="display:none;"
           <% endif %>
-        >
-          <%= form.settings.success_message %>
-        </p>
-        <p class="mailpoet_validate_error" style="display:none;">
-          <!-- errors will be displayed here -->
+        ><%= form.settings.success_message %></p>
+        <p class="mailpoet_validate_error"
+          <% if not(error) %>
+          style="display:none;"
+          <% endif %>
+        ><% if (error) %>
+           <%= __("An error occurred, make sure you have filled all the required fields.") %>
+          <% endif %>
         </p>
       </div>
     </form>

views/forms.html

@@ -41,6 +41,7 @@
 
     'formName': __('Name'),
     'segments': __('Lists'),
+    'userChoice': __('User choice:'),
     'signups': __('Signups'),
     'createdOn': __('Created On'),
     'oneFormTrashed': __('1 form was moved to the trash'),

views/limit.html

@@ -0,0 +1,28 @@
+<% extends 'layout.html' %>
+
+<% block content %>
+
+<div class="wrap about-wrap">
+  <h1><%= __("You've reached the %d subscribers limit!") | format(limit) %></h1>
+
+  <p class="about-text">
+    <%= __("MailPoet 3 is currently limited to %d subscribers.") | format(limit) %>
+  </p>
+
+  <img
+    src="http://i2.wp.com/www.mailpoet.com/wp-content/uploads/2015/05/sad-cat.gif?resize=500%2C212"
+    alt="sad-cat"
+    width="500"
+    height="212"
+  />
+
+  <h3><%= __('Immediately, you can:') %></h3>
+  <ul>
+    <li><%= __('Delete unconfirmed subscribers to have less than %d subscribers.') | format(limit) %></li>
+    <li>
+      <a href="http://www.mailpoet.com/support/"><%= __('Contact us')%></a>
+      <%= __('to become a Premium beta tester.')%>
+    </li>
+  </ul>
+</div>
+<% endblock %>

views/newsletter/editor.html

@@ -324,9 +324,7 @@
     'shortcodesWindowTitle': __('Select a shortcode'),
     'unsubscribeLinkMissing': __('All newsletters must include an "Unsubscribe" link. Add a footer widget to your newsletter to continue'),
     'newsletterPreviewEmailMissing': __('Enter an email address to send the preview newsletter to'),
-    'newsletterPreviewFailed': __('Preview failed. Please check console log'),
     'newsletterPreviewSent': __('Your test email has been sent!'),
-    'newsletterPreviewFailedToSend': __('Attempt to send a newsletter preview email failed. Please verify that your sending method is configured correctly and try again'),
     'templateNameMissing': __('Please add a template name'),
     'templateDescriptionMissing': __('Please add a template description'),
     'templateSaved': __('Template has been saved.'),
@@ -1197,14 +1195,23 @@
     MailPoet.Ajax.post({
       endpoint: 'newsletters',
       action: 'get',
-      data: <%= params('id') %>
-    }).done(function(newsletter) {
+      data: {
+        id: <%= params('id') %>
+      }
+    }).always(function() {
+      MailPoet.Modal.loading(false);
+    }).done(function(response) {
       EditorApplication.start({
-        newsletter: newsletter,
+        newsletter: response.data,
         config: config,
       });
-
-      MailPoet.Modal.loading(false);
+    }).fail(function(response) {
+      if (response.errors.length > 0) {
+        MailPoet.Notice.error(
+          response.errors.map(function(error) { return error.message; }),
+          { scroll: true }
+        );
+      }
     });
   </script>
 <% endblock %>

views/newsletter/templates/blocks/footer/block.hbs

@@ -16,5 +16,5 @@
         text-decoration: {{ model.styles.link.textDecoration }};
     }
 </style>
-<div class="mailpoet_content mailpoet_text_content mailpoet_ignore_drag">{{{ model.text }}}</div>
+<div class="mailpoet_content mailpoet_text_content">{{{ model.text }}}</div>
 <div class="mailpoet_block_highlight"></div>

views/newsletter/templates/blocks/header/block.hbs

@@ -16,5 +16,5 @@
         text-decoration: {{ model.styles.link.textDecoration }};
     }
 </style>
-<div class="mailpoet_content mailpoet_text_content mailpoet_ignore_drag">{{{ model.text }}}</div>
+<div class="mailpoet_content mailpoet_text_content">{{{ model.text }}}</div>
 <div class="mailpoet_block_highlight"></div>

views/newsletter/templates/blocks/text/block.hbs

@@ -1,3 +1,3 @@
 <div class="mailpoet_tools"></div>
-<div class="mailpoet_content mailpoet_text_content mailpoet_ignore_drag">{{{ model.text }}}</div>
+<div class="mailpoet_content mailpoet_text_content">{{{ model.text }}}</div>
 <div class="mailpoet_block_highlight"></div>

views/newsletter/templates/components/heading.hbs

@@ -10,6 +10,6 @@
   <input type="text"
     class="mailpoet_input mailpoet_input_preheader"
     value="{{ model.preheader }}"
-    placeholder="<%= __('Short summary text that follows the subject line when an email is viewed in the inbox') %>"
+    placeholder="<%= __('Preview text (usually displayed underneath the subject line in the inbox)') %>"
   />
 </div>

views/newsletters.html

@@ -99,13 +99,13 @@
     'preview': __('Preview'),
     'selectTemplateTitle': __('Select a template'),
 
-    'draftNewsletterTitle': __('Draft newsletter'),
+    'draftNewsletterTitle': __('Subject'),
     'pickCampaignType': __('Pick a type of campaign'),
     'regularNewsletterTypeTitle': __('Newsletter'),
     'regularNewsletterTypeDescription': __('Send a newsletter with images, buttons, dividers, and social bookmarks. Or, just send a basic text email.'),
     'create': __('Create'),
     'welcomeNewsletterTypeTitle': __('Welcome Email'),
-    'welcomeNewsletterTypeDescription': __('Send an email to new users'),
+    'welcomeNewsletterTypeDescription': __('Automatically send an email (or series of emails) to new subscribers or WordPress users. Send a day, a week, or a month after they sign up.'),
     'setUp': __('Set up'),
     'postNotificationNewsletterTypeTitle': __('Post Notifications'),
     'postNotificationsNewsletterTypeDescription': __('Automatically send posts immediately, daily, weekly or monthly. Filter by categories, if you like.'),

views/settings/advanced.html

@@ -29,7 +29,7 @@
         </label>
         <p class="description">
           <%= __('Select what will activate your newsletter queue.') %>
-          <a href="#TODO"
+          <a href="http://docs.mailpoet.com/article/129-what-is-the-newsletter-task-scheduler"
              target="_blank"
           ><%= __('Read more.') %></a>
         </p>
@@ -58,7 +58,7 @@
                 <% endif %>
               /><%= __("MailPoet's own script. Doesn't work with [link]these hosts[/link].")
                     |replace({
-                      '[link]': '<a target="_blank" href="#TODO">',
+                      '[link]': '<a target="_blank" href="http://docs.mailpoet.com/article/131-hosts-which-mailpoet-task-scheduler-wont-work">',
                       '[/link]': '</a>'
                       })
                     |raw
@@ -112,7 +112,7 @@
         <p class="description">
           <%= __('Share anonymous data and help us improve the plugin. We appreciate your help!') %>
           <a
-            href="http://support.mailpoet.com/knowledgebase/share-your-data/?utm_source=wpadmin&utm_campaign=advanced_settings"
+            href="http://docs.mailpoet.com/article/130-sharing-your-data-with-us"
             target="_blank"
           ><%= __('Read more.') %></a>
         </p>

views/settings/mta.html

@@ -85,7 +85,7 @@
     <p class="mailpoet_description">
       <strong><%= __('Free, but not recommended') %></strong>
       <br />
-      <%= __('Web hosts generally have a bad reputation as a sender. Your newsletter will probably be considered spam') %>
+      <%= __('Web hosts generally have a bad reputation as a sender. Your newsletter will probably be considered spam.') %>
     </p>
 
     <div class="mailpoet_status">
@@ -107,7 +107,11 @@
     <p class="mailpoet_description">
       <strong><%= __('Currently the best solution') %></strong>
       <br />
-      <%= __('Send with an external email provider. This is usually not free') %>
+      <%= __('Send with an external email provider. This is usually not free.') %>
+      <a
+        href="http://docs.mailpoet.com/article/53-send-with-smtp-when-using-a-professional-sending-provider"
+        target="_blank"
+      ><%= __('Read more.') %></a>
     </p>
 
     <div class="mailpoet_status">

views/settings/signup.html

@@ -8,7 +8,7 @@
         </label>
         <p class="description">
           <%= __("If you enable this option, your subscribers will first receive a confirmation email after they subscribe. Once they confirm their subscription (via this email), they will be marked as 'confirmed' and will begin to receive your email newsletters.") %>
-          <a href="#TODO" target="_blank"><%= __('Read more about Double Opt-in confirmation.') %></a>
+          <a href="http://docs.mailpoet.com/article/128-why-you-should-use-signup-confirmation-double-opt-in" target="_blank"><%= __('Read more about Double Opt-in confirmation.') %></a>
         </p>
       </th>
       <td>

views/subscribers/importExport/import.html

@@ -1,5 +1,5 @@
 <% set csvDescription = __('This file needs to be formatted in a CSV style (comma-separated-values.) Look at some [link]examples on our support site[/link].') %>
-<% set csvKBLink = '<a target="_blank" href="http://support.mailpoet.com/knowledgebase/importing-subscribers-with-a-csv-file?utm_source=wpadmin&utm_campaign=import">' %>
+<% set csvKBLink = '<a target="_blank" href="http://docs.mailpoet.com/article/126-importing-subscribers-with-csv-files">' %>
 <% extends 'layout.html' %>
 <% block content %>
 <div id="mailpoet_subscribers_import" class="wrap">

views/subscribers/importExport/import/step1.html

@@ -76,7 +76,7 @@
         <tr>
           <th scope="row">
             <label for="mailchimp_key">
-              <%= __('Enter you MailChimp API key') %>
+              <%= __('Enter your MailChimp API key') %>
             </label>
           </th>
           <td>
@@ -115,7 +115,7 @@
               <%=
               __('[link]Read more on support.mailpoet.com[/link]')
               |replace({
-              '[link]': '<a target="_blank" href="http://support.mailpoet.com/knowledgebase/dont-import-subscribers-who-didnt-sign-up/#utm_source=wpadmin&utm_campaign=importwarning">',
+              '[link]': '<a target="_blank" href="http://docs.mailpoet.com/article/127-checklist-before-importing-subscribers">',
               '[/link]': '</a>'
               })
               |raw