bumbleworks 0.0.73 → 0.0.74

data/lib/bumbleworks.rb

@@ -88,7 +88,7 @@ module Bumbleworks
     # @yield [configuration] global configuration
     # @see Bumbleworks.configure
     def configure!(&block)
-      @configuration = nil
+      clear_configuration!
       configure(&block)
     end
 
@@ -142,12 +142,17 @@ module Bumbleworks
     end
 
     # @public
-    # Resets Bumbleworks - clears configuration and setup variables, and
-    # also resets the dashboard.
-    #
+    # Resets Bumbleworks - resets dashboard, purges storage, and clears
+    # configuration and setup variables.
     def reset!
-      @configuration = nil
       Bumbleworks::Ruote.reset!
+      clear_configuration!
+    end
+
+    # @public
+    # Clears configuration completely, resetting to defaults.
+    def clear_configuration!
+      @configuration = nil
     end
 
     # @public

data/lib/bumbleworks/ruote.rb

@@ -146,18 +146,24 @@ module Bumbleworks
       end
 
       def storage
-        @storage ||= Bumbleworks.storage_adapter.new_storage(Bumbleworks.storage, Bumbleworks.storage_options)
+        @storage ||= initialize_storage_adapter
       end
 
       def reset!
-        if @storage
-          @storage.purge!
-          @storage.shutdown
+        if Bumbleworks.storage && storage
+          storage.purge!
+          storage.shutdown
         end
         @dashboard.shutdown if @dashboard && @dashboard.respond_to?(:shutdown)
         @storage = nil
         @dashboard = nil
       end
+
+    private
+
+      def initialize_storage_adapter
+        Bumbleworks.storage_adapter.new_storage(Bumbleworks.storage, Bumbleworks.storage_options)
+      end
     end
   end
 end

data/lib/bumbleworks/version.rb

@@ -1,3 +1,3 @@
 module Bumbleworks
-  VERSION = "0.0.73"
+  VERSION = "0.0.74"
 end

data/spec/integration/entity_spec.rb

@@ -6,7 +6,6 @@ describe 'Entity Module' do
   }
 
   before :each do
-    Bumbleworks.reset!
     load File.join(app_root, 'full_initializer.rb')
   end
 

data/spec/integration/history_storage_spec.rb

@@ -9,10 +9,6 @@ describe 'History storage' do
     end
   end
 
-  before :each do
-    Bumbleworks.reset!
-  end
-
   context 'when storage allows storing history' do
     before :each do
       Bumbleworks.stub(:storage_adapter => HashStorageWithHistory)

data/spec/integration/sample_application_spec.rb

@@ -4,7 +4,6 @@ describe 'Bumbleworks Sample Application' do
   }
 
   before :each do
-    Bumbleworks.reset!
     load File.join(app_root, 'full_initializer.rb')
   end
 

data/spec/lib/bumbleworks/expression_spec.rb

@@ -46,7 +46,6 @@ describe Bumbleworks::Expression do
 
   describe '#cancel!' do
     it 'cancels the expression' do
-      Bumbleworks.storage = {}
       Bumbleworks.dashboard.should_receive(:cancel_expression).with(fei)
       subject.cancel!
     end
@@ -54,7 +53,6 @@ describe Bumbleworks::Expression do
 
   describe '#kill!' do
     it 'kills the expression' do
-      Bumbleworks.storage = {}
       Bumbleworks.dashboard.should_receive(:kill_expression).with(fei)
       subject.kill!
     end

data/spec/lib/bumbleworks/participant_registration_spec.rb

@@ -1,6 +1,5 @@
 describe Bumbleworks::ParticipantRegistration do
   before(:each) do
-    Bumbleworks.reset!
     Bumbleworks.root = File.join(fixtures_path, 'apps', 'with_default_directories')
   end
 

data/spec/lib/bumbleworks/process/error_record_spec.rb

@@ -2,8 +2,6 @@ require File.expand_path(File.join(fixtures_path, 'participants', 'naughty_parti
 
 describe Bumbleworks::Process::ErrorRecord do
   before :each do
-    Bumbleworks.reset!
-    Bumbleworks.storage = {}
     Bumbleworks::Ruote.register_participants do
       fall_apart NaughtyParticipant
     end

data/spec/lib/bumbleworks/process_definition_spec.rb

@@ -1,9 +1,4 @@
 describe Bumbleworks::ProcessDefinition do
-  before :each do
-    Bumbleworks.reset!
-    Bumbleworks.storage = {}
-  end
-
   let(:valid_definition) { %q(
     Bumbleworks.define_process 'monkeys' do
       chocolate_covered_skis :are => 'awesome'

data/spec/lib/bumbleworks/process_spec.rb

@@ -2,8 +2,6 @@ require File.expand_path(File.join(fixtures_path, 'entities', 'rainbow_loom'))
 
 describe Bumbleworks::Process do
   before :each do
-    Bumbleworks.reset!
-    Bumbleworks.storage = {}
     Bumbleworks::Ruote.register_participants
     Bumbleworks.start_worker!
 

data/spec/lib/bumbleworks/ruote/exp/broadcast_event_expression_spec.rb

@@ -1,7 +1,5 @@
 describe Ruote::Exp::BroadcastEventExpression do
   before :each do
-    Bumbleworks.reset!
-    Bumbleworks.storage = {}
     Bumbleworks.start_worker!
     Bumbleworks.dashboard.add_service('tracer', @tracer = Tracer.new)
   end

data/spec/lib/bumbleworks/ruote/exp/wait_for_event_expression_spec.rb

@@ -1,7 +1,5 @@
 describe Ruote::Exp::WaitForEventExpression do
   before :each do
-    Bumbleworks.reset!
-    Bumbleworks.storage = {}
     Bumbleworks.start_worker!
     Bumbleworks.dashboard.add_service('tracer', @tracer = Tracer.new)
   end

data/spec/lib/bumbleworks/ruote_spec.rb

@@ -1,9 +1,4 @@
 describe Bumbleworks::Ruote do
-  before :each do
-    Bumbleworks.reset!
-    Bumbleworks.storage = {}
-  end
-
   describe ".cancel_process!" do
     before :each do
       Bumbleworks.start_worker!
@@ -398,11 +393,15 @@ describe Bumbleworks::Ruote do
 
   describe '.reset!' do
     it 'purges and shuts down storage, then resets storage' do
-      old_storage = described_class.storage
+      old_storage = double('Storage')
+      allow(described_class).to receive(:initialize_storage_adapter).and_return(old_storage)
       old_storage.should_receive(:purge!)
       old_storage.should_receive(:shutdown)
       described_class.reset!
-      described_class.storage.should_not == old_storage
+      allow(described_class).to receive(:initialize_storage_adapter).and_return(:new_storage)
+      described_class.storage.should == :new_storage
+      # clean up
+      described_class.instance_variable_set(:@storage, nil)
     end
 
     it 'skips purging and shutting down of storage if no storage' do

data/spec/lib/bumbleworks/task/finder_spec.rb

@@ -1,7 +1,5 @@
 describe Bumbleworks::Task::Finder do
   before :each do
-    Bumbleworks.reset!
-    Bumbleworks.storage = {}
     Bumbleworks::Ruote.register_participants
     Bumbleworks.start_worker!
     Bumbleworks.define_process 'dog-lifecycle' do

data/spec/lib/bumbleworks/task_spec.rb

@@ -2,8 +2,6 @@ describe Bumbleworks::Task do
   let(:workflow_item) {Ruote::Workitem.new('fields' => {'params' => {'task' => 'go_to_work'} })}
 
   before :each do
-    Bumbleworks.reset!
-    Bumbleworks.storage = {}
     Bumbleworks::Ruote.register_participants
     Bumbleworks.start_worker!
   end

data/spec/lib/bumbleworks/tracker_spec.rb

@@ -3,8 +3,6 @@ require File.expand_path(File.join(fixtures_path, 'trackers'))
 
 describe Bumbleworks::Tracker do
   before(:each) do
-    Bumbleworks.reset!
-    Bumbleworks.storage = {}
     Bumbleworks.dashboard.stub(:get_trackers => fake_trackers)
   end
 

data/spec/lib/bumbleworks_spec.rb

@@ -35,12 +35,19 @@ describe Bumbleworks do
     end
   end
 
+  describe '.clear_configuration!' do
+    it 'resets configuration' do
+      old_config = described_class.configuration
+      described_class.clear_configuration!
+      described_class.configuration.should_not == old_config
+    end
+  end
+
   describe '.reset!' do
     it 'resets configuration and resets ruote' do
-      old_config = described_class.configuration
-      Bumbleworks::Ruote.should_receive(:reset!)
+      expect(Bumbleworks::Ruote).to receive(:reset!).ordered
+      expect(described_class).to receive(:clear_configuration!).ordered
       described_class.reset!
-      described_class.configuration.should_not == old_config
     end
   end
 
@@ -134,7 +141,6 @@ describe Bumbleworks do
 
   describe '.configuration' do
     before :each do
-      Bumbleworks.reset!
       Bumbleworks::StorageAdapter.auto_register = nil
     end
 
@@ -149,11 +155,13 @@ describe Bumbleworks do
 
     it 'automatically adds Redis adapter if defined' do
       stub_const('Bumbleworks::Redis::Adapter', Bumbleworks::StorageAdapter)
+      Bumbleworks.clear_configuration! # to reload storage adapters
       described_class.configuration.storage_adapters.should include(Bumbleworks::Redis::Adapter)
     end
 
     it 'automatically adds Sequel adapter if defined' do
       stub_const('Bumbleworks::Sequel::Adapter', Bumbleworks::StorageAdapter)
+      Bumbleworks.clear_configuration! # to reload storage adapters
       described_class.configuration.storage_adapters.should include(Bumbleworks::Sequel::Adapter)
     end
   end

data/spec/spec_helper.rb

@@ -16,4 +16,13 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
+
+  config.before(:each) do
+    # Yup, we're setting the storage twice - the first time is to
+    # ensure that the .reset! isn't trying to access a test double, and
+    # the second is to initialize it to a hash for tests.
+    Bumbleworks.storage = nil
+    Bumbleworks.reset!
+    Bumbleworks.storage = {}
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumbleworks
 version: !ruby/object:Gem::Version
-  version: 0.0.73
+  version: 0.0.74
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruote
@@ -271,7 +271,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2455234384689575722
+      hash: 1064429954326837811
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -280,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2455234384689575722
+      hash: 1064429954326837811
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23