bumbleworks 0.0.56 → 0.0.57

data/lib/bumbleworks.rb

@@ -183,12 +183,12 @@ module Bumbleworks
     def extract_entity_from_fields!(fields)
       begin
         if entity = fields.delete(:entity)
-          fields[:entity_id] = entity.respond_to?(:identifier) ? entity.identifier : entity.id
+          fields[:entity_id] = entity.identifier
           fields[:entity_type] = entity.class.name
-          raise InvalidEntity, "Entity#id must be non-null" unless fields[:entity_id]
+          raise InvalidEntity, "Entity#identifier must be non-null" unless fields[:entity_id]
         end
       rescue NoMethodError => e
-        raise InvalidEntity, "Entity must respond to #identifier (or #id) and #class.name"
+        raise InvalidEntity, "Entity must respond to #identifier and #class.name"
       end
     end
   end

data/lib/bumbleworks/entity.rb

@@ -4,6 +4,14 @@ module Bumbleworks
       klass.extend ClassMethods
     end
 
+    def identifier
+      id
+    end
+
+    def to_s
+      "#{Bumbleworks::Support.titleize(self.class.name)} #{identifier}"
+    end
+
     def launch_process(process_name, options = {})
       identifier_attribute = attribute_for_process_name(process_name.to_sym)
       if (options[:force] == true || (process_identifier = self.send(identifier_attribute)).nil?)

data/lib/bumbleworks/task/finder.rb

@@ -76,10 +76,9 @@ module Bumbleworks
       end
 
       def for_entity(entity)
-        entity_id = entity.respond_to?(:identifier) ? entity.identifier : entity.id
         @queries << proc { |wi|
           (wi['fields'][:entity_type] || wi['fields']['entity_type']) == entity.class.name &&
-            (wi['fields'][:entity_id] || wi['fields']['entity_id']) == entity_id
+            (wi['fields'][:entity_id] || wi['fields']['entity_id']) == entity.identifier
         }
         self
       end

data/lib/bumbleworks/version.rb

@@ -1,3 +1,3 @@
 module Bumbleworks
-  VERSION = "0.0.56"
+  VERSION = "0.0.57"
 end

data/spec/lib/bumbleworks/entity_spec.rb

@@ -1,6 +1,23 @@
 describe Bumbleworks::Entity do
   let(:entity_class) { Class.new { include Bumbleworks::Entity } }
 
+  describe '#identifier' do
+    it 'returns id by default' do
+      entity = entity_class.new
+      entity.stub(:id => 'berf')
+      entity.identifier.should == 'berf'
+    end
+  end
+
+  describe '#to_s' do
+    it 'returns string with titleized class name and identifier' do
+      entity_class.stub(:name => 'GiantAngryPlum')
+      entity = entity_class.new
+      entity.stub(:identifier => 1490)
+      entity.to_s.should == 'Giant Angry Plum 1490'
+    end
+  end
+
   describe '#processes_by_name' do
     it 'returns hash of process names and process instances' do
       [:zoom, :foof, :nook].each do |pname|

data/spec/lib/bumbleworks/task_spec.rb

@@ -552,20 +552,6 @@ describe Bumbleworks::Task do
       tasks = described_class.for_entity(fake_sandwich)
       tasks.should have(2).items
     end
-
-    it 'queries for id if entity does not respond to identifier' do
-      fake_mauvebelt = OpenStruct.new(:id => 'television_hat')
-      Bumbleworks.define_process 'tautological_mauvebelt' do
-        concurrence do
-          mauvebelt :task => 'wear_oneself'
-          mauvebelt :task => 'be_worn_by_oneself'
-        end
-      end
-      Bumbleworks.launch!('tautological_mauvebelt', :entity => fake_mauvebelt)
-      Bumbleworks.dashboard.wait_for(:mauvebelt)
-      tasks = described_class.for_entity(fake_mauvebelt)
-      tasks.should have(2).items
-    end
   end
 
   context '.by_nickname' do

data/spec/lib/bumbleworks_spec.rb

@@ -193,9 +193,9 @@ describe Bumbleworks do
   describe '.launch!' do
     before :all do
       class LovelyEntity
-        attr_accessor :id
-        def initialize(id)
-          @id = id
+        attr_accessor :identifier
+        def initialize(identifier)
+          @identifier = identifier
         end
       end
     end
@@ -219,13 +219,6 @@ describe Bumbleworks do
       Bumbleworks.launch!(:amazing_process, { :entity => LovelyEntity.new(:wiley_e_coyote) }, :et_cetera)
     end
 
-    it 'uses "identifier" method instead of id, if entity has one' do
-      entity = LovelyEntity.new(5)
-      entity.stub(:identifier).and_return(:five)
-      Bumbleworks::Ruote.should_receive(:launch).with(:amazing_process, :entity_id => :five, :entity_type => 'LovelyEntity')
-      Bumbleworks.launch!(:amazing_process, :entity => entity)
-    end
-
     it 'returns a Bumbleworks::Process instance with the wfid of the launched process' do
       Bumbleworks::Ruote.stub(:launch).with(:amazing_process).and_return('18181818')
       bp = Bumbleworks.launch!(:amazing_process)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumbleworks
 version: !ruby/object:Gem::Version
-  version: 0.0.56
+  version: 0.0.57
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruote
@@ -262,7 +262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1303608967349520599
+      hash: 855634540597559898
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1303608967349520599
+      hash: 855634540597559898
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23