Skip to content

Commit

Permalink
Merge branch 'release/1.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
FGRibreau committed Jan 28, 2013
2 parents c713ce8 + 6e39926 commit 4ba47a2
Show file tree
Hide file tree
Showing 13 changed files with 161 additions and 427 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -5,4 +5,4 @@ node_modules
*.log

# mac
DS_STORE
.DS_Store
22 changes: 22 additions & 0 deletions LICENCE-MIT.txt
@@ -0,0 +1,22 @@
Copyright (c) 2013 FG Ribreau

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
20 changes: 14 additions & 6 deletions README.md
Expand Up @@ -25,9 +25,9 @@ amqp.login(
if err
throw err
return

console.log 'We are connected !'

)
```

Expand All @@ -47,6 +47,7 @@ AmqpDsl.login(

.queue( 'testQueue', (queue) -> console.log "Connected to Queue", queue.name )
.bind( 'stream', '#' )
.bind( 'stream2', 'routing.key' )
.subscribe( (message, header, deliveryInfo) -> )

.queue( 'queue2' )
Expand All @@ -63,7 +64,7 @@ AmqpDsl.login(
# Do other stuff with `amqp` like subscribing to a queue

queue3 = amqp.queues.queue3

queue3.subscribe( ack:true, ( message, header, deliveryInfo ) ->
console.log "Hey ! We got one new message !"
queue3.shift()
Expand Down Expand Up @@ -102,7 +103,7 @@ See `examples/` and `docs/` for more information.
### .connect
* `.connect( amqp, callback(err, amqp) )`
* `.connect( callback(err, amqp) )`

The `amqp` argument is simply hashtable with the following properties:

* queues (hashtable of `AMQP::queues`)
Expand All @@ -118,5 +119,12 @@ The `amqp` argument is simply hashtable with the following properties:
... and browse `docs/`

## Test

$ npm test

$ npm test

## Release History
v1.0.1 - .bind & .subscribe can now be called multiple times. This is the behavior that should have been in place since the beginning.

## License
Copyright (c) 2013 Francois-Guillaume Ribreau
Licensed under the MIT license.
Empty file added grunt.js
Empty file.
2 changes: 2 additions & 0 deletions index.js
@@ -0,0 +1,2 @@
require('coffee-script');
module.exports = require('./src/AmqpDsl');
194 changes: 0 additions & 194 deletions lib/AmqpDsl.js

This file was deleted.

24 changes: 0 additions & 24 deletions lib/AmqpExchange.js

This file was deleted.

38 changes: 0 additions & 38 deletions lib/AmqpQueue.js

This file was deleted.

41 changes: 0 additions & 41 deletions lib/IndexedList.js

This file was deleted.

0 comments on commit 4ba47a2

Please sign in to comment.