Merge branch 'release/0.7.2'

Author: repejota

.gitignore

@@ -1,7 +1,9 @@
 .contrib
+bin
 vendor
 cover
 *.phar
-composer.lock
+/composer.phar
+/composer.lock
 build
 .idea

.travis.yml

@@ -1,26 +1,20 @@
+sudo: required
+services:
+  - docker
 language: php
 php:
-  # - 5.4
   - 5.5
   - 5.6
   - 7
-  # - nightly
 cache:
   directories:
    - vendor
    - $HOME/.composer/cache
+before_install:
+  - docker run -d -p 4222:4222 --name nats nats
 before_script:
-  # - sudo apt-get install python-software-properties  # 12.04
-  # - sudo add-apt-repository -y ppa:duh/golang
-  # - sudo apt-get update
-  # - sudo apt-get install golang
-  # - export GOROOT=`go env GOROOT` && export GOPATH=$HOME/go
-  # - go get -u github.com/nats-io/gnatsd
-  # - gnats="$GOPATH/bin/gnatsd"
-  # - $gnats &
   - make deps
 script:
-  # - make cs
   - mkdir -p build/logs
   - make test
 after_script:

Makefile

@@ -1,25 +1,29 @@
+lint:
+	find src -name *.php -exec php -l {} \;
+	find test -name *.php -exec php -l {} \;
+	find spec -name *.php -exec php -l {} \;
+	find examples -name *.php -exec php -l {} \;
+
 cs: lint
-	./vendor/bin/phpcbf --standard=PSR2 src tests examples
-	./vendor/bin/phpcs --standard=PSR2 --warning-severity=0 src tests examples
-	./vendor/bin/phpcs --standard=Squiz --sniffs=Squiz.Commenting.FunctionComment,Squiz.Commenting.FunctionCommentThrowTag,Squiz.Commenting.ClassComment,Squiz.Commenting.VariableComment src tests examples
+	./bin/phpcbf --standard=PSR2 src tests examples
+	./bin/phpcs --standard=PSR2 --warning-severity=0 src tests examples
+	./bin/phpcs --standard=Squiz --sniffs=Squiz.Commenting.FunctionComment,Squiz.Commenting.FunctionCommentThrowTag,Squiz.Commenting.ClassComment,Squiz.Commenting.VariableComment src tests examples
 
 test:
-	./vendor/bin/phpunit
-
-cover:
-	./vendor/bin/phpunit --coverage-html ./cover
+	./vendor/bin/phpunit test
 
-lint:
-	find src -name *.php -exec php -l {} \;
-	find tests -name *.php -exec php -l {} \;
-	find examples -name *.php -exec php -l {} \;
+bdd:
+	./vendor/bin/phpspec run --format=pretty
 
+cover:
+	./vendor/bin/phpunit --coverage-html ./cover test
 deps:
 	wget -q https://getcomposer.org/composer.phar -O ./composer.phar
 	chmod +x composer.phar
 	php composer.phar install
 
 dist-clean:
+	rm -rf bin
 	rm -rf vendor
 	rm -f composer.phar
 	rm -f composer.lock

README.md

@@ -96,6 +96,8 @@ Developer's Information
 Tests are in the `tests` folder.
 To run them, you need `PHPUnit` and execute `make test`.
 
+We also have a BDD test suite under the `spec` folder.
+To run the suite, you need `PHPSpec` and execute `make bdd`.
 
 ### Code Quality
 

VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

composer.json

@@ -10,7 +10,8 @@
     "require-dev": {
         "phpunit/phpunit": "4.7.*",
         "satooshi/php-coveralls": "dev-master",
-        "squizlabs/php_codesniffer": "~2.0"
+        "squizlabs/php_codesniffer": "~2.0",
+        "phpspec/phpspec": "~2.0"
     },
     "authors": [
         {
@@ -38,13 +39,9 @@
         }
     ],
     "autoload": {
-        "psr-4": {
-            "Nats\\": "src"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\Nats\\": "tests/Unit"
+        "psr-0": {
+            "Nats": "src",
+            "Nats\\Test": "src"
         }
     }
 }

spec/Nats/ConnectionOptionsSpec.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace spec\Nats;
+
+use PhpSpec\ObjectBehavior;
+use Prophecy\Argument;
+
+class ConnectionOptionsSpec extends ObjectBehavior
+{
+    function it_is_initializable()
+    {
+        $this->shouldHaveType('Nats\ConnectionOptions');
+    }
+
+    function it_has_default_host_value_as_localhost() {
+        $this->getHost()->shouldEqual("localhost");
+    }
+
+    function it_has_default_port_value_as_4222() {
+        $this->getPort()->shouldBe(4222);
+    }
+
+    function it_has_default_user_value_as_null() {
+        $this->getUser()->shouldBe(null);
+    }
+
+    function it_has_default_pass_value_as_null() {
+        $this->getPass()->shouldBe(null);
+    }
+
+    function it_has_default_lang_value_as_php() {
+        $this->getLang()->shouldEqual("php");
+    }
+
+    function it_has_default_version_value_as_null() {
+        $this->getVersion()->shouldEqual("0.0.5");
+    }
+
+    function it_has_default_verbose_value_as_null() {
+        $this->isVerbose()->shouldBe(false);
+    }
+
+    function it_has_default_pedantic_value_as_null() {
+        $this->isPedantic()->shouldBe(false);
+    }
+
+    function it_has_default_reconnect_value_as_null() {
+        $this->isReconnect()->shouldBe(true);
+    }
+
+    function it_returns_a_valid_default_address() {
+        $this->getAddress()->shouldEqual("tcp://localhost:4222");
+    }
+}

spec/Nats/ConnectionSpec.php

@@ -0,0 +1,98 @@
+<?php
+namespace spec\Nats;
+
+use PhpSpec\ObjectBehavior;
+use Prophecy\Argument;
+
+class ConnectionSpec extends ObjectBehavior
+{
+    function it_is_initializable()
+    {
+        $this->shouldHaveType('Nats\Connection');
+    }
+
+    function it_has_ping_count_to_zero()
+    {
+        $this->pingsCount()->shouldBe(0);
+    }
+
+    function it_has_pubs_count_to_zero()
+    {
+        $this->pubsCount()->shouldBe(0);
+    }
+
+    function it_has_reconnects_count_to_zero()
+    {
+        $this->reconnectsCount()->shouldBe(0);
+    }
+
+    function it_has_subscriptions_count_to_zero()
+    {
+        $this->subscriptionsCount()->shouldBe(0);
+    }
+
+    function it_subscriptions_array_is_empty()
+    {
+        $this->getSubscriptions()->shouldHaveCount(0);
+    }
+
+    function it_is_disconnected()
+    {
+        $this->isConnected()->shouldBe(false);
+    }
+
+    function it_can_connect_and_disconnect_with_default_options()
+    {
+        $this->connect();
+        $this->shouldHaveType('Nats\Connection');
+        $this->isConnected()->shouldBe(true);
+        $this->close();
+        $this->isConnected()->shouldBe(false);
+    }
+
+    function it_increases_reconnects_count_on_each_reconnection()
+    {
+        $this->connect();
+        $this->reconnect();
+        $this->reconnectsCount()->shouldBe(1);
+        $this->isConnected()->shouldBe(true);
+        $this->close();
+    }
+
+    function it_a_ping_is_sent_after_a_successful_connection()
+    {
+        $this->connect();
+        $this->pingsCount()->shouldBe(1);
+        $this->close();
+    }
+
+    function it_increases_pubs_after_publishing_a_message()
+    {
+        $this->connect();
+        $this->publish("foo");
+        $this->pubsCount()->shouldBe(1);
+        $this->close();
+    }
+
+    function it_increases_subscriptions_after_subscribing_to_a_topic()
+    {
+        $this->connect();
+        $callback = function($payload) {};
+        $sid = $this->subscribe("foo", $callback);
+        $this->subscriptionsCount()->shouldBe(1);
+        $this->unsubscribe($sid);
+        $this->close();
+    }
+
+    function it_decreases_subscriptions_after_unsubscribing_to_a_topic()
+    {
+        $this->connect();
+        $callback = function($payload) {};
+        $sid = $this->subscribe("foo", $callback);
+        $this->unsubscribe($sid);
+        $this->subscriptionsCount()->shouldBe(0);
+        $this->close();
+    }
+
+
+}

src/Connection.php renamed to src/Nats/Connection.php

@@ -114,13 +114,6 @@ public function getSubscriptions()
      */
     private $streamSocket;
 
-    /**
-     * Stream wrapper for testing purposes.
-     *
-     * @var mixed StreamWrapper.
-     */
-    private $streamWrapper;
-
     /**
      * @var Generator
      */
@@ -137,7 +130,6 @@ public function __construct(ConnectionOptions $options = null)
         $this->pubs = 0;
         $this->subscriptions = [];
         $this->options = $options;
-        $this->streamWrapper = new StreamWrapper();
         $randomFactory = new Factory();
         $this->randomGenerator = $randomFactory->getLowStrengthGenerator();
 
@@ -146,18 +138,6 @@ public function __construct(ConnectionOptions $options = null)
         }
     }
 
-    /**
-     * Setter for $streamWrapper. For testing purposes.
-     *
-     * @param StreamWrapper $streamWrapper StreamWrapper for testing purposes.
-     *
-     * @return void
-     */
-    public function setStreamWrapper(StreamWrapper $streamWrapper)
-    {
-        $this->streamWrapper = $streamWrapper;
-    }
-
     /**
      * Sends data thought the stream.
      *
@@ -187,7 +167,7 @@ private function receive($len = null)
             $receivedBytes = 0;
             while ($receivedBytes < $len) {
                 $bytesLeft = $len - $receivedBytes;
-                if ( $bytesLeft < 1500 ) {
+                if ( $bytesLeft < $this->chunkSize ) {
                     $chunkSize = $bytesLeft;
                 }
 
@@ -220,13 +200,16 @@ private function getStream($address, $timeout = null)
         $errno = null;
         $errstr = null;
 
-        $fp = $this->streamWrapper->getStreamSocketClient($address, $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT);
+        $fp = stream_socket_client($address, $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT);
+        $timeout = number_format($timeout, 3);
+        $seconds = floor($timeout);
+        $microseconds = ($timeout - $seconds) * 1000;
+        stream_set_timeout($fp, $seconds, $microseconds);
 
         if (!$fp) {
             throw new \Exception($errstr, $errno);
         }
 
-        //stream_set_blocking($fp, 0);
         return $fp;
     }
 
@@ -250,19 +233,22 @@ public function isConnected()
      */
     public function connect($timeout = null)
     {
+
         $this->timeout = $timeout;
         $this->streamSocket = $this->getStream($this->options->getAddress(), $timeout);
+
         $msg = 'CONNECT '.$this->options;
         $this->send($msg);
-
-        $response = $this->receive();
+        $connect_response = $this->receive();
+        if (strpos($connect_response, '-ERR')!== false) {
+            throw new \Exception("Failing connection: $connect_response");
+        }
 
         $this->ping();
-        $response = $this->receive();
-
-        if ($response !== "PONG") {
-            if (strpos($response, '-ERR')!== false) {
-                throw new \Exception("Failing connection: $response");
+        $ping_response = $this->receive();
+        if ($ping_response !== "PONG") {
+            if (strpos($ping_response, '-ERR')!== false) {
+                throw new \Exception("Failing on first ping: $ping_response");
             }
         }
     }
@@ -381,7 +367,7 @@ private function handlePING()
     /**
      * Handles MSG command.
      *
-     * @param string $line Message command from NATS.
+     * @param string $line Message command from Nats.
      *
      * @return void
      * @throws Exception
@@ -471,7 +457,6 @@ public function setStreamTimeout($seconds)
                 }
             }
         }
-
         return false;
     }