#286 Add [lazy] configuration for RPC client, update documentation and tests

Author: skafandri

DependencyInjection/Configuration.php

@@ -244,6 +244,7 @@ protected function addRpcClients(ArrayNodeDefinition $node)
                             ->scalarNode('connection')->defaultValue('default')->end()
                             ->booleanNode('expect_serialized_response')->defaultTrue()->end()
                             ->scalarNode('unserializer')->defaultValue('unserialize')->end()
+                            ->booleanNode('lazy')->defaultFalse()->end()
                         ->end()
                     ->end()
                 ->end()

DependencyInjection/OldSoundRabbitMqExtension.php

@@ -389,7 +389,7 @@ protected function loadRpcClients()
     {
         foreach ($this->config['rpc_clients'] as $key => $client) {
             $definition = new Definition('%old_sound_rabbit_mq.rpc_client.class%');
-            $definition->setLazy(true);
+            $definition->setLazy($client['lazy']);
             $definition
                 ->addTag('old_sound_rabbit_mq.rpc_client')
                 ->addMethodCall('initClient', array($client['expect_serialized_response']));

README.md

@@ -370,8 +370,9 @@ Let's add a RPC client and server into the configuration:
 ```yaml
 rpc_clients:
     integer_store:
-        connection: default
-        unserializer: json_decode
+        connection: default #default: default
+        unserializer: json_decode #default: unserialize
+        lazy: true #default: false
 rpc_servers:
     random_int:
         connection: default

Tests/DependencyInjection/Fixtures/rpc-clients.yml

@@ -0,0 +1,19 @@
+old_sound_rabbit_mq:
+    enable_collector: true
+    connections:
+        foo_connection:
+            host:     foo_host
+            port:     123
+            user:     foo_user
+            password: foo_password
+            vhost:    /foo
+
+    rpc_clients:
+        foo_client:
+            connection:      foo_connection
+            unserializer:    json_decode
+        lazy_client:
+            connection:      default
+            lazy: true
+
+        default_client:

Tests/DependencyInjection/Fixtures/test.yml

@@ -162,13 +162,6 @@ old_sound_rabbit_mq:
                 type:        direct
             callback:        default_anon.callback
 
-    rpc_clients:
-        foo_client:
-            connection:      foo_connection
-            unserializer:    json_decode
-
-        default_client:
-
     rpc_servers:
         foo_server:
             connection:      foo_connection

Tests/DependencyInjection/OldSoundRabbitMqExtensionTest.php

@@ -597,7 +597,7 @@ public function testDefaultAnonConsumerDefinition()
 
     public function testFooRpcClientDefinition()
     {
-        $container = $this->getContainer('test.yml');
+        $container = $this->getContainer('rpc-clients.yml');
 
         $this->assertTrue($container->has('old_sound_rabbit_mq.foo_client_rpc'));
         $definition = $container->getDefinition('old_sound_rabbit_mq.foo_client_rpc');
@@ -615,7 +615,7 @@ public function testFooRpcClientDefinition()
 
     public function testDefaultRpcClientDefinition()
     {
-        $container = $this->getContainer('test.yml');
+        $container = $this->getContainer('rpc-clients.yml');
 
         $this->assertTrue($container->has('old_sound_rabbit_mq.default_client_rpc'));
         $definition = $container->getDefinition('old_sound_rabbit_mq.default_client_rpc');
@@ -628,6 +628,26 @@ public function testDefaultRpcClientDefinition()
             ),
             $definition->getMethodCalls()
         );
+        $this->assertFalse($definition->isLazy());
+        $this->assertEquals('%old_sound_rabbit_mq.rpc_client.class%', $definition->getClass());
+    }
+
+    public function testLazyRpcClientDefinition()
+    {
+        $container = $this->getContainer('rpc-clients.yml');
+
+        $this->assertTrue($container->has('old_sound_rabbit_mq.lazy_client_rpc'));
+        $definition = $container->getDefinition('old_sound_rabbit_mq.lazy_client_rpc');
+        $this->assertEquals((string) $definition->getArgument(0), 'old_sound_rabbit_mq.connection.default');
+        $this->assertEquals((string) $definition->getArgument(1), 'old_sound_rabbit_mq.channel.lazy_client');
+        $this->assertEquals(
+            array(
+                array('initClient', array(true)),
+                array('setUnserializer', array('unserialize'))
+            ),
+            $definition->getMethodCalls()
+        );
+        $this->assertTrue($definition->isLazy());
         $this->assertEquals('%old_sound_rabbit_mq.rpc_client.class%', $definition->getClass());
     }