blockenspiel 0.2.2-java → 0.3.0-java

data/tests/tc_dynamic.rb

@@ -51,7 +51,7 @@ module Blockenspiel
       # * Asserts that the simplest case works.
       
       def test_simple
-        block_ = proc do
+        block_ = ::Proc.new do
           set_value(:a, 1)
         end
         hash_ = ::Hash.new
@@ -71,17 +71,17 @@ module Blockenspiel
       
       def test_renaming
         hash_ = ::Hash.new
-        dsl_definition_ = proc do
+        dsl_definition_ = ::Proc.new do
           add_method(:set_value, :dsl_method => :renamed_set_value) do |key_, value_|
             hash_[key_] = value_
           end
         end
-        block1_ = proc do
+        block1_ = ::Proc.new do
           renamed_set_value(:a, 1)
           assert_raise(::NoMethodError){ set_value(:b, 2) }
         end
         ::Blockenspiel.invoke(block1_, &dsl_definition_)
-        block2_ = proc do |dsl_|
+        block2_ = ::Proc.new do |dsl_|
           dsl_.set_value(:c, 3)
           assert_raise(::NoMethodError){ renamed_set_value(:d, 4) }
         end
@@ -93,15 +93,53 @@ module Blockenspiel
       end
       
       
-      # Test calls with blocks.
+      # Test calls with blocks passed the usual way.
+      # This works in MRI 1.8.7 or later. However, it does NOT currently
+      # work with JRuby 1.4 because of JRUBY-4180. So we disable this test
+      # for all versions of JRuby (for now) and for MRI < 1.8.7.
+      # 
+      # * Asserts that a block passed the usual way works
+      # * Asserts that we can detect when a block has not been passed
+      
+if ::RUBY_PLATFORM != 'java' && ::RUBY_VERSION >= '1.8.7'
+  module_eval <<-END
+      def test_blocks_normal
+        hash_ = ::Hash.new
+        block_ = ::Proc.new do
+          set_value1(:a){ 1 }
+          set_value2(:b){ 2 }
+          set_value2(:c)
+        end
+        ::Blockenspiel.invoke(block_) do
+          add_method(:set_value1) do |key_, &bl_|
+            hash_[key_] = bl_.call
+          end
+          add_method(:set_value2) do |key_, &bl_|
+            hash_[key_] = bl_ ? true : false
+          end
+        end
+        assert_equal(1, hash_[:a])
+        assert_equal(true, hash_[:b])
+        assert_equal(false, hash_[:c])
+      end
+  END
+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 "last" works.
+      # * Asserts that a block passed "true" works.
       
       def test_blocks_first_and_last
         hash_ = ::Hash.new
-        dsl_definition_ = proc do
+        block_ = ::Proc.new do
+          set_value1(:a){ 1 }
+          set_value2(:b){ 2 }
+          set_value2(:c){ 3 }
+        end
+        ::Blockenspiel.invoke(block_) do
           add_method(:set_value1, :block => :first) do |bl_, key_|
             hash_[key_] = bl_.call
           end
@@ -112,12 +150,6 @@ module Blockenspiel
             hash_[key_] = bl_.call
           end
         end
-        block_ = proc do
-          set_value1(:a){ 1 }
-          set_value2(:b){ 2 }
-          set_value2(:c){ 3 }
-        end
-        ::Blockenspiel.invoke(block_, &dsl_definition_)
         assert_equal(1, hash_[:a])
         assert_equal(2, hash_[:b])
         assert_equal(3, hash_[:c])
@@ -130,7 +162,11 @@ module Blockenspiel
       
       def test_blocks_nil
         hash_ = ::Hash.new
-        dsl_definition_ = proc do
+        block_ = ::Proc.new do
+          set_value1(:a)
+          set_value2(:b)
+        end
+        ::Blockenspiel.invoke(block_) do
           add_method(:set_value1, :block => :first) do |bl_, key_|
             assert_nil(bl_)
           end
@@ -138,11 +174,6 @@ module Blockenspiel
             assert_nil(bl_)
           end
         end
-        block_ = proc do
-          set_value1(:a)
-          set_value2(:b)
-        end
-        ::Blockenspiel.invoke(block_, &dsl_definition_)
         assert_nil(hash_[:a])
         assert_nil(hash_[:b])
       end
@@ -150,21 +181,18 @@ module Blockenspiel
       
       # Test calls with blocks (legacy api)
       # 
-      # * Asserts that a block passed "first" works.
-      # * Asserts that a block passed "last" works.
-      # * Asserts that a block passed "last" works.
+      # * Asserts that a block with receive_block works.
       
       def test_blocks_legacy
         hash_ = ::Hash.new
-        dsl_definition_ = proc do
+        block_ = ::Proc.new do
+          set_value(:a){ 1 }
+        end
+        ::Blockenspiel.invoke(block_) do
           add_method(:set_value, :receive_block => true) do |key_, bl_|
             hash_[key_] = bl_.call
           end
         end
-        block_ = proc do
-          set_value(:a){ 1 }
-        end
-        ::Blockenspiel.invoke(block_, &dsl_definition_)
         assert_equal(1, hash_[:a])
       end
       

data/tests/tc_mixins.rb

@@ -97,7 +97,7 @@ module Blockenspiel
         @my_instance_variable_test = :hello
         assert(!self.respond_to?(:set_value))
         assert(!self.respond_to?(:set_value2))
-        block_ = proc do
+        block_ = ::Proc.new do
           set_value('a', 1)
           set_value2('b'){ 2 }
           assert_equal(:hello, @my_instance_variable_test)
@@ -121,7 +121,7 @@ module Blockenspiel
         assert(!self.respond_to?(:set_value))
         assert(!self.respond_to?(:set_value2))
         assert(!self.respond_to?(:set_value2_inmixin))
-        block_ = proc do
+        block_ = ::Proc.new do
           set_value('a', 1)
           set_value2_inmixin('b'){ 2 }
           assert(!self.respond_to?(:set_value2))
@@ -146,11 +146,11 @@ module Blockenspiel
         assert(!self.respond_to?(:set_value))
         assert(!self.respond_to?(:set_value2))
         assert(!self.respond_to?(:set_value2_inmixin))
-        ::Blockenspiel.invoke(proc do
+        ::Blockenspiel.invoke(::Proc.new do
           set_value('a', 1)
           set_value2('b'){ 2 }
           assert(!self.respond_to?(:set_value2_inmixin))
-          ::Blockenspiel.invoke(proc do
+          ::Blockenspiel.invoke(::Proc.new do
             set_value('c', 1)
             set_value2_inmixin('d'){ 2 }
           end, Target2.new(hash_))
@@ -179,10 +179,10 @@ module Blockenspiel
         assert(!self.respond_to?(:set_value))
         assert(!self.respond_to?(:set_value2))
         assert(!self.respond_to?(:set_value2_inmixin))
-        ::Blockenspiel.invoke(proc do
+        ::Blockenspiel.invoke(::Proc.new do
           set_value('a', 1)
           set_value2_inmixin('b'){ 2 }
-          ::Blockenspiel.invoke(proc do
+          ::Blockenspiel.invoke(::Proc.new do
             set_value('c', 1)
             set_value2_inmixin('d'){ 2 }
             assert(!self.respond_to?(:set_value2))
@@ -208,12 +208,12 @@ module Blockenspiel
       
       def test_threads_same_mixin
         hash_ = ::Hash.new
-        block1_ = proc do
+        block1_ = ::Proc.new do
           set_value('a', 1)
           sleep(0.5)
           set_value2('b'){ 2 }
         end
-        block2_ = proc do
+        block2_ = ::Proc.new do
           set_value('c', 3)
           sleep(1)
           set_value2('d'){ 4 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: blockenspiel
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: java
 authors: 
   - Daniel Azuma
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 -07:00
+date: 2009-11-04 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -21,6 +21,7 @@ extensions: []
 
 extra_rdoc_files: 
   - README.rdoc
+  - Blockenspiel.rdoc
   - History.rdoc
   - ImplementingDSLblocks.rdoc
 files: 
@@ -30,16 +31,18 @@ files:
   - lib/blockenspiel.rb
   - lib/blockenspiel/impl.rb
   - lib/blockenspiel/version.rb
+  - lib/blockenspiel_unmixer.jar
   - tests/tc_basic.rb
   - tests/tc_behaviors.rb
+  - tests/tc_dsl_attrs.rb
   - tests/tc_dsl_methods.rb
   - tests/tc_dynamic.rb
   - tests/tc_mixins.rb
+  - Blockenspiel.rdoc
   - History.rdoc
   - ImplementingDSLblocks.rdoc
   - README.rdoc
   - Rakefile
-  - lib/blockenspiel_unmixer.jar
 has_rdoc: true
 homepage: http://virtuoso.rubyforge.org/blockenspiel
 licenses: []
@@ -71,6 +74,7 @@ summary: Blockenspiel is a helper library designed to make it easy to implement
 test_files: 
   - tests/tc_basic.rb
   - tests/tc_behaviors.rb
+  - tests/tc_dsl_attrs.rb
   - tests/tc_dsl_methods.rb
   - tests/tc_dynamic.rb
   - tests/tc_mixins.rb