blockenspiel 0.4.3 → 0.4.4

data/test/tc_dynamic.rb

@@ -1,17 +1,17 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Blockenspiel dynamic tests
-# 
+#
 # This file contains tests for dynamic DSL generation.
-# 
+#
 # -----------------------------------------------------------------------------
 # Copyright 2008-2011 Daniel Azuma
-# 
+#
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # * Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright notice,
@@ -20,7 +20,7 @@
 # * Neither the name of the copyright holder, nor the names of any other
 #   contributors to this software, may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -42,14 +42,14 @@ require 'blockenspiel'
 
 module Blockenspiel
   module Tests  # :nodoc:
-    
+
     class TestDynamic < ::Test::Unit::TestCase  # :nodoc:
-      
-      
+
+
       # Test the simple case.
-      # 
+      #
       # * Asserts that the simplest case works.
-      
+
       def test_simple
         block_ = ::Proc.new do
           set_value(:a, 1)
@@ -62,13 +62,13 @@ module Blockenspiel
         end
         assert_equal(1, hash_[:a])
       end
-      
-      
+
+
       # Test renaming.
-      # 
+      #
       # * Asserts that the method appears renamed in a parameterless block.
       # * Asserts that the method appears in its original name in a parametered block.
-      
+
       def test_renaming
         hash_ = ::Hash.new
         dsl_definition_ = ::Proc.new do
@@ -91,14 +91,14 @@ module Blockenspiel
         assert_equal(3, hash_[:c])
         assert_nil(hash_[:d])
       end
-      
-      
+
+
       # Test calls with blocks passed the usual way.
       # Note: this will fail in MRI < 1.8.7 and JRuby < 1.5.
-      # 
+      #
       # * Asserts that a block passed the usual way works
       # * Asserts that we can detect when a block has not been passed
-      
+
       def test_blocks_normal
         hash_ = ::Hash.new
         block_ = ::Proc.new do
@@ -118,14 +118,14 @@ module Blockenspiel
         assert_equal(true, hash_[:b])
         assert_equal(false, hash_[:c])
       end
-      
-      
+
+
       # Test calls with blocks passed as non-block parameters.
-      # 
+      #
       # * Asserts that a block passed "first" works.
       # * Asserts that a block passed "last" works.
       # * Asserts that a block passed "true" works.
-      
+
       def test_blocks_first_and_last
         hash_ = ::Hash.new
         block_ = ::Proc.new do
@@ -148,12 +148,12 @@ module Blockenspiel
         assert_equal(2, hash_[:b])
         assert_equal(3, hash_[:c])
       end
-      
-      
+
+
       # Test calls with blocks not passed.
-      # 
+      #
       # * Asserts that if a block isn't given, it is set to nil.
-      
+
       def test_blocks_nil
         hash_ = ::Hash.new
         block_ = ::Proc.new do
@@ -171,12 +171,12 @@ module Blockenspiel
         assert_nil(hash_[:a])
         assert_nil(hash_[:b])
       end
-      
-      
+
+
       # Test calls with blocks (legacy api)
-      # 
+      #
       # * Asserts that a block with receive_block works.
-      
+
       def test_blocks_legacy
         hash_ = ::Hash.new
         block_ = ::Proc.new do
@@ -189,12 +189,12 @@ module Blockenspiel
         end
         assert_equal(1, hash_[:a])
       end
-      
-      
+
+
       # Test passing options in.
-      # 
+      #
       # * Asserts that the "parameter" option is recognized
-      
+
       def test_options_recognized
         block_ = ::Proc.new do
           set_value(:a, 1)
@@ -208,9 +208,9 @@ module Blockenspiel
           end
         end
       end
-      
-      
+
+
     end
-    
+
   end
 end

data/test/tc_embedded_block.rb

@@ -1,17 +1,17 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Blockenspiel behavior tests
-# 
+#
 # This file contains tests for behavior settings.
-# 
+#
 # -----------------------------------------------------------------------------
 # Copyright 2008-2011 Daniel Azuma
-# 
+#
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # * Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright notice,
@@ -20,7 +20,7 @@
 # * Neither the name of the copyright holder, nor the names of any other
 #   contributors to this software, may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -42,52 +42,53 @@ require 'blockenspiel'
 
 module Blockenspiel
   module Tests  # :nodoc:
-    
+
     class TestEmbeddedBlock < ::Test::Unit::TestCase  # :nodoc:
-      
-      
+
+
       class Target1 < ::Blockenspiel::Base
-        
+
         def initialize(value_)
           @value = value_
           @block = nil
         end
-        
+
         def set_block(&block_)
           @block = block_
         end
-        
+
         def value
           @value
         end
-        
+
         dsl_methods false
-        
+
         def call_block
           @block.call
         end
-        
+
       end
-      
-      
+
+
       BLOCK = ::Proc.new do
         set_block do
           self.value
         end
       end
-      
-      
+
+
       # Test an embedded block with a proxy.
-      
+
       def test_proxy_embedded_block
-        return  # TEMP
-        target_ = Target1.new(23)
-        ::Blockenspiel.invoke(BLOCK, target_, :parameterless => :proxy)
-        assert_equal(23, target_.call_block)
+        if false  # TEMP
+          target_ = Target1.new(23)
+          ::Blockenspiel.invoke(BLOCK, target_, :parameterless => :proxy)
+          assert_equal(23, target_.call_block)
+        end
       end
-      
-      
+
+
     end
-    
+
   end
 end

data/test/tc_mixins.rb

@@ -1,18 +1,18 @@
 # -----------------------------------------------------------------------------
-# 
+#
 # Blockenspiel mixin tests
-# 
+#
 # This file contains tests for various mixin cases,
 # including nested blocks and multithreading.
-# 
+#
 # -----------------------------------------------------------------------------
 # Copyright 2008-2011 Daniel Azuma
-# 
+#
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # * Redistributions of source code must retain the above copyright notice,
 #   this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright notice,
@@ -21,7 +21,7 @@
 # * Neither the name of the copyright holder, nor the names of any other
 #   contributors to this software, may be used to endorse or promote products
 #   derived from this software without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -43,86 +43,86 @@ require 'blockenspiel'
 
 module Blockenspiel
   module Tests  # :nodoc:
-    
+
     class TestMixins < ::Test::Unit::TestCase  # :nodoc:
-      
-      
+
+
       class Target1 < ::Blockenspiel::Base
-        
+
         def initialize(hash_)
           @hash = hash_
         end
-        
+
         def set_value(key_, value_)
           @hash["#{key_}1"] = value_
         end
-        
+
         def set_value2(key_)
           @hash["#{key_}1"] = yield
         end
-        
+
       end
-      
-      
+
+
       class Target2 < ::Blockenspiel::Base
-        
+
         dsl_methods false
-        
+
         def initialize(hash_=nil)
           @hash = hash_ || ::Hash.new
         end
-        
+
         def set_value(key_, value_)
           @hash["#{key_}2"] = value_
         end
         dsl_method :set_value
-        
+
         def set_value2(key_)
           @hash["#{key_}2"] = yield
         end
         dsl_method :set_value2_inmixin, :set_value2
-        
+
       end
-      
-      
+
+
       class Target3 < ::Blockenspiel::Base
-        
+
         def initialize(hash_)
           @hash = hash_
         end
-        
+
         def set_value(key_, value_)
           @hash[key_] = value_
         end
-        
+
         def _helper_method(key_)
           @hash[key_]
         end
-        
+
         def get_value(key_)
           @hash[key_]
         end
         dsl_method :get_value, false
-        
+
         def get_value2(key_)
           @hash[key_]
         end
         dsl_method :get_value2, false
-        
+
       end
-      
-      
+
+
       def get_value(key_)
         :helper
       end
-      
-      
+
+
       # Basic test of mixin mechanism.
-      # 
+      #
       # * Asserts that the mixin methods are added and removed for a single mixin.
       # * Asserts that the methods properly delegate to the target object.
       # * Asserts that self doesn't change, and instance variables are preserved.
-      
+
       def test_basic_mixin
         hash_ = ::Hash.new
         saved_object_id_ = self.object_id
@@ -141,13 +141,13 @@ module Blockenspiel
         assert_equal(1, hash_['a1'])
         assert_equal(2, hash_['b1'])
       end
-      
-      
+
+
       # Test renaming of mixin methods.
-      # 
+      #
       # * Asserts that correctly renamed mixin methods are added and removed.
       # * Asserts that the methods properly delegate to the target object.
-      
+
       def test_mixin_with_renaming
         hash_ = ::Hash.new
         assert(!self.respond_to?(:set_value))
@@ -165,14 +165,14 @@ module Blockenspiel
         assert_equal(1, hash_['a2'])
         assert_equal(2, hash_['b2'])
       end
-      
-      
+
+
       # Test of two different nested mixins.
-      # 
+      #
       # * Asserts that the right methods are added and removed at the right time.
       # * Asserts that the methods delegate to the right target object, even when
       #   multiple mixins add the same method name
-      
+
       def test_nested_different
         hash_ = ::Hash.new
         assert(!self.respond_to?(:set_value))
@@ -200,12 +200,12 @@ module Blockenspiel
         assert_equal(1, hash_['e1'])
         assert_equal(2, hash_['f1'])
       end
-      
-      
+
+
       # Test of the same mixin nested in itself.
-      # 
+      #
       # * Asserts that the methods are added and removed at the right time.
-      
+
       def test_nested_same
         hash_ = ::Hash.new
         assert(!self.respond_to?(:set_value))
@@ -232,12 +232,12 @@ module Blockenspiel
         assert_equal(1, hash_['e2'])
         assert_equal(2, hash_['f2'])
       end
-      
-      
+
+
       # Test of two threads mixing the same mixin into the same object
-      # 
+      #
       # * Asserts that the mixin is removed only after the second thread is done.
-      
+
       def test_threads_same_mixin
         hash_ = ::Hash.new
         block1_ = ::Proc.new do
@@ -264,16 +264,51 @@ module Blockenspiel
         assert_equal(3, hash_['c1'])
         assert_equal(4, hash_['d1'])
       end
-      
-      
+
+
+      def test_two_threads_different_mixin
+        hash_ = {}
+        target1_ = Target1.new(hash_)
+        target2_ = Target2.new(hash_)
+        assert(!self.respond_to?(:set_value))
+        assert(!self.respond_to?(:set_value2))
+        assert(!self.respond_to?(:set_value2_inmixin))
+        t1_ = ::Thread.new do
+          ::Blockenspiel.invoke(::Proc.new do
+            sleep(0.1)
+            set_value('a', 1)
+            sleep(0.1)
+            set_value('e', 5)
+          end, target1_)
+        end
+        t2_ = ::Thread.new do
+          ::Blockenspiel.invoke(::Proc.new do
+            sleep(0.1)
+            set_value('A', 11)
+            sleep(0.1)
+            set_value('E', 15)
+          end, target2_)
+        end
+        t1_.join
+        t2_.join
+        assert(!self.respond_to?(:set_value))
+        assert(!self.respond_to?(:set_value2))
+        assert(!self.respond_to?(:set_value2_inmixin))
+        assert_equal(1, hash_['a1'])
+        assert_equal(5, hash_['e1'])
+        assert_equal(11, hash_['A2'])
+        assert_equal(15, hash_['E2'])
+      end
+
+
       # A full thread test with the same set of nested mixins done into the same
       # object twice in two different threads.
-      # 
+      #
       # * Asserts that the right methods are added and removed at the right time.
       # * Asserts that the methods delegate to the right target object, even when
       #   multiple mixins add the same method name, multiple times from different
       #   threads.
-      
+
       def test_nested_two_threads
         hash_ = {}
         target1_ = Target1.new(hash_)
@@ -329,18 +364,18 @@ module Blockenspiel
         assert_equal(15, hash_['E2'])
         assert_equal(16, hash_['F2'])
       end
-      
-      
+
+
       # A full fiber test with the same set of nested mixins done into the same
       # object twice in two different fibers.
-      # 
+      #
       # * Asserts that the right methods are added and removed at the right time.
       # * Asserts that the methods delegate to the right target object, even when
       #   multiple mixins add the same method name, multiple times from different
       #   fibers.
-      
+
       if defined?(::Fiber)
-        
+
         def test_nested_two_fibers
           hash_ = {}
           target1_ = Target1.new(hash_)
@@ -402,15 +437,15 @@ module Blockenspiel
           assert_equal(15, hash_['E2'])
           assert_equal(16, hash_['F2'])
         end
-        
+
       end
-      
-      
+
+
       # Test mixin omissions.
-      # 
+      #
       # * Asserts that underscore methods are not mixed in.
       # * Asserts that methods that are turned off after the fact cannot be called.
-      
+
       def test_omissions
         hash_ = ::Hash.new
         block_ = ::Proc.new do
@@ -426,9 +461,9 @@ module Blockenspiel
         assert(!self.respond_to?(:set_value))
         assert_equal(1, target_.get_value(:a))
       end
-      
-      
+
+
     end
-    
+
   end
 end