RSH1a New push.admin.publish

src/AblyRest.php

@@ -60,6 +60,7 @@ public function __construct( $options = [] ) {
         $authClass = $this->options->authClass;
         $this->auth = new $authClass( $this, $this->options );
         $this->channels = new Channels( $this );
+        $this->push = new Push( $this );
 
         return $this;
     }

src/Http.php

@@ -158,7 +158,11 @@ public function request( $method, $url, $headers = [], $params = [] ) {
         $body = substr( $raw, $info['header_size'] );
         $decodedBody = json_decode( $body );
 
-        $response = [ 'headers' => $resHeaders, 'body' => $decodedBody ? $decodedBody : $body ];
+        $response = [
+            'headers' => $resHeaders,
+            'body' => $decodedBody ? $decodedBody : $body,
+            'info' => $info,
+        ];
 
         Log::v( 'cURL request response:', $info['http_code'], $response );
 

src/Push.php

@@ -0,0 +1,17 @@
+<?php
+namespace Ably;
+
+class Push {
+
+    private $ably;
+
+    /**
+     * Constructor
+     * @param AblyRest $ably Ably API instance
+     */
+    public function __construct( AblyRest $ably ) {
+        $this->ably = $ably;
+        $this->admin = new PushAdmin( $ably );
+    }
+
+}

src/PushAdmin.php

@@ -0,0 +1,30 @@
+<?php
+namespace Ably;
+
+class PushAdmin {
+
+    private $ably;
+
+    /**
+     * Constructor
+     * @param AblyRest $ably Ably API instance
+     */
+    public function __construct( AblyRest $ably ) {
+        $this->ably = $ably;
+    }
+
+    public function publish ( array $recipient, array $data, $returnHeaders = false ) {
+        if ( empty($recipient) ) {
+            throw new \InvalidArgumentException('recipient is empty');
+        }
+
+        if ( empty($data) ) {
+            throw new \InvalidArgumentException('data is empty');
+        }
+
+        $params = array_merge( $data, [ 'recipient' => $recipient ] );
+        $params = json_encode( $params );
+        return $this->ably->post( '/push/publish', [], $params, $returnHeaders );
+    }
+
+}

tests/PushAdminTest.php

@@ -0,0 +1,63 @@
+<?php
+namespace tests;
+use Ably\AblyRest;
+
+require_once __DIR__ . '/factories/TestApp.php';
+
+
+class PushAdminTest extends \PHPUnit_Framework_TestCase {
+    protected static $testApp;
+    protected static $defaultOptions;
+    protected static $ably;
+
+    public static function setUpBeforeClass() {
+        self::$testApp = new TestApp();
+        self::$defaultOptions = self::$testApp->getOptions();
+        self::$ably = new AblyRest( array_merge( self::$defaultOptions, [
+            'key' => self::$testApp->getAppKeyDefault()->string,
+        ] ) );
+    }
+
+    public static function tearDownAfterClass() {
+        self::$testApp->release();
+    }
+
+    /**
+     * RSH1a
+     */
+    public function testAdminPublish() {
+        $channelName = 'pushenabled:push_admin_publish-ok';
+        $recipient = [
+            'transportType' => 'ablyChannel',
+            'channel' => $channelName,
+            'ablyKey' => self::$ably->options->key,
+            'ablyUrl' => self::$testApp->server
+        ];
+        $data = [ 'data' => [ 'foo' => 'bar' ] ];
+
+        $res = self::$ably->push->admin->publish( $recipient, $data , true );
+        $this->assertEquals($res['info']['http_code'] , 204 );
+
+        $channel = self::$ably->channel($channelName);
+        $history = $channel->history();
+        $this->assertEquals( 1, count($history->items), 'Expected 1 message' );
+    }
+
+    public function badValues() {
+        $recipient = [ 'clientId' => 'ablyChannel' ];
+        $data = [ 'data' => [ 'foo' => 'bar' ] ];
+
+        return [
+            [ [], $data ],
+            [ $recipient, [] ],
+        ];
+    }
+
+    /**
+     * @dataProvider badValues
+     * @expectedException InvalidArgumentException
+     */
+    public function testAdminPublishInvalid($recipient, $data) {
+        self::$ably->push->admin->publish( $recipient, $data );
+    }
+}

tests/factories/TestApp.php

@@ -18,7 +18,7 @@ class TestApp {
     private $fixture;
     private $appId;
     private $appKeys = [];
-    private $server;
+    public $server;
     private $debugRequests = false;
 
     public function __construct() {