blockenspiel 0.3.3-java → 0.4.0-java

data/lib/blockenspiel/version.rb

@@ -3,7 +3,7 @@
 # Blockenspiel version
 # 
 # -----------------------------------------------------------------------------
-# Copyright 2008-2009 Daniel Azuma
+# Copyright 2008-2010 Daniel Azuma
 # 
 # All rights reserved.
 # 
@@ -37,7 +37,7 @@
 module Blockenspiel
   
   # Current gem version, as a frozen string.
-  VERSION_STRING = '0.3.3'.freeze
+  VERSION_STRING = '0.4.0'.freeze
   
   autoload(:VERSION, ::File.dirname(__FILE__)+'/versionomy.rb')
   

data/lib/blockenspiel/versionomy.rb

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

data/lib/blockenspiel.rb

@@ -3,7 +3,7 @@
 # Blockenspiel entry point
 # 
 # -----------------------------------------------------------------------------
-# Copyright 2008 Daniel Azuma
+# Copyright 2008-2010 Daniel Azuma
 # 
 # All rights reserved.
 # 
@@ -34,10 +34,28 @@
 ;
 
 
+# == Blockenspiel
+# 
+# The Blockenspiel module provides a namespace for Blockenspiel, as well as
+# the main entry point method "invoke".
+
+module Blockenspiel
+end
+
+
+includes_ = [
+ 'errors',
+ 'dsl_setup',
+ 'builder',
+ 'impl',
+ 'version',
+]
+
+
+dir_ = ::File.expand_path('blockenspiel', ::File.dirname(__FILE__))
 if ::RUBY_PLATFORM =~ /java/
   require "blockenspiel_unmixer"
 else
-  require "#{File.dirname(__FILE__)}/blockenspiel/unmixer"
+  includes_.unshift('unmixer')
 end
-require "#{File.dirname(__FILE__)}/blockenspiel/impl"
-require "#{File.dirname(__FILE__)}/blockenspiel/version"
+includes_.each{ |file_| require "#{dir_}/#{file_}" }

data/tests/files/file1.rb

@@ -0,0 +1,2 @@
+set_value(:a, 1)
+set_value_by_block(:b){ 2 }

data/tests/tc_basic.rb

@@ -131,6 +131,36 @@ module Blockenspiel
       end
       
       
+      # Test basic usage with a string.
+      # 
+      # * Asserts that the specified target object receives the messages.
+      
+      def test_basic_string
+        string_ = <<-STR
+          set_value(:a, 1)
+          set_value_by_block(:b){ 2 }
+        STR
+        target_ = SimpleTarget.new
+        ::Blockenspiel.invoke(string_, target_)
+        assert(!self.respond_to?(:set_value))
+        assert_equal(1, target_.get_value(:a))
+        assert_equal(2, target_.get_value(:b))
+      end
+      
+      
+      # Test basic usage with a file.
+      # 
+      # * Asserts that the specified target object receives the messages.
+      
+      def test_basic_file
+        target_ = SimpleTarget.new
+        ::Blockenspiel.invoke(target_, :file => "#{File.dirname(__FILE__)}/files/file1.rb")
+        assert(!self.respond_to?(:set_value))
+        assert_equal(1, target_.get_value(:a))
+        assert_equal(2, target_.get_value(:b))
+      end
+      
+      
     end
     
   end

data/tests/tc_mixins.rb

@@ -242,12 +242,12 @@ module Blockenspiel
         hash_ = ::Hash.new
         block1_ = ::Proc.new do
           set_value('a', 1)
-          sleep(0.5)
+          sleep(0.1)
           set_value2('b'){ 2 }
         end
         block2_ = ::Proc.new do
           set_value('c', 3)
-          sleep(1)
+          sleep(0.2)
           set_value2('d'){ 4 }
         end
         target_ = Target1.new(hash_)
@@ -266,6 +266,143 @@ module Blockenspiel
       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_)
+        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)
+            set_value2('b'){ 2 }
+            ::Blockenspiel.invoke(::Proc.new do
+              sleep(0.1)
+              set_value('c', 3)
+              set_value2_inmixin('d'){ 4 }
+            end, target2_)
+            sleep(0.1)
+            set_value('e', 5)
+            set_value2('f'){ 6 }
+          end, target1_)
+        end
+        t2_ = ::Thread.new do
+          ::Blockenspiel.invoke(::Proc.new do
+            sleep(0.1)
+            set_value('A', 11)
+            set_value2_inmixin('B'){ 12 }
+            ::Blockenspiel.invoke(::Proc.new do
+              sleep(0.1)
+              set_value('C', 13)
+              set_value2('D'){ 14 }
+            end, target1_)
+            sleep(0.1)
+            set_value('E', 15)
+            set_value2_inmixin('F'){ 16 }
+          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(2, hash_['b1'])
+        assert_equal(3, hash_['c2'])
+        assert_equal(4, hash_['d2'])
+        assert_equal(5, hash_['e1'])
+        assert_equal(6, hash_['f1'])
+        assert_equal(11, hash_['A2'])
+        assert_equal(12, hash_['B2'])
+        assert_equal(13, hash_['C1'])
+        assert_equal(14, hash_['D1'])
+        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.
+      
+      def test_nested_two_fibers
+        return unless defined?(::Fiber)
+        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))
+        f1_ = ::Fiber.new do
+          ::Blockenspiel.invoke(::Proc.new do
+            ::Fiber.yield
+            set_value('a', 1)
+            set_value2('b'){ 2 }
+            ::Blockenspiel.invoke(::Proc.new do
+              ::Fiber.yield
+              set_value('c', 3)
+              set_value2_inmixin('d'){ 4 }
+            end, target2_)
+            ::Fiber.yield
+            set_value('e', 5)
+            set_value2('f'){ 6 }
+          end, target1_)
+        end
+        f2_ = ::Fiber.new do
+          ::Blockenspiel.invoke(::Proc.new do
+            ::Fiber.yield
+            set_value('A', 11)
+            set_value2_inmixin('B'){ 12 }
+            ::Blockenspiel.invoke(::Proc.new do
+              ::Fiber.yield
+              set_value('C', 13)
+              set_value2('D'){ 14 }
+            end, target1_)
+            ::Fiber.yield
+            set_value('E', 15)
+            set_value2_inmixin('F'){ 16 }
+          end, target2_)
+        end
+        f1_.resume
+        f2_.resume
+        f1_.resume
+        f2_.resume
+        f1_.resume
+        f2_.resume
+        f1_.resume
+        f2_.resume
+        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(2, hash_['b1'])
+        assert_equal(3, hash_['c2'])
+        assert_equal(4, hash_['d2'])
+        assert_equal(5, hash_['e1'])
+        assert_equal(6, hash_['f1'])
+        assert_equal(11, hash_['A2'])
+        assert_equal(12, hash_['B2'])
+        assert_equal(13, hash_['C1'])
+        assert_equal(14, hash_['D1'])
+        assert_equal(15, hash_['E2'])
+        assert_equal(16, hash_['F2'])
+      end
+      
+      
       # Test mixin omissions.
       # 
       # * Asserts that underscore methods are not mixed in.

metadata

@@ -1,20 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: blockenspiel
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
-    - 0
-    - 3
-    - 3
-  version: 0.3.3
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: java
 authors: 
-  - Daniel Azuma
+- Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 -07:00
+date: 2010-06-21 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -25,31 +26,35 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-  - README.rdoc
-  - Blockenspiel.rdoc
-  - History.rdoc
-  - ImplementingDSLblocks.rdoc
+- README.rdoc
+- Blockenspiel.rdoc
+- History.rdoc
+- ImplementingDSLblocks.rdoc
 files: 
-  - ext/blockenspiel/unmixer.c
-  - ext/blockenspiel/extconf.rb
-  - ext/blockenspiel/BlockenspielUnmixerService.java
-  - lib/blockenspiel.rb
-  - lib/blockenspiel/impl.rb
-  - lib/blockenspiel/version.rb
-  - lib/blockenspiel/versionomy.rb
-  - 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
-  - tests/tc_modules.rb
-  - Blockenspiel.rdoc
-  - History.rdoc
-  - ImplementingDSLblocks.rdoc
-  - README.rdoc
-  - Rakefile
-  - lib/blockenspiel_unmixer.jar
+- ext/blockenspiel/unmixer.c
+- ext/blockenspiel/extconf.rb
+- ext/blockenspiel/BlockenspielUnmixerService.java
+- lib/blockenspiel/builder.rb
+- lib/blockenspiel/dsl_setup.rb
+- lib/blockenspiel/errors.rb
+- lib/blockenspiel/impl.rb
+- lib/blockenspiel/version.rb
+- lib/blockenspiel/versionomy.rb
+- lib/blockenspiel.rb
+- lib/blockenspiel_unmixer.jar
+- tests/files/file1.rb
+- 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
+- tests/tc_modules.rb
+- Blockenspiel.rdoc
+- History.rdoc
+- ImplementingDSLblocks.rdoc
+- README.rdoc
+- Rakefile
 has_rdoc: true
 homepage: http://virtuoso.rubyforge.org/blockenspiel
 licenses: []
@@ -58,35 +63,39 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 1
-          - 8
-          - 6
-        version: 1.8.6
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: virtuoso
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Blockenspiel is a helper library designed to make it easy to implement DSL blocks.
 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
-  - tests/tc_modules.rb
+- 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
+- tests/tc_modules.rb