Merge branch 'upgrade-4.1'

Conflicts:
	README.md
	composer.json

Author: vyuldashev

README.md

@@ -5,7 +5,7 @@ RabbitMQ driver for Laravel
 
 Require this package in your composer.json and run composer update:
 
-	"fintech-fab/laravel-queue-rabbitmq": "4.0"
+	"fintech-fab/laravel-queue-rabbitmq": "4.1"
 
 or run:
 
@@ -20,31 +20,44 @@ After composer update is finished you need to add ServiceProvider to your `provi
 now you are able to configure your connections in queue.php:
 
     return array(
-    
-        'default'     => 'rabbitmq',
-    
-        'connections' => array(
-    
-            'rabbitmq' => array(
-                'driver'        => 'rabbitmq',
-    
-                'host'          => '',
-                'port'          => '',
-    
-                'vhost'         => '',
-                'login'         => '',
-                'password'      => '',
-    
-                'queue'         => '', // name of the default queue
-                'exchange_name' => '', // name of the exchange
-            ),
-    
-        ),
-    
+
+    	'default'     => 'rabbitmq',
+
+    	'connections' => array(
+
+    		'rabbitmq' => array(
+    			'driver'         => 'rabbitmq',
+
+    			'host'           => '',
+    			'port'           => '',
+
+    			'vhost'          => '',
+    			'login'          => '',
+    			'password'       => '',
+
+    			'queue'          => '', // name of the default queue
+
+    			'exchange_name'  => '', // name of the exchange
+
+    			// Type of your exchange
+    			// Can be AMQP_EX_TYPE_DIRECT or AMQP_EX_TYPE_FANOUT
+    			// see documentation for more info
+    			// http://www.rabbitmq.com/tutorials/amqp-concepts.html
+    			'exchange_type'  => AMQP_EX_TYPE_DIRECT,
+    			'exchange_flags' => AMQP_DURABLE,
+
+
+    		),
+
+    	),
+
     );
 
 You can also find these examples in src/examples folder. 
 
+####Usage
+Once you completed the configuration you can use Laravel Queue API. If you used other queue drivers you do not need to change anything else. If you do not know how to use Queue API, please refer to the official Laravel documentation: http://laravel.com/docs/queues
+
 ####PHPUnit
 Unit tests will be provided soon.
 

composer.json

@@ -1,6 +1,6 @@
 {
 	"name": "fintech-fab/laravel-queue-rabbitmq",
-	"version": "4.0",
+	"version": "4.1",
 	"description": "RabbitMQ driver for Laravel Queue",
 	"license": "Apache-2.0",
 	"authors": [
@@ -11,8 +11,8 @@
 	],
 	"require": {
 		"php": ">=5.3.0",
-		"illuminate/support": "4.0.x",
-		"illuminate/queue": "4.0.*@dev"
+		"illuminate/support": "4.1.*@dev",
+		"illuminate/queue": "4.1.*@dev"
 	},
 	"suggest": {
 		"ext-amqp": "PECL extension for the AMQP protocol - this is preferred"

src/FintechFab/LaravelQueueRabbitMQ/Queue/Connectors/RabbitMQConnector.php

@@ -21,10 +21,20 @@ public function connect(array $config)
 		$connection = new AMQPConnection($config);
 		$connection->connect();
 
+		if (!isset($config['exchange_type'])) {
+			$config['exchange_type'] = AMQP_EX_TYPE_DIRECT;
+		}
+
+		if (!isset($config['exchange_flags'])) {
+			$config['exchange_flags'] = AMQP_DURABLE;
+		}
+
 		return new RabbitMQQueue(
 			$connection,
 			$config['queue'],
-			$config['exchange_name']
+			$config['exchange_name'],
+			$config['exchange_type'],
+			$config['exchange_flags']
 		);
 	}
 }

src/FintechFab/LaravelQueueRabbitMQ/Queue/Jobs/RabbitMQJob.php

@@ -28,6 +28,16 @@ public function fire()
 		$this->resolveAndFire(json_decode($this->envelope->getBody(), true));
 	}
 
+	/**
+	 * Get the raw body string for the job.
+	 *
+	 * @return string
+	 */
+	public function getRawBody()
+	{
+		return $this->envelope->getBody();
+	}
+
 	/**
 	 * Delete the job from the queue.
 	 *

src/FintechFab/LaravelQueueRabbitMQ/Queue/RabbitMQQueue.php

@@ -18,19 +18,24 @@ class RabbitMQQueue extends Queue implements QueueInterface
 	protected $exchange;
 	protected $default_queue;
 	protected $exchange_name;
+	protected $exchange_type;
+	protected $exchange_flags;
 
 	/**
 	 * @param AMQPConnection $amqpConnection
 	 * @param string         $default_queue
 	 * @param string         $exchange_name
 	 *
-	 * @internal param string $routing_key
+	 * @param mixed          $exchange_type
+	 * @param mixed          $exchange_flags
 	 */
-	public function __construct(AMQPConnection $amqpConnection, $default_queue, $exchange_name)
+	public function __construct(AMQPConnection $amqpConnection, $default_queue, $exchange_name, $exchange_type, $exchange_flags)
 	{
 		$this->connection = $amqpConnection;
 		$this->default_queue = $default_queue;
 		$this->exchange_name = $exchange_name;
+		$this->exchange_type = $exchange_type;
+		$this->exchange_flags = $exchange_flags;
 		$this->channel = $this->getChannel();
 		$this->exchange = $this->getExchange($this->channel);
 	}
@@ -62,6 +67,31 @@ public function push($job, $data = '', $queue = null)
 		return $job;
 	}
 
+	/**
+	 * Push a raw payload onto the queue.
+	 *
+	 * @param  string $payload
+	 * @param  string $queue
+	 * @param  array  $options
+	 *
+	 * @throws \AMQPException
+	 * @return mixed
+	 */
+	public function pushRaw($payload, $queue = null, array $options = array())
+	{
+		// get queue
+		$queue = $this->declareQueue($queue);
+
+		// push task to a queue
+		$job = $this->exchange->publish($payload, $queue->getName());
+
+		if (!$job) {
+			throw new AMQPException('Could not push job to a queue');
+		}
+
+		return $job;
+	}
+
 	/**
 	 * Push a new job onto the queue after a delay.
 	 *
@@ -139,7 +169,8 @@ public function getExchange(AMQPChannel $channel)
 	{
 		$exchange = new AMQPExchange($channel);
 		$exchange->setName($this->exchange_name);
-		$exchange->setType(AMQP_EX_TYPE_DIRECT);
+		$exchange->setFlags($this->exchange_flags);
+		$exchange->setType($this->exchange_type);
 		$exchange->declareExchange();
 
 		return $exchange;

src/examples/queue.php

@@ -12,17 +12,27 @@
 	'connections' => array(
 
 		'rabbitmq' => array(
-			'driver'        => 'rabbitmq',
+			'driver'         => 'rabbitmq',
 
-			'host'          => '',
-			'port'          => '',
+			'host'           => '',
+			'port'           => '',
+
+			'vhost'          => '',
+			'login'          => '',
+			'password'       => '',
+
+			'queue'          => '', // name of the default queue
+
+			'exchange_name'  => '', // name of the exchange
+
+			// Type of your exchange
+			// Can be AMQP_EX_TYPE_DIRECT or AMQP_EX_TYPE_FANOUT
+			// see documentation for more info
+			// http://www.rabbitmq.com/tutorials/amqp-concepts.html
+			'exchange_type'  => AMQP_EX_TYPE_DIRECT,
+			'exchange_flags' => AMQP_DURABLE,
 
-			'vhost'         => '',
-			'login'         => '',
-			'password'      => '',
 
-			'queue'         => '', // name of the default queue
-			'exchange_name' => '', // name of the exchange
 		),
 
 	),