dslkit 0.2.9 → 0.2.10

data/.gitignore

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

data/.travis.yml

@@ -1,6 +1,7 @@
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
   - ruby-head
   - ree
   - rbx

data/CHANGES

@@ -1,3 +1,5 @@
+2012-01-12 (0.2.10)
+ * Add module for rails-style concerns.
 2011-10-07 (0.2.9)
  * Add ParameterizedModule and FromModule.
 2011-09-26 (0.2.8)

data/Gemfile

@@ -3,3 +3,7 @@
 source :rubygems
 
 gemspec
+
+group :test do
+  gem 'simplecov', :platform => :mri_19
+end

data/README.rdoc

@@ -9,7 +9,7 @@ internal Domain Specific Languages (DSL) in Ruby.
 
 Florian Frank <mailto:flori@ping.de>
 
-== License 
+== License
 
 This is free software; you can redistribute it and/or modify it under the
 terms of the GNU General Public License Version 2 as published by the Free

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', '.rvmrc'
+  ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', '.rvmrc', 'coverage'
   readme      'README.rdoc'
 
   dependency  'term-ansicolor', '~>1.0'
@@ -19,7 +19,7 @@ GemHadar do
 
   install_library do
     libdir = CONFIG["sitelibdir"]
-    cd 'lib' do 
+    cd 'lib' do
       dst = File.join(libdir, 'dslkit')
       mkdir_p dst
       cd 'dslkit' do

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.2.10

data/dslkit.gemspec

@@ -2,36 +2,36 @@
 
 Gem::Specification.new do |s|
   s.name = "dslkit"
-  s.version = "0.2.9"
+  s.version = "0.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2011-10-07"
+  s.date = "2012-01-12"
   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", ".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.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/concern_test.rb", "tests/dynamic_scope_test.rb", "tests/from_module_test.rb", "tests/polite_test.rb", "tests/scope_test.rb", "tests/test_helper.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.rubygems_version = "1.8.13"
   s.summary = "Kit for building DSLs in Ruby"
-  s.test_files = ["tests/from_module_test.rb", "tests/polite_test.rb"]
+  s.test_files = ["tests/concern_test.rb", "tests/from_module_test.rb", "tests/dynamic_scope_test.rb", "tests/scope_test.rb", "tests/test_helper.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.1"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.4"])
       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.1"])
+      s.add_dependency(%q<gem_hadar>, ["~> 0.1.4"])
       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.1"])
+    s.add_dependency(%q<gem_hadar>, ["~> 0.1.4"])
     s.add_dependency(%q<term-ansicolor>, ["~> 1.0"])
     s.add_dependency(%q<tins>, ["~> 0.3"])
   end

data/examples/bb3.stm

@@ -6,7 +6,7 @@
 
 # state A
  1. cond  :if => 'B', :then => 2, :else => 4
- 2. write :symbol => '1', :goto => 3 
+ 2. write :symbol => '1', :goto => 3
  3. right :goto => 6
  4. write :symbol => '1', :goto => 5
  5. right :goto => 16

data/examples/bb3_19.stm

@@ -6,7 +6,7 @@
 
 # state A
  1. cond  if: 'B', then: 2, else: 4
- 2. write symbol: '1', goto: 3 
+ 2. write symbol: '1', goto: 3
  3. right goto: 6
  4. write symbol: '1', goto: 5
  5. right goto: 16

data/examples/length_difference.mtm

@@ -1,6 +1,6 @@
 # vim: ts=2 sw=2 et ft=ruby
 # Call with two [ab]* strings on the tapes:
-# $ turing.rb prefix-equals-suffix-reversed-with-infix.stm ab ababab 
+# $ turing.rb prefix-equals-suffix-reversed-with-infix.stm ab ababab
 
  1. right 1,  :goto => 2
  2. right 2,  :goto => 3

data/examples/length_difference_19.mtm

@@ -1,6 +1,6 @@
 # vim: ts=2 sw=2 et ft=ruby
 # Call with two [ab]* strings on the tapes:
-# $ turing.rb prefix-equals-suffix-reversed-with-infix.stm ab ababab 
+# $ turing.rb prefix-equals-suffix-reversed-with-infix.stm ab ababab
 
  1. right 1,  goto: 2
  2. right 2,  goto: 3

data/lib/dslkit/polite.rb

@@ -627,4 +627,101 @@ module DSLKit
       result
     end
   end
+
+  module Scope
+    def scope_push(scope_frame, name = :default)
+      scope_get(name).push scope_frame
+      self
+    end
+
+    def scope_pop(name = :default)
+      scope_get(name).pop
+      scope_get(name).empty? and Thread.current[name] = nil
+      self
+    end
+
+    def scope_top(name = :default)
+      scope_get(name).last
+    end
+
+    def scope_reverse(name = :default, &block)
+      scope_get(name).reverse_each(&block)
+    end
+
+    def scope_block(scope_frame, name = :default)
+      scope_push(scope_frame, name)
+      yield
+      self
+    ensure
+      scope_pop(name)
+    end
+
+    def scope_get(name = :default)
+      Thread.current[name] ||= []
+    end
+
+    def scope(name = :default)
+      scope_get(name).dup
+    end
+  end
+
+  module DynamicScope
+    class Context < Hash
+      def [](name)
+        super name.to_sym
+      end
+
+      def []=(name, value)
+        super name.to_sym, value
+      end
+    end
+
+    include Scope
+
+    attr_accessor :dynamic_scope_name
+
+    def dynamic_scope(&block)
+      self.dynamic_scope_name ||= :variables
+      scope_block(Context.new, dynamic_scope_name, &block)
+    end
+
+    def method_missing(id, *args)
+      self.dynamic_scope_name ||= :variables
+      if args.empty? and scope_reverse(dynamic_scope_name) { |c| c.key?(id) and return c[id] }
+        super
+      elsif args.size == 1 and id.to_s =~ /(.*?)=\Z/
+        c = scope_top(dynamic_scope_name) or super
+        c[$1.to_sym] = args.first
+      else
+        super
+      end
+    end
+  end
+
+  module Concern
+    def self.extended(base)
+      base.instance_variable_set("@_dependencies", [])
+    end
+
+    def append_features(base)
+      if base.instance_variable_defined?("@_dependencies")
+        base.instance_variable_get("@_dependencies") << self
+        return false
+      else
+        return false if base < self
+        @_dependencies.each { |dep| base.send(:include, dep) }
+        super
+        base.extend const_get("ClassMethods") if const_defined?("ClassMethods")
+        base.class_eval(&@_included_block) if instance_variable_defined?("@_included_block")
+      end
+    end
+
+    def included(base = nil, &block)
+      if base.nil?
+        @_included_block = block
+      else
+        super
+      end
+    end
+  end
 end

data/lib/dslkit/version.rb

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

data/tests/concern_test.rb

@@ -0,0 +1,35 @@
+require 'test_helper'
+require 'dslkit/polite'
+
+class ConcernTest < Test::Unit::TestCase
+  module AC
+    extend DSLKit::Concern
+
+    included do
+      $included = self
+    end
+
+    def foo
+      :foo
+    end
+
+    module ClassMethods
+      def bar
+        :bar
+      end
+    end
+  end
+
+  $included = nil
+
+  class A
+    include AC
+  end
+
+  def test_concern
+    a = A.new
+    assert_equal A, $included
+    assert_equal :foo, a.foo
+    assert_equal :bar, A.bar
+  end
+end

data/tests/dynamic_scope_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+require 'dslkit/polite'
+
+class DynamicScopeTest < Test::Unit::TestCase
+  include DSLKit::DynamicScope
+
+  def test_dynamic_scoping
+    assert_raise(NameError) { foo }
+    dynamic_scope do
+      assert_raise(NameError) { foo }
+      self.foo = 1
+      assert_equal 1, foo
+      dynamic_scope do
+        assert_equal 1, foo
+        self.foo = 2
+        assert_equal 2, foo
+        dynamic_scope do
+          assert_equal 2, foo
+        end
+        assert_equal 2, foo
+      end
+      assert_equal 1, foo
+    end
+    assert_raise(NameError) { foo }
+  end
+end

data/tests/from_module_test.rb

@@ -1,5 +1,5 @@
+require 'test_helper'
 require 'dslkit/polite'
-require 'test/unit'
 
 class FromModuleTest < Test::Unit::TestCase
   module MyIncludedModule

data/tests/polite_test.rb

@@ -1,3 +1,4 @@
+require 'test_helper'
 require 'dslkit/polite'
 
 class TL

data/tests/scope_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+require 'dslkit/polite'
+
+class ScopeTest < Test::Unit::TestCase
+  include DSLKit::Scope
+
+  def test_default_scope
+    scope_block(:foo) do
+      assert_equal [ :foo ], scope
+      scope_block(:bar) do
+        assert_equal [ :foo, :bar ], scope
+        scope.push :baz
+        assert_equal [ :foo, :bar ], scope
+      end
+    end
+  end
+
+  def test_two_scopes
+    scope_block(:foo, :my_scope) do
+      assert_equal [ :foo ], scope(:my_scope)
+      scope_block(:baz) do
+        scope_block(:bar, :my_scope) do
+          assert_equal [ :foo, :bar ], scope(:my_scope)
+          scope.push(:baz, :my_scope)
+          assert_equal [ :foo, :bar ], scope(:my_scope)
+          assert_equal [ :baz ], scope
+        end
+      end
+    end
+  end
+end

data/tests/test_helper.rb

@@ -0,0 +1,7 @@
+if ENV['START_SIMPLECOV'].to_i == 1
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "#{File.basename(File.dirname(__FILE__))}/"
+  end
+end
+require 'test/unit'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dslkit
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-07 00:00:00.000000000 Z
+date: 2012-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
-  requirement: &70131132995660 !ruby/object:Gem::Requirement
+  requirement: &73147590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.4
   type: :development
   prerelease: false
-  version_requirements: *70131132995660
+  version_requirements: *73147590
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70131132994340 !ruby/object:Gem::Requirement
+  requirement: &73162410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70131132994340
+  version_requirements: *73162410
 - !ruby/object:Gem::Dependency
   name: tins
-  requirement: &70131132993400 !ruby/object:Gem::Requirement
+  requirement: &73161340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70131132993400
+  version_requirements: *73161340
 description: This library contains recurring patterns, that are useful in the creation
   of internal Domain Specific Languages (DSL) in Ruby.
 email: flori@ping.de
@@ -102,8 +102,12 @@ files:
 - lib/dslkit/polite.rb
 - lib/dslkit/rude.rb
 - lib/dslkit/version.rb
+- tests/concern_test.rb
+- tests/dynamic_scope_test.rb
 - tests/from_module_test.rb
 - tests/polite_test.rb
+- tests/scope_test.rb
+- tests/test_helper.rb
 homepage: http://flori.github.com/dslkit
 licenses: []
 post_install_message: 
@@ -128,10 +132,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: Kit for building DSLs in Ruby
 test_files:
+- tests/concern_test.rb
 - tests/from_module_test.rb
+- tests/dynamic_scope_test.rb
+- tests/scope_test.rb
+- tests/test_helper.rb
 - tests/polite_test.rb