objectbouncer 0.1.2 → 0.1.3

data/lib/objectbouncer/class_methods.rb

@@ -95,18 +95,22 @@ module ObjectBouncer
       end
 
       def protect_method!(method, force = false)
-        renamed_method = "#{method}_without_objectbouncer".to_sym
         if method_defined?(method)
-          return if method_defined?(renamed_method)
-          return if !force && method_defined?(renamed_method)
-          alias_method renamed_method, method
-          define_method method do |*args, &block|
-            if call_denied?(method, *args)
-              raise ObjectBouncer::PermissionDenied.new
-            else
-              send(renamed_method, *args, &block)
+          renamed_method = "#{method}_without_objectbouncer".to_sym
+          new_method     = "#{method}_with_objectbouncer".to_sym
+          unless method_defined?(new_method)
+            define_method new_method do |*args, &block|
+              if call_denied?(method, *args)
+                raise ObjectBouncer::PermissionDenied.new
+              else
+                send(renamed_method, *args, &block)
+              end
             end
           end
+          if instance_method(method) != instance_method(new_method)
+            alias_method renamed_method, method
+            alias_method method, new_method
+          end
         end
       end
 

data/test/objectbouncer/activerecord_test.rb

@@ -12,9 +12,9 @@ class Book < ActiveRecord::Base
     deny :destroy
   end
 
-  #def destroy
-  #  super
-  #end
+  def destroy
+    super
+  end
 end
 
 class Author
@@ -66,8 +66,6 @@ class ActiveRecordTest < Test::Unit::TestCase
         @book = Book.create!(:name   => "On Food & Cooking",
                              :author => "Harold McGee",
                              :price  => 4900)
-        @book_as_author = Book.as(@author).find(@book.id)
-        @book_as_reader = Book.as(@author).find(@book.id)
       end
 
       should "prevent all users from destroying (even with an overridden method)" do

data/test/objectbouncer/base_test.rb

@@ -89,18 +89,6 @@ class ObjectBouncerTest < Test::Unit::TestCase
       end
     end
 
-    should "be able to specify user on creation" do
-      joe_public = JoePublic.new
-      @president = President.as(joe_public).new
-      assert_raise ObjectBouncer::PermissionDenied do
-        @president.shake_hands
-      end
-
-      first_lady = MichelleObama.new
-      @president = President.as(first_lady).new
-      assert_equal "shaking hands", @president.shake_hands
-    end
-
   end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: objectbouncer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Glenn Gillen