@@ -16,14 +16,14 @@ module Immutable alias_method "#{UNIQ}_old_#{method}", method end - @allow_method_override = false + instance_variable_set("@#{UNIQ}_in_method_added", false) @args = args; @opts = opts module_eval do def self.method_added(sym) if @args @args.each do |method| - if method && sym == method.to_sym && !@allow_method_override + if method && sym == method.to_sym && !in_method_added? unless @opts[:silent] raise CannotOverrideMethod, "Cannot override the immutable method: #{sym}" end @@ -50,10 +50,14 @@ module Immutable end # module_eval def self.allow_method_override - @allow_method_override = true + instance_variable_set("@#{UNIQ}_in_method_added", true) yield ensure - @allow_method_override = false + instance_variable_set("@#{UNIQ}_in_method_added", false) + end + + def self.in_method_added? + instance_variable_get("@#{UNIQ}_in_method_added") end end # def immutable_method() lib/immutable.rb 8768bbdc1fb84e0bd2a56aec30f77ad2a9afdc48 Garry Dolley gdolley@arpnetworks.com http://github.com/up_the_irons/immutable/commit/08e3a5540694ce151f8b3962ea784f1b1cc72f60 08e3a5540694ce151f8b3962ea784f1b1cc72f60 2008-09-27T14:13:07-07:00 2008-09-27T14:13:07-07:00 Made instance var that holds state of whether we are already in our own method_added() unique. 53126e54ff6f819e6e88f83e9091d25672a5dfb6 Garry Dolley gdolley@arpnetworks.com