dslkit 0.2.8 → 0.2.9

data/.gitignore

@@ -1,3 +1,4 @@
 .*.sw[pon]
+.rvmrc
 Gemfile.lock
 pkg

data/.rvmrc

@@ -0,0 +1,3 @@
+rvm use ruby-1.9.3-rc1
+rvm gemset create dslkit
+rvm gemset use dslkit

data/CHANGES

@@ -1,3 +1,7 @@
+2011-10-07 (0.2.9)
+ * Add ParameterizedModule and FromModule.
+2011-09-26 (0.2.8)
+ * Depend on tins instead of spruz.
 2011-07-16 (0.2.7)
   * Added turing machines example.
 2009-07-20 (0.2.6)

data/Rakefile

@@ -11,7 +11,7 @@ GemHadar do
   summary     'Kit for building DSLs in Ruby'
   description 'This library contains recurring patterns, that are useful in the creation of internal Domain Specific Languages (DSL) in Ruby.'
   test_dir    'tests'
-  ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock'
+  ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', '.rvmrc'
   readme      'README.rdoc'
 
   dependency  'term-ansicolor', '~>1.0'

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.9

data/dslkit.gemspec

@@ -2,36 +2,36 @@
 
 Gem::Specification.new do |s|
   s.name = "dslkit"
-  s.version = "0.2.8"
+  s.version = "0.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2011-09-25"
+  s.date = "2011-10-07"
   s.description = "This library contains recurring patterns, that are useful in the creation of internal Domain Specific Languages (DSL) in Ruby."
   s.email = "flori@ping.de"
   s.extra_rdoc_files = ["README.rdoc", "lib/dslkit/version.rb", "lib/dslkit/rude.rb", "lib/dslkit/polite.rb", "lib/dslkit.rb"]
-  s.files = [".gitignore", ".travis.yml", "CHANGES", "COPYING", "Gemfile", "README.rdoc", "Rakefile", "TODO", "VERSION", "dslkit.gemspec", "examples/add_one.pdf", "examples/add_one.stm", "examples/bb3.pdf", "examples/bb3.stm", "examples/bb3_19.stm", "examples/concatenate_compare.mtm", "examples/concatenate_compare.pdf", "examples/concatenate_compare_19.mtm", "examples/length_difference.mtm", "examples/length_difference.pdf", "examples/length_difference_19.mtm", "examples/let.rb", "examples/mail.rb", "examples/minsky.rb", "examples/multiply.reg", "examples/null_pattern.rb", "examples/ones_difference-mtm.pdf", "examples/ones_difference-stm.pdf", "examples/ones_difference.mtm", "examples/ones_difference.stm", "examples/ones_difference_19.mtm", "examples/ones_difference_19.stm", "examples/prefix-equals-suffix-reversed-with-infix.pdf", "examples/prefix-equals-suffix-reversed-with-infix.stm", "examples/prefix-equals-suffix-reversed-with-infix_19.stm", "examples/recipe.rb", "examples/recipe2.rb", "examples/recipe_common.rb", "examples/subtract.reg", "examples/turing-graph.rb", "examples/turing.rb", "lib/dslkit.rb", "lib/dslkit/polite.rb", "lib/dslkit/rude.rb", "lib/dslkit/version.rb", "tests/test_polite.rb"]
+  s.files = [".gitignore", ".rvmrc", ".travis.yml", "CHANGES", "COPYING", "Gemfile", "README.rdoc", "Rakefile", "TODO", "VERSION", "dslkit.gemspec", "examples/add_one.pdf", "examples/add_one.stm", "examples/bb3.pdf", "examples/bb3.stm", "examples/bb3_19.stm", "examples/concatenate_compare.mtm", "examples/concatenate_compare.pdf", "examples/concatenate_compare_19.mtm", "examples/length_difference.mtm", "examples/length_difference.pdf", "examples/length_difference_19.mtm", "examples/let.rb", "examples/mail.rb", "examples/minsky.rb", "examples/multiply.reg", "examples/null_pattern.rb", "examples/ones_difference-mtm.pdf", "examples/ones_difference-stm.pdf", "examples/ones_difference.mtm", "examples/ones_difference.stm", "examples/ones_difference_19.mtm", "examples/ones_difference_19.stm", "examples/prefix-equals-suffix-reversed-with-infix.pdf", "examples/prefix-equals-suffix-reversed-with-infix.stm", "examples/prefix-equals-suffix-reversed-with-infix_19.stm", "examples/recipe.rb", "examples/recipe2.rb", "examples/recipe_common.rb", "examples/subtract.reg", "examples/turing-graph.rb", "examples/turing.rb", "lib/dslkit.rb", "lib/dslkit/polite.rb", "lib/dslkit/rude.rb", "lib/dslkit/version.rb", "tests/from_module_test.rb", "tests/polite_test.rb"]
   s.homepage = "http://flori.github.com/dslkit"
   s.rdoc_options = ["--title", "Dslkit - Kit for building DSLs in Ruby", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.10"
   s.summary = "Kit for building DSLs in Ruby"
-  s.test_files = ["tests/test_polite.rb"]
+  s.test_files = ["tests/from_module_test.rb", "tests/polite_test.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.0"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.1"])
       s.add_runtime_dependency(%q<term-ansicolor>, ["~> 1.0"])
       s.add_runtime_dependency(%q<tins>, ["~> 0.3"])
     else
-      s.add_dependency(%q<gem_hadar>, ["~> 0.1.0"])
+      s.add_dependency(%q<gem_hadar>, ["~> 0.1.1"])
       s.add_dependency(%q<term-ansicolor>, ["~> 1.0"])
       s.add_dependency(%q<tins>, ["~> 0.3"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 0.1.0"])
+    s.add_dependency(%q<gem_hadar>, ["~> 0.1.1"])
     s.add_dependency(%q<term-ansicolor>, ["~> 1.0"])
     s.add_dependency(%q<tins>, ["~> 0.3"])
   end

data/examples/let.rb

@@ -50,7 +50,7 @@ if $0 == __FILE__
     end
 
     def test
-      let :x => 1, :y => twice(1) do 
+      let :x => 1, :y => twice(1) do
         let :z => twice(x) do
           puts "#{x} * #{y} == #{z} # => #{x * y == twice(x)}"
         end

data/examples/mail.rb

@@ -29,7 +29,7 @@ class Mail
 
   dsl_accessor :date      do Time.now.rfc2822 end
 
-  def message_id 
+  def message_id
     key = [ ENV['HOSTNAME'] || 'localhost', $$ , Time.now ].join
     (::Digest::MD5.new << key).to_s
   end

data/examples/minsky.rb

@@ -10,7 +10,7 @@ module Minsky
     attr_accessor :interpreter
 
     attr_accessor :name
-    
+
     def execute
       interpreter.display_registers(self)
       call
@@ -70,7 +70,7 @@ module Minsky
     end
 
     def display_registers(label)
-      @format ||= "%#{@labels.map { |l| l.name.to_s.size }.max}s" 
+      @format ||= "%#{@labels.map { |l| l.name.to_s.size }.max}s"
       STDOUT.puts "#{@format % label.name}: #{@registers}"
       if @stepping
         STDOUT.print "? "
@@ -107,7 +107,7 @@ module Minsky
 
     def increment(register, label)
       label = label_fetch label
-      register_increment(register)  
+      register_increment(register)
       label
     end
 
@@ -117,8 +117,8 @@ module Minsky
       else_label = label_fetch else_label
       if register_value.zero?
         zero_label
-      else  
-        register_decrement(register)  
+      else
+        register_decrement(register)
         else_label
       end
     end

data/examples/recipe2.rb

@@ -61,7 +61,7 @@ end
 recipe_source = <<EOT
 pancakes = recipe do
   2.cups.         flour
-  2.5.teaspoons.  baking_powder 
+  2.5.teaspoons.  baking_powder
   0.5.teaspoon.   salt
   1.              egg
   1.5.cups.       milk

data/examples/recipe_common.rb

@@ -58,7 +58,7 @@ class Unit
   end
 
   attr_reader :n
-  
+
   def to_s
     "#@n #{name}#{@n > 1 ? 's' : ''}"
   end
@@ -90,7 +90,7 @@ class Unit
   end
 
   attr_reader :n
-  
+
   def to_s
     "#@n #{name}#{@n > 1 ? 's' : ''}"
   end

data/examples/turing.rb

@@ -56,7 +56,7 @@ module Turing
     def to_s
       "#{@left.join}#{Term::ANSIColor.red(@head)}#{@right.join.reverse}"
     end
-    
+
     alias inspect to_s
   end
 

data/lib/dslkit/polite.rb

@@ -63,7 +63,7 @@ module DSLKit
 
     # 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)
+    def thread_local(name, default_value = nil)
       is_a?(Module) or raise TypeError, "receiver has to be a Module"
 
       name = name.to_s
@@ -81,9 +81,9 @@ module DSLKit
         Thread.current[my_id][name] = value
       end
 
-      if value
+      if default_value
         Thread.current[my_id] = {}
-        Thread.current[my_id][name] = value
+        Thread.current[my_id][name] = default_value
       end
       self
     end
@@ -103,9 +103,9 @@ module DSLKit
   module ThreadGlobal
     # Define a thread global variable named _name_ in this module/class. If the
     # value _value_ is given, it is used to initialize the variable.
-    def thread_global(name, value = nil)
+    def thread_global(name, default_value = nil)
       is_a?(Module) or raise TypeError, "receiver has to be a Module"
-     
+
       name = name.to_s
       var_name = "@__#{name}_#{__id__.abs}__"
 
@@ -120,7 +120,7 @@ module DSLKit
         lock.synchronize { modul.instance_variable_set var_name, value }
       end
 
-      modul.instance_variable_set var_name, value if value
+      modul.instance_variable_set var_name, default_value if default_value
       self
     end
 
@@ -199,7 +199,7 @@ module DSLKit
     #      3
     #    end
     #  end
-    # 
+    #
     #  A.new.interpret('|a,b| a + b + c', 1, 2) # => 6
     #
     # To use a specified binding see #interpret_with_binding.
@@ -218,7 +218,7 @@ module DSLKit
     #      3
     #    end
     #    def foo
-    #      b = 2 
+    #      b = 2
     #      interpret_with_binding('|a| a + b + c', binding, 1) # => 6
     #    end
     #  end
@@ -243,7 +243,7 @@ module DSLKit
     # frozen, if this is possible. If you want to modify/exchange a value use
     # DSLAccessor#dsl_reader/DSLAccessor#dsl_accessor instead.
     def constant(name, value = name)
-      value = value.freeze rescue value 
+      value = value.freeze rescue value
       define_method(name) { value }
     end
   end
@@ -251,7 +251,7 @@ module DSLKit
   # The DSLAccessor module contains some methods, that can be used to make
   # simple accessors for a DSL.
   #
-  # 
+  #
   #  class CoffeeMaker
   #    extend DSLKit::Constant
   #
@@ -598,4 +598,33 @@ module DSLKit
       end
     end
   end
+
+  module ParameterizedModule
+    # Pass _args_ and _block_ to configure the module and then return it after
+    # calling the parameterize method has been called with these arguments. The
+    # _parameterize_ method should return a configured module.
+    def parameterize_for(*args, &block)
+      respond_to?(:parameterize) ? parameterize(*args, &block) : self
+    end
+  end
+
+  module FromModule
+    include ParameterizedModule
+
+    alias from parameterize_for
+
+    def parameterize(opts = {})
+      modul = opts[:module] or raise ArgumentError, 'option :module is required'
+      import_methods = Array(opts[:methods])
+      result = modul.dup
+      remove_methods = modul.instance_methods.map(&:to_sym) - import_methods.map(&:to_sym)
+      remove_methods.each do |m|
+        begin
+          result.__send__ :remove_method, m
+        rescue NameError
+        end
+      end
+      result
+    end
+  end
 end

data/lib/dslkit/rude.rb

@@ -10,6 +10,8 @@ module DSLKit
     include DSLKit::DSLAccessor
     include DSLKit::ClassMethod
     include DSLKit::Delegate
+    include DSLKit::ParameterizedModule
+    include DSLKit::FromModule
   end
 
   class ::Object

data/lib/dslkit/version.rb

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

data/tests/from_module_test.rb

@@ -0,0 +1,61 @@
+require 'dslkit/polite'
+require 'test/unit'
+
+class FromModuleTest < Test::Unit::TestCase
+  module MyIncludedModule
+    def foo
+      :foo
+    end
+
+    def bar
+      :bar
+    end
+  end
+
+  class MyKlass
+    def foo
+      :original_foo
+    end
+
+    def bar
+      :original_bar
+    end
+  end
+
+  class DerivedKlass < MyKlass
+    extend DSLKit::FromModule
+
+    include from :module => MyIncludedModule, :methods => [ :foo ]
+  end
+
+  module MyModule
+    def foo
+      :original_foo
+    end
+
+    def bar
+      :original_bar
+    end
+    include MyIncludedModule
+  end
+
+  class AnotherDerivedKlass
+    include MyModule
+
+    extend DSLKit::FromModule
+
+    include from :module => MyIncludedModule, :methods => :foo
+  end
+
+  def test_derived_klass
+    c = DerivedKlass.new
+    assert_equal :foo, c.foo
+    assert_equal :original_bar, c.bar
+  end
+
+  def test_another_derived_klass
+    c = AnotherDerivedKlass.new
+    assert_equal :foo, c.foo
+    assert_equal :original_bar, c.bar
+  end
+end

data/tests/{test_polite.rb → polite_test.rb}

@@ -52,7 +52,7 @@ class DA
 
   dsl_accessor :quux, :qu, :ux
 
-  dsl_reader :on, true 
+  dsl_reader :on, true
 
   dsl_reader :off, false
 
@@ -69,7 +69,7 @@ class I
   def foo
     :foo
   end
-  
+
   def y
     2
   end
@@ -108,7 +108,7 @@ end
 require 'test/unit'
 require 'tempfile'
 
-class TC_DSLKit < Test::Unit::TestCase
+class PoliteTest < Test::Unit::TestCase
   def setup
     @tl = TL.new
     @tl2 = TL.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dslkit
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-25 00:00:00.000000000Z
+date: 2011-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
-  requirement: &2156319460 !ruby/object:Gem::Requirement
+  requirement: &70131132995660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :development
   prerelease: false
-  version_requirements: *2156319460
+  version_requirements: *70131132995660
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2156318700 !ruby/object:Gem::Requirement
+  requirement: &70131132994340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156318700
+  version_requirements: *70131132994340
 - !ruby/object:Gem::Dependency
   name: tins
-  requirement: &2156317900 !ruby/object:Gem::Requirement
+  requirement: &70131132993400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2156317900
+  version_requirements: *70131132993400
 description: This library contains recurring patterns, that are useful in the creation
   of internal Domain Specific Languages (DSL) in Ruby.
 email: flori@ping.de
@@ -57,6 +57,7 @@ extra_rdoc_files:
 - lib/dslkit.rb
 files:
 - .gitignore
+- .rvmrc
 - .travis.yml
 - CHANGES
 - COPYING
@@ -101,7 +102,8 @@ files:
 - lib/dslkit/polite.rb
 - lib/dslkit/rude.rb
 - lib/dslkit/version.rb
-- tests/test_polite.rb
+- tests/from_module_test.rb
+- tests/polite_test.rb
 homepage: http://flori.github.com/dslkit
 licenses: []
 post_install_message: 
@@ -131,4 +133,5 @@ signing_key:
 specification_version: 3
 summary: Kit for building DSLs in Ruby
 test_files:
-- tests/test_polite.rb
+- tests/from_module_test.rb
+- tests/polite_test.rb