wlang 0.8.5 → 0.9.1

data/lib/wlang/wlang_command.rb

@@ -27,20 +27,17 @@ module WLang
       dialect = options.template_dialect
       braces = options.template_brace
       context = options.context_object
-      unless options.context_name.nil?
-        context = {options.context_name => context}
-      end
-      template = WLang::Template.new(source, dialect, context, braces)
-      template.source_file = options.template_file
+      context = {options.context_name => context} unless options.context_name.nil?
+      template = WLang::file_template(options.template_file, options.template_dialect, braces)
     
       if options.verbosity>1
         puts "Instantiating #{options.template_file}"
-        puts "Using dialect #{dialect} : #{dialect.class}"
+        puts "Using dialect #{dialect}"
         puts "Block delimiters are " << Template::BLOCK_SYMBOLS[braces].inspect
         puts "Context is " << context.inspect
       end
     
-      buffer << template.instantiate
+      buffer << template.instantiate(context || {})
     
       # Flush and close if needed
       if File===buffer

data/lib/wlang/wlang_command_options.rb

@@ -65,6 +65,11 @@ module WLang
             @template_dialect = value
           end
       
+          opt.on("-m", "--methodize", 
+                 "Use methodization of hashes?") do |value|
+            Kernel.load('wlang/ext/hash_methodize.rb')
+          end
+      
           opt.on("-o", "--output=OUTPUT",
                  "Flush instantiation result in output file") do |value|
             @output_file = value         

data/test/blackbox/basic/execution_1.exp

@@ -0,0 +1 @@
+world

data/test/blackbox/basic/execution_1.tpl

@@ -0,0 +1 @@
+!{"world"}

data/test/blackbox/basic/execution_2.exp

@@ -0,0 +1 @@
+WLang

data/test/blackbox/basic/execution_2.tpl

@@ -0,0 +1 @@
+!{WLang.name}

data/test/blackbox/basic/execution_3.exp

@@ -0,0 +1 @@
+wlang

data/test/blackbox/basic/execution_3.tpl

@@ -0,0 +1 @@
+!{who}

data/test/blackbox/basic/execution_4.exp

@@ -0,0 +1 @@
+wlang

data/test/blackbox/basic/execution_4.tpl

@@ -0,0 +1 @@
+!{!{whowho}}

data/test/blackbox/basic/inclusion_1.exp

@@ -0,0 +1 @@
+wlang

data/test/blackbox/basic/inclusion_1.tpl

@@ -0,0 +1 @@
++{who}

data/test/blackbox/basic/inclusion_2.exp

@@ -0,0 +1 @@
+wlang

data/test/blackbox/basic/inclusion_2.tpl

@@ -0,0 +1 @@
++{+{whowho}}

data/test/blackbox/basic/injection_1.exp

@@ -0,0 +1 @@
+wlang

data/test/blackbox/basic/injection_1.tpl

@@ -0,0 +1 @@
+${who}

data/test/blackbox/basic/injection_2.exp

@@ -0,0 +1 @@
+wlang

data/test/blackbox/basic/injection_2.tpl

@@ -0,0 +1 @@
+${${whowho}}

data/test/blackbox/basic/modulation_1.exp

@@ -0,0 +1 @@
+wlang

data/test/blackbox/basic/modulation_1.tpl

@@ -0,0 +1 @@
+%{blackbox/basic}{!{who}}

data/test/blackbox/basic/modulation_2.exp

@@ -0,0 +1 @@
+!{who}

data/test/blackbox/basic/modulation_2.tpl

@@ -0,0 +1 @@
+%{wlang/dummy}{!{who}}

data/test/blackbox/basic/recursive_app_1.exp

@@ -0,0 +1 @@
+wlang

data/test/blackbox/basic/recursive_app_1.tpl

@@ -0,0 +1 @@
+%!{blackbox/basic}{!{who}}

data/test/blackbox/basic/recursive_app_2.exp

@@ -0,0 +1 @@
+blambeau

data/test/blackbox/basic/recursive_app_2.tpl

@@ -0,0 +1 @@
+%!{blackbox/basic with who: 'blambeau'}{\!{!{whowho}\}}

data/test/blackbox/buffering/data_1.rb

@@ -0,0 +1 @@
+"blambeau"

data/test/blackbox/buffering/data_assignment_1.exp

@@ -0,0 +1 @@
+blambeau

data/test/blackbox/buffering/data_assignment_1.tpl

@@ -0,0 +1 @@
+<<={data_1.rb as x}{+{x}}

data/test/blackbox/buffering/data_assignment_2.exp

@@ -0,0 +1 @@
+blambeau wlang

data/test/blackbox/buffering/data_assignment_2.tpl

@@ -0,0 +1 @@
+<<={data_1.rb as who}{+{who}} +{who}

data/test/blackbox/buffering/data_assignment_3.exp

@@ -0,0 +1 @@
+blambeau wlang

data/test/blackbox/buffering/data_assignment_3.tpl

@@ -0,0 +1 @@
+<<={+{data_file_1} as who}{+{who}} +{who}

data/test/blackbox/buffering/data_assignment_4.exp

@@ -0,0 +1 @@
+blambeau wlang

data/test/blackbox/buffering/data_assignment_4.tpl

@@ -0,0 +1 @@
+<<={../+{data_file_1} as who}{+{who}} +{who}

data/test/blackbox/buffering/input_1.exp

@@ -0,0 +1 @@
+text_1

data/test/blackbox/buffering/input_1.tpl

@@ -0,0 +1 @@
+<<{text_1.txt}

data/test/blackbox/buffering/input_2.exp

@@ -0,0 +1 @@
+wlang

data/test/blackbox/buffering/input_2.tpl

@@ -0,0 +1 @@
+<<{+{who}.txt}

data/test/blackbox/buffering/input_3.exp

@@ -0,0 +1 @@
+text_1

data/test/blackbox/buffering/input_3.tpl

@@ -0,0 +1 @@
+<<{+{input_file}}

data/test/blackbox/buffering/input_inclusion.exp

@@ -0,0 +1 @@
+wlang

data/test/blackbox/buffering/input_inclusion.tpl

@@ -0,0 +1 @@
++{who}

data/test/blackbox/buffering/input_inclusion_1.tpl

@@ -0,0 +1 @@
+<<+{input_inclusion.tpl share none}

data/test/blackbox/buffering/input_inclusion_2.exp

@@ -0,0 +1 @@
+wlang

data/test/blackbox/buffering/input_inclusion_2.tpl

@@ -0,0 +1 @@
+<<+{input_inclusion.tpl share root}

data/test/blackbox/buffering/input_inclusion_3.exp

@@ -0,0 +1 @@
+wlang

data/test/blackbox/buffering/input_inclusion_3.tpl

@@ -0,0 +1 @@
+<<+{input_inclusion.tpl share all}

data/test/blackbox/buffering/input_inclusion_4.tpl

@@ -0,0 +1 @@
+<<+{input_inclusion_1.tpl with who: 'blambeau'}

data/test/blackbox/buffering/input_inclusion_5.exp

@@ -0,0 +1 @@
+blambeau

data/test/blackbox/buffering/input_inclusion_5.tpl

@@ -0,0 +1 @@
+<<+{input_inclusion_2.tpl with who: 'blambeau'}

data/test/blackbox/buffering/input_inclusion_6.exp

@@ -0,0 +1 @@
+blambeau

data/test/blackbox/buffering/input_inclusion_6.tpl

@@ -0,0 +1 @@
+<<+{input_inclusion_3.tpl with who: 'blambeau'}

data/test/blackbox/buffering/input_inclusion_7.tpl

@@ -0,0 +1 @@
+<<+{input_inclusion.tpl}

data/test/blackbox/buffering/text_1.txt

@@ -0,0 +1 @@
+text_1

data/test/blackbox/buffering/wlang.txt

@@ -0,0 +1 @@
+wlang

data/test/blackbox/context/assignment_1.exp

@@ -0,0 +1 @@
+blambeau

data/test/blackbox/context/assignment_1.tpl

@@ -0,0 +1 @@
+={'blambeau' as who}{!{who}}

data/test/blackbox/context/assignment_2.exp

@@ -0,0 +1 @@
+blambeau wlang

data/test/blackbox/context/assignment_2.tpl

@@ -0,0 +1 @@
+={'blambeau' as who}{!{who}} !{who}

data/test/blackbox/context/assignment_3.exp

@@ -0,0 +1,2 @@
+
+blambeau

data/test/blackbox/context/assignment_3.tpl

@@ -0,0 +1,2 @@
+={'blambeau' as who}
+!{who}

data/test/blackbox/context/assignment_4.exp

@@ -0,0 +1 @@
+Hello wlang!

data/test/blackbox/context/assignment_4.tpl

@@ -0,0 +1 @@
+Hello ={'wlang' as result}{${result}}!

data/test/blackbox/context/block_assignment_1.exp

@@ -0,0 +1 @@
+who

data/test/blackbox/context/block_assignment_1.tpl

@@ -0,0 +1 @@
+#={x}{who}{!{x}}

data/test/blackbox/context/block_assignment_2.exp

@@ -0,0 +1 @@
+wlang

data/test/blackbox/context/block_assignment_2.tpl

@@ -0,0 +1 @@
+#={x}{!{who}}{!{x}}

data/test/blackbox/context/modulo_assignment_1.exp

@@ -0,0 +1 @@
+!{who}

data/test/blackbox/context/modulo_assignment_1.tpl

@@ -0,0 +1 @@
+%={wlang/dummy as x}{!{who}}{!{x}}

data/test/blackbox/context/modulo_assignment_2.exp

@@ -0,0 +1 @@
+wlang

data/test/blackbox/context/modulo_assignment_2.tpl

@@ -0,0 +1 @@
+%={blackbox/context as x}{!{who}}{!{x}}

data/test/blackbox/data_1.rb

@@ -0,0 +1 @@
+"blambeau"

data/test/blackbox/test_all.rb

@@ -0,0 +1,59 @@
+here = File.dirname(__FILE__)
+$LOAD_PATH.unshift(File.join(here, '..', '..', 'lib'))
+require 'wlang'
+require 'test/unit'
+module WLang
+  class BackBoxTest < Test::Unit::TestCase
+    
+    def test_on_examples 
+      # Dialect used here
+      dialect = WLang::dialect("blackbox") do
+        dialect("basic") { 
+          ruby_require "wlang/rulesets/basic_ruleset"
+          rules WLang::RuleSet::Basic
+        }
+        dialect("context") {
+          ruby_require "wlang/rulesets/basic_ruleset"
+          ruby_require "wlang/rulesets/context_ruleset"
+          rules WLang::RuleSet::Basic
+          rules WLang::RuleSet::Context
+        }
+        dialect("buffering") {
+          ruby_require "wlang/rulesets/basic_ruleset"
+          ruby_require "wlang/rulesets/buffering_ruleset"
+          rules WLang::RuleSet::Basic
+          rules WLang::RuleSet::Buffering
+        }
+      end
+      hosted = ::WLang::HostedLanguage.new
+      def hosted.variable_missing(name)
+        ""
+      end
+      WLang::file_extension_map('.tpl', 'blackbox/buffering')
+
+      # Context used here
+      context = {
+        'who'         => 'wlang',
+        'whowho'      => 'who',
+        'input_file'  => 'text_1.txt',
+        'data_file_1' => 'data_1.rb'
+      }
+
+      Dir["#{File.dirname(__FILE__)}/*"].each do |folder|
+        dialect_name = File.basename(folder)
+        Dir["#{folder}/*.tpl"].each do |template_file|
+          begin
+            basename = File.basename(template_file, ".tpl")
+            expected = File.read(File.join(folder, "#{basename}.exp"))
+            template = WLang::file_template(template_file, "blackbox/#{dialect_name}")
+            assert_equal(expected, template.instantiate(context.dup, hosted), "Blackbox test failed #{basename}")
+          rescue Exception => ex
+            puts "Blackbox test failed: #{template_file}\n#{ex.message}"
+            puts ex.backtrace.join("\n")
+          end
+        end
+      end
+    end
+    
+  end # class BackBoxTest
+end # module WLang

data/test/spec/basic_object.spec

@@ -0,0 +1,40 @@
+require "wlang"
+describe "WLang's version of BasicObject" do
+  
+  class A 
+    # Methods that we keep
+    KEPT_METHODS = ["__send__", "__id__", "instance_eval", "initialize", 
+                    "object_id", "nil?", "singleton_method_added", "__clean_scope__",
+                    "singleton_method_undefined"]
+
+    def self.__clean_scope__
+      # Removes all methods that are not needed to the class
+      (instance_methods + private_instance_methods).each do |m|
+        undef_method(m.to_s.to_sym) unless KEPT_METHODS.include?(m.to_s)
+      end
+    end
+    __clean_scope__
+  end
+  
+  it "should not have kernel methods except certain" do
+    [:puts, :to_s, :hash].each do |sym|
+      begin
+        A.new.instance_eval{ __send__(sym, []) }
+        "Not pass here".should == ""
+      rescue NoMethodError 
+        true.should == true
+      end
+    end
+  end
+  
+  it "should not gain methods when requiring gems" do
+    Kernel.load(File.join(File.dirname(__FILE__),"global_extensions.rb"))
+    begin
+      A.new.__clean_scope__.instance_eval{ hello_world }
+      "Not pass here".should == ""
+    rescue NoMethodError 
+      true.should == true
+    end
+  end
+  
+end

data/test/spec/global_extensions.rb

@@ -0,0 +1,2 @@
+def hello_world
+end

data/test/spec/hash_scope.spec

@@ -0,0 +1,76 @@
+require 'wlang'
+require 'wlang/hash_scope'
+
+describe ::WLang::HashScope do
+  
+  # Builds a new scope instance, with an optional parent and
+  # initial hash
+  def newscope(pairing = nil, parent = nil)
+    ::WLang::HashScope.new(pairing, parent)
+  end
+  
+  it "should act as a basic hash at first glance" do
+    scope = newscope
+    scope.has_key?(:hello).should be_false
+    scope[:hello] = "world"
+    scope.has_key?(:hello).should be_true
+    scope[:hello].should == "world"
+  end
+  
+  it "should support a parent" do
+    parent = newscope(:hello => "world", :mine => false)
+    child = newscope({:mine => true}, parent)
+
+    child.has_key?(:mine).should be_true
+    child.has_key?(:hello).should be_true
+    child[:mine].should be_true
+    child[:hello].should == "world"
+  end
+  
+  it "should never touch its parent" do
+    parent = newscope(:hello => "world")
+    child = newscope(nil, parent)
+    child[:hello].should == "world"
+    child[:hello] = "none"
+    child[:hello].should == "none"
+    parent[:hello].should == "world"
+  end
+  
+  it "should support branching easily" do
+    parent = newscope(:hello => "world")
+    parent.branch do |scope|
+      scope[:who] = "blambeau"
+      scope[:who].should == "blambeau" 
+      scope[:hello].should == "world" 
+      scope[:hello] = "none"
+    end
+    parent.has_key?(:who).should be_false
+    parent[:hello].should == "world"
+  end
+  
+  it "should allow push/pop kind of branching" do
+    scope = newscope(:hello => "world")
+    scope = scope.branch
+    scope[:hello].should == "world"
+    scope[:hello] = "none"
+    scope[:hello].should == "none"
+    scope = scope.parent
+    scope[:hello].should == "world"
+  end
+  
+  it "should respect scoping hierarchy" do
+    scope = newscope(:hello => "world")
+    child = newscope({}, scope)
+    child2 = newscope({}, child)
+
+    scope.parent.should be_nil
+    scope.root.should == scope
+
+    child.parent.should == scope
+    child.root.should == scope
+
+    child2.parent.should == child
+    child2.root.should == scope
+  end
+
+end

data/test/spec/redcloth_dialect.spec

@@ -0,0 +1,24 @@
+require "wlang"
+describe("WLang should support redcloth encoder") do
+  
+  it("should support basic redcloth encoding") {
+    expected = "<h1>This is a title</h1>"
+    WLang::encode("h1. This is a title", "redcloth/xhtml").should == expected
+  }
+  
+  it("should not perturbate template variables with global variables") {
+    # RedCloth installs a t global method (which becomes a private method
+    # of Object) which was perturbating the HostedLanguage::DSL class.
+    # This test acts as a non-regression one.
+    require 'rubygems'
+    require 'RedCloth'
+    "${t}".wlang(:t => 'wlang').should == 'wlang'
+    begin
+      "${t}".wlang()
+      true.should == false
+    rescue ::WLang::UndefinedVariableError
+      true.should == true
+    end
+  }
+  
+end