@@ -12,6 +12,7 @@ module Immutable def immutable_method(*args) # Initialize variables @immutable_methods = [] if @immutable_methods.nil? + @silent_immutable_methods = [] if @silent_immutable_methods.nil? instance_variable_set("@#{UNIQ}_in_method_added", false) opts = args.last.is_a?(Hash) ? args.pop : {} @@ -22,6 +23,7 @@ module Immutable # Build list of immutable methods @immutable_methods += args + @silent_immutable_methods += args if opts[:silent] @opts = opts module_eval do @@ -29,7 +31,7 @@ module Immutable if @immutable_methods @immutable_methods.each do |method| if method && sym == method.to_sym && !in_method_added? - unless @opts[:silent] + unless @silent_immutable_methods.include?(method) raise CannotOverrideMethod, "Cannot override the immutable method: #{sym}" end lib/immutable.rb @@ -176,6 +176,11 @@ module Boo :fast end + def boofoo + :boofoo_fast + end + + immutable_method :boofoo, :silent => true immutable_method :boo end @@ -187,6 +192,11 @@ describe "Exceptions" do end.should raise_error(Immutable::CannotOverrideMethod, /Cannot override the immutable method: boo$/) end end + + it "should not raise if :silent => true" do + redefine(Boo, :boofoo) + test_it(Boo, :boofoo, :boofoo_fast) + end end ######### @@ -208,10 +218,15 @@ module Bear :baz_fast end + def boo + :boo_fast + end + # Make sure we can make independent calls to immutable_method immutable_method :foo immutable_method :bar - immutable_method :baz + immutable_method :baz, :silent => true + immutable_method :boo end describe "Multiple independent calls to immutable_method()" do @@ -228,9 +243,14 @@ describe "Multiple independent calls to immutable_method()" do end it "should still recognize baz() is immutable" do + redefine(Bear, :baz) + test_it(Bear, :baz, :baz_fast) + end + + it "should still recognize boo() is immutable" do lambda do - redefine(Bear, :baz) - end.should raise_error(Immutable::CannotOverrideMethod, /Cannot override the immutable method: baz$/) + redefine(Bear, :boo) + end.should raise_error(Immutable::CannotOverrideMethod, /Cannot override the immutable method: boo$/) end end spec/immutable_spec.rb 637efc92a98862efbb9ba6d99af522b40ddd4160 Garry Dolley gdolley@arpnetworks.com http://github.com/up_the_irons/immutable/commit/fdaf6080c73e337b6a332da4f6e6c69e41ae94f9 fdaf6080c73e337b6a332da4f6e6c69e41ae94f9 2008-09-27T18:27:24-07:00 2008-09-27T18:27:24-07:00 Allow some immutable methods to be silent, while others still raise exception 627d6ce299e3db0ebde7d74b148b3a0cfb5b207d Garry Dolley gdolley@arpnetworks.com