dslkit 0.2.10 → 0.2.11

data/Rakefile

@@ -15,7 +15,8 @@ GemHadar do
   readme      'README.rdoc'
 
   dependency  'term-ansicolor', '~>1.0'
-  dependency  'tins',           '~>0.3'
+  dependency  'tins',           '~>0.5.6'
+  development_dependency 'utils'
 
   install_library do
     libdir = CONFIG["sitelibdir"]

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.2.11

data/dslkit.gemspec

@@ -2,37 +2,40 @@
 
 Gem::Specification.new do |s|
   s.name = "dslkit"
-  s.version = "0.2.10"
+  s.version = "0.2.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2012-01-12"
+  s.date = "2012-10-02"
   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/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.extra_rdoc_files = ["README.rdoc", "lib/dslkit/polite.rb", "lib/dslkit/rude.rb", "lib/dslkit/version.rb", "lib/dslkit.rb"]
+  s.files = [".gitignore", ".rvmrc", ".travis.yml", "CHANGES", "COPYING", "Gemfile", "README.rdoc", "Rakefile", "TODO", "VERSION", "dslkit.gemspec", "examples/add_one.png", "examples/add_one.stm", "examples/bb3.png", "examples/bb3.stm", "examples/bb3_19.stm", "examples/concatenate_compare.mtm", "examples/concatenate_compare.png", "examples/concatenate_compare_19.mtm", "examples/length_difference.mtm", "examples/length_difference.png", "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.png", "examples/ones_difference-stm.png", "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.png", "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.13"
+  s.rubygems_version = "1.8.24"
   s.summary = "Kit for building DSLs in Ruby"
-  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"]
+  s.test_files = ["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"]
 
   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.4"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.8"])
+      s.add_development_dependency(%q<utils>, [">= 0"])
       s.add_runtime_dependency(%q<term-ansicolor>, ["~> 1.0"])
-      s.add_runtime_dependency(%q<tins>, ["~> 0.3"])
+      s.add_runtime_dependency(%q<tins>, ["~> 0.5.6"])
     else
-      s.add_dependency(%q<gem_hadar>, ["~> 0.1.4"])
+      s.add_dependency(%q<gem_hadar>, ["~> 0.1.8"])
+      s.add_dependency(%q<utils>, [">= 0"])
       s.add_dependency(%q<term-ansicolor>, ["~> 1.0"])
-      s.add_dependency(%q<tins>, ["~> 0.3"])
+      s.add_dependency(%q<tins>, ["~> 0.5.6"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 0.1.4"])
+    s.add_dependency(%q<gem_hadar>, ["~> 0.1.8"])
+    s.add_dependency(%q<utils>, [">= 0"])
     s.add_dependency(%q<term-ansicolor>, ["~> 1.0"])
-    s.add_dependency(%q<tins>, ["~> 0.3"])
+    s.add_dependency(%q<tins>, ["~> 0.5.6"])
   end
 end

data/examples/turing.rb

@@ -169,13 +169,13 @@ module Turing
   end
 
   class BaseMachine
-    def initialize(program = nil)
+    def initialize(program = nil, &block)
       @states = []
       if program
         block_given? and raise "use either program source string or a block"
         interpret program
       else
-        instance_eval(&Proc.new)
+        instance_eval(&block)
       end
     end
 

data/lib/dslkit/polite.rb

@@ -11,9 +11,13 @@ module DSLKit
   #
   # The module can be included into other modules/classes to make the methods available.
   module Eigenclass
-    # Returns the eigenclass of this object.
-    def eigenclass
-      class << self; self; end
+    if Object.respond_to?(:singleton_class)
+      alias eigenclass singleton_class
+    else
+      # Returns the eigenclass of this object.
+      def eigenclass
+        class << self; self; end
+      end
     end
 
     # Evaluates the _block_ in context of the eigenclass of this object.
@@ -375,8 +379,9 @@ module DSLKit
     # <i>*ids</i>. ids can be Symbols, Strings, and Regexps that have to match
     # the method name with #===.
     def self.with(*ids)
+      opts = Hash === ids.last ? ids.pop : {}
       ids = ids.map { |id| Regexp === id ? id : id.to_s }
-      klass = Class.new
+      klass = opts[:superclass] ? Class.new(opts[:superclass]) : Class.new
       klass.instance_eval do
         instance_methods.each do |m|
           m = m.to_s
@@ -691,37 +696,13 @@ module DSLKit
         super
       elsif args.size == 1 and id.to_s =~ /(.*?)=\Z/
         c = scope_top(dynamic_scope_name) or super
-        c[$1.to_sym] = args.first
+        c[$1] = 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
+  require 'tins/concern'
+  Concern = ::Tins::Concern
 end

data/lib/dslkit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dslkit
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,43 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-12 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
-  requirement: &73147590 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.8
   type: :development
   prerelease: false
-  version_requirements: *73147590
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.8
+- !ruby/object:Gem::Dependency
+  name: utils
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &73162410 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,18 +53,28 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *73162410
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: tins
-  requirement: &73161340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *73161340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.6
 description: This library contains recurring patterns, that are useful in the creation
   of internal Domain Specific Languages (DSL) in Ruby.
 email: flori@ping.de
@@ -51,9 +82,9 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - README.rdoc
-- lib/dslkit/version.rb
-- lib/dslkit/rude.rb
 - lib/dslkit/polite.rb
+- lib/dslkit/rude.rb
+- lib/dslkit/version.rb
 - lib/dslkit.rb
 files:
 - .gitignore
@@ -67,29 +98,29 @@ files:
 - TODO
 - VERSION
 - dslkit.gemspec
-- examples/add_one.pdf
+- examples/add_one.png
 - examples/add_one.stm
-- examples/bb3.pdf
+- examples/bb3.png
 - examples/bb3.stm
 - examples/bb3_19.stm
 - examples/concatenate_compare.mtm
-- examples/concatenate_compare.pdf
+- examples/concatenate_compare.png
 - examples/concatenate_compare_19.mtm
 - examples/length_difference.mtm
-- examples/length_difference.pdf
+- examples/length_difference.png
 - 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.png
+- examples/ones_difference-stm.png
 - 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.png
 - examples/prefix-equals-suffix-reversed-with-infix.stm
 - examples/prefix-equals-suffix-reversed-with-infix_19.stm
 - examples/recipe.rb
@@ -124,6 +155,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2565139679419943526
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -132,14 +166,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.8.24
 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/from_module_test.rb
+- tests/polite_test.rb
 - tests/scope_test.rb
 - tests/test_helper.rb
-- tests/polite_test.rb