Merge pull request grails-plugins#4 from charliek/master

Update spring build so queues and exchanges build, and update to new version number

Author: jeffscottbrown

RabbitmqGrailsPlugin.groovy

@@ -8,11 +8,11 @@ import org.springframework.amqp.rabbit.core.RabbitAdmin
 import org.springframework.amqp.rabbit.core.RabbitTemplate
 import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer
 import org.springframework.amqp.rabbit.listener.adapter.MessageListenerAdapter
-
+import static org.springframework.amqp.core.Binding.DestinationType.QUEUE
 
 class RabbitmqGrailsPlugin {
     // the plugin version
-    def version = "0.3.1"
+    def version = "0.3.3"
     // the version or versions of Grails the plugin is designed for
     def grailsVersion = "1.2 > *"
     // the other plugins this plugin depends on
@@ -104,7 +104,7 @@ The Rabbit MQ plugin provides integration with the Rabbit MQ Messaging System.
                         channelTransacted = transactional
                         connectionFactory = rabbitMQConnectionFactory
                         concurrentConsumers = connectionFactoryConsumers
-                        queueName = rabbitQueue
+                        queueNames = rabbitQueue
                     }
                 }
                 else {
@@ -147,26 +147,25 @@ The Rabbit MQ plugin provides integration with the Rabbit MQ Messaging System.
                     if (log.debugEnabled) {
                         log.debug "Registering exchange '${exchange.name}'"
                     }
-                    
-                    "grails.rabbit.exchange.${exchange.name}"(exchange.type, exchange.name) {
-                        durable = Boolean.valueOf(exchange.durable)
-                        autoDelete = Boolean.valueOf(exchange.autoDelete)
-                        arguments = exchange.arguments
-                    }
+
+                    "grails.rabbit.exchange.${exchange.name}"(exchange.type, exchange.name,
+                            Boolean.valueOf(exchange.durable),
+                            Boolean.valueOf(exchange.autoDelete),
+                            exchange.arguments)
                 }
 
                 // Next, the queues.
                 queueBuilder.queues?.each { queue ->
                     if (log.debugEnabled) {
                         log.debug "Registering queue '${queue.name}'"
                     }
-                    
-                    "grails.rabbit.queue.${queue.name}"(Queue, queue.name) {
-                        durable = queue.durable
-                        autoDelete = queue.autoDelete
-                        exclusive = queue.exclusive
-                        arguments = queue.arguments
-                    }
+
+                    "grails.rabbit.queue.${queue.name}"(Queue, queue.name,
+                            Boolean.valueOf(queue.durable),
+                            Boolean.valueOf(queue.exclusive),
+                            Boolean.valueOf(queue.autoDelete),
+                            queue.arguments,
+                    )
                 }
 
                 // Finally, the bindings between exchanges and queues.
@@ -183,10 +182,8 @@ The Rabbit MQ plugin provides integration with the Rabbit MQ Messaging System.
                         // is the only valid option atm) are passed through as is.
                         args << (binding.rule instanceof CharSequence ? binding.rule.toString() : binding.rule)
                     }
-                    
-                    "grails.rabbit.binding.${binding.exchange}.${binding.queue}"(Binding, *args) {
-                        arguments = binding.arguments
-                    }
+
+                    "grails.rabbit.binding.${binding.exchange}.${binding.queue}"(Binding, binding.queue, QUEUE, binding.exchange, binding.rule, binding.arguments )
                 }
             }
         }   

test/unit/org/grails/rabbitmq/RabbitGrailsPluginTests.groovy

@@ -0,0 +1,69 @@
+package org.grails.rabbitmq
+
+import grails.spring.BeanBuilder
+import org.springframework.amqp.core.TopicExchange
+import org.springframework.amqp.core.Queue
+import org.springframework.amqp.core.Binding
+import org.springframework.amqp.core.Binding.DestinationType
+
+/**
+ * Test cases for main plugin file setup.
+ */
+class RabbitGrailsPluginTests extends GroovyTestCase {
+
+    void testQueueAndExchangeSetup(){
+        // load the base plugin file
+        String[] roots = ['./']
+        ClassLoader loader = this.getClass().getClassLoader()
+        def engine = new GroovyScriptEngine(roots, loader)
+        def pluginClass = engine.loadScriptByName('RabbitmqGrailsPlugin.groovy')
+        def base = pluginClass.newInstance()
+
+        // mock up test configuration
+        base.metaClass.application = [:]
+        base.application.config = new ConfigSlurper().parse("""
+            rabbitmq {
+                connectionfactory {
+                    username = 'guest'
+                    password = 'guest'
+                    hostname = 'localhost'
+                }
+
+                queues = {
+                   exchange name: 'it_topic', durable: true, type: topic, autoDelete: false, {
+                         it_q1 autoDelete: false, durable: true, binding: '#', arguments: ['x-ha-policy' : 'all']
+                   }
+                }
+            }
+        """)
+
+        // run a spring builder to create context
+        def bb = new BeanBuilder()
+        bb.beans base.doWithSpring
+        def ctx = bb.createApplicationContext()
+
+        // test topic
+        def itTopic = ctx.getBean("grails.rabbit.exchange.it_topic")
+        assertEquals(itTopic.getClass(), TopicExchange.class)
+        assertTrue(itTopic.durable)
+        assertFalse(itTopic.autoDelete)
+        assertEquals(itTopic.name, 'it_topic')
+
+        // test queue
+        def itQ1 = ctx.getBean("grails.rabbit.queue.it_q1")
+        assertEquals(itQ1.getClass(), Queue.class)
+        assertEquals(itQ1.name, "it_q1")
+        assertEquals(itQ1.durable, true)
+        assertEquals(itQ1.autoDelete, false)
+        assertEquals(itQ1.arguments['x-ha-policy'], 'all')
+
+        // test binding
+        def ibBind = ctx.getBean("grails.rabbit.binding.it_topic.it_q1")
+        assertEquals(ibBind.getClass(), Binding.class)
+        assertEquals(ibBind.destination, 'it_q1')
+        assertEquals(ibBind.exchange, 'it_topic')
+        assertEquals(ibBind.routingKey, '#')
+        assertEquals(ibBind.destinationType, DestinationType.QUEUE)
+    }
+
+}