blockenspiel 0.4.5 → 0.5.0

data/lib/blockenspiel/unmixer_rubinius.rb

@@ -71,10 +71,25 @@ module Blockenspiel
     end
 
 
-    def self._reset_method_cache(obj_)  # :nodoc:
-      obj_.methods.each do |name_|
-        ::Rubinius::VM.reset_method_cache(name_.to_sym)
+    if ::Rubinius::VM.method(:reset_method_cache).arity == 1
+
+      # Older versions of Rubinius
+      def self._reset_method_cache(obj_)  # :nodoc:
+        obj_.methods.each do |name_|
+          ::Rubinius::VM.reset_method_cache(name_.to_sym)
+        end
       end
+
+    else
+
+      # Newer versions of Rubinius
+      def self._reset_method_cache(obj_)  # :nodoc:
+        klass_ = obj_.class
+        obj_.methods.each do |name_|
+          ::Rubinius::VM.reset_method_cache(klass_, name_.to_sym)
+        end
+      end
+
     end
 
 

data/lib/blockenspiel/unmixer_unimplemented.rb

@@ -3,7 +3,7 @@
 # Blockenspiel unmixer module when unmixer is not implemented
 #
 # -----------------------------------------------------------------------------
-# Copyright 2010-2011 Daniel Azuma
+# Copyright 2010 Daniel Azuma
 #
 # All rights reserved.
 #
@@ -42,6 +42,9 @@ module Blockenspiel
   module Unmixer
 
 
+    UNIMPLEMENTED = true
+
+
     # Unmixer stub.
     # This throws an exception indicating the unmixer is not implemented.
 

data/lib/blockenspiel/version.rb

@@ -3,7 +3,7 @@
 # Blockenspiel version
 #
 # -----------------------------------------------------------------------------
-# Copyright 2008-2011 Daniel Azuma
+# Copyright 2008 Daniel Azuma
 #
 # All rights reserved.
 #

data/lib/blockenspiel/versionomy.rb

@@ -3,7 +3,7 @@
 # Blockenspiel version
 #
 # -----------------------------------------------------------------------------
-# Copyright 2008-2011 Daniel Azuma
+# Copyright 2008 Daniel Azuma
 #
 # All rights reserved.
 #

data/test/tc_basic.rb

@@ -5,7 +5,7 @@
 # This file contains tests for the simple use cases.
 #
 # -----------------------------------------------------------------------------
-# Copyright 2008-2011 Daniel Azuma
+# Copyright 2008 Daniel Azuma
 #
 # All rights reserved.
 #
@@ -36,14 +36,14 @@
 ;
 
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'blockenspiel'
 
 
 module Blockenspiel
   module Tests  # :nodoc:
 
-    class TestBasic < ::Test::Unit::TestCase  # :nodoc:
+    class TestBasic < ::Minitest::Test  # :nodoc:
 
 
       class SimpleTarget < ::Blockenspiel::Base
@@ -87,16 +87,17 @@ module Blockenspiel
       end
 
 
-      # Test basic usage with a mixin.
+      # Test basic usage with a delegator.
       #
-      # * Asserts that methods are mixed in to self.
-      # * Asserts that methods are removed from self afterward.
-      # * Asserts that the specified target object still receives the messages.
+      # * Asserts that the specified target object receives the messages.
+      # * Asserts that methods from the surrounding context are also available.
+      # * Asserts that methods are not present in self afterward.
 
-      def test_basic_mixin
+      def test_basic_parameterless
         block_ = ::Proc.new do
           set_value(:a, 1)
           set_value_by_block(:b){ 2 }
+          assert(true)
         end
         target_ = SimpleTarget.new
         ::Blockenspiel.invoke(block_, target_)

data/test/tc_behaviors.rb

@@ -36,14 +36,14 @@
 ;
 
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'blockenspiel'
 
 
 module Blockenspiel
   module Tests  # :nodoc:
 
-    class TestBehaviors < ::Test::Unit::TestCase  # :nodoc:
+    class TestBehaviors < ::Minitest::Test  # :nodoc:
 
 
       class Target1 < ::Blockenspiel::Base
@@ -93,8 +93,8 @@ module Blockenspiel
           set_value1('a', 1)
           set_value2('b'){ 2 }
           set_value3('c', 3)
-          context_self_.assert_raise(::NoMethodError){ set_value3_dslversion('d', 4) }
-          context_self_.assert_raise(::NoMethodError){ helper_method() }
+          context_self_.assert_raises(::NoMethodError){ set_value3_dslversion('d', 4) }
+          context_self_.assert_raises(::NoMethodError){ helper_method() }
           context_self_.assert(!instance_variable_defined?(:@my_instance_variable_test))
           context_self_.assert_instance_of(::Blockenspiel::Tests::TestBehaviors::Target1, self)
         end
@@ -120,11 +120,11 @@ module Blockenspiel
           set_value1('a', 1)
           set_value2('b'){ 2 }
           set_value3_dslversion('c', 3)
-          context_self_.assert_raise(::NoMethodError){ set_value3('d', 4) }
+          context_self_.assert_raises(::NoMethodError){ set_value3('d', 4) }
           context_self_.assert(helper_method())
           context_self_.assert(!instance_variable_defined?(:@my_instance_variable_test))
           context_self_.assert(!self.kind_of?(::Blockenspiel::Tests::TestBehaviors::Target1))
-          context_self_.assert_not_equal(context_self_, self)
+          context_self_.refute_equal(context_self_, self)
         end
         ::Blockenspiel.invoke(block_, Target1.new(hash_), :parameterless => :proxy)
         assert_equal(1, hash_['a1'])
@@ -149,11 +149,11 @@ module Blockenspiel
         block3_ = ::Proc.new do
           set_value1('c', 3)
         end
-        assert_raise(::Blockenspiel::BlockParameterError) do
+        assert_raises(::Blockenspiel::BlockParameterError) do
           ::Blockenspiel.invoke(block1_, Target1.new(hash_), :parameterless => false)
         end
         ::Blockenspiel.invoke(block2_, Target1.new(hash_), :parameterless => false)
-        assert_raise(::Blockenspiel::BlockParameterError) do
+        assert_raises(::Blockenspiel::BlockParameterError) do
           ::Blockenspiel.invoke(block3_, Target1.new(hash_), :parameterless => false)
         end
         assert_equal(2, hash_['b1'])
@@ -177,7 +177,7 @@ module Blockenspiel
           set_value1('c', 3)
         end
         ::Blockenspiel.invoke(block1_, Target1.new(hash_), :parameter => false)
-        assert_raise(::Blockenspiel::BlockParameterError) do
+        assert_raises(::Blockenspiel::BlockParameterError) do
           ::Blockenspiel.invoke(block2_, Target1.new(hash_), :parameter => false)
         end
         ::Blockenspiel.invoke(block3_, Target1.new(hash_), :parameter => false)

data/test/tc_dsl_attrs.rb

@@ -36,14 +36,14 @@
 ;
 
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'blockenspiel'
 
 
 module Blockenspiel
   module Tests  # :nodoc:
 
-    class TestDSLAttrs < ::Test::Unit::TestCase  # :nodoc:
+    class TestDSLAttrs < ::Minitest::Test  # :nodoc:
 
 
       class WriterTarget < ::Blockenspiel::Base

data/test/tc_dsl_methods.rb

@@ -36,14 +36,14 @@
 ;
 
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'blockenspiel'
 
 
 module Blockenspiel
   module Tests  # :nodoc:
 
-    class TestDSLMethods < ::Test::Unit::TestCase  # :nodoc:
+    class TestDSLMethods < ::Minitest::Test  # :nodoc:
 
 
       class Target1 < ::Blockenspiel::Base
@@ -206,7 +206,7 @@ module Blockenspiel
         block_ = ::Proc.new do
           set_value1('a', 1)
           set_value2('b'){ 2 }
-          assert_raise(::NoMethodError){ _set_value3('c', 3) }
+          assert_raises(::NoMethodError){ _set_value3('c', 3) }
         end
         ::Blockenspiel.invoke(block_, Target1.new(hash_))
         assert_equal(1, hash_['a1'])
@@ -224,7 +224,7 @@ module Blockenspiel
       def test_onoff_switching
         hash_ = ::Hash.new
         block_ = ::Proc.new do
-          assert_raise(::NoMethodError){ _set_value1('a', 1) }
+          assert_raises(::NoMethodError){ _set_value1('a', 1) }
           set_value2('b'){ 2 }
           _set_value3('c', 3)
         end
@@ -244,7 +244,7 @@ module Blockenspiel
         hash_ = ::Hash.new
         block_ = ::Proc.new do
           set_value1('a', 1)
-          assert_raise(::NoMethodError){ set_value2('b'){ 2 } }
+          assert_raises(::NoMethodError){ set_value2('b'){ 2 } }
           renamed_set_value2('c'){ 3 }
           another_set_value2('d'){ 4 }
         end
@@ -264,8 +264,8 @@ module Blockenspiel
       def test_explicit_removing
         hash_ = ::Hash.new
         block_ = ::Proc.new do
-          assert_raise(::NoMethodError){ set_value1('a', 1) }
-          assert_raise(::NoMethodError){ set_value2('b'){ 2 } }
+          assert_raises(::NoMethodError){ set_value1('a', 1) }
+          assert_raises(::NoMethodError){ set_value2('b'){ 2 } }
           renamed_set_value2('c'){ 3 }
         end
         ::Blockenspiel.invoke(block_, Target4.new(hash_))
@@ -285,8 +285,8 @@ module Blockenspiel
         block_ = ::Proc.new do
           set_value1('a', 1)
           set_value2('b'){ 2 }
-          assert_raise(::NoMethodError){ set_value3('c', 3) }
-          assert_raise(::NoMethodError){ set_value4('d', 4) }
+          assert_raises(::NoMethodError){ set_value3('c', 3) }
+          assert_raises(::NoMethodError){ set_value4('d', 4) }
           renamed_set_value4('e', 5)
           set_value5('f', 6)
         end
@@ -310,7 +310,7 @@ module Blockenspiel
         block_ = ::Proc.new do
           set_value1('a', 1)
           renamed_set_value2('b'){ 2 }
-          assert_raise(::NoMethodError){ set_value2('c', 3) }
+          assert_raises(::NoMethodError){ set_value2('c', 3) }
         end
         ::Blockenspiel.invoke(block_, Target6.new(hash_))
         assert_equal(1, hash_['a1'])

data/test/tc_dynamic.rb

@@ -36,14 +36,14 @@
 ;
 
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'blockenspiel'
 
 
 module Blockenspiel
   module Tests  # :nodoc:
 
-    class TestDynamic < ::Test::Unit::TestCase  # :nodoc:
+    class TestDynamic < ::Minitest::Test  # :nodoc:
 
 
       # Test the simple case.
@@ -78,12 +78,12 @@ module Blockenspiel
         end
         block1_ = ::Proc.new do
           renamed_set_value(:a, 1)
-          assert_raise(::NoMethodError){ set_value(:b, 2) }
+          assert_raises(::NoMethodError){ set_value(:b, 2) }
         end
         ::Blockenspiel.invoke(block1_, &dsl_definition_)
         block2_ = ::Proc.new do |dsl_|
           dsl_.set_value(:c, 3)
-          assert_raise(::NoMethodError){ renamed_set_value(:d, 4) }
+          assert_raises(::NoMethodError){ renamed_set_value(:d, 4) }
         end
         ::Blockenspiel.invoke(block2_, &dsl_definition_)
         assert_equal(1, hash_[:a])
@@ -200,7 +200,7 @@ module Blockenspiel
           set_value(:a, 1)
         end
         hash_ = ::Hash.new
-        assert_raise(::Blockenspiel::BlockParameterError) do
+        assert_raises(::Blockenspiel::BlockParameterError) do
           ::Blockenspiel.invoke(block_, :parameterless => false) do
             add_method(:set_value) do |key_, value_|
               hash_[key_] = value_

data/test/tc_embedded_block.rb

@@ -36,14 +36,14 @@
 ;
 
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'blockenspiel'
 
 
 module Blockenspiel
   module Tests  # :nodoc:
 
-    class TestEmbeddedBlock < ::Test::Unit::TestCase  # :nodoc:
+    class TestEmbeddedBlock < ::Minitest::Test  # :nodoc:
 
 
       class Target1 < ::Blockenspiel::Base

data/test/tc_mixins.rb

@@ -37,14 +37,14 @@
 ;
 
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'blockenspiel'
 
 
 module Blockenspiel
   module Tests  # :nodoc:
 
-    class TestMixins < ::Test::Unit::TestCase  # :nodoc:
+    class TestMixins < ::Minitest::Test  # :nodoc:
 
 
       class Target1 < ::Blockenspiel::Base
@@ -124,6 +124,8 @@ module Blockenspiel
       # * Asserts that self doesn't change, and instance variables are preserved.
 
       def test_basic_mixin
+        skip unless ::Blockenspiel.mixin_available?
+
         hash_ = ::Hash.new
         saved_object_id_ = self.object_id
         @my_instance_variable_test = :hello
@@ -135,7 +137,7 @@ module Blockenspiel
           assert_equal(:hello, @my_instance_variable_test)
           assert_equal(saved_object_id_, self.object_id)
         end
-        ::Blockenspiel.invoke(block_, Target1.new(hash_))
+        ::Blockenspiel.invoke(block_, Target1.new(hash_), :parameterless => :mixin)
         assert(!self.respond_to?(:set_value))
         assert(!self.respond_to?(:set_value2))
         assert_equal(1, hash_['a1'])
@@ -149,6 +151,8 @@ module Blockenspiel
       # * Asserts that the methods properly delegate to the target object.
 
       def test_mixin_with_renaming
+        skip unless ::Blockenspiel.mixin_available?
+
         hash_ = ::Hash.new
         assert(!self.respond_to?(:set_value))
         assert(!self.respond_to?(:set_value2))
@@ -158,7 +162,7 @@ module Blockenspiel
           set_value2_inmixin('b'){ 2 }
           assert(!self.respond_to?(:set_value2))
         end
-        ::Blockenspiel.invoke(block_, Target2.new(hash_))
+        ::Blockenspiel.invoke(block_, Target2.new(hash_), :parameterless => :mixin)
         assert(!self.respond_to?(:set_value))
         assert(!self.respond_to?(:set_value2))
         assert(!self.respond_to?(:set_value2_inmixin))
@@ -174,6 +178,8 @@ module Blockenspiel
       #   multiple mixins add the same method name
 
       def test_nested_different
+        skip unless ::Blockenspiel.mixin_available?
+
         hash_ = ::Hash.new
         assert(!self.respond_to?(:set_value))
         assert(!self.respond_to?(:set_value2))
@@ -185,11 +191,11 @@ module Blockenspiel
           ::Blockenspiel.invoke(::Proc.new do
             set_value('c', 1)
             set_value2_inmixin('d'){ 2 }
-          end, Target2.new(hash_))
+          end, Target2.new(hash_), :parameterless => :mixin)
           assert(!self.respond_to?(:set_value2_inmixin))
           set_value('e', 1)
           set_value2('f'){ 2 }
-        end, Target1.new(hash_))
+        end, Target1.new(hash_), :parameterless => :mixin)
         assert(!self.respond_to?(:set_value))
         assert(!self.respond_to?(:set_value2))
         assert(!self.respond_to?(:set_value2_inmixin))
@@ -207,6 +213,8 @@ module Blockenspiel
       # * Asserts that the methods are added and removed at the right time.
 
       def test_nested_same
+        skip unless ::Blockenspiel.mixin_available?
+
         hash_ = ::Hash.new
         assert(!self.respond_to?(:set_value))
         assert(!self.respond_to?(:set_value2))
@@ -218,10 +226,10 @@ module Blockenspiel
             set_value('c', 1)
             set_value2_inmixin('d'){ 2 }
             assert(!self.respond_to?(:set_value2))
-          end, Target2.new(hash_))
+          end, Target2.new(hash_), :parameterless => :mixin)
           set_value('e', 1)
           set_value2_inmixin('f'){ 2 }
-        end, Target2.new(hash_))
+        end, Target2.new(hash_), :parameterless => :mixin)
         assert(!self.respond_to?(:set_value))
         assert(!self.respond_to?(:set_value2))
         assert(!self.respond_to?(:set_value2_inmixin))
@@ -239,6 +247,8 @@ module Blockenspiel
       # * Asserts that the mixin is removed only after the second thread is done.
 
       def test_threads_same_mixin
+        skip unless ::Blockenspiel.mixin_available?
+
         hash_ = ::Hash.new
         block1_ = ::Proc.new do
           set_value('a', 1)
@@ -252,10 +262,10 @@ module Blockenspiel
         end
         target_ = Target1.new(hash_)
         thread1_ = ::Thread.new do
-          ::Blockenspiel.invoke(block1_, target_)
+          ::Blockenspiel.invoke(block1_, target_, :parameterless => :mixin)
         end
         thread2_ = ::Thread.new do
-          ::Blockenspiel.invoke(block2_, target_)
+          ::Blockenspiel.invoke(block2_, target_, :parameterless => :mixin)
         end
         thread1_.join
         thread2_.join
@@ -267,6 +277,8 @@ module Blockenspiel
 
 
       def test_two_threads_different_mixin
+        skip unless ::Blockenspiel.mixin_available?
+
         hash_ = {}
         target1_ = Target1.new(hash_)
         target2_ = Target2.new(hash_)
@@ -279,7 +291,7 @@ module Blockenspiel
             set_value('a', 1)
             sleep(0.1)
             set_value('e', 5)
-          end, target1_)
+          end, target1_, :parameterless => :mixin)
         end
         t2_ = ::Thread.new do
           ::Blockenspiel.invoke(::Proc.new do
@@ -287,7 +299,7 @@ module Blockenspiel
             set_value('A', 11)
             sleep(0.1)
             set_value('E', 15)
-          end, target2_)
+          end, target2_, :parameterless => :mixin)
         end
         t1_.join
         t2_.join
@@ -310,6 +322,8 @@ module Blockenspiel
       #   threads.
 
       def test_nested_two_threads
+        skip unless ::Blockenspiel.mixin_available?
+
         hash_ = {}
         target1_ = Target1.new(hash_)
         target2_ = Target2.new(hash_)
@@ -325,11 +339,11 @@ module Blockenspiel
               sleep(0.1)
               set_value('c', 3)
               set_value2_inmixin('d'){ 4 }
-            end, target2_)
+            end, target2_, :parameterless => :mixin)
             sleep(0.1)
             set_value('e', 5)
             set_value2('f'){ 6 }
-          end, target1_)
+          end, target1_, :parameterless => :mixin)
         end
         t2_ = ::Thread.new do
           ::Blockenspiel.invoke(::Proc.new do
@@ -340,11 +354,11 @@ module Blockenspiel
               sleep(0.1)
               set_value('C', 13)
               set_value2('D'){ 14 }
-            end, target1_)
+            end, target1_, :parameterless => :mixin)
             sleep(0.1)
             set_value('E', 15)
             set_value2_inmixin('F'){ 16 }
-          end, target2_)
+          end, target2_, :parameterless => :mixin)
         end
         t1_.join
         t2_.join
@@ -377,6 +391,8 @@ module Blockenspiel
       if defined?(::Fiber)
 
         def test_nested_two_fibers
+          skip unless ::Blockenspiel.mixin_available?
+
           hash_ = {}
           target1_ = Target1.new(hash_)
           target2_ = Target2.new(hash_)
@@ -392,11 +408,11 @@ module Blockenspiel
                 ::Fiber.yield
                 set_value('c', 3)
                 set_value2_inmixin('d'){ 4 }
-              end, target2_)
+              end, target2_, :parameterless => :mixin)
               ::Fiber.yield
               set_value('e', 5)
               set_value2('f'){ 6 }
-            end, target1_)
+            end, target1_, :parameterless => :mixin)
           end
           f2_ = ::Fiber.new do
             ::Blockenspiel.invoke(::Proc.new do
@@ -407,11 +423,11 @@ module Blockenspiel
                 ::Fiber.yield
                 set_value('C', 13)
                 set_value2('D'){ 14 }
-              end, target1_)
+              end, target1_, :parameterless => :mixin)
               ::Fiber.yield
               set_value('E', 15)
               set_value2_inmixin('F'){ 16 }
-            end, target2_)
+            end, target2_, :parameterless => :mixin)
           end
           f1_.resume
           f2_.resume
@@ -447,17 +463,19 @@ module Blockenspiel
       # * Asserts that methods that are turned off after the fact cannot be called.
 
       def test_omissions
+        skip unless ::Blockenspiel.mixin_available?
+
         hash_ = ::Hash.new
         block_ = ::Proc.new do
           set_value(:a, 1)
           assert(!self.respond_to?(:_helper_method))
           assert_equal(:helper, get_value(:a))
-          assert_raise(::NoMethodError) do
+          assert_raises(::NoMethodError) do
             get_value2(:a)
           end
         end
         target_ = Target3.new(hash_)
-        ::Blockenspiel.invoke(block_, target_)
+        ::Blockenspiel.invoke(block_, target_, :parameterless => :mixin)
         assert(!self.respond_to?(:set_value))
         assert_equal(1, target_.get_value(:a))
       end