moved jail-methods out of blankslate

svenfuchs · Apr 23, 2010 · c076d4f · c076d4f
1 parent 022c81d
commit c076d4f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 21 deletions.
diff --git a/plugins/adva_safemode/lib/safemode/blankslate.rb b/plugins/adva_safemode/lib/safemode/blankslate.rb
@@ -9,27 +9,6 @@ class << self
       silently { undef_methods(*instance_methods - @@allow_class_methods) }
 
       def method_added(name) end # ActiveSupport needs this
-
-      def inherited(subclass)
-        subclass.init_allowed_methods(@allowed_methods)
-      end
-
-      def init_allowed_methods(allowed_methods)
-        @allowed_methods = allowed_methods
-      end
-
-      def allowed_methods
-        @allowed_methods ||= []
-      end
-
-      def allow(*names)
-        @allowed_methods = allowed_methods + names.map{|name| name.to_s}
-        @allowed_methods.uniq!
-      end
-
-      def allowed?(name)
-        allowed_methods.include? name.to_s
-      end
     end
   end
 end
diff --git a/plugins/adva_safemode/lib/safemode/jail.rb b/plugins/adva_safemode/lib/safemode/jail.rb
@@ -1,5 +1,30 @@
 module Safemode
   class Jail < Blankslate
+    class << self
+      def method_added(name) end # ActiveSupport needs this
+
+      def inherited(subclass)
+        subclass.init_allowed_methods(@allowed_methods)
+      end
+
+      def init_allowed_methods(allowed_methods)
+        @allowed_methods = allowed_methods
+      end
+
+      def allowed_methods
+        @allowed_methods ||= []
+      end
+
+      def allow(*names)
+        @allowed_methods = allowed_methods + names.map{|name| name.to_s}
+        @allowed_methods.uniq!
+      end
+
+      def allowed?(name)
+        allowed_methods.include? name.to_s
+      end
+    end
+
     def initialize(source = nil)
       @source = source
     end