acts-as-approvable 0.6.8.1 → 0.6.9

data/CHANGELOG

@@ -1,3 +1,12 @@
+== 0.6.9
+
+ * Fix generator templates using `select` instead of `select_tag`
+ * `reset!` to push a create approval back to a valid pending state
+ * Refactor Ownership setup to use a source class instead of monkey-patching
+ to override owner retrieval methods. Fixes an issue with rails development
+ mode.
+ * General cleanup
+
 == 0.6.8.1
 
  * Bad gem push...

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    acts-as-approvable (0.6.7)
+    acts-as-approvable (0.6.8.1)
 
 GEM
   remote: http://rubygems.org/
@@ -15,17 +15,15 @@ GEM
     binding_of_caller (0.6.7)
     builder (3.0.0)
     coderay (1.0.5)
-    coolline (0.1.0)
-    cucumber (1.1.0)
+    cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.5.0)
+      gherkin (~> 2.9.0)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
-    gherkin (2.5.1)
+    gherkin (2.9.0)
       json (>= 1.4.6)
-    io-console (0.3)
     json (1.6.5)
     method_source (0.7.1)
     multi_json (1.1.0)
@@ -35,9 +33,6 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.7.1)
       slop (>= 2.4.4, < 3)
-    pry-coolline (0.1.1)
-      coolline (~> 0.1.0)
-      io-console (~> 0.3.0)
     pry-exception_explorer (0.1.9)
       pry-stack_explorer (>= 0.3.9)
     pry-nav (0.1.0)
@@ -63,7 +58,7 @@ GEM
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
     slop (2.4.4)
-    term-ansicolor (1.0.6)
+    term-ansicolor (1.0.7)
     timecop (0.3.5)
     yard (0.7.5)
 
@@ -77,7 +72,6 @@ DEPENDENCIES
   cucumber (~> 1.1.0)
   plymouth
   pry (~> 0.9.8.1)
-  pry-coolline
   pry-nav (~> 0.1.0)
   pry-stack_explorer
   pry-syntax-hacks

data/VERSION

@@ -1 +1 @@
-0.6.8.1
+0.6.9

data/acts-as-approvable.gemspec

@@ -31,7 +31,6 @@ Gem::Specification.new do |s|
 
   if RUBY_VERSION =~ /^1\.9/
     s.add_development_dependency %q<simplecov>
-    s.add_development_dependency %q<pry-coolline>
     s.add_development_dependency %q<pry-stack_explorer>
     s.add_development_dependency %q<pry-nav>,           '~> 0.1.0'
     s.add_development_dependency %q<plymouth>

data/features/reset_approval.feature

@@ -0,0 +1,13 @@
+Feature: Reset Approvals
+    In order to allow reseting record creation approval for future-approval.
+
+    Background:
+        Given a record created with create approval
+        And the record is stale
+
+    Scenario: a stale record is encountered
+        Then it should be stale
+
+    Scenario: a stale record is reset
+        When I reset the record
+        Then it should not be stale

data/features/step_definitions/cucumber_steps.rb

@@ -10,7 +10,17 @@ Given /^a record created with (create|update|any) approval$/ do |type|
             end
 end
 
-When /^I (approve|reject) the (record|changes?)$/ do |state, type|
+Given /^the record is (stale)$/ do |state|
+  case state
+  when 'stale'
+    @record.title = 'changed'
+    sleep(1) # Save will put updated_at in a stale place
+  end
+
+  @record.save_without_approval!
+end
+
+When /^I (approve|reject|reset) the (record|changes?)$/ do |state, type|
   begin
     method = "#{state}!".to_sym
 
@@ -44,9 +54,17 @@ When /^I update the record with:$/ do |table|
   @update = table.rows_hash
 end
 
-Then /^it should be (pending|approved|rejected)$/ do |state|
+Then /^it should (not )?be (pending|approved|rejected|stale)$/ do |invert, state|
   method = "#{state}?".to_sym
-  @record.send(method).should be_true
+  record = state == 'stale' ? @record.approval : @record
+
+  unless invert == 'not '
+    record.send(method).should be_true
+  else
+    record.send(method).should be_false
+  end
+
+  @record.reload
 end
 
 Then /^it should have (no )?pending changes$/ do |empty|

data/gemfiles/mysql2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /Users/jlogsdon/Code/acts_as_approvable/acts_as_approvable
+  remote: /Users/jlogsdon/Code/jlogsdon.github.com/acts_as_approvable
   specs:
-    acts-as-approvable (0.6.7)
+    acts-as-approvable (0.6.8.1)
 
 GEM
   remote: http://rubygems.org/
@@ -15,7 +15,6 @@ GEM
     binding_of_caller (0.6.7)
     builder (3.0.0)
     coderay (1.0.5)
-    coolline (0.1.0)
     cucumber (1.1.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -25,7 +24,6 @@ GEM
     diff-lcs (1.1.3)
     gherkin (2.5.1)
       json (>= 1.4.6)
-    io-console (0.3)
     json (1.6.5)
     method_source (0.7.1)
     multi_json (1.1.0)
@@ -36,9 +34,6 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.7.1)
       slop (>= 2.4.4, < 3)
-    pry-coolline (0.1.1)
-      coolline (~> 0.1.0)
-      io-console (~> 0.3.0)
     pry-exception_explorer (0.1.9)
       pry-stack_explorer (>= 0.3.9)
     pry-nav (0.1.0)
@@ -79,7 +74,6 @@ DEPENDENCIES
   mysql2 (~> 0.2.18)
   plymouth
   pry (~> 0.9.8.1)
-  pry-coolline
   pry-nav (~> 0.1.0)
   pry-stack_explorer
   pry-syntax-hacks

data/gemfiles/rails2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /Users/jlogsdon/Code/acts_as_approvable/acts_as_approvable
+  remote: /Users/jlogsdon/Code/jlogsdon.github.com/acts_as_approvable
   specs:
-    acts-as-approvable (0.6.7)
+    acts-as-approvable (0.6.8.1)
 
 GEM
   remote: http://rubygems.org/
@@ -15,7 +15,6 @@ GEM
     binding_of_caller (0.6.7)
     builder (3.0.0)
     coderay (1.0.5)
-    coolline (0.1.0)
     cucumber (1.1.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -25,7 +24,6 @@ GEM
     diff-lcs (1.1.3)
     gherkin (2.5.1)
       json (>= 1.4.6)
-    io-console (0.3)
     json (1.6.5)
     method_source (0.7.1)
     multi_json (1.1.0)
@@ -35,9 +33,6 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.7.1)
       slop (>= 2.4.4, < 3)
-    pry-coolline (0.1.1)
-      coolline (~> 0.1.0)
-      io-console (~> 0.3.0)
     pry-exception_explorer (0.1.9)
       pry-stack_explorer (>= 0.3.9)
     pry-nav (0.1.0)
@@ -78,7 +73,6 @@ DEPENDENCIES
   cucumber (~> 1.1.0)
   plymouth
   pry (~> 0.9.8.1)
-  pry-coolline
   pry-nav (~> 0.1.0)
   pry-stack_explorer
   pry-syntax-hacks

data/gemfiles/rails30.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /Users/jlogsdon/Code/acts_as_approvable/acts_as_approvable
+  remote: /Users/jlogsdon/Code/jlogsdon.github.com/acts_as_approvable
   specs:
-    acts-as-approvable (0.6.7)
+    acts-as-approvable (0.6.8.1)
 
 GEM
   remote: http://rubygems.org/
@@ -34,7 +34,6 @@ GEM
     binding_of_caller (0.6.7)
     builder (2.1.2)
     coderay (1.0.5)
-    coolline (0.1.0)
     cucumber (1.1.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -47,7 +46,6 @@ GEM
     gherkin (2.5.1)
       json (>= 1.4.6)
     i18n (0.5.0)
-    io-console (0.3)
     json (1.6.5)
     method_source (0.7.1)
     multi_json (1.0.4)
@@ -57,9 +55,6 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.7.1)
       slop (>= 2.4.4, < 3)
-    pry-coolline (0.1.1)
-      coolline (~> 0.1.0)
-      io-console (~> 0.3.0)
     pry-exception_explorer (0.1.9)
       pry-stack_explorer (>= 0.3.9)
     pry-nav (0.1.0)
@@ -115,7 +110,6 @@ DEPENDENCIES
   cucumber (~> 1.1.0)
   plymouth
   pry (~> 0.9.8.1)
-  pry-coolline
   pry-nav (~> 0.1.0)
   pry-stack_explorer
   pry-syntax-hacks

data/gemfiles/rails31.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /Users/jlogsdon/Code/acts_as_approvable/acts_as_approvable
+  remote: /Users/jlogsdon/Code/jlogsdon.github.com/acts_as_approvable
   specs:
-    acts-as-approvable (0.6.7)
+    acts-as-approvable (0.6.8.1)
 
 GEM
   remote: http://rubygems.org/
@@ -35,7 +35,6 @@ GEM
     binding_of_caller (0.6.7)
     builder (3.0.0)
     coderay (1.0.5)
-    coolline (0.1.0)
     cucumber (1.1.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -48,7 +47,6 @@ GEM
       json (>= 1.4.6)
     hike (1.2.1)
     i18n (0.6.0)
-    io-console (0.3)
     json (1.6.5)
     method_source (0.7.1)
     multi_json (1.0.4)
@@ -58,9 +56,6 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.7.1)
       slop (>= 2.4.4, < 3)
-    pry-coolline (0.1.1)
-      coolline (~> 0.1.0)
-      io-console (~> 0.3.0)
     pry-exception_explorer (0.1.9)
       pry-stack_explorer (>= 0.3.9)
     pry-nav (0.1.0)
@@ -126,7 +121,6 @@ DEPENDENCIES
   cucumber (~> 1.1.0)
   plymouth
   pry (~> 0.9.8.1)
-  pry-coolline
   pry-nav (~> 0.1.0)
   pry-stack_explorer
   pry-syntax-hacks

data/generators/acts_as_approvable/templates/approvals_controller.rb

@@ -67,13 +67,8 @@ class ApprovalsController < <%= options[:base] %>
   def setup_conditions
     @conditions ||= {}
 
-<% if owner? %>    if params[:owner_id]
-      @conditions[:owner_id] = params[:owner_id]
-      @conditions[:owner_id] = nil if params[:owner_id] == 0
-    end
-<% end %>    if params[:item_type]
-      @conditions[:item_type] = params[:item_type]
-    end
+<% if owner? %>    @conditions[:owner_id] = params[:owner_id] if params[:owner_id].present?
+<% end %>    @conditions[:item_type] = params[:item_type] if params[:item_type].present?
   end
 
   # Check for the selected models partial, use the generic one if it doesn't exist

data/generators/acts_as_approvable/templates/views/erb/index.html.erb

@@ -2,13 +2,13 @@
 
 <%% form_for(:approval, :url => approvals_path, :html => {:method => :get}) do |f| %>
   <%% unless @conditions[:state].is_a?(Array) # History page shouldn't allow selecting different states %>
-    <%%= f.label(:state) %>
-    <%%= f.select(:state, options_for_select(Approval.options_for_state, @conditions[:state])) %>
+    <%%= label_tag(:state) %>
+    <%%= select_tag(:state, options_for_select(Approval.options_for_state, @conditions[:state])) %>
   <%% end %>
-<% if owner? %>  <%%= f.label(:owner_id) %>
-  <%%= f.select(:owner_id, options_for_select(Approval.options_for_assigned_owners, @conditions[:owner_id]), :prompt => 'All Users') %>
-<% end %>  <%%= f.label(:item_type) %>
-  <%%= f.select(:item_type, options_for_select(Approval.options_for_type, @conditions[:item_type]), :prompt => 'All Types') %>
+<% if owner? %>  <%%= label_tag(:owner_id) %>
+  <%%= select_tag(:owner_id, options_for_select(Approval.options_for_assigned_owners, @conditions[:owner_id]), :prompt => 'All Users') %>
+<% end %>  <%%= label_tag(:item_type) %>
+  <%%= select_tag(:item_type, options_for_select(Approval.options_for_type, @conditions[:item_type]), :prompt => 'All Types') %>
   <%%= f.submit('Filter') %>
 <%% end %>
 

data/generators/acts_as_approvable/templates/views/haml/index.html.haml

@@ -5,7 +5,7 @@
     = label_tag('state', 'State')
     = select_tag('state', options_for_select(Approval.options_for_state, @conditions[:state]))
 <% if owner? %>  = label_tag('owner_id', 'Owner')
-  = select('owner_id', options_for_select(Approval.options_for_assigned_owners(true), @conditions[:owner_id]))
+  = select_tag('owner_id', options_for_select(Approval.options_for_assigned_owners(true), @conditions[:owner_id]))
 <% end %>  = label_tag('item_type', 'Type')
   = select_tag('item_type', options_for_select(Approval.options_for_type(true), @conditions[:item_type]))
   %button{:type => 'Submit'} Filter

data/lib/acts-as-approvable.rb

@@ -52,6 +52,22 @@ module ActsAsApprovable
     @owner_class
   end
 
+  ##
+  # Set the class used for overriding Ownership retrieval
+  #
+  # @see Ownership
+  def self.owner_source=(source)
+    @owner_source = source
+  end
+
+  ##
+  # Get the class used for overriding Ownership retrieval
+  #
+  # @see Ownership
+  def self.owner_source
+    @owner_source
+  end
+
   ##
   # Set the engine used for rendering view files.
   def self.view_language=(lang)

data/lib/acts_as_approvable/approval.rb

@@ -106,7 +106,7 @@ class Approval < ActiveRecord::Base
   # Returns true if the affected item has been updated since this approval was
   # created.
   def stale?
-    unlocked? and item.has_attribute?(:updated_at) and created_at < item.updated_at
+    unlocked? and item.has_attribute?(:updated_at) and updated_at < item.updated_at
   end
 
   ##
@@ -164,15 +164,27 @@ class Approval < ActiveRecord::Base
     raise ActsAsApprovable::Error::Locked if locked?
     return unless run_item_callback(:before_reject)
 
-    if create?
-      item.set_approval_state('rejected')
-    end
+    item.set_approval_state('rejected') if create?
 
     item.save_without_approval!
     update_attributes!(:state => 'rejected', :reason => reason)
     run_item_callback(:after_reject)
   end
 
+  ##
+  # Force the approval back into a 'pending' state. Only valid for :create events.
+  #
+  # @raise [ActsAsApprovable::Error::InvalidTransition] raised if the event is not {#create? :create}.
+  def reset!
+    raise ActsAsApprovable::Error::InvalidTransition.new(state, 'pending', self) unless create?
+
+    item.set_approval_state('pending')
+    item.save_without_approval!
+
+    state_will_change! # Force an update to the record
+    update_attributes!(:state => 'rejected')
+  end
+
   private
   def run_item_callback(callback)
     item.send(callback, self) != false

data/lib/acts_as_approvable/error.rb

@@ -4,8 +4,7 @@ module ActsAsApprovable
     # Raised when a locked approval is accepted or rejected.
     class Locked < ActsAsApprovable::Error
       def initialize(*args)
-        args[0] = 'this approval is locked'
-        super(*args)
+        super('this approval is locked')
       end
     end
 
@@ -13,8 +12,7 @@ module ActsAsApprovable
     # Raised when a stale approval is accepted.
     class Stale < ActsAsApprovable::Error
       def initialize(*args)
-        args[0] = 'this approval is stale and should not be approved'
-        super(*args)
+        super('this approval is stale and should not be approved')
       end
     end
 
@@ -23,8 +21,13 @@ module ActsAsApprovable
     # {ActsAsApprovable::Ownership::ClassMethods#available_owners}.
     class InvalidOwner < ActsAsApprovable::Error
       def initialize(*args)
-        args[0] = 'this record cannot be assigned as an owner'
-        super(*args)
+        super('this record cannot be assigned as an owner')
+      end
+    end
+
+    class InvalidTransition < ActsAsApprovable::Error
+      def initialize(from, to, approval)
+        super("you may not transition from #{from} to #{to} in a #{approval.event} approval")
       end
     end
   end

data/lib/acts_as_approvable/model/create_instance_methods.rb

@@ -69,6 +69,11 @@ module ActsAsApprovable
         approval.reject!
       end
 
+      def reset!
+        return unless approvable_on?(:create) && approval.present?
+        approval.reset!
+      end
+
       private
       def approvable_create?
         approvals_enabled? and approvable_on?(:create)

data/lib/acts_as_approvable/ownership.rb

@@ -15,8 +15,9 @@ module ActsAsApprovable
     # allowing you to override functionality on the fly.
     #
     # @param [Hash] options a hash of options for configuration
-    # @option options [Object] :model the model being used for Approval records (defaults to `Approval`).
-    # @option options [Object] :owner the model being used for owner records (defaults to `User`).
+    # @option options [Object] :model   the model being used for Approval records (defaults to `Approval`).
+    # @option options [Object] :owner   the model being used for owner records (defaults to `User`).
+    # @option options [Object] :source  class used to override retrieval of owner records.
     def self.configure(options = {}, &block)
       approval = options.delete(:model) { Approval }
       owner = options.delete(:owner) { User }
@@ -24,9 +25,9 @@ module ActsAsApprovable
       approval.send(:include, self)
 
       ActsAsApprovable.owner_class = owner
-      approval.send(:belongs_to, :owner, :class_name => owner.to_s, :foreign_key => :owner_id)
+      ActsAsApprovable.owner_source = options.delete(:source)
 
-      approval.class_exec(&block) if block
+      approval.send(:belongs_to, :owner, :class_name => owner.to_s, :foreign_key => :owner_id)
     end
 
     def self.included(base)
@@ -69,11 +70,30 @@ module ActsAsApprovable
       end
 
       ##
-      # A list of records that can be assigned to an approval. This should be
-      # overridden in {ActsAsApprovable::Ownership.configure} to return only the
-      # records you wish to manage approvals.
+      # Source class used to override Owner retrieval methods
+      #
+      # @see ActsAsApprovable::Ownership.configure
+      def owner_source
+        ActsAsApprovable.owner_source
+      end
+
+      ##
+      # Attempt to run a method on the configured #owner_source class. If it does
+      # not exist yield to the given block.
+      def with_owner_source(method, *args)
+        if owner_source && owner_source.singleton_class.method_defined?(method)
+          owner_source.send(method, *args)
+        else
+          yield
+        end
+      end
+
+      ##
+      # A list of records that can be assigned to an approval.
+      #
+      # This method can be overriden by the configured #owner_source.
       def available_owners
-        owner_class.all
+        with_owner_source(:available_owners) { owner_class.all }
       end
 
       ##
@@ -89,8 +109,10 @@ module ActsAsApprovable
 
       ##
       # A list of owners that have assigned approvals.
+      #
+      # This method can be overriden by the configured #owner_source.
       def assigned_owners
-        all(:select => 'DISTINCT(owner_id)', :conditions => 'owner_id IS NOT NULL', :include => :owner).map(&:owner)
+        with_owner_source(:assigned_owners) { all(:select => 'DISTINCT(owner_id)', :conditions => 'owner_id IS NOT NULL', :include => :owner).map(&:owner) }
       end
 
       ##
@@ -108,9 +130,11 @@ module ActsAsApprovable
       # Helper method that takes an owner record and returns an array for Rails'
       # `#options_for_select`.
       #
+      # This method can be overriden by the configured #owner_source.
+      #
       # @return [Array] a 2-index array with a display string and value.
       def option_for_owner(owner)
-        [owner.to_str, owner.id]
+        with_owner_source(:option_for_owner, owner) { [owner.to_str, owner.id] }
       end
     end
   end

data/lib/generators/acts_as_approvable/templates/approvals_controller.rb

@@ -67,13 +67,8 @@ class ApprovalsController < <%= options[:base] %>
   def setup_conditions
     @conditions ||= {}
 
-<% if owner? %>    if params[:owner_id]
-      @conditions[:owner_id] = params[:owner_id]
-      @conditions[:owner_id] = nil if params[:owner_id] == 0
-    end
-<% end %>    if params[:item_type]
-      @conditions[:item_type] = params[:item_type]
-    end
+<% if owner? %>    @conditions[:owner_id] = params[:owner_id] if params[:owner_id].present?
+<% end %>    @conditions[:item_type] = params[:item_type] if params[:item_type].present?
   end
 
   # Check for the selected models partial, use the generic one if it doesn't exist

data/lib/generators/erb/templates/index.html.erb

@@ -2,13 +2,13 @@
 
 <%% form_for(:approval, :url => approvals_path, :html => {:method => :get}) do |f| %>
   <%% unless @conditions[:state].is_a?(Array) # History page shouldn't allow selecting different states %>
-    <%%= f.label(:state) %>
-    <%%= f.select(:state, options_for_select(Approval.options_for_state, @conditions[:state])) %>
+    <%%= label_tag(:state) %>
+    <%%= select_tag(:state, options_for_select(Approval.options_for_state, @conditions[:state])) %>
   <%% end %>
-<% if owner? %>  <%%= f.label(:owner_id) %>
-  <%%= f.select(:owner_id, options_for_select(Approval.options_for_assigned_owners, @conditions[:owner_id]), :prompt => 'All Users') %>
-<% end %>  <%%= f.label(:item_type) %>
-  <%%= f.select(:item_type, options_for_select(Approval.options_for_type, @conditions[:item_type]), :prompt => 'All Types') %>
+<% if owner? %>  <%%= label_tag(:owner_id) %>
+  <%%= select_tag(:owner_id, options_for_select(Approval.options_for_assigned_owners, @conditions[:owner_id]), :prompt => 'All Users') %>
+<% end %>  <%%= label_tag(:item_type) %>
+  <%%= select_tag(:item_type, options_for_select(Approval.options_for_type, @conditions[:item_type]), :prompt => 'All Types') %>
   <%%= f.submit('Filter') %>
 <%% end %>
 

data/lib/generators/haml/templates/index.html.haml

@@ -5,7 +5,7 @@
     = label_tag('state', 'State')
     = select_tag('state', options_for_select(Approval.options_for_state, @conditions[:state]))
 <% if owner? %>  = label_tag('owner_id', 'Owner')
-  = select('owner_id', options_for_select(Approval.options_for_assigned_owners(true), @conditions[:owner_id]))
+  = select_tag('owner_id', options_for_select(Approval.options_for_assigned_owners(true), @conditions[:owner_id]))
 <% end %>  = label_tag('item_type', 'Type')
   = select_tag('item_type', options_for_select(Approval.options_for_type(true), @conditions[:item_type]))
   %button{:type => 'Submit'} Filter

data/spec/acts_as_approvable/approval_spec.rb

@@ -181,6 +181,12 @@ describe Approval do
 
     it { should be_update }
     it { should_not be_create }
+
+    describe '#reset!' do
+      it 'should raise an InvalidTransition error' do
+        expect { subject.reset! }.to raise_error(ActsAsApprovable::Error::InvalidTransition)
+      end
+    end
   end
 
   context 'when the event is :create' do
@@ -190,12 +196,24 @@ describe Approval do
 
     it { should_not be_update }
     it { should be_create }
+
+    describe '#reset!' do
+      it 'should not raise an InvalidTransition error' do
+        expect { subject.reset! }.not_to raise_error(ActsAsApprovable::Error::InvalidTransition)
+      end
+
+      it 'should save even if no values change' do
+        subject.stub(:item => DefaultApprovable.new)
+        subject.should_receive(:save!).and_return(true)
+        subject.reset!
+      end
+    end
   end
 
   context 'when the approval is unlocked' do
     before(:each) do
       @item = DefaultApprovable.without_approval { |m| m.create }
-      subject.stub(:locked? => false, :created_at => Time.now, :item => @item)
+      subject.stub(:locked? => false, :updated_at => Time.now, :item => @item)
       @item.stub(:updated_at => Time.now)
     end
 
@@ -222,9 +240,25 @@ describe Approval do
       end
     end
 
+    describe '#reset!' do
+      before(:each) do
+        subject.stub(:event => 'create')
+      end
+
+      it 'saves the approval record' do
+        subject.should_receive(:save!).and_return(true)
+        subject.reset!
+      end
+
+      it 'changes the item state' do
+        @item.should_receive(:set_approval_state).with('pending')
+        subject.reset!
+      end
+    end
+
     context 'when the approval is newer than the last update' do
       before(:each) do
-        subject.stub(:created_at => @item.updated_at + 60)
+        subject.stub(:updated_at => @item.updated_at + 60)
       end
 
       it { should_not be_stale }
@@ -233,7 +267,7 @@ describe Approval do
 
     context 'when the approval is older than the last update' do
       before(:each) do
-        subject.stub(:created_at => @item.updated_at - 60)
+        subject.stub(:updated_at => @item.updated_at - 60)
       end
 
       it { should be_stale }

data/spec/acts_as_approvable/model/create_instance_methods_spec.rb

@@ -145,5 +145,25 @@ describe ActsAsApprovable::Model::CreateInstanceMethods do
         subject.reject!
       end
     end
+
+    describe '#reset!' do
+      it 'proxies to the approval record for approval' do
+        subject.should_receive(:approval)
+        subject.reset!
+      end
+
+      context 'when the approval is stale' do
+        before(:each) do
+          subject.approval.class.record_timestamps = false
+          subject.approval.update_attribute(:updated_at, subject.approval.updated_at - 1)
+          subject.approval.class.record_timestamps = true
+        end
+
+        it 'puts the approval back to fresh' do
+          subject.reset!
+          subject.approval.should be_fresh
+        end
+      end
+    end
   end
 end

data/spec/acts_as_approvable/ownership/class_methods_spec.rb

@@ -19,11 +19,30 @@ describe ActsAsApprovable::Ownership::ClassMethods do
     end
   end
 
+  describe '.owner_source' do
+    it 'proxies to ActsAsApprovable' do
+      ActsAsApprovable.should_receive(:owner_source)
+      subject.owner_source
+    end
+  end
+
   describe '.available_owners' do
     it 'selects all records from #owner_class' do
       subject.available_owners.should include(@user1)
       subject.available_owners.should include(@user2)
     end
+
+    context 'when an owner source is configured' do
+      before(:each) do
+        class FakeSource; end
+        ActsAsApprovable.owner_source = FakeSource
+      end
+
+      it 'proxies to the configured source' do
+        FakeSource.should_receive(:available_owners)
+        subject.available_owners
+      end
+    end
   end
 
   describe '.options_for_available_owners' do
@@ -51,6 +70,20 @@ describe ActsAsApprovable::Ownership::ClassMethods do
     end
   end
 
+  context 'when an owner source is configured' do
+    before(:each) do
+      class FakeSource; end
+      ActsAsApprovable.owner_source = FakeSource
+    end
+
+    describe '.assigned_owners' do
+      it 'proxies to the configured source' do
+        FakeSource.should_receive(:assigned_owners)
+        subject.assigned_owners
+      end
+    end
+  end
+
   context 'when no users are assigned' do
     describe '.assigned_owners' do
       it 'should be empty' do

data/spec/acts_as_approvable/ownership_spec.rb

@@ -29,9 +29,10 @@ describe ActsAsApprovable::Ownership do
       subject.configure(:owner => FakeUser)
     end
 
-    it 'applies the provided block' do
-      Approval.should_receive(:class_exec)
-      subject.configure {}
+    it 'uses the given :source' do
+      class FakeSource; end
+      ActsAsApprovable.should_receive(:owner_source=).with(FakeSource)
+      subject.configure(:source => FakeSource)
     end
   end
 

data/spec/spec_helper.rb

@@ -19,7 +19,7 @@ require 'active_record'
 begin
   require 'plymouth'
 rescue LoadError
-end
+end if ENV['PRYABLE']
 
 require File.expand_path('../lib/acts-as-approvable', File.dirname(__FILE__))
 

data/spec/support/database.rb

@@ -24,7 +24,10 @@ module Support
       end
 
       if db_adapter.nil?
-        raise 'No DB Adapter selected. Pass the DB= option to pick one, or install Sqlite or Sqlite3.'
+        puts
+        puts
+        puts "You must run tests using one of the available appraisals. `bundle exec rake -T` to list, `bundle exec rake appraisal:rails31` to run against Rails 3.1 and SQLite."
+        exit
       end
 
       ActiveRecord::Base.establish_connection(config[db_adapter])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-approvable
 version: !ruby/object:Gem::Version
-  version: 0.6.8.1
+  version: 0.6.9
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2012-02-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70189871219020 !ruby/object:Gem::Requirement
+  requirement: &70273856448700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 2.3.14
   type: :development
   prerelease: false
-  version_requirements: *70189871219020
+  version_requirements: *70273856448700
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70189871218380 !ruby/object:Gem::Requirement
+  requirement: &70273856524460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 0.4.1
   type: :development
   prerelease: false
-  version_requirements: *70189871218380
+  version_requirements: *70273856524460
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70189871217740 !ruby/object:Gem::Requirement
+  requirement: &70273856571200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *70189871217740
+  version_requirements: *70273856571200
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70189871217020 !ruby/object:Gem::Requirement
+  requirement: &70273856581720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70189871217020
+  version_requirements: *70273856581720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70189871152460 !ruby/object:Gem::Requirement
+  requirement: &70273856589600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70189871152460
+  version_requirements: *70273856589600
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70189871151700 !ruby/object:Gem::Requirement
+  requirement: &70273856676420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *70189871151700
+  version_requirements: *70273856676420
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70189871151120 !ruby/object:Gem::Requirement
+  requirement: &70273856899940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70189871151120
+  version_requirements: *70273856899940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70189871150360 !ruby/object:Gem::Requirement
+  requirement: &70273865174320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70189871150360
+  version_requirements: *70273865174320
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70189871149940 !ruby/object:Gem::Requirement
+  requirement: &70273865539380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189871149940
+  version_requirements: *70273865539380
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70189871149320 !ruby/object:Gem::Requirement
+  requirement: &70273865678380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +122,10 @@ dependencies:
         version: 0.9.8.1
   type: :development
   prerelease: false
-  version_requirements: *70189871149320
+  version_requirements: *70273865678380
 - !ruby/object:Gem::Dependency
   name: pry-syntax-hacks
-  requirement: &70189871148820 !ruby/object:Gem::Requirement
+  requirement: &70273865753300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +133,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189871148820
+  version_requirements: *70273865753300
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70189871148180 !ruby/object:Gem::Requirement
+  requirement: &70273866035260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,21 +144,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189871148180
-- !ruby/object:Gem::Dependency
-  name: pry-coolline
-  requirement: &70189871147640 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70189871147640
+  version_requirements: *70273866035260
 - !ruby/object:Gem::Dependency
   name: pry-stack_explorer
-  requirement: &70189871147080 !ruby/object:Gem::Requirement
+  requirement: &70273866221340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,10 +155,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189871147080
+  version_requirements: *70273866221340
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  requirement: &70189871146340 !ruby/object:Gem::Requirement
+  requirement: &70273866220740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -177,10 +166,10 @@ dependencies:
         version: 0.1.0
   type: :development
   prerelease: false
-  version_requirements: *70189871146340
+  version_requirements: *70273866220740
 - !ruby/object:Gem::Dependency
   name: plymouth
-  requirement: &70189871145480 !ruby/object:Gem::Requirement
+  requirement: &70273866220160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,7 +177,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70189871145480
+  version_requirements: *70273866220160
 description: Generic approval queues for record creation and updates
 email: dwarf@girsbrain.org
 executables: []
@@ -208,6 +197,7 @@ files:
 - VERSION
 - acts-as-approvable.gemspec
 - features/create_approval.feature
+- features/reset_approval.feature
 - features/step_definitions/cucumber_steps.rb
 - features/support/env.rb
 - features/support/large.txt
@@ -308,6 +298,7 @@ specification_version: 3
 summary: Generic approval queues for record creation and updates
 test_files:
 - features/create_approval.feature
+- features/reset_approval.feature
 - features/step_definitions/cucumber_steps.rb
 - features/support/env.rb
 - features/support/large.txt