Merge pull request GoogleCloudPlatform#46 from GoogleCloudPlatform/add-mailjet

adds mailjet, fixes a few mailgun issues

Author: bshaffer

.travis.yml

@@ -64,6 +64,11 @@ script:
   - composer install
   - phpunit test
   - popd
+  # run mailjet tests
+  - pushd appengine/standard/mailjet
+  - composer install
+  - phpunit test
+  - popd
   # run cloudsql tests
   - pushd appengine/standard/cloudsql
   - composer install

appengine/standard/mailgun/README.md

@@ -7,8 +7,8 @@ This sample application demonstrates how to use [Mailgun with Google App Engine]
 Before running this sample:
 
 1. You will need a [Mailgun account](http://www.mailgun.com/google).
-2. Update the `MAILGUN_DOMAIN_NAME` and `MAILGUN_API_KEY` constants in `index.php`.
-   You can use your account's sandbox domain.
+2. Update `MAILGUN_DOMAIN` and `MAILGUN_API_KEY` in `index.php` to match your
+   Mailgun credentials. You can use your account's sandbox domain.
 
 ## Prerequisites
 

appengine/standard/mailgun/app.php

@@ -23,8 +23,8 @@
 $app = new Application();
 
 $app->get('/', function () use ($app) {
-    if ($app['mailgun.domain'] == 'YOUR_DOMAIN_NAME') {
-        return 'set your mailgun domain and API key in web/index.php';
+    if ($app['mailgun.domain'] == 'MAILGUN_DOMAIN_NAME') {
+        return 'set your mailgun domain and API key in index.php';
     }
     return <<
 

appengine/standard/mailgun/functions.php

@@ -1,13 +1,12 @@
 
 
 use Mailgun\Mailgun;
-use Http\Adapter\Guzzle6\Client;
 
 # [START simple_message]
 function sendSimpleMessage($recipient, $mailgunDomain, $mailgunApiKey)
 {
     // Instantiate the client.
-    $httpClient = new Client();
+    $httpClient = new Http\Adapter\Guzzle6\Client();
     $mailgunClient = new Mailgun($mailgunApiKey, $httpClient);
 
     // Make the call to the client.
@@ -24,7 +23,7 @@ function sendSimpleMessage($recipient, $mailgunDomain, $mailgunApiKey)
 function sendComplexMessage($recipient, $mailgunDomain, $mailgunApiKey, $cc = '[email protected]', $bcc = '[email protected]')
 {
     // Instantiate the client.
-    $httpClient = new Client();
+    $httpClient = new Http\Adapter\Guzzle6\Client();
     $mailgunClient = new Mailgun($mailgunApiKey, $httpClient);
     $fileAttachment = __DIR__ . '/attachment.txt';
 

appengine/standard/mailgun/index.php

@@ -17,16 +17,15 @@
 
 // Install composer dependencies with "composer install"
 // @see http://getcomposer.org for more information.
-require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/vendor/autoload.php';
 
-$app = require __DIR__ . '/../src/app.php';
+$app = require __DIR__ . '/app.php';
 
 // set your Mailgun domain name and API key
-$app['mailgun.domain'] = 'YOUR_DOMAIN_NAME';;
-$app['mailgun.api_key'] = 'YOUR_API_KEY';
+$app['mailgun.domain'] = 'MAILGUN_DOMAIN_NAME';;
+$app['mailgun.api_key'] = 'MAILGUN_API_KEY';
 
 // Run the app!
 // use "gcloud preview app deploy" or run "php -S localhost:8000"
-// and browse to "mailgun.php"
 $app['debug'] = true;
 $app->run();

appengine/standard/mailgun/test/mailgunTest.php

@@ -35,7 +35,7 @@ public function createApplication()
         $mailgunApiKey = getenv('MAILGUN_APIKEY');
 
         if (empty($mailgunDomain) || empty($mailgunApiKey)) {
-            $this->markTestSkipped('set the GOOGLE_PROJECT_ID, MAILGUN_DOMAIN and MAILGUN_APIKEY environment variables');
+            $this->markTestSkipped('set the MAILGUN_DOMAIN and MAILGUN_APIKEY environment variables');
         }
 
         $app['mailgun.domain'] = $mailgunDomain;

appengine/standard/mailjet/README.md

@@ -0,0 +1,49 @@
+# Mailjet & Google App Engine
+
+This sample application demonstrates how to use [Mailjet with Google App Engine](https://cloud.google.com/appengine/docs/php/mail/).
+
+## Setup
+
+Before running this sample:
+
+1. You will need a [Mailjet account](http://www.mailjet.com).
+2. Update `MAILJET_API_KEY` and `MAILJET_SECRET` in `index.php` to match your
+   Mailjet credentials.
+
+## Prerequisites
+
+- Install [`composer`](https://getcomposer.org)
+- Install dependencies by running:
+
+```sh
+composer install
+```
+
+## Run locally
+
+you can run locally using PHP's built-in web server:
+
+```sh
+cd php-docs-samples/appengine/standard/mailjet
+php -S localhost:8080
+```
+
+Now you can view the app running at [http://localhost:8080](http://localhost:8080)
+in your browser.
+
+## Deploy to App Engine
+
+**Prerequisites**
+
+- Install the [Google Cloud SDK](https://developers.google.com/cloud/sdk/).
+
+**Deploy with gcloud**
+
+```
+gcloud config set project YOUR_PROJECT_ID
+gcloud preview app deploy
+gcloud preview app browse
+```
+
+The last command will open `https://{YOUR_PROJECT_ID}.appspot.com/`
+in your browser.

appengine/standard/mailjet/app.php

@@ -0,0 +1,86 @@
+
+/**
+ * Copyright 2015 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+use Silex\Application;
+
+// create the Silex application
+$app = new Application();
+
+$app->get('/', function () use ($app) {
+    /** @var Mailjet\Client $mailjet */
+    $mailjet = $app['mailjet'];
+    return <<
+
+
+
+
+
+
+
+EOF;
+});
+
+$app->post('/send', function () use ($app) {
+    /** @var Symfony\Component\HttpFoundation\Request $request */
+    $request = $app['request'];
+    /** @var Mailjet\Client $mailjet */
+    $mailjet = $app['mailjet'];
+    $recipient = $request->get('recipient');
+
+    # [START send_email]
+    $body = [
+        'FromEmail' => "[email protected]",
+        'FromName' => "Testing Mailjet",
+        'Subject' => "Your email flight plan!",
+        'Text-part' => "Dear passenger, welcome to Mailjet! May the delivery force be with you!",
+        'Html-part' => "Dear passenger, welcome to Mailjet!May the delivery force be with you!",
+        'Recipients' => [
+            [
+                'Email' => $recipient,
+            ]
+        ]
+    ];
+
+    // trigger the API call
+    $response = $mailjet->post(Mailjet\Resources::$Email, ['body' => $body]);
+    if ($response->success()) {
+        // if the call succed, data will go here
+        return sprintf(
+            '%s',
+            json_encode($response->getData(), JSON_PRETTY_PRINT)
+        );
+    }
+
+    return 'Error: ' . print_r($response->getStatus(), true);
+    # [END send_email]
+});
+
+$app['mailjet'] = function () use ($app) {
+    if ($app['mailjet.api_key'] == 'MAILJET_API_KEY') {
+        return 'set your mailjet api key and secret in index.php';
+    }
+    $mailjetApiKey = $app['mailjet.api_key'];
+    $mailjetSecret = $app['mailjet.secret'];
+
+    # [START mailjet_client]
+    $mailjet = new Mailjet\Client($mailjetApiKey, $mailjetSecret);
+    # [END mailjet_client]
+
+    return $mailjet;
+};
+
+return $app;

appengine/standard/mailjet/app.yaml

@@ -0,0 +1,7 @@
+runtime: php55
+threadsafe: yes
+api_version: 1
+
+handlers:
+- url: .*
+  script: index.php

appengine/standard/mailjet/composer.json

@@ -0,0 +1,9 @@
+{
+    "require": {
+        "silex/silex": "^1.3",
+        "mailjet/mailjet-apiv3-php": "^1.1"
+    },
+    "require-dev": {
+        "symfony/browser-kit": "^3.0"
+    }
+}