ruote-amqp 0.9.21.1 → 2.1.5

data/spec/{listener_spec.rb → workitem_listener_spec.rb}

@@ -1,29 +1,27 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe RuoteAMQP::Listener do
+describe RuoteAMQP::WorkitemListener do
+
   it "should handle replies" do
-    pdef = <<-EOF
-    class AmqpParticipant2 < OpenWFE::ProcessDefinition
 
+    pdef = Ruote.process_definition :name => 'test' do
       set :field => 'foo', :value => 'foo'
-
       sequence do
         echo '${f:foo}'
         amqp :queue => 'test3'
         echo '${f:foo}'
       end
     end
-    EOF
 
     @engine.register_participant( :amqp, RuoteAMQP::Participant )
 
-    @engine.register_listener( RuoteAMQP::Listener )
+    RuoteAMQP::WorkitemListener.new( @engine )
 
     fei = @engine.launch pdef
 
     begin
-      Timeout::timeout(10) do
-        msg = nil
+      Timeout::timeout(5) do
+        @msg = nil
         MQ.queue('test3').subscribe { |msg| @msg = msg }
 
         loop do
@@ -35,14 +33,14 @@ describe RuoteAMQP::Listener do
       violated "Timeout waiting for message"
     end
 
-    wi = OpenWFE::InFlowWorkItem.from_h( OpenWFE::Json.decode( @msg ) )
-    wi.attributes['foo'] = "bar"
+    wi = Ruote::Workitem.new( Rufus::Json.decode( @msg ) )
+    wi.fields['foo'] = "bar"
 
-    MQ.queue( wi.attributes['reply_queue'] ).publish( OpenWFE::Json.encode( wi.to_h ) )
+    MQ.queue( wi.fields['params']['reply_queue'] ).publish( Rufus::Json.encode( wi.to_h ) )
 
-    wait( fei )
+    @engine.context.logger.wait_for( fei )
 
-    @engine.should_not have_errors( fei )
+    @engine.should_not have_errors
     @engine.should_not have_remaining_expressions
 
     @tracer.to_s.should == "foo\nbar"
@@ -50,3 +48,4 @@ describe RuoteAMQP::Listener do
     purge_engine
   end
 end
+

metadata

@@ -1,26 +1,26 @@
 --- !ruby/object:Gem::Specification 
 name: ruote-amqp
 version: !ruby/object:Gem::Version 
-  version: 0.9.21.1
+  version: 2.1.5
 platform: ruby
 authors: 
-- Kenneth Kalmer
+- kenneth.kalmer@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-08-03 00:00:00 +02:00
+date: 2010-02-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ruote
+  name: rufus-json
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.20
+        version: 0.1.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: amqp
@@ -28,28 +28,32 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.6
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: ruote
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.0
+        version: 2.1.5
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rspec
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: "0"
     version: 
-description: |-
-  ruote-amqp provides an AMQP participant/listener pair that allows you to 
-  distribute workitems out to AMQP consumers for processing.
-  
-  To learn more about remote participants in ruote please see
-  http://openwfe.rubyforge.org/part.html
-email: 
-- kenneth.kalmer@gmail.com
+description: 
+email: kenneth.kalmer@gmail.com
 executables: []
 
 extensions: []
@@ -58,8 +62,10 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - PostInstall.txt
+- README.rdoc
 - TODO.txt
 files: 
+- .gitignore
 - History.txt
 - Manifest.txt
 - PostInstall.txt
@@ -67,29 +73,30 @@ files:
 - Rakefile
 - TODO.txt
 - lib/ruote-amqp.rb
-- lib/ruote-amqp/listener.rb
+- lib/ruote-amqp/launchitem_listener.rb
 - lib/ruote-amqp/participant.rb
+- lib/ruote-amqp/workitem_listener.rb
 - lib/spec/ruote.rb
 - lib/spec/ruote_example_group.rb
 - lib/spec/ruote_helpers.rb
 - lib/spec/ruote_matchers.rb
+- ruote-amqp.gemspec
 - script/console
 - script/destroy
 - script/generate
-- spec/listener_spec.rb
+- spec/launchitem_listener_spec.rb
 - spec/participant_spec.rb
 - spec/ruote_amqp_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/rspec.rake
+- spec/workitem_listener_spec.rb
 has_rdoc: true
 homepage: http://github.com/kennethkalmer/ruote-amqp
 licenses: []
 
-post_install_message: PostInstall.txt
+post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -106,10 +113,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: ruote-amqp
-rubygems_version: 1.3.4
+rubyforge_project: 
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: ruote-amqp provides an AMQP participant/listener pair that allows you to  distribute workitems out to AMQP consumers for processing
-test_files: []
-
+summary: AMQP participant/listener pair for ruote 2.1
+test_files: 
+- spec/launchitem_listener_spec.rb
+- spec/participant_spec.rb
+- spec/ruote_amqp_spec.rb
+- spec/spec_helper.rb
+- spec/workitem_listener_spec.rb

data/lib/ruote-amqp/listener.rb

@@ -1,92 +0,0 @@
-require 'openwfe/service'
-require 'openwfe/listeners/listener'
-
-module RuoteAMQP
-
-  #
-  # = AMQP Listeners
-  #
-  # Used in conjunction with the RuoteAMQP::Participant, the Listener
-  # subscribes to a specific direct exchange and monitors for
-  # incoming workitems. It expects workitems to arrive serialized as
-  # JSON.
-  #
-  # == Configuration
-  #
-  # AMQP configuration is handled by directly manipulating the values of
-  # the +AMQP.settings+ hash, as provided by the AMQP gem. No
-  # defaults are set by the participant. The only +option+ parsed by
-  # the initializer of the listener is the +queue+ key (Hash
-  # expected). If no +queue+ key is set, the listener will subscribe
-  # to the +ruote+ direct exchange for workitems, otherwise it will
-  # subscribe to the direct exchange provided.
-  #
-  # The participant requires version 0.6.1 or later of the amqp gem.
-  #
-  # == Usage
-  #
-  # Register the listener with the engine:
-  #
-  #   engine.register_listener( RuoteAMQP::Listener )
-  #
-  # The listener leverages the asynchronous nature of the amqp gem,
-  # so no timers are setup when initialized.
-  #
-  # See the RuoteAMQP::Participant docs for information on sending
-  # workitems out to remote participants, and have them send replies
-  # to the correct direct exchange specified in the workitem
-  # attributes.
-  #
-  class Listener < OpenWFE::Service
-    include OpenWFE::WorkItemListener
-
-    class << self
-
-      # Listening queue
-      attr_writer :queue
-
-      def queue
-        @queue ||= 'ruote'
-      end
-
-    end
-
-    # Only one option is used (:queue) to determine where to listen
-    # for work
-    def initialize( service_name, options )
-
-      if q = options.delete(:queue)
-        self.class.queue = q
-      end
-
-      super( service_name, options )
-
-      #if AMQP.connection.nil?
-        @em_thread = Thread.new { EM.run } unless EM.reactor_running?
-      #end
-
-      MQ.queue( self.class.queue, :durable => true ).subscribe do |message|
-        workitem = decode_workitem( message )
-        ldebug { "workitem from '#{self.class.queue}': #{workitem.inspect}" }
-        handle_item( workitem )
-      end
-    end
-
-    def stop
-      linfo { "Stopping..." }
-
-      AMQP.stop { EM.stop } #if EM.reactor_running? }
-      @em_thread.join if @em_thread
-    end
-
-    private
-
-    # Complicated guesswork that needs to happen here to detect the format
-    def decode_workitem( msg )
-      ldebug { "decoding workitem from: #{msg}" }
-
-      hash = OpenWFE::Json.decode(msg)
-      OpenWFE.workitem_from_h( hash )
-    end
-  end
-end

data/tasks/rspec.rake

@@ -1,21 +0,0 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems' unless ENV['NO_RUBYGEMS']
-  require 'spec'
-end
-begin
-  require 'spec/rake/spectask'
-rescue LoadError
-  puts <<-EOS
-To use rspec for testing you must install rspec gem:
-    gem install rspec
-EOS
-  exit(0)
-end
-
-desc "Run the specs under spec/models"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end