ruote-amqp 2.1.5 → 2.2.0

data/spec/receiver_spec.rb

@@ -0,0 +1,126 @@
+
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+require 'ruote/participant'
+
+
+describe RuoteAMQP::Receiver do
+
+  after(:each) do
+    purge_engine
+  end
+
+  it "handles replies" do
+
+    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
+
+    @engine.register_participant(:amqp, RuoteAMQP::ParticipantProxy)
+
+    RuoteAMQP::Receiver.new(@engine)
+
+    wfid = @engine.launch(pdef)
+
+    workitem = nil
+
+    begin
+      Timeout::timeout(5) do
+
+        MQ.queue('test3', :durable => true).subscribe { |msg|
+          wi = Ruote::Workitem.new(Rufus::Json.decode(msg))
+          workitem = wi if wi.wfid == wfid
+        }
+
+        loop do
+          break unless workitem.nil?
+          sleep 0.1
+        end
+      end
+    rescue Timeout::Error
+      violated "Timeout waiting for message"
+    end
+
+    workitem.fields['foo'] = "bar"
+
+    MQ.queue('ruote_workitems', :durable => true).publish(Rufus::Json.encode(workitem.to_h), :persistent => true)
+
+    @engine.wait_for(wfid)
+
+    @engine.should_not have_errors
+    @engine.should_not have_remaining_expressions
+
+    @tracer.to_s.should == "foo\nbar"
+  end
+
+  it "launches processes" do
+
+    json = {
+      'definition' => %{
+        Ruote.process_definition :name => 'test' do
+          sequence do
+            echo '${f:foo}'
+          end
+        end
+      },
+      'fields' => { 'foo' => 'bar' }
+    }.to_json
+
+    RuoteAMQP::Receiver.new(@engine, :launchitems => true, :unsubscribe => true)
+
+    MQ.queue(
+      'ruote_workitems', :durable => true
+    ).publish(
+      json, :persistent => true
+    )
+
+    sleep 0.5
+
+    @engine.should_not have_errors
+    @engine.should_not have_remaining_expressions
+
+    @tracer.to_s.should == 'bar'
+  end
+
+  it 'accepts a custom :queue' do
+
+    #@engine.noisy = true
+
+    RuoteAMQP::Receiver.new(
+      @engine, :queue => 'mario', :launchitems => true, :unsubscribe => true)
+
+    @engine.register_participant 'alpha', Ruote::StorageParticipant
+
+    json = Rufus::Json.encode({
+      'definition' => "Ruote.define { alpha }"
+    })
+
+    MQ.queue(
+      'ruote_workitems', :durable => true
+    ).publish(
+      json, :persistent => true
+    )
+
+    sleep 1
+
+    @engine.processes.size.should == 0
+      # nothing happened
+
+    MQ.queue(
+      'mario', :durable => true
+    ).publish(
+      json, :persistent => true
+    )
+
+    sleep 1
+
+    @engine.processes.size.should == 1
+      # launch happened
+  end
+end
+

data/spec/ruote_amqp_spec.rb

@@ -1,12 +1,18 @@
-require File.dirname(__FILE__) + '/spec_helper'
+
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
 
 describe RuoteAMQP do
-  it "should use persistent messages by default" do
+
+  it "uses persistent messages by default" do
+
     RuoteAMQP.use_persistent_messages?.should be_true
   end
 
-  it "should allow switching to transient messages" do
+  it "allows switching to transient messages" do
+
     RuoteAMQP.use_persistent_messages = false
     RuoteAMQP.use_persistent_messages?.should be_false
   end
 end
+

data/spec/spec_helper.rb

@@ -1,16 +1,15 @@
+
 require 'rubygems'
-gem 'rspec'
-require 'spec'
+require 'rspec'
 
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-$:.unshift('../ruote/lib')
+$:.unshift(File.join(File.dirname(__FILE__), '../lib'))
+$:.unshift(File.join(File.dirname(__FILE__), '../../ruote/lib'))
 
-# For the tests to work you need to use the AMQP gem built from
-# http://github.com/kennethkalmer/amqp.git
-gem 'amqp', '=0.6.6'
+#gem 'amqp', '=0.6.7'
 
 require 'fileutils'
 require 'json'
+require 'timeout'
 
 require 'ruote/engine'
 require 'ruote/worker'
@@ -18,7 +17,10 @@ require 'ruote/storage/hash_storage'
 require 'ruote/log/test_logger'
 
 require 'ruote-amqp'
-require 'spec/ruote'
+
+Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |path|
+  require(path)
+}
 
 
 # AMQP magic worked here
@@ -29,9 +31,9 @@ AMQP.settings[:pass]  = 'ruote'
 
 #AMQP.logging = true
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
 
-  config.include( RuoteSpecHelpers )
+  config.include(RuoteSpecHelpers)
 
   config.before(:each) do
     @tracer = Tracer.new
@@ -39,12 +41,9 @@ Spec::Runner.configure do |config|
     @engine = Ruote::Engine.new(
       Ruote::Worker.new(
         Ruote::HashStorage.new(
-          's_logger' => [ 'ruote/log/test_logger', 'Ruote::TestLogger' ]
-        )
-      )
-    )
+          's_logger' => [ 'ruote/log/test_logger', 'Ruote::TestLogger' ])))
 
-    @engine.add_service( 'tracer', @tracer )
+    @engine.add_service('tracer', @tracer)
   end
 
   config.after(:each) do
@@ -53,9 +52,9 @@ Spec::Runner.configure do |config|
   end
 
   config.after(:all) do
-    base = File.expand_path( File.dirname(__FILE__) + '/..' )
-    FileUtils.rm_rf( base + '/logs' )
-    FileUtils.rm_rf( base + '/work' )
+    base = File.expand_path(File.dirname(__FILE__) + '/..')
+    FileUtils.rm_rf(base + '/logs')
+    FileUtils.rm_rf(base + '/work')
   end
 end
 
@@ -77,3 +76,4 @@ class Tracer
     @trace << "#{s}\n"
   end
 end
+

data/spec/support/ruote_helpers.rb

@@ -0,0 +1,29 @@
+
+module RuoteSpecHelpers
+
+  def purge_engine
+
+    # TODO : adapt to ruote 2.1.10
+  end
+
+  def run_definition(pdef)
+
+    wfid = @engine.launch(pdef)
+
+    #r = @engine.wait_for(wfid)
+    #@engine.wait_for(wfid) if r['action'] == 'ceased'
+    #  # make sure to wait for 'terminated'
+    @engine.wait_for(:inactive)
+
+    @engine.should_not have_errors
+    @engine.should_not have_remaining_expressions
+
+    purge_engine
+  end
+
+  def noisy(on = true)
+
+    @engine.context.logger.noisy = on
+  end
+end
+

data/{lib/spec → spec/support}/ruote_matchers.rb

@@ -1,10 +1,10 @@
 
-Spec::Matchers.define :have_errors do |*args|
+RSpec::Matchers.define :have_errors do |*args|
 
   match do |engine|
 
     @ps = if wfid = args.shift
-      engine.processes( wfid )
+      engine.processes(wfid)
     else
       engine.processes.first
     end
@@ -13,21 +13,21 @@ Spec::Matchers.define :have_errors do |*args|
   end
 
   failure_message_for_should do |engine|
+
     "Expected engine to have errors, but didn't"
   end
+
   failure_message_for_should_not do |engine|
+
     "Expected the engine to not have errors, but it did.\n" +
-    @ps.errors.map { |e|
-      "  * error: #{e.error_class} #{e.error_message} " +
-      "\n\"#{e.error_backtrace.join("\n")}\""
-    }.join("\n")
+    @ps.errors.map { |e| "  * error: #{e.message}\n\"#{e.trace}\"" }.join("\n")
   end
+
   description do
-    #
   end
 end
 
-Spec::Matchers.define :have_remaining_expressions do
+RSpec::Matchers.define :have_remaining_expressions do
 
   match do |engine|
 
@@ -35,11 +35,16 @@ Spec::Matchers.define :have_remaining_expressions do
   end
 
   failure_message_for_should do |engine|
+
     "Expected engine to have processes remaining, but it didn't"
   end
+
   failure_message_for_should_not do |engine|
-    "Expected engine to have no processes remaining, but it did.#{engine.storage.get_many('expressions').inspect}"
+
+    "Expected engine to have no processes remaining, but it did." +
+    "#{engine.storage.get_many('expressions').inspect}"
   end
+
   description do
   end
 end

data/spec/workitem_listener_spec.rb

@@ -1,31 +1,49 @@
-require File.dirname(__FILE__) + '/spec_helper'
+
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+#
+# NOTE : RuoteAMQP::WorkitemListener has been depreacted in favour of
+#        RuoteAMQP::Receiver
+#
+
 
 describe RuoteAMQP::WorkitemListener do
 
-  it "should handle replies" do
+  after(:each) do
+    purge_engine
+  end
+
+  it "handles replies" do
 
     pdef = Ruote.process_definition :name => 'test' do
       set :field => 'foo', :value => 'foo'
       sequence do
         echo '${f:foo}'
-        amqp :queue => 'test3'
+        amqp :queue => 'test7'
         echo '${f:foo}'
       end
     end
 
-    @engine.register_participant( :amqp, RuoteAMQP::Participant )
+    @engine.register_participant(:amqp, RuoteAMQP::ParticipantProxy)
 
-    RuoteAMQP::WorkitemListener.new( @engine )
+    RuoteAMQP::WorkitemListener.new(@engine, :unsubscribe => true)
 
-    fei = @engine.launch pdef
+    #@engine.noisy = true
+
+    wfid = @engine.launch(pdef)
+
+    workitem = nil
 
     begin
       Timeout::timeout(5) do
-        @msg = nil
-        MQ.queue('test3').subscribe { |msg| @msg = msg }
+
+        MQ.queue('test7', :durable => true).subscribe { |msg|
+          wi = Ruote::Workitem.new(Rufus::Json.decode(msg))
+          workitem = wi if wi.wfid == wfid
+        }
 
         loop do
-          break unless @msg.nil?
+          break unless workitem.nil?
           sleep 0.1
         end
       end
@@ -33,19 +51,16 @@ describe RuoteAMQP::WorkitemListener do
       violated "Timeout waiting for message"
     end
 
-    wi = Ruote::Workitem.new( Rufus::Json.decode( @msg ) )
-    wi.fields['foo'] = "bar"
+    workitem.fields['foo'] = 'bar'
 
-    MQ.queue( wi.fields['params']['reply_queue'] ).publish( Rufus::Json.encode( wi.to_h ) )
+    MQ.queue('ruote_workitems', :durable => true).publish(Rufus::Json.encode(workitem.to_h), :persistent => true)
 
-    @engine.context.logger.wait_for( fei )
+    @engine.wait_for(wfid)
 
     @engine.should_not have_errors
     @engine.should_not have_remaining_expressions
 
     @tracer.to_s.should == "foo\nbar"
-
-    purge_engine
   end
 end
 

metadata

@@ -1,126 +1,152 @@
 --- !ruby/object:Gem::Specification 
 name: ruote-amqp
 version: !ruby/object:Gem::Version 
-  version: 2.1.5
+  hash: 7
+  prerelease: 
+  segments: 
+  - 2
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
-- kenneth.kalmer@gmail.com
+- Kenneth Kalmer
+- John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 +02:00
+date: 2011-03-01 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rufus-json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: amqp
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.1.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: amqp
+        hash: 3
+        segments: 
+        - 0
+        - 7
+        - 0
+        version: 0.7.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: ruote
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.6
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: ruote
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        - 0
+        version: 2.2.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.5
-    version: 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-description: 
-email: kenneth.kalmer@gmail.com
+        hash: 5
+        segments: 
+        - 2
+        - 2
+        - 1
+        version: 2.2.1
+  type: :development
+  version_requirements: *id004
+description: "\n\
+  AMQP participant/listener pair for ruote 2.1\n  "
+email: 
+- kenneth.kalmer@gmail.com
+- jmettraux@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- PostInstall.txt
-- README.rdoc
-- TODO.txt
+extra_rdoc_files: []
+
 files: 
-- .gitignore
-- History.txt
-- Manifest.txt
-- PostInstall.txt
-- README.rdoc
 - Rakefile
-- TODO.txt
-- lib/ruote-amqp.rb
 - lib/ruote-amqp/launchitem_listener.rb
 - lib/ruote-amqp/participant.rb
+- lib/ruote-amqp/receiver.rb
+- lib/ruote-amqp/version.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
+- lib/ruote-amqp.rb
 - spec/launchitem_listener_spec.rb
 - spec/participant_spec.rb
+- spec/receiver_spec.rb
 - spec/ruote_amqp_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
+- spec/support/ruote_helpers.rb
+- spec/support/ruote_matchers.rb
 - spec/workitem_listener_spec.rb
+- ruote-amqp.gemspec
+- CHANGELOG.txt
+- CREDITS.txt
+- PostInstall.txt
+- TODO.txt
+- README.rdoc
 has_rdoc: true
-homepage: http://github.com/kennethkalmer/ruote-amqp
+homepage: http://ruote.rubyforge.org
 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: 
-rubygems_version: 1.3.5
+rubyforge_project: ruote
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 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
+test_files: []
+