bumbleworks 0.0.24 → 0.0.25

data/lib/bumbleworks/configuration.rb

@@ -125,12 +125,13 @@ module Bumbleworks
     #
     def root
       @root ||= case
-      when defined?(Rails) then Rails.root
-      when defined?(Rory) then Rory.root
-      when defined?(Sinatra::Application) then Sinatra::Application.root
-      else
-        raise UndefinedSetting.new("Bumbleworks.root must be set") unless @root
+        when defined?(Rails) then Rails.root
+        when defined?(Rory) then Rory.root
+        when defined?(Padrino) then Padrino.root
+        when defined?(Sinatra::Application) then Sinatra::Application.root
       end
+      raise UndefinedSetting.new("Bumbleworks.root must be set") unless @root
+      @root
     end
 
     # Add a storage adapter to the set of possible adapters.  Takes an object
@@ -176,22 +177,26 @@ module Bumbleworks
       find_folder(default_folders, @tasks_directory, "Tasks folder not found")
     end
 
-    def find_folder(default_directories, defined_directory, message)
-      # use defined directory structure if defined
-      if defined_directory
-        defined_directory = File.join(root, defined_directory) unless defined_directory[0] == '/'
-      end
-
-      # next look in default directory structure
-      defined_directory ||= default_directories.detect do |default_folder|
-        folder = File.join(root, default_folder)
-        next unless File.directory?(folder)
-        break folder
+    def find_folder(default_directories, user_defined_directory, message)
+      if user_defined_directory
+        # use user-defined directory if specified
+        defined_directory = if user_defined_directory[0] == '/'
+          user_defined_directory
+        else
+          File.join(root, user_defined_directory)
+        end
+      else
+        # next look in default directory structure
+        defined_directory = default_directories.detect do |default_folder|
+          folder = File.join(root, default_folder)
+          next unless File.directory?(folder)
+          break folder
+        end
       end
 
       return defined_directory if File.directory?(defined_directory.to_s)
 
-      raise Bumbleworks::InvalidSetting, "#{message}: #{defined_directory}"
+      raise Bumbleworks::InvalidSetting, "#{message} (looked in #{user_defined_directory || default_directories.join(', ')})"
     end
   end
 end

data/lib/bumbleworks/task.rb

@@ -171,10 +171,6 @@ module Bumbleworks
 
   private
 
-    def workitem
-      @workitem
-    end
-
     def storage_participant
       self.class.storage_participant
     end

data/lib/bumbleworks/version.rb

@@ -1,3 +1,3 @@
 module Bumbleworks
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

data/spec/lib/bumbleworks/configuration_spec.rb

@@ -25,6 +25,17 @@ describe Bumbleworks::Configuration do
       Object.send(:remove_const, :Rails)
     end
 
+    it 'uses Padrino.root if defined' do
+      class Padrino
+        def self.root
+          '/Padrino/Root'
+        end
+      end
+
+      configuration.root.should == '/Padrino/Root'
+      Object.send(:remove_const, :Padrino)
+    end
+
     it 'uses Sinatra::Application.root if defined' do
       class Sinatra
         class Application
@@ -48,6 +59,17 @@ describe Bumbleworks::Configuration do
       configuration.root.should == '/Rory/Root'
       Object.send(:remove_const, :Rory)
     end
+
+    it 'raises error if automatic root detection returns nil' do
+      class Rails
+        def self.root
+          nil
+        end
+      end
+
+      expect{configuration.root}.to raise_error Bumbleworks::UndefinedSetting
+      Object.send(:remove_const, :Rails)
+    end
   end
 
   describe "#definitions_directory" do
@@ -72,12 +94,22 @@ describe Bumbleworks::Configuration do
 
     it 'raises an error if default folder not found' do
       configuration.root = '/Root'
-      expect{configuration.definitions_directory}.to raise_error Bumbleworks::InvalidSetting
+      expect {
+        configuration.definitions_directory
+      }.to raise_error(
+        Bumbleworks::InvalidSetting,
+        "Definitions folder not found (looked in lib/bumbleworks/process_definitions, lib/bumbleworks/processes)"
+      )
     end
 
     it 'raises an error if specific folder not found' do
       configuration.definitions_directory = '/mumbo/jumbo'
-      expect{configuration.definitions_directory}.to raise_error Bumbleworks::InvalidSetting
+      expect {
+        configuration.definitions_directory
+      }.to raise_error(
+        Bumbleworks::InvalidSetting,
+        "Definitions folder not found (looked in /mumbo/jumbo)"
+      )
     end
   end
 
@@ -96,12 +128,22 @@ describe Bumbleworks::Configuration do
 
     it 'raises an error if default folder not found' do
       configuration.root = '/Root'
-      expect{configuration.participants_directory}.to raise_error Bumbleworks::InvalidSetting
+      expect {
+        configuration.participants_directory
+      }.to raise_error(
+        Bumbleworks::InvalidSetting,
+        "Participants folder not found (looked in lib/bumbleworks/participants)"
+      )
     end
 
     it 'raises an error if specific folder not found' do
       configuration.participants_directory = '/mumbo/jumbo'
-      expect{configuration.participants_directory}.to raise_error Bumbleworks::InvalidSetting
+      expect {
+        configuration.participants_directory
+      }.to raise_error(
+        Bumbleworks::InvalidSetting,
+        "Participants folder not found (looked in /mumbo/jumbo)"
+      )
     end
   end
 
@@ -120,12 +162,22 @@ describe Bumbleworks::Configuration do
 
     it 'raises an error if default folder not found' do
       configuration.root = '/Root'
-      expect{configuration.tasks_directory}.to raise_error Bumbleworks::InvalidSetting
+      expect {
+        configuration.tasks_directory
+      }.to raise_error(
+        Bumbleworks::InvalidSetting,
+        "Tasks folder not found (looked in lib/bumbleworks/tasks)"
+      )
     end
 
     it 'raises an error if specific folder not found' do
       configuration.tasks_directory = '/mumbo/jumbo'
-      expect{configuration.tasks_directory}.to raise_error Bumbleworks::InvalidSetting
+      expect {
+        configuration.tasks_directory
+      }.to raise_error(
+        Bumbleworks::InvalidSetting,
+        "Tasks folder not found (looked in /mumbo/jumbo)"
+      )
     end
   end
 

data/spec/lib/bumbleworks/workitem_entity_storage_spec.rb

@@ -57,14 +57,6 @@ describe Bumbleworks::WorkitemEntityStorage do
       Object.send(:remove_const, :LovelyEntity)
     end
 
-    let(:entitied_workflow_item) {
-      Ruote::Workitem.new('fields' => {
-        'entity_id' => '15',
-        'entity_type' => 'LovelyEntity',
-        'params' => {'task' => 'go_to_work'}
-      })
-    }
-
     it 'attempts to instantiate business entity from _id and _type fields' do
       feh = FakeEntityHolder.new('entity_id' => '15', 'entity_type' => 'LovelyEntity')
       feh.entity.identifier.should == '15'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumbleworks
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-13 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruote
@@ -227,12 +227,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2155630126504321546
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2155630126504321546
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -271,4 +277,3 @@ test_files:
 - spec/lib/bumbleworks_spec.rb
 - spec/spec_helper.rb
 - spec/support/path_helpers.rb
-has_rdoc: