bumbleworks 0.0.41 → 0.0.42

data/Gemfile

@@ -2,4 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in bumbleworks.gemspec
 gemspec
-gem "rufus-scheduler", "~> 2.0"

data/README.md

@@ -1,11 +1,5 @@
 # Bumbleworks
 
-**IMPORTANT**: Ruote (a dependency of Bumbleworks) currently has a bug in its dependency graph.  Until this is fixed (and we'll update this readme when it is), make sure you add this to your gemfile:
-
-```ruby
-gem 'rufus-scheduler', '~> 2.0'
-```
-
 **NOTE**: This product is still pre-release, and implementation is *not* in sync with documentation yet - hence the pre-release version.  We'll follow [the Semantic Versioning Specification (Semver)](http://semver.org/), so you can assume anything at 0.x.x still has an unstable API.  But we *are* actively developing this.
 
 Bumbleworks is a gem that adds a workflow engine (via [ruote](http://github.com/jmettraux/ruote)) to your Ruby application, and adds tools for task authorization and locking.  It also establishes conventions for easily loading process definitions and registering participant classes based on configurable file locations.

data/lib/bumbleworks/ruote.rb

@@ -99,14 +99,17 @@ module Bumbleworks
 
       def register_participants(&block)
         dashboard.register(&block) if block
-        set_catchall_if_needed
         register_error_handler
+        set_catchall_if_needed
         dashboard.participant_list
       end
 
       def register_error_handler
-        dashboard.register_participant :error_handler_participant, Bumbleworks::ErrorHandlerParticipant
-        dashboard.on_error = 'error_handler_participant'
+        unless dashboard.participant_list.any? { |part| part.regex == '^error_handler_participant$' }
+          error_handler_participant = ::Ruote::ParticipantEntry.new(['^error_handler_participant$', ["Bumbleworks::ErrorHandlerParticipant", {}]])
+          dashboard.participant_list = dashboard.participant_list.unshift(error_handler_participant)
+          dashboard.on_error = 'error_handler_participant'
+        end
       end
 
       def set_catchall_if_needed

data/lib/bumbleworks/version.rb

@@ -1,3 +1,3 @@
 module Bumbleworks
-  VERSION = "0.0.41"
+  VERSION = "0.0.42"
 end

data/spec/lib/bumbleworks/ruote_spec.rb

@@ -225,6 +225,14 @@ describe Bumbleworks::Ruote do
       described_class.should_receive(:register_error_handler)
       described_class.start_worker!
     end
+
+    it 'does not add another error_handler_participant if already registered' do
+      described_class.register_participants
+      described_class.start_worker!
+      described_class.dashboard.participant_list.map(&:classname).should == [
+        'Bumbleworks::ErrorHandlerParticipant', 'Bumbleworks::StorageParticipant']
+      Bumbleworks.dashboard.on_error.flatten[2].should == 'error_handler_participant'
+    end
   end
 
   describe '.register_participants' do
@@ -238,8 +246,8 @@ describe Bumbleworks::Ruote do
       described_class.dashboard.participant_list.should be_empty
       described_class.register_participants &registration_block
       described_class.dashboard.participant_list.should have(5).items
-      described_class.dashboard.participant_list.map(&:classname).should =~ [
-        'BeesHoney', 'MapleSyrup', 'NewCatchall', 'Bumbleworks::ErrorHandlerParticipant', 'Bumbleworks::StorageParticipant']
+      described_class.dashboard.participant_list.map(&:classname).should == [
+        'Bumbleworks::ErrorHandlerParticipant', 'BeesHoney', 'MapleSyrup', 'NewCatchall', 'Bumbleworks::StorageParticipant']
     end
 
     it 'does not add storage participant catchall if already exists' do
@@ -251,16 +259,17 @@ describe Bumbleworks::Ruote do
       described_class.dashboard.participant_list.should be_empty
       described_class.register_participants &registration_block
       described_class.dashboard.participant_list.should have(3).items
-      described_class.dashboard.participant_list.map(&:classname).should =~ [
-        'BeesHoney', 'Bumbleworks::ErrorHandlerParticipant', 'Ruote::StorageParticipant'
+      described_class.dashboard.participant_list.map(&:classname).should == [
+        'Bumbleworks::ErrorHandlerParticipant', 'BeesHoney', 'Ruote::StorageParticipant'
       ]
     end
 
-    it 'adds catchall participant if block is nil' do
+    it 'adds catchall and error_handler participants if block is nil' do
       described_class.dashboard.participant_list.should be_empty
       described_class.register_participants &nil
       described_class.dashboard.participant_list.should have(2).item
-      described_class.dashboard.participant_list.first.classname.should == 'Bumbleworks::StorageParticipant'
+      described_class.dashboard.participant_list.map(&:classname).should ==
+        ['Bumbleworks::ErrorHandlerParticipant', 'Bumbleworks::StorageParticipant']
     end
   end
 
@@ -275,14 +284,14 @@ describe Bumbleworks::Ruote do
       Bumbleworks.dashboard.on_error.flatten[2].should == 'error_handler_participant'
     end
 
-    it 'skip registration if error_handlers list is missing' do
-      described_class.stub(:error_handlers => nil)
-      Bumbleworks.dashboard.should_not_receive(:register_participant).with(:error_handler, Bumbleworks::ErrorHandlerParticipant)
-    end
+    it 'does not override existing error_handler_participant' do
+      described_class.register_participants do
+        error_handler_participant 'Whatever'
+      end
+      described_class.register_error_handler
+      Bumbleworks.dashboard.participant_list.map(&:classname).should ==
+        ['Whatever', 'Bumbleworks::StorageParticipant']
 
-    it 'skip registration if error_handlers list is empty' do
-      described_class.stub(:error_handlers => [])
-      Bumbleworks.dashboard.should_not_receive(:register_participant).with(:error_handler, Bumbleworks::ErrorHandlerParticipant)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumbleworks
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.42
   prerelease: 
 platform: ruby
 authors:
@@ -242,7 +242,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2565282303718385581
+      hash: -1259087947392220578
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -251,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2565282303718385581
+      hash: -1259087947392220578
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23