bumbleworks 0.0.70 → 0.0.71

data/lib/bumbleworks/user.rb

@@ -1,10 +1,18 @@
 module Bumbleworks
   module User
+    # This exception is raised if the including class has no #role_identifiers
+    # method defined.  See #role_identifiers below for details.
     class NoRoleIdentifiersMethodDefined < StandardError; end
+    # This exception is raised if the including class has no #claim_token
+    # method defined, and also no fallback methods (#username or #email).  See
+    # #claim_token below for details.
     class NoClaimTokenMethodDefined < StandardError; end
-    class MissingRoleQueryMethod < StandardError; end
-    class AmbiguousRoleQueryMethod < StandardError; end
+
+    # Attempting to #claim a task that the user is not authorized for will raise
+    # this exception.
     class UnauthorizedClaimAttempt < StandardError; end
+    # Attempting to #release a task that is claimed by another token will raise
+    # this exception.
     class UnauthorizedReleaseAttempt < StandardError; end
 
     # The return value from this method is used as the "claimant" token on
@@ -41,17 +49,19 @@ module Bumbleworks
     # Attempts to set self as the claimant of the given task.  If not authorized
     # to claim the task, raises exception.  Also bubbles exception from Task
     # when task is already claimed by a different claimant.
-    def claim(task)
+    def claim(task, force = false)
       raise UnauthorizedClaimAttempt unless has_role?(task.role)
+      release!(task) if force
       task.claim(claim_token)
     end
 
-    # Same as #claim, but first releases (by force) the task, to avoid any
-    # possible UnauthorizedClaimAttempt or AlreadyClaimed exceptions.  Should
-    # only be made available to supervisory roles.
+    # Same as #claim, but first releases (by force) the task, to avoid an
+    # AlreadyClaimed exceptions.  Note that this may still raise an
+    # UnauthorizedClaimAttempt exception - this method does not allow a user
+    # to claim a task they are not authorized for.  Should only be made
+    # available to supervisory roles.
     def claim!(task)
-      release!(task)
-      claim(task)
+      claim(task, true)
     end
 
     # If we are the current claimant of the given task, release the task. Does

data/lib/bumbleworks/version.rb

@@ -1,3 +1,3 @@
 module Bumbleworks
-  VERSION = "0.0.70"
+  VERSION = "0.0.71"
 end

data/spec/lib/bumbleworks/user_spec.rb

@@ -65,6 +65,15 @@ describe Bumbleworks::User do
         task.should_receive(:claim).with("the umpire of snorts").ordered
         subject.claim!(task)
       end
+
+      it 'raises exception (and does not release) if unauthorized' do
+        task = double('task', :role => 'fashbone')
+        task.should_receive(:release).never
+        task.should_receive(:claim).never
+        expect {
+          subject.claim!(task)
+        }.to raise_error(Bumbleworks::User::UnauthorizedClaimAttempt)
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumbleworks
 version: !ruby/object:Gem::Version
-  version: 0.0.70
+  version: 0.0.71
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruote
@@ -266,7 +266,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1442108325624690777
+      hash: 53431836910523847
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -275,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1442108325624690777
+      hash: 53431836910523847
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23