rosetta_queue 0.5.0 → 0.5.2

data/Rakefile

@@ -24,6 +24,7 @@ begin
     s.extra_rdoc_files = ["README.rdoc", "MIT-LICENSE.txt"]
     s.files = FileList["[A-Z]*.*", "{bin,generators,lib,features,spec}/**/*", "Rakefile", "cucumber.yml"]
     s.authors = ["Ben Mabey", "Chris Wyckoff"]
+    s.add_dependency("bunny")
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
@@ -36,4 +37,3 @@ desc 'Removes trailing whitespace'
 task :whitespace do
   sh %{find . -name '*.rb' -exec sed -i '' 's/ *$//g' {} \\;}
 end
-

data/VERSION.yml

@@ -1,5 +1,5 @@
---- 
+---
 :major: 0
 :minor: 5
-:build: 
-:patch: 0
+:patch: 2
+:build:

data/lib/rosetta_queue.rb

@@ -14,9 +14,4 @@ require 'rosetta_queue/exception_handler'
 require 'rosetta_queue/producer'
 require 'rosetta_queue/consumer_managers/base'
 require 'rosetta_queue/consumer_managers/threaded'
-
-if defined?(Rails)
-  RosettaQueue.logger = RosettaQueue::Logger.new(File.join(Rails.root, 'log', 'rosetta_queue.log'))
-  require('rosetta_queue/spec_helpers') if Rails.env == "test"
-end
-
+require 'rosetta_queue/railtie' if defined?(Rails)

data/lib/rosetta_queue/adapters/amqp_synch.rb

@@ -17,7 +17,6 @@ module RosettaQueue
         end
 
         def unsubscribe
-          @queue.unsubscribe
           conn.stop
         end
 
@@ -40,23 +39,22 @@ module RosettaQueue
         def publish(destination, message, options={})
           RosettaQueue.logger.info("Publishing to #{destination} :: #{message}")
           @queue = conn.queue(destination, options)
-          @queue.publish(message, options)
+          exchange = conn.exchange("")
+          exchange.publish(message, {:key => destination}.merge(options))
         end
 
         def receive(destination, message_handler)
-          ack = @options[:ack]
           @queue = conn.queue(destination, @options)
           @queue.subscribe(@options) do |msg|
-            RosettaQueue.logger.info("Receiving from #{destination} :: #{msg}")
-            message_handler.handle_message(msg)
-            @queue.ack if ack
+            RosettaQueue.logger.info("Receiving from #{destination} :: #{msg[:payload]}")
+            message_handler.handle_message(msg[:payload])
           end
         end
 
         def receive_once(destination, options = {})
           ack = options[:ack]
           @queue = conn.queue(destination, options)
-          msg = @queue.pop(options)
+          msg = @queue.pop[:payload]
           RosettaQueue.logger.info("Receiving from #{destination} :: #{msg}")
           @queue.ack if ack
           yield Filters.process_receiving(msg)
@@ -74,14 +72,12 @@ module RosettaQueue
         end
 
         def receive(destination, message_handler)
-          ack = @options[:ack]
           @queue = conn.queue("queue_#{self.object_id}", @options)
           exchange = conn.exchange(fanout_name_for(destination), @options.merge({:type => :fanout}))
           @queue.bind(exchange)
           @queue.subscribe(@options) do |msg|
-            RosettaQueue.logger.info("Receiving from #{destination} :: #{msg}")
-            message_handler.handle_message(msg)
-            @queue.ack if ack
+            RosettaQueue.logger.info("Receiving from #{destination} :: #{msg[:payload]}")
+            message_handler.handle_message(msg[:payload])
           end
         end
 
@@ -90,7 +86,7 @@ module RosettaQueue
           @queue = conn.queue("queue_#{self.object_id}", options)
           exchange = conn.exchange(fanout_name_for(destination), options.merge({:type => :fanout}))
           @queue.bind(exchange)
-          msg = @queue.pop(options)
+          msg = @queue.pop[:payload]
           RosettaQueue.logger.info("Receiving from #{destination} :: #{msg}")
           @queue.ack if ack
           yield Filters.process_receiving(msg)

data/lib/rosetta_queue/railtie.rb

@@ -0,0 +1,6 @@
+class RosettaQueueRailtie < Rails::Railtie
+  initializer "rosetta_queue" do
+    RosettaQueue.logger = RosettaQueue::Logger.new(File.join(Rails.root, 'log', 'rosetta_queue.log'))
+    require('rosetta_queue/spec_helpers') if Rails.env == "test"
+  end
+end

data/spec/rosetta_queue/adapters/amqp_synchronous_spec.rb

@@ -32,7 +32,7 @@ module RosettaQueue::Gateway
 
     before(:each) do
       RosettaQueue.logger.stub!(:info)
-      @msg = "Hello World!"
+      @msg = {:payload => "Hello World!"}
       @adapter = AmqpSynchAdapter.new({:user => "foo", :password => "bar", :host => "localhost"})
       @handler = mock("handler", :handle_message => true, :destination => :foo, :options_hash => {:durable => true})
     end
@@ -93,7 +93,7 @@ module RosettaQueue::Gateway
         it "delegates to cached exchange strategy" do
           # given
           @adapter.receive_with(@handler)
-          
+
           # expect
           @exchange_strategy.should_receive(:unsubscribe)
 
@@ -115,12 +115,13 @@ module RosettaQueue::Gateway
 
       end
     end
-    
+
     describe SynchExchange::DirectExchange do
 
       before(:each) do
+        mock_exchange = mock("SynchExchange::DirectExchange", :publish => true)
         @queue = mock("Bunny::Queue", :pop => @msg, :publish => true, :unsubscribe => true)
-        Bunny.stub!(:new).and_return(@conn = mock("Bunny::Client", :queue => @queue, :exchange => @exchange, :status => :connected, :stop => nil))
+        Bunny.stub!(:new).and_return(@conn = mock("Bunny::Client", :queue => @queue, :exchange => mock_exchange, :status => :connected, :stop => nil))
         @queue.stub!(:subscribe).and_yield(@msg)
         @handler = mock("handler", :handle_message => true, :destination => :foo)
         @exchange = SynchExchange::DirectExchange.new({:user => 'user', :password => 'pass', :host => 'host', :opts => {:vhost => "foo"}})
@@ -142,7 +143,7 @@ module RosettaQueue::Gateway
 
         it "should return the message from the connection" do
           @exchange.receive_once("queue.foo") do |msg|
-              msg.should == @msg
+            msg.should == @msg[:payload]
           end
         end
 
@@ -177,9 +178,9 @@ module RosettaQueue::Gateway
           }
         end
 
-        it "should publish message to queue" do
+        it "should publish message to exchange" do
           when_publishing {
-            @conn.queue.should_receive(:publish).with("message", {})
+            @conn.exchange.should_receive(:publish).with("message", {:key => "queue.foo"})
           }
         end
 
@@ -214,7 +215,7 @@ module RosettaQueue::Gateway
 
         it "should return the message from the connection" do
           @exchange.receive_once("topic.foo") do |msg|
-            msg.should == @msg
+            msg.should == @msg[:payload]
           end
         end
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rosetta_queue
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  hash: 15
+  prerelease: 
+  segments: 
+  - 0
+  - 5
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Ben Mabey
@@ -10,10 +16,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 -07:00
-default_executable: 
-dependencies: []
-
+date: 2012-11-05 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: bunny
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: Messaging gateway API with adapters for many messaging systems available in Ruby. Messaging systems can be easily switched out with a small configuration change. Code for testing on the object and application level is also provided.
 email: cbwyckoff@gmail.com
 executables: []
@@ -38,10 +56,6 @@ files:
 - features/step_definitions/publish_subscribe_steps.rb
 - features/support/env.rb
 - features/support/sample_consumers.rb
-- features/support/tmp/barconsumer.log
-- features/support/tmp/fooconsumer.log
-- features/support/tmp/point-to-point.log
-- features/support/tmp/pub-sub.log
 - lib/rosetta_queue.rb
 - lib/rosetta_queue/adapter.rb
 - lib/rosetta_queue/adapters/amqp.rb
@@ -65,6 +79,7 @@ files:
 - lib/rosetta_queue/logger.rb
 - lib/rosetta_queue/message_handler.rb
 - lib/rosetta_queue/producer.rb
+- lib/rosetta_queue/railtie.rb
 - lib/rosetta_queue/spec_helpers.rb
 - lib/rosetta_queue/spec_helpers/hash.rb
 - lib/rosetta_queue/spec_helpers/helpers.rb
@@ -90,56 +105,38 @@ files:
 - spec/rosetta_queue/producer_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/cwyckoff/rosetta_queue
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rosetta-queue
-rubygems_version: 1.3.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Messaging gateway API with adapters for many messaging systems available in Ruby.
-test_files: 
-- spec/rosetta_queue/adapter_spec.rb
-- spec/rosetta_queue/adapters/amqp_synchronous_spec.rb
-- spec/rosetta_queue/adapters/beanstalk_spec.rb
-- spec/rosetta_queue/adapters/fake_spec.rb
-- spec/rosetta_queue/adapters/null_spec.rb
-- spec/rosetta_queue/adapters/shared_adapter_behavior.rb
-- spec/rosetta_queue/adapters/shared_fanout_behavior.rb
-- spec/rosetta_queue/adapters/stomp_spec.rb
-- spec/rosetta_queue/consumer_managers/base_spec.rb
-- spec/rosetta_queue/consumer_managers/evented_spec.rb
-- spec/rosetta_queue/consumer_managers/shared_manager_behavior.rb
-- spec/rosetta_queue/consumer_managers/threaded_spec.rb
-- spec/rosetta_queue/consumer_spec.rb
-- spec/rosetta_queue/core_ext/string_spec.rb
-- spec/rosetta_queue/destinations_spec.rb
-- spec/rosetta_queue/exception_handler_spec.rb
-- spec/rosetta_queue/filters_spec.rb
-- spec/rosetta_queue/message_handler_spec.rb
-- spec/rosetta_queue/producer_spec.rb
-- spec/spec_helper.rb
-- examples/sample_amqp_consumer.rb
-- examples/sample_amqp_fanout_consumer.rb
-- examples/sample_amqp_fanout_producer.rb
-- examples/sample_amqp_producer.rb
+test_files: []
+

data/examples/sample_amqp_consumer.rb

@@ -1,45 +0,0 @@
-require 'rubygems'
-require File.dirname(__FILE__) + '/../init.rb'
-require File.expand_path(File.dirname(__FILE__) + '/../lib/rosetta_queue/consumer_managers/threaded')
-RosettaQueue.logger = Logger.new(File.expand_path(File.dirname(__FILE__) + '/../../log/rosetta_queue.log'))
-
-module RosettaQueue
-
-  Adapter.define do |a|
-    a.user      = "rosetta"
-    a.password  = "password"
-    a.host      = "localhost"
-    a.type      = 'amqp_synch'
-  end
-
-  Destinations.define do |dest|
-    dest.map :foo, "queue.foo"
-  end
-
-  class MessageHandlerFoo
-    include RosettaQueue::MessageHandler
-    subscribes_to :foo
-    options :ack => true
-    attr_reader :msg
-
-    def on_message(msg)
-      puts "FOO received message: #{msg}"
-    end
-
-  end
-
-#   consumer = RosettaQueue::Consumer.new(MessageHandlerFoo.new)
-# #  Thread.new(consumer) do |cons|
-#     consumer.receive
-# #  end
-#   puts "sleeping for 10"
-#   sleep 10
-#   puts "shutting consumer down"
-#  consumer.disconnect
-
-  ThreadedManager.create do |m|
-    m.add MessageHandlerFoo.new
-    m.start
-  end
-
-end

data/examples/sample_amqp_fanout_consumer.rb

@@ -1,52 +0,0 @@
-require 'rubygems'
-require File.dirname(__FILE__) + '/../init.rb'
-require File.expand_path(File.dirname(__FILE__) + '/../lib/rosetta_queue/consumer_managers/threaded.rb')
-RosettaQueue.logger = Logger.new(File.expand_path(File.dirname(__FILE__) + '/../../log/rosetta_queue.log'))
-
-module RosettaQueue
-
-  Adapter.define do |a|
-    a.user      = "rosetta"
-    a.password  = "password"
-    a.host      = "localhost"
-    a.type      = 'amqp_synch'
-  end
-
-  Destinations.define do |dest|
-    dest.map :foo, "fanout.foo"
-  end
-
-  class MessageHandlerFoo
-    include RosettaQueue::MessageHandler
-    subscribes_to :foo
-    options :ack => true
-    attr_reader :msg
-
-    def on_message(msg)
-      puts "FOO received message:  #{msg}"
-      ack
-    end
-
-  end
-
-  class MessageHandlerBar
-    include RosettaQueue::MessageHandler
-    subscribes_to :foo
-    options :ack => true
-    attr_reader :msg
-
-    def on_message(msg)
-      puts "BAR received message:  #{msg}"
-      ack
-    end
-  end
-
-
-  # threaded version
-  ThreadedManager.create do |m|
-    m.add MessageHandlerFoo.new
-    m.add MessageHandlerBar.new
-    m.start
-  end
-
-end

data/examples/sample_amqp_fanout_producer.rb

@@ -1,18 +0,0 @@
-require 'rubygems'
-require File.dirname(__FILE__) + '/../init.rb'
-RosettaQueue.logger = Logger.new(File.expand_path(File.dirname(__FILE__) + '/../../log/rosetta_queue.log'))
-
-RosettaQueue::Adapter.define do |a|
-  a.user      = "rosetta"
-  a.password  = "password"
-  a.host      = "localhost"
-  a.type      = "amqp_synch"
-end
-
-RosettaQueue::Destinations.define do |dest|
-  dest.map :foo, "fanout.foo"
-end
-
-
-RosettaQueue::Producer.publish(:foo, "hello there")
-

data/examples/sample_amqp_producer.rb

@@ -1,16 +0,0 @@
-require 'rubygems'
-require File.dirname(__FILE__) + '/../init.rb'
-RosettaQueue.logger = Logger.new(File.expand_path(File.dirname(__FILE__) + '/../../log/rosetta_queue.log'))
-
-RosettaQueue::Adapter.define do |a|
-  a.user      = "rosetta"
-  a.password  = "password"
-  a.host      = "localhost"
-  a.type      = "amqp_synch"
-end
-
-RosettaQueue::Destinations.define do |dest|
-  dest.map :foo, "queue.foo"
-end
-
-RosettaQueue::Producer.publish(:foo, "hello there")