blockenspiel 0.4.0-java → 0.4.1-java

data/Blockenspiel.rdoc

@@ -307,20 +307,19 @@ multiple threads trying to mix methods into the same object concurrently.
 
 === Requirements
 
-* Ruby 1.8.7, Ruby 1.9.1 or later, or JRuby 1.5 or later.
+* Ruby 1.8.7, Ruby 1.9.1 or later, JRuby 1.5 or later, or Rubinius 1.0 or later.
 
 === Installation
 
  gem install blockenspiel
 
-=== Known issues and limitations
+=== Known issues and to-do items
 
 * Implementing wildcard DSL methods using <tt>method_missing</tt> doesn't
   work. I haven't yet decided on the right semantics for this case, or
   whether it is even a reasonable feature at all.
 * Including Blockenspiel::DSL in a module (rather than a class) is not yet
   supported, but this is planned for a future release.
-* Rubinius support is not yet present, but on the to-do list.
 * Installing on Windows may be a challenge because blockenspiel includes a
   native extension. I'm considering evaluating Luis Lavena's rake-compiler
   to simplify this process.
@@ -345,10 +344,13 @@ Way Out Of Instance Eval?". The original link is gone, but you may find
 copies or mirrors out there.
 
 The unmixer code is based on {Mixology}[http://rubyforge.org/projects/mixology],
-version 0.1 by Patrick Farley, anonymous z, Dan Manges, and Clint Bishop.
-The code has been stripped down and modified to support MRI 1.9 and JRuby 1.2.
-I know Mixology 0.2 is available, but I'm keeping the unmixer bundled with
-Blockenspiel for now, to reduce dependencies.
+version by Patrick Farley, anonymous z, Dan Manges, and Clint Bishop.
+The MRI C extension and the JRuby code were adapted from Mixology 0.1, and
+have been stripped down and modified to support Ruby 1.9 and JRuby >= 1.2.
+The Rubinius code was adapted from unreleased code in the Mixology source
+tree and modified to support Rubinius 1.0. I know Mixology 0.2 is now
+available, but its Rubinius support is not active, and I'd rather keep the
+unmixer bundled with Blockenspiel for now to reduce dependencies.
 
 The dsl_attr_writer and dsl_attr_accessor feature came from a suggestion by
 Luis Lavena.

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 0.4.1 / 2010-06-23
+
+* Support for rubinius 1.0.
+
 === 0.4.0 / 2010-06-21
 
 * Implemented string- and file-based DSLs (in addition to block-based).

data/README.rdoc

@@ -55,20 +55,19 @@ For an extended analysis of different ways to implement DSL blocks, see
 
 === Requirements
 
-* Ruby 1.8.7, Ruby 1.9.1 or later, or JRuby 1.5 or later.
+* Ruby 1.8.7, Ruby 1.9.1 or later, JRuby 1.5 or later, or Rubinius 1.0 or later.
 
 === Installation
 
  gem install blockenspiel
 
-=== Known issues and limitations
+=== Known issues and to-do items
 
 * Implementing wildcard DSL methods using <tt>method_missing</tt> doesn't
   work. I haven't yet decided on the right semantics for this case, or
   whether it is even a reasonable feature at all.
 * Including Blockenspiel::DSL in a module (rather than a class) is not yet
   supported, but this is planned for a future release.
-* Rubinius support is not yet present, but on the to-do list.
 * Installing on Windows may be a challenge because blockenspiel includes a
   native extension. I'm considering evaluating Luis Lavena's rake-compiler
   to simplify this process.
@@ -93,10 +92,16 @@ Way Out Of Instance Eval?". The original link has disappeared along with
 its author, but you may find copies or mirrors out there.
 
 The unmixer code is based on {Mixology}[http://rubyforge.org/projects/mixology],
-version 0.1 by Patrick Farley, anonymous z, Dan Manges, and Clint Bishop.
-The code has been stripped down and modified to support MRI 1.9 and JRuby 1.2.
-I know Mixology 0.2 is available, but I'm keeping the unmixer bundled with
-Blockenspiel for now, to reduce dependencies.
+version by Patrick Farley, anonymous z, Dan Manges, and Clint Bishop.
+The MRI C extension and the JRuby code were adapted from Mixology 0.1, and
+have been stripped down and modified to support Ruby 1.9 and JRuby >= 1.2.
+The Rubinius code was adapted from unreleased code in the Mixology source
+tree and modified to support Rubinius 1.0. I know Mixology 0.2 is now
+available, but its Rubinius support is not active, and I'd rather keep the
+unmixer bundled with Blockenspiel for now to reduce dependencies.
+
+The dsl_attr_writer and dsl_attr_accessor feature came from a suggestion by
+Luis Lavena.
 
 === License
 

data/Rakefile

@@ -31,6 +31,8 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 # -----------------------------------------------------------------------------
+;
+
 
 require 'rubygems'
 require 'rake'
@@ -45,35 +47,34 @@ require ::File.expand_path("#{::File.dirname(__FILE__)}/lib/blockenspiel/version
 
 
 # Configuration
+
 EXTRA_RDOC_FILES = ['README.rdoc', 'Blockenspiel.rdoc', 'History.rdoc', 'ImplementingDSLblocks.rdoc']
 
 
 # Environment configuration
+
 dlext_ = Config::CONFIG['DLEXT']
-if ::RUBY_PLATFORM =~ /java/
-  platform_suffix_ = 'java'
-elsif ::RUBY_COPYRIGHT =~ /Yukihiro\sMatsumoto/i
-  if ::RUBY_VERSION =~ /^1\.8(\..*)?$/
-    platform_suffix_ = 'mri18'
-  elsif ::RUBY_VERSION =~ /^1\.9(\..*)?$/
-    platform_suffix_ = 'mri19'
-  else
-    raise "Unknown version of Matz Ruby Interpreter (#{::RUBY_VERSION})"
+platform_ =
+  case ::RUBY_DESCRIPTION
+  when /^jruby\s/ then :jruby
+  when /^ruby\s/ then :mri
+  when /^rubinius\s/ then :rubinius
+  else :unknown
   end
-else
-  raise "Could not identify the ruby runtime"
-end
 
 
 # Default task
+
 task :default => [:clean, :rdoc, :package, :test]
 
 
 # Clean task
-CLEAN.include(['ext/blockenspiel/Makefile*', "**/*.#{dlext_}", 'ext/blockenspiel/unmixer.o', '**/blockenspiel_unmixer.jar', 'ext/blockenspiel/BlockenspielUnmixerService.class', 'idslb_markdown.txt', 'doc', 'pkg'])
+
+CLEAN.include(['ext/blockenspiel/Makefile*', "**/*.#{dlext_}", "**/*.rbc", 'ext/blockenspiel/*.o', '**/*.jar', 'ext/blockenspiel/*.class', 'idslb_markdown.txt', 'doc', 'pkg'])
 
 
 # Test task
+
 task :test => :build
 ::Rake::TestTask.new('test') do |task_|
   task_.pattern = 'tests/tc_*.rb'
@@ -81,10 +82,11 @@ end
 
 
 # RDoc task
+
 ::Rake::RDocTask.new do |task_|
   task_.main = 'README.rdoc'
   task_.rdoc_files.include(*EXTRA_RDOC_FILES)
-  task_.rdoc_files.include('lib/blockenspiel/*.rb')
+  task_.rdoc_files.include(['lib/blockenspiel.rb', 'lib/blockenspiel/*.rb'])
   task_.rdoc_dir = 'doc'
   task_.title = "Blockenspiel #{::Blockenspiel::VERSION_STRING} documentation"
   task_.options << '--format=darkfish'
@@ -92,7 +94,8 @@ end
 
 
 # Gem package task
-task :package => [:build_java] do
+
+task :package => [:build_jruby] do
   mkdir_p('pkg')
   
   # Common gemspec
@@ -126,7 +129,7 @@ task :package => [:build_java] do
   # JRuby gemspec
   gemspec_ = create_gemspec do |s_|
     s_.platform = 'java'
-    s_.files += ['lib/blockenspiel_unmixer.jar']
+    s_.files += ['lib/blockenspiel_unmixer_jruby.jar']
   end
   ::Gem::Builder.new(gemspec_).build
   mv "blockenspiel-#{::Blockenspiel::VERSION_STRING}-java.gem", 'pkg'
@@ -134,51 +137,78 @@ end
 
 
 # General build task
-task :build => ::RUBY_PLATFORM =~ /java/ ? [:build_java] : [:build_c]
 
+case platform_
+when :jruby
+  task :build => [:build_jruby]
+when :mri
+  task :build => [:build_mri]
+else
+  task :build
+end
 
-# Build tasks for MRI
-
-makefile_name_ = "Makefile_#{platform_suffix_}"
-unmixer_general_name_ = "unmixer.#{dlext_}"
-unmixer_name_ = "unmixer_#{platform_suffix_}.#{dlext_}"
 
-desc 'Ensures the C extension appropriate to the current platform is present'
-task :build_c => ["ext/blockenspiel/#{unmixer_name_}"] do
-  cp "ext/blockenspiel/#{unmixer_name_}", "lib/blockenspiel/#{unmixer_general_name_}"
-end
+# Build tasks for MRI.
+# These are available only if the current rake is running under MRI.
+# They build the C extension for the current MRI.
 
-file "ext/blockenspiel/#{unmixer_name_}" => ["ext/blockenspiel/#{makefile_name_}"] do
-  ::Dir.chdir('ext/blockenspiel') do
-    cp makefile_name_, 'Makefile'
-    sh 'make'
-    rm 'unmixer.o'
-    mv unmixer_general_name_, unmixer_name_
+if platform_ == :mri
+  
+  if ::RUBY_VERSION =~ /^1\.8\..*$/
+    mri_version_suffix_ = '18'
+  elsif ::RUBY_VERSION =~ /^1\.9\..*$/
+    mri_version_suffix_ = '19'
+  else
+    raise "Unknown version of Matz Ruby Interpreter (#{::RUBY_VERSION})"
+  end
+  
+  makefile_name_ = "Makefile#{mri_version_suffix_}"
+  unmixer_general_name_ = "unmixer_mri.#{dlext_}"
+  unmixer_name_ = "unmixer_mri#{mri_version_suffix_}.#{dlext_}"
+  
+  desc 'Ensures the MRI C extension appropriate to the current platform is present'
+  task :build_mri => ["ext/blockenspiel/#{unmixer_name_}"] do
+    cp "ext/blockenspiel/#{unmixer_name_}", "lib/blockenspiel/#{unmixer_general_name_}"
   end
+  
+  file "ext/blockenspiel/#{unmixer_name_}" => ["ext/blockenspiel/#{makefile_name_}"] do
+    ::Dir.chdir('ext/blockenspiel') do
+      cp makefile_name_, 'Makefile'
+      sh 'make'
+      rm 'unmixer_mri.o'
+      mv unmixer_general_name_, unmixer_name_
+    end
+  end
+  
+  file "ext/blockenspiel/#{makefile_name_}" do
+    ::Dir.chdir('ext/blockenspiel') do
+      ruby 'extconf.rb'
+      mv 'Makefile', makefile_name_
+    end  
+  end
+  
 end
 
-file "ext/blockenspiel/#{makefile_name_}" do
-  ::Dir.chdir('ext/blockenspiel') do
-    ruby 'extconf.rb'
-    mv 'Makefile', makefile_name_
-  end  
-end
 
+# Build tasks for JRuby.
+# These are available under any ruby.
+# They assume that $JRUBY_HOME is set, and that the javac and jar
+# binaries are in the current path.
 
-# Build tasks for JRuby
 desc 'Builds the JRuby extension'
-task :build_java => ['lib/blockenspiel_unmixer.jar']
+task :build_jruby => ['lib/blockenspiel_unmixer_jruby.jar']
 
-file 'lib/blockenspiel_unmixer.jar' do
+file 'lib/blockenspiel_unmixer_jruby.jar' do
   ::Dir.chdir('ext/blockenspiel') do
-    sh 'javac -source 1.5 -target 1.5 -classpath $JRUBY_HOME/lib/jruby.jar BlockenspielUnmixerService.java'
-    sh 'jar cf blockenspiel_unmixer.jar BlockenspielUnmixerService.class'
+    sh 'javac -source 1.5 -target 1.5 -classpath $JRUBY_HOME/lib/jruby.jar BlockenspielUnmixerJrubyService.java'
+    sh 'jar cf blockenspiel_unmixer_jruby.jar BlockenspielUnmixerJrubyService.class'
   end
-  mv 'ext/blockenspiel/blockenspiel_unmixer.jar', 'lib'
+  mv 'ext/blockenspiel/blockenspiel_unmixer_jruby.jar', 'lib'
 end
 
 
 # Publish RDocs
+
 desc 'Publishes RDocs to RubyForge'
 task :publish_rdoc_to_rubyforge => [:rerdoc] do
   config_ = ::YAML.load(::File.read(::File.expand_path("~/.rubyforge/user-config.yml")))
@@ -188,6 +218,7 @@ end
 
 
 # Publish gem
+
 task :release_gem => [:package] do |t_|
   v_ = ::ENV["VERSION"]
   abort "Must supply VERSION=x.y.z" unless v_
@@ -203,11 +234,13 @@ end
 
 
 # Publish everything
+
 task :release => [:release_gem, :publish_rdoc_to_rubyforge]
 
 
 # Custom task that takes the implementing dsl blocks paper
 # and converts it from RDoc format to Markdown
+
 task :idslb_markdown do
   ::File.open('ImplementingDSLblocks.rdoc') do |read_|
     ::File.open('idslb_markdown.txt', 'w') do |write_|

data/ext/blockenspiel/{BlockenspielUnmixerService.java → BlockenspielUnmixerJrubyService.java}

@@ -36,10 +36,10 @@
 
 
 /*
-  This implementation based on Mixology,
+  This implementation based on Mixology 0.1,
   written by Patrick Farley, anonymous z, Dan Manges, and Clint Bishop.
   http://rubyforge.org/projects/mixology
-  http://github.com/dan-manges/mixology/tree/master
+  http://github.com/dan-manges/mixology
   
   It has been stripped down and modified for JRuby 1.2 compatibility.
 */
@@ -63,14 +63,14 @@ import org.jruby.exceptions.RaiseException;
 import org.jruby.runtime.load.BasicLibraryService;
 
 
-public class BlockenspielUnmixerService implements BasicLibraryService
+public class BlockenspielUnmixerJrubyService implements BasicLibraryService
 {
     
     public boolean basicLoad(final Ruby runtime) throws IOException
     {
         RubyModule blockenspielModule = runtime.getOrCreateModule("Blockenspiel");
         RubyModule unmixerModule = runtime.defineModuleUnder("Unmixer", blockenspielModule);
-        unmixerModule.getSingletonClass().defineAnnotatedMethods(BlockenspielUnmixerService.class);
+        unmixerModule.getSingletonClass().defineAnnotatedMethods(BlockenspielUnmixerJrubyService.class);
         return true;
     }
     

data/ext/blockenspiel/extconf.rb

@@ -1,2 +1,38 @@
+# -----------------------------------------------------------------------------
+# 
+# Blockenspiel native library builder
+# 
+# -----------------------------------------------------------------------------
+# Copyright 2010 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,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * 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
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+;
+
+
 require 'mkmf'
-create_makefile 'blockenspiel/unmixer'
+create_makefile 'blockenspiel/unmixer_mri'

data/ext/blockenspiel/{unmixer.c → unmixer_mri.c}

@@ -4,7 +4,7 @@
   Blockenspiel unmixer (MRI implementation)
   
   -----------------------------------------------------------------------------
-  Copyright 2008-2009 Daniel Azuma
+  Copyright 2008-2010 Daniel Azuma
   
   All rights reserved.
   
@@ -36,12 +36,14 @@
 
 
 /*
-  This implementation based on Mixology,
+  This implementation based on Mixology 0.1,
   written by Patrick Farley, anonymous z, Dan Manges, and Clint Bishop.
   http://rubyforge.org/projects/mixology
   http://github.com/dan-manges/mixology/tree/master
   
   It has been stripped down and modified for compatibility with Ruby 1.9.
+  
+  Note that this C extension is specific to MRI.
 */
 
 
@@ -53,8 +55,11 @@
 #endif
 
 
+#ifndef RUBINIUS
+
+
 static void remove_nested_module(VALUE klass, VALUE module) {
-  if (RBASIC(RCLASS_SUPER(klass))->klass == RBASIC(RCLASS_SUPER(module))->klass) {
+  if (CLASS_OF(RCLASS_SUPER(klass)) == CLASS_OF(RCLASS_SUPER(module))) {
     if (RCLASS_SUPER(RCLASS_SUPER(module)) && BUILTIN_TYPE(RCLASS_SUPER(module)) == T_ICLASS) {
       remove_nested_module(RCLASS_SUPER(klass), RCLASS_SUPER(module));
     }
@@ -64,10 +69,10 @@ static void remove_nested_module(VALUE klass, VALUE module) {
 
 
 static VALUE do_unmix(VALUE self, VALUE receiver, VALUE module) {
-  VALUE klass = RBASIC(receiver)->klass;
+  VALUE klass = CLASS_OF(receiver);
   while (klass != rb_class_real(klass)) {
     VALUE super = RCLASS_SUPER(klass);
-    if (BUILTIN_TYPE(super) == T_ICLASS && RBASIC(super)->klass == module) {
+    if (BUILTIN_TYPE(super) == T_ICLASS && CLASS_OF(super) == module) {
       if (RCLASS_SUPER(module) && BUILTIN_TYPE(RCLASS_SUPER(module)) == T_ICLASS) {
         remove_nested_module(super, module);
       }
@@ -80,7 +85,14 @@ static VALUE do_unmix(VALUE self, VALUE receiver, VALUE module) {
 }
 
 
-void Init_unmixer() {
+#endif
+
+
+void Init_unmixer_mri() {
+#ifndef RUBINIUS
+  
   VALUE container = rb_singleton_class(rb_define_module_under(rb_define_module("Blockenspiel"), "Unmixer"));
   rb_define_method(container, "unmix", do_unmix, 2);
+  
+#endif
 }

data/lib/blockenspiel/unmixer_rubinius.rb

@@ -0,0 +1,84 @@
+# -----------------------------------------------------------------------------
+# 
+# Blockenspiel unmixer for Rubinius
+# 
+# -----------------------------------------------------------------------------
+# Copyright 2010 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,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * 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
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+;
+
+
+module Blockenspiel
+  
+  
+  # :stopdoc:
+  
+  module Unmixer
+    
+    
+    # Unmix a module from an object in Rubinius.
+    # 
+    # This implementation is based on unreleased code from the Mixology
+    # source, written by Dan Manges.
+    # See http://github.com/dan-manges/mixology
+    # 
+    # It has been stripped down and modified for compatibility with the
+    # Rubinius 1.0 release.
+    
+    def self.unmix(obj_, mod_)  # :nodoc:
+      last_super_ = obj_.metaclass
+      this_super_ = last_super_.direct_superclass
+      while this_super_
+        if (this_super_ == mod_ || this_super_.respond_to?(:module) && this_super_.module == mod_)
+          _reset_method_cache(obj_)
+          last_super_.superclass = this_super_.direct_superclass
+          _reset_method_cache(obj_)
+          return
+        else
+          last_super_ = this_super_
+          this_super_ = this_super_.direct_superclass
+        end
+      end
+      nil
+    end
+    
+    
+    def self._reset_method_cache(obj_)  # :nodoc:
+      obj_.methods.each do |name_|
+        ::Rubinius::VM.reset_method_cache(name_.to_sym)
+      end
+    end
+    
+    
+  end
+  
+  # :startdoc:
+  
+  
+end

data/lib/blockenspiel/unmixer_unimplemented.rb

@@ -0,0 +1,58 @@
+# -----------------------------------------------------------------------------
+# 
+# Blockenspiel unmixer module when unmixer is not implemented
+# 
+# -----------------------------------------------------------------------------
+# Copyright 2010 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,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * 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
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+;
+
+
+module Blockenspiel
+  
+  
+  # :stopdoc:
+  
+  module Unmixer
+    
+    
+    # Unmixer stub.
+    # This throws an exception indicating the unmixer is not implemented.
+    
+    def self.unmix(obj_, mod_)  # :nodoc:
+      raise "Blockenspiel's mixin behavior is not implemented on this ruby platform."
+    end
+    
+    
+  end
+  
+  # :startdoc:
+  
+  
+end

data/lib/blockenspiel/version.rb

@@ -37,7 +37,7 @@
 module Blockenspiel
   
   # Current gem version, as a frozen string.
-  VERSION_STRING = '0.4.0'.freeze
+  VERSION_STRING = '0.4.1'.freeze
   
   autoload(:VERSION, ::File.dirname(__FILE__)+'/versionomy.rb')
   

data/lib/blockenspiel.rb

@@ -53,9 +53,14 @@ includes_ = [
 
 
 dir_ = ::File.expand_path('blockenspiel', ::File.dirname(__FILE__))
-if ::RUBY_PLATFORM =~ /java/
-  require "blockenspiel_unmixer"
+case ::RUBY_DESCRIPTION
+when /^ruby\s/
+  includes_.unshift('unmixer_mri')
+when /^jruby\s/
+  require "blockenspiel_unmixer_jruby"
+when /^rubinius\s/
+  includes_.unshift('unmixer_rubinius')
 else
-  includes_.unshift('unmixer')
+  includes_.unshift('unmixer_unimplemented')
 end
 includes_.each{ |file_| require "#{dir_}/#{file_}" }

data/tests/tc_mixins.rb

@@ -339,67 +339,70 @@ module Blockenspiel
       #   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 }
+      if defined?(::Fiber)
+        
+        def test_nested_two_fibers
+          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('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
+              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('C', 13)
-              set_value2('D'){ 14 }
+              set_value('e', 5)
+              set_value2('f'){ 6 }
             end, target1_)
-            ::Fiber.yield
-            set_value('E', 15)
-            set_value2_inmixin('F'){ 16 }
-          end, target2_)
+          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
-        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
       
       

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blockenspiel
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: java
 authors: 
 - Daniel Azuma
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-21 00:00:00 -07:00
+date: 2010-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -31,17 +31,19 @@ extra_rdoc_files:
 - History.rdoc
 - ImplementingDSLblocks.rdoc
 files: 
-- ext/blockenspiel/unmixer.c
+- ext/blockenspiel/unmixer_mri.c
 - ext/blockenspiel/extconf.rb
-- ext/blockenspiel/BlockenspielUnmixerService.java
+- ext/blockenspiel/BlockenspielUnmixerJrubyService.java
 - lib/blockenspiel/builder.rb
 - lib/blockenspiel/dsl_setup.rb
 - lib/blockenspiel/errors.rb
 - lib/blockenspiel/impl.rb
+- lib/blockenspiel/unmixer_rubinius.rb
+- lib/blockenspiel/unmixer_unimplemented.rb
 - lib/blockenspiel/version.rb
 - lib/blockenspiel/versionomy.rb
 - lib/blockenspiel.rb
-- lib/blockenspiel_unmixer.jar
+- lib/blockenspiel_unmixer_jruby.jar
 - tests/files/file1.rb
 - tests/tc_basic.rb
 - tests/tc_behaviors.rb