amqp-hermes 1.0.0 → 1.0.1

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/amqp-hermes.gemspec

@@ -0,0 +1,73 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "amqp-hermes"
+  s.version = "1.0.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Hartog C. de Mik"]
+  s.date = "2012-07-26"
+  s.description = "Wrapper around ruby-amqp to make pub/sub easier"
+  s.email = "hartog.de.mik@gmail.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "amqp-hermes.gemspec",
+    "lib/amqp-hermes.rb",
+    "lib/amqp-hermes/connectivity.rb",
+    "lib/amqp-hermes/message.rb",
+    "lib/amqp-hermes/receiver.rb",
+    "lib/amqp-hermes/transmitter.rb",
+    "lib/amqp-hermes/version.rb",
+    "spec/amqp-hermes/connectivity_spec.rb",
+    "spec/amqp-hermes/receiver_spec.rb",
+    "spec/amqp-hermes/transmitter_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = "http://github.com/wyngle/amqp-hermes"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "Hermes; Messenger of the gods"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<amqp>, ["~> 0.9"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<faker>, ["~> 1"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+    else
+      s.add_dependency(%q<amqp>, ["~> 0.9"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<faker>, ["~> 1"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    end
+  else
+    s.add_dependency(%q<amqp>, ["~> 0.9"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<faker>, ["~> 1"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+  end
+end
+

data/lib/amqp-hermes/receiver.rb

@@ -6,13 +6,13 @@ module Hermes
     attr_reader :messages, :queue, :exchange, :routing_key
     attr_accessor :_listening
 
-    def initialize(queue, topic="pub/sub", options={})
+    def initialize(queue, topic=nil, options={})
       raise "You *MUST* specify a queue" if queue.nil? or queue.empty?
       @queue = queue
 
       if topic.is_a? Hash
         options = topic.dup
-        topic = options.delete(:topic) || "pub/sub"
+        topic = options.delete(:topic)
       end
 
       @routing_key = options.delete(:routing_key)
@@ -25,6 +25,8 @@ module Hermes
       @handler = options.delete(:handler) || self
 
       options[:auto_delete] ||= true
+
+      topic ||= "pub/sub"
       @exchange = channel.topic(topic, options)
 
       @messages = []
@@ -40,8 +42,9 @@ module Hermes
 
         receiver.channel.queue(receiver.queue).bind(
           receiver.exchange, :routing_key => receiver.routing_key
-        ).subscribe do |headers, payload|
+        ).subscribe(:ack => true) do |headers, payload|
           handler.receive(AMQP::Hermes::Message.new(headers, payload))
+          headers.ack
         end
       end
     end

data/lib/amqp-hermes/transmitter.rb

@@ -4,11 +4,19 @@ module Hermes
     include AMQP::Hermes::Connectivity
 
     attr_reader :queue
-    def initialize(queue=nil, topic="pub/sub", options={})
+    def initialize(queue=nil, topic=nil, options={})
       @queue = queue
 
+      if topic.is_a?(Hash)
+        options = topic.clone
+        topic   = options[:topic]
+      end
+
       options[:auto_delete] ||= true
+
+      topic ||= "pub/sub"
       @exchange = channel.topic(topic, options)
+
       @transmitting = false
     end
 

metadata

@@ -1,93 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: amqp-hermes
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.0.1
   prerelease: 
-  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Hartog C. de Mik
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &20873100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *20873100
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &20881220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *20881220
+- !ruby/object:Gem::Dependency
   name: faker
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &20894140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *20894140
+- !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &20892680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.12"
+      - !ruby/object:Gem::Version
+        version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *20892680
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &20891200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *20891200
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &20888860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *20888860
 description: Wrapper around ruby-amqp to make pub/sub easier
 email: hartog.de.mik@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -96,6 +93,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- amqp-hermes.gemspec
 - lib/amqp-hermes.rb
 - lib/amqp-hermes/connectivity.rb
 - lib/amqp-hermes/message.rb
@@ -107,34 +105,31 @@ files:
 - spec/amqp-hermes/transmitter_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/wyngle/amqp-hermes
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -1570954477034988232
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1892227814602822125
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Hermes; Messenger of the gods
 test_files: []
-