update how we're checking whether a method is defined, and add a test

jamesgolick · Nov 29, 2008 · 2b261bc · 2b261bc
1 parent ee643a0
commit 2b261bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/resource_controller/class_methods.rb b/lib/resource_controller/class_methods.rb
@@ -17,7 +17,7 @@ def actions(*opts)
       actions_to_remove += [*config[:except]] if config[:except]
       actions_to_remove.uniq!
 
-      actions_to_remove.each { |action| undef_method(action) if instance_methods.include?(action.to_s) }
+      actions_to_remove.each { |action| undef_method(action) if method_defined?(action) }
     end
 
   end

diff --git a/test/app/controllers/photos_controller.rb b/test/app/controllers/photos_controller.rb
@@ -1,5 +1,6 @@
 class PhotosController < ResourceController::Base
   actions :all, :except => :update
+  actions :all, :except => :update
 
   belongs_to :user
   create.flash { "#{@photo.title} was created!" }