dslkit 0.2.1 → 0.2.2

data/CHANGES

@@ -1,3 +1,8 @@
+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.
+    Added BlockSelf and MethodMissingDelegator modules for the implementation.
+  * Added version.rb.
 2007-02-22 (0.2.1)
   * Add coverage to tests.
   * New delegate method for classes/modules.

data/Rakefile

@@ -32,9 +32,6 @@ task :clean do
   rm_rf %w[doc coverage]
 end
 
-desc "Prepare a release"
-task :release => [:clean, :package]
-
 spec = Gem::Specification.new do |s|
   #### Basic information.
 
@@ -85,4 +82,24 @@ Rake::GemPackageTask.new(spec) do |pkg|
   pkg.need_tar = true
   pkg.package_files += PKG_FILES
 end
+
+desc m = "Writing version information for #{PKG_VERSION}"
+task :version do
+  puts m
+  File.open(File.join('lib', 'dslkit', 'version.rb'), 'w') do |v|
+    v.puts <<EOT
+module DSLKit
+  # DSLKit version
+  VERSION         = '#{PKG_VERSION}'
+  VERSION_ARRAY   = VERSION.split(/\\./).map { |x| x.to_i } # :nodoc:
+  VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
+  VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:
+  VERSION_BUILD   = VERSION_ARRAY[2] # :nodoc:
+end
+EOT
+  end
+end
+
+desc "Prepare a release"
+task :release => [:clean, :version, :package]
   # vim: set et sw=2 ts=2:

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/examples/let.rb

@@ -0,0 +1,62 @@
+#!/usr/bin/env ruby
+
+require 'dslkit/polite'
+
+LetScope = DSLKit::BlankSlate.with :instance_eval, :to_s, :inspect, :extend
+class LetScope
+  include DSLKit::MethodMissingDelegator::DelegatorModule
+  include DSLKit::BlockSelf
+
+  def initialize(my_self, bindings = {}, outer_scope = nil)
+    super(my_self)
+    @outer_scope = outer_scope
+    @bindings = bindings
+    extend DSLKit::Eigenclass
+    eigenclass_eval { extend DSLKit::Constant }
+    each_binding do |name, value|
+      eigenclass_eval {  constant name, value }
+    end
+  end
+
+  def each_binding(&block)
+    if @outer_scope
+      @outer_scope.each_binding(&block)
+    end
+    @bindings.each(&block)
+  end
+
+  def let(bindings = {}, &block)
+    ls = LetScope.new(block_self(&block), bindings, self)
+    ls.instance_eval(&block)
+  end
+
+  # Inlcuding this module into your current namespace defines the let method.
+  module Include
+    include DSLKit::BlockSelf
+
+    def let(bindings = {}, &block)
+      ls = LetScope.new(block_self(&block), bindings)
+      ls.instance_eval(&block)
+    end
+  end
+end
+
+if $0 == __FILE__
+  class Foo
+    include LetScope::Include
+
+    def twice(x)
+      2 * x
+    end
+
+    def test
+      let :x => 1, :y => twice(1) do 
+        let :z => twice(x) do
+          puts "#{x} * #{y} == #{z} # => #{x * y == twice(x)}"
+        end
+      end
+    end
+  end
+
+  Foo.new.test
+end

data/examples/mail.rb

@@ -4,9 +4,11 @@ require 'net/smtp'
 class Mail
   extend DSLKit::DSLAccessor
   include DSLKit::InstanceExec
+  include DSLKit::MethodMissingDelegator::DelegatorModule
+  include DSLKit::BlockSelf
 
-  def initialize(dispatch = nil, &block)
-    @dispatch = dispatch
+  def initialize(&block)
+    super block_self(&block)
     instance_exec(&block)
   end
 
@@ -48,18 +50,10 @@ class Mail
       smtp.send_message msg, from, to
     end
   end
-
-  def method_missing(id, *args, &block)
-    if @dispatch
-      @dispatch.instance_eval { __send__(id, *args, &block) }
-    else
-      super
-    end
-  end
 end
 
 def mail(&block)
-  Mail.new(self, &block)
+  Mail.new(&block)
 end
 
 def prompt
@@ -67,10 +61,11 @@ def prompt
   STDIN.gets.strip
 end
 
-rcpt = prompt
 m = mail do
   subject subject + ': Hi!'
-  to      rcpt unless rcpt.empty?
+  if rcpt = prompt
+    to      rcpt
+  end
   body    "Hello, world!\n"
 end
 m.send

data/examples/mm.rb

@@ -44,7 +44,7 @@ module MM
       if name[-1] == ?=
         name = name[0..-2].intern
         value >= 0 or raise InterpreterError,
-          "only non-negative numbers can be stored in registers"
+          "only non-negative numbers can be stored in register #{name}"
         @registers[name] = value
       else
         super
@@ -137,7 +137,7 @@ module MM
   end
 end
 
-#if $0 == __FILE__
+if $0 == __FILE__
   if ARGV.empty?
     MM::Interpreter.new(STDIN.read).run
   else
@@ -145,4 +145,4 @@ end
     interpreter.stepping = !ARGV.empty?
     interpreter.run
   end
-#end
+end

data/examples/recipe_common.rb

@@ -95,5 +95,3 @@ class Unit
     "#@n #{name}#{@n > 1 ? 's' : ''}"
   end
 end
-
-

data/install.rb

@@ -9,9 +9,10 @@ include Config
 src = File.join(*%w[lib dslkit])
 dst = File.join(CONFIG["sitelibdir"], 'dslkit')
 mkdir_p dst
-for file in %w[polite.rb rude.rb]
-  install File.join(src, file), File.join(dst, file)
+cd src do
+  for file in Dir['*.rb']
+    install file, File.join(dst, file)
+  end
 end
-install File.join('lib', 'dslkit.rb'), File.join(CONFIG["sitelibdir"], file)
-
-    # vim: set et sw=4 ts=4:
+install File.join('lib', 'dslkit.rb'), File.join(CONFIG["sitelibdir"], 'dslkit.rb')
+    # vim: set et sw=2 ts=2:

data/lib/dslkit/polite.rb

@@ -31,6 +31,8 @@
 # subdirectory of this library.
 #
 module DSLKit
+  require 'dslkit/version'
+
   # This module contains some handy methods to deal with eigenclasses. Those
   # are also known as virtual classes, singleton classes, metaclasses, plus all
   # the other names Matz doesn't like enough to actually accept one of the
@@ -578,4 +580,53 @@ module DSLKit
       end
     end
   end
+
+  # This module includes the block_self module_function.
+  module BlockSelf
+    module_function
+
+    # This method returns the receiver _self_ of the context in which _block_
+    # was created.
+    def block_self(&block)
+      eval 'self', block.binding
+    end
+  end
+
+  # This module contains a configurable method missing delegator and can be
+  # mixed into a module/class.
+  module MethodMissingDelegator
+
+    # Including this module in your classes makes an _initialize_ method
+    # available, whose first argument is used as method_missing_delegator
+    # attribute. If a superior _initialize_ method was defined it is called
+    # with all arguments but the first.
+    module DelegatorModule
+      include DSLKit::MethodMissingDelegator
+
+      def initialize(delegator, *a, &b)
+        self.method_missing_delegator = delegator
+        super(*a, &b) if defined? super
+      end
+    end
+
+    # This class includes DelegatorModule and can be used as a superclass
+    # instead of including DelegatorModule.
+    class DelegatorClass
+      include DelegatorModule
+    end
+
+    # This object will be the receiver of all missing method calls, if it has a
+    # value other than nil.
+    attr_accessor :method_missing_delegator
+
+    # Delegates all missing method calls to _method_missing_delegator_ if this
+    # attribute has been set. Otherwise it will call super.
+    def method_missing(id, *a, &b)
+      unless method_missing_delegator.nil?
+        method_missing_delegator.__send__(id, *a, &b)
+      else
+        super
+      end
+    end
+  end
 end

data/lib/dslkit/rude.rb

@@ -20,5 +20,6 @@ module DSLKit
     include DSLKit::Deflect
     include DSLKit::ThreadLocal
     include DSLKit::Eigenclass
+    include DSLKit::BlockSelf
   end
 end

data/lib/dslkit/version.rb

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

data/tests/test_common.rb

@@ -185,4 +185,17 @@ class TC_DSLKit < Test::Unit::TestCase
     assert_equal 3, d.size
     assert_equal 3, d.length
   end
+
+  if defined? D3
+    def test_delegate
+      d = D3.new []
+      assert_equal 0, d.size
+      d.push 1
+      assert_equal [1], d.map { |x| x }
+      d.push 2
+      assert_equal [1, 2], d.map { |x| x }
+      d.push 3
+      assert_equal [1, 2, 3], d.map { |x| x }
+    end
+  end
 end

data/tests/test_polite.rb

@@ -102,4 +102,7 @@ class D2
   delegate :length, :ary
 end
 
+class D3 < DSLKit::MethodMissingDelegator::DelegatorClass
+end
+
 require 'test_common'

metadata

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