@@ -1,5 +1,6 @@ module Mixology def mixin(mod) + unmix mod reset_method_cache IncludedModule.new(mod).attach_to metaclass reset_method_cache @@ -10,6 +11,7 @@ module Mixology last_super = metaclass this_super = metaclass.direct_superclass while this_super + break if this_super == self.class if (this_super == mod_to_unmix || this_super.respond_to?(:module) && this_super.module == mod_to_unmix) reset_method_cache lib/mixology_rubinius.rb @@ -44,9 +44,6 @@ class MixologyTest < Test::Unit::TestCase end def test_unmix_effects_limited_to_instance - if rubinius? - print "PENDING"; return - end mixin = Module.new { def foo; "mixin"; end } object = Class.new {include mixin}.new assert_equal "mixin", object.foo @@ -79,9 +76,6 @@ class MixologyTest < Test::Unit::TestCase end def test_included_modules_after_remix - if rubinius? - print "PENDING"; return - end mixin_one = Module.new mixin_two = Module.new object = Object.new @@ -129,7 +123,7 @@ class MixologyTest < Test::Unit::TestCase assert_equal [mixin, nested_module, nested_module_penultimate, nested_module_ultimate, Mixology, Kernel], (class << object; self; end).included_modules end - def test_nested_modules_are_mixedin_even_if_alrady_mixed_in + def test_nested_modules_are_mixedin_even_if_already_mixed_in if rubinius? print "PENDING"; return end test/mixology_test.rb 44694d277fbcc31d0de5ba0fd3c8853cf9d3a929 Dan Manges daniel.manges@gmail.com http://github.com/dan-manges/mixology/commit/b150998ab12ea669c24f984d1ca69abda0be56b5 b150998ab12ea669c24f984d1ca69abda0be56b5 2008-10-12T20:47:50-07:00 2008-10-12T20:47:50-07:00 2 more passing tests for the rubinius implementation ea10d1fdb1dcf189ec3abba7cc97051ae8386597 Dan Manges daniel.manges@gmail.com