dslkit 0.2.2 → 0.2.3

data/CHANGES

@@ -1,3 +1,5 @@
+2007-11-29 (0.2.3)
+  * Now compatible to Ruby 1.9 (for the moment).
 2007-04-11 (0.2.2)
   * Ported Reginald Braithwaite's let DSL to DSLKit as examples/let.rb, see
     http://weblog.raganwald.com/2007/03/approach-to-composing-domain-specific.html.

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/examples/mail.rb

@@ -1,5 +1,6 @@
 require 'dslkit/polite'
 require 'net/smtp'
+require 'time'
 
 class Mail
   extend DSLKit::DSLAccessor
@@ -30,7 +31,7 @@ class Mail
 
   def message_id 
     key = [ ENV['HOSTNAME'] || 'localhost', $$ , Time.now ].join
-    ::Digest::MD5.new(key).to_s
+    (::Digest::MD5.new << key).to_s
   end
 
   def msg
@@ -58,6 +59,7 @@ end
 
 def prompt
   STDOUT.print "Send to? "
+  STDOUT.flush
   STDIN.gets.strip
 end
 

data/examples/mm.rb

@@ -6,17 +6,13 @@ require 'dslkit/polite'
 module MM
   class InterpreterError < StandardError; end
 
-  class  Label < Proc
-    def initialize(interpreter, name, &block)
-      @interpreter = interpreter
-      @name = name
-      super(&block)
-    end
+  class ::Proc
+    attr_accessor :interpreter
 
-    attr_reader :name
+    attr_accessor :name
     
     def execute
-      @interpreter.display_registers(self)
+      interpreter.display_registers(self)
       call
     end
   end
@@ -88,7 +84,8 @@ module MM
     def label(name, &block)
       @labels.find { |l| l.name == name }  and
         raise InterpreterError, "label named '#{name}' was already defined"
-      @labels << Label.new(self, name, &block)
+      block.interpreter, block.name = self, name
+      @labels << block
     end
 
     def register_fetch(register)

data/lib/dslkit/polite.rb

@@ -1,3 +1,8 @@
+# :stopdoc:
+require 'thread'
+require 'sync'
+# :startdoc:
+
 # = dslkit - Building Blocks for Domain Specific Languages (DSL)
 #
 # == Description
@@ -79,6 +84,17 @@ module DSLKit
   end
 
   module ThreadLocal
+    @@mutex = Mutex.new
+
+    @@cleanup = lambda do |my_object_id|
+      my_id = "__thread_local_#{my_object_id}__"
+      @mutex.synchronize do
+        for t in Thread.list
+          t[my_id] = nil if t[my_id]
+        end
+      end
+    end
+
     # Define a thread local variable named _name_ in this module/class. If the
     # value _value_ is given, it is used to initialize the variable.
     def thread_local(name, value = nil)
@@ -87,21 +103,7 @@ module DSLKit
       name = name.to_s
       my_id = "__thread_local_#{__id__}__"
 
-      cleanup = eval <<-'EOT', TOPLEVEL_BINDING
-      lambda do |my_object_id|
-        my_id = "__thread_local_#{my_object_id}__"
-        begin 
-          old = Thread.critical
-          Thread.critical = true
-          for t in Thread.list
-            t[my_id] = nil if t[my_id]
-          end
-        ensure
-          Thread.critical = old
-        end
-      end
-      EOT
-      ObjectSpace.define_finalizer(self, cleanup)
+      ObjectSpace.define_finalizer(self, @@cleanup)
 
       define_method(name) do
         Thread.current[my_id] ||= {}
@@ -138,7 +140,6 @@ module DSLKit
     def thread_global(name, value = nil)
       is_a?(Module) or raise TypeError, "receiver has to be a Module"
      
-      require 'thread'
       name = name.to_s
       var_name = "@__#{name}_#{__id__.abs}__"
 
@@ -171,47 +172,49 @@ module DSLKit
   end
 
   module InstanceExec
-    class << self
-      attr_accessor :pool
-      attr_accessor :count
-    end
-    self.count = 0
-    self.pool = []
-
-    # This is a pure ruby implementation of Ruby 1.9's instance_exec method. It
-    # executes _block_ in the context of this object while parsing <i>*args</i> into
-    # the block.
-    def instance_exec(*args, &block)
-      instance = self
-      id = instance_exec_fetch_symbol
-      InstanceExec.module_eval do
-        begin
-          define_method id, block
-          instance.__send__ id, *args
-        ensure
-          remove_method id if method_defined?(id)
+    unless (Object.instance_method(:instance_exec) rescue nil)
+      class << self
+        attr_accessor :pool
+        attr_accessor :count
+      end
+      self.count = 0
+      self.pool = []
+
+      # This is a pure ruby implementation of Ruby 1.9's instance_exec method. It
+      # executes _block_ in the context of this object while parsing <i>*args</i> into
+      # the block.
+      def instance_exec(*args, &block)
+        instance = self
+        id = instance_exec_fetch_symbol
+        InstanceExec.module_eval do
+          begin
+            define_method id, block
+            instance.__send__ id, *args
+          ensure
+            remove_method id if method_defined?(id)
+          end
         end
+      ensure
+        InstanceExec.pool << id
       end
-    ensure
-      InstanceExec.pool << id
-    end
 
-    private
+      private
 
-    # Fetch a symbol from a pool in thread save way. If no more symbols are
-    # available create a new one, that will be pushed into the pool later.
-    def instance_exec_fetch_symbol
-      old = Thread.critical
-      Thread.critical = true
-      if InstanceExec.pool.empty?
-        InstanceExec.count += 1
-        symbol = :"__instance_exec_#{InstanceExec.count}__"
-      else
-        symbol = InstanceExec.pool.shift
+      @@mutex = Mutex.new
+
+      # Fetch a symbol from a pool in thread save way. If no more symbols are
+      # available create a new one, that will be pushed into the pool later.
+      def instance_exec_fetch_symbol
+        @@mutex.synchronize do
+          if InstanceExec.pool.empty?
+            InstanceExec.count += 1
+            symbol = :"__instance_exec_#{InstanceExec.count}__"
+          else
+            symbol = InstanceExec.pool.shift
+          end
+          return symbol
+        end
       end
-      return symbol
-    ensure
-      Thread.critical = old
     end
   end
 
@@ -408,7 +411,8 @@ module DSLKit
       klass = Class.new
       klass.instance_eval do
         instance_methods.each do |m|
-          undef_method m unless m =~ /^__/ or ids.any? { |i| i === m }
+          m = m.to_s
+          undef_method m unless m =~ /^(__|object_id)/ or ids.any? { |i| i === m }
         end
       end
       klass
@@ -477,28 +481,26 @@ module DSLKit
       end
     end
 
+    @@sync = Sync.new
+
     # Start deflecting method calls named _id_ to the _from_ class using the
     # Deflector instance deflector.
     def deflect_start(from, id, deflector)
-      old = Thread.critical
-      Thread.critical = true
-      Deflect.deflecting ||= DeflectorCollection.new
-      Deflect.deflecting.member?(from, id) and
-        raise DeflectError, "#{from}##{id} is already deflected"
-      Deflect.deflecting.add(from, id, deflector)
-      from.class_eval do
-        define_method(id) do |*args|
-          if Deflect.deflecting and d = Deflect.deflecting.find(self.class, id)
-            Thread.critical = old
-            d.call(self, id, *args)
-          else
-            Thread.critical = old
-            super
+      @@sync.synchronize do
+        Deflect.deflecting ||= DeflectorCollection.new
+        Deflect.deflecting.member?(from, id) and
+          raise DeflectError, "#{from}##{id} is already deflected"
+        Deflect.deflecting.add(from, id, deflector)
+        from.class_eval do
+          define_method(id) do |*args|
+            if Deflect.deflecting and d = Deflect.deflecting.find(self.class, id)
+              d.call(self, id, *args)
+            else
+              super(*args)
+            end
           end
         end
       end
-    ensure
-      Thread.critical = old
     end
 
     # Return true if method _id_ is deflected from class _from_, otherwise
@@ -517,24 +519,23 @@ module DSLKit
     # Deflector instance deflector. After that yield to the given block and
     # stop deflecting again.
     def deflect(from, id, deflector)
-      old = Thread.critical
-      Thread.critical = true
-      deflect_start(from, id, deflector)
-      yield
-    ensure
-      deflect_stop(from, id)
-      Thread.critical = old
+      @@sync.synchronize do
+        begin
+          deflect_start(from, id, deflector)
+          yield
+        ensure
+          deflect_stop(from, id)
+        end
+      end
     end
 
     # Stop deflection method calls named _id_ to class _from_.
     def deflect_stop(from, id)
-      old = Thread.critical
-      Thread.critical = true
-      Deflect.deflecting.delete(from, id) or
-        raise DeflectError, "#{from}##{id} is not deflected from"
-      from.instance_eval { remove_method id }
-    ensure
-      Thread.critical = old
+      @@sync.synchronize do
+        Deflect.deflecting.delete(from, id) or
+          raise DeflectError, "#{from}##{id} is not deflected from"
+        from.instance_eval { remove_method id }
+      end
     end
   end
 
@@ -588,7 +589,7 @@ module DSLKit
     # This method returns the receiver _self_ of the context in which _block_
     # was created.
     def block_self(&block)
-      eval 'self', block.binding
+      eval 'self', block.__send__(:binding)
     end
   end
 

data/lib/dslkit/version.rb

@@ -1,6 +1,6 @@
 module DSLKit
   # DSLKit version
-  VERSION         = '0.2.2'
+  VERSION         = '0.2.3'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: dslkit
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
-date: 2007-04-13 00:00:00 +02:00
+  version: 0.2.3
+date: 2007-11-29 00:00:00 +01:00
 summary: Kit for building DSLs in Ruby
 require_paths: 
 - lib
@@ -29,33 +29,33 @@ post_install_message:
 authors: 
 - Florian Frank
 files: 
-- VERSION
-- TODO
-- tests
-- GPL
 - install.rb
-- Rakefile
-- examples
 - lib
+- lib/dslkit
+- lib/dslkit/rude.rb
+- lib/dslkit/polite.rb
+- lib/dslkit/version.rb
+- lib/dslkit.rb
 - CHANGES
-- tests/runner.rb
+- TODO
+- VERSION
+- tests
 - tests/test_common.rb
-- tests/test_rude.rb
+- tests/runner.rb
 - tests/test_polite.rb
-- examples/recipe_common.rb
-- examples/multiply.reg
-- examples/mail.rb
+- tests/test_rude.rb
+- Rakefile
+- GPL
+- examples
+- examples/recipe.rb
+- examples/mm.rb
 - examples/recipe2.rb
-- examples/null_pattern.rb
 - examples/subtract.reg
-- examples/recipe.rb
+- examples/null_pattern.rb
+- examples/recipe_common.rb
 - examples/let.rb
-- examples/mm.rb
-- lib/dslkit
-- lib/dslkit.rb
-- lib/dslkit/rude.rb
-- lib/dslkit/polite.rb
-- lib/dslkit/version.rb
+- examples/multiply.reg
+- examples/mail.rb
 test_files: 
 - tests/runner.rb
 rdoc_options: []