wlang 0.8.5 → 0.9.1

data/test/spec/test_all.rb

@@ -0,0 +1,8 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
+require 'wlang'
+require 'spec/autorun'
+test_files = Dir[File.join(File.dirname(__FILE__), '**/*.spec')]
+test_files.each { |file|
+  load(file) 
+}
+

data/test/spec/wlang.spec

@@ -0,0 +1,53 @@
+require 'wlang'
+describe ::WLang do
+  
+  it("should allow easy use of encoders") {
+    WLang::encode('&', 'xhtml/entities-encoding').should == '&'
+    WLang::encode("O'Neil", 'ruby/single-quoting').should == "O\\'Neil"
+    WLang::encode('O"Neil', 'ruby/double-quoting').should == 'O\\"Neil'
+    WLang::encode("O'Neil", 'sql/single-quoting').should == "O\\'Neil"
+    WLang::encode("O'Neil", 'sql/sybase/single-quoting').should == "O''Neil"
+  }
+  
+  it "should allow easy upper camel casing" do
+    WLang::encode('hello_world', 'plain-text/camel-case').should == "HelloWorld"
+    WLang::encode('hello_world', 'plain-text/camel').should == "HelloWorld"
+    WLang::encode('hello_world', 'plain-text/upper-camel').should == "HelloWorld"
+    WLang::encode('this is another example', 'plain-text/camel-case').should == "ThisIsAnotherExample"
+    WLang::encode("this is   yet \n another example", 'plain-text/camel-case').should == "ThisIsYetAnotherExample"
+
+    WLang::encode('hello_world', 'plain-text/lower-camel').should == "helloWorld"
+  end
+  
+  it "should allow easy ruby method casing" do
+    WLang::encode('helloWorld', 'ruby/method-case').should == "hello_world"
+    WLang::encode('HelloWorld', 'ruby/method-case').should == "hello_world"
+    WLang::encode('hello world', 'ruby/method-case').should == "hello_world"
+    WLang::encode('Hello123World', 'ruby/method-case').should == "hello123_world"
+    WLang::encode('HelloWorld_123', 'ruby/method-case').should == "hello_world_123"
+    WLang::encode('123_HelloWorld', 'ruby/method-case').should == "_123_hello_world"
+  end
+  
+  it "should have correct examples in README.rdoc" do
+    expected = "Hello world!"
+    "Hello ${who}!".wlang(:who => 'world').should == expected
+
+    expected = "Hello cruel & world!"
+    "Hello ${who}!".wlang({:who => 'cruel & world'}, 'wlang/xhtml').should == expected
+  
+    expected = "Hello blambeau, llambeau"
+    "Hello *{authors as a}{${a}}{, }".wlang(:authors => ['blambeau', 'llambeau']).should == expected
+
+    expected = "INSERT INTO people VALUES ('O\\'Neil')"
+    "INSERT INTO people VALUES ('{who}')".wlang({:who => "O'Neil"}, 'wlang/sql')
+    
+    expected = "Hello wlang!"
+    tpl = "Hello $(${varname})!".wlang(:varname => 'who')          
+    tpl.wlang({:who => 'wlang'}, 'wlang/active-string', :parentheses).should == expected
+
+    context = {:varname => 'who', :who => 'wlang'}
+    expected = "Hello wlang!"
+    "Hello ${${varname}}!".wlang(context).should == expected
+  end
+  
+end

data/test/spec/xhtml_dialect.spec

@@ -0,0 +1,23 @@
+require "wlang"
+
+describe "The wlang/xhtml dialect" do
+  
+  it("should provide helpers to create links") {
+    "@{/details}".wlang({}, 'wlang/xhtml').should == "/details"
+    "@{/details}{Details}".wlang({}, 'wlang/xhtml').should == '<a href="/details">Details</a>'
+  }
+  
+  it("should provide to_xhtml_link callback on links") {
+    ::String.module_eval do
+      def to_xhtml_link(url, label) 
+        "#{url}:#{label}"
+      end
+      def to_xhtml_href(url)
+        "Hello:#{url}"
+      end
+    end
+    "@{/details}{Details}".wlang({}, 'wlang/xhtml').should == '/details:Details'
+    "@{/details}".wlang({}, 'wlang/xhtml').should == 'Hello:/details'
+  }
+
+end

data/test/{test_all.rb → unit/test_all.rb}

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__),'..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
 require 'wlang'
 require 'test/unit'
 test_files = Dir[File.join(File.dirname(__FILE__), '**/*_test.rb')]

data/test/{wlang → unit/wlang}/anagram_bugs_test.rb

@@ -25,7 +25,7 @@ module WLang
         }
       }.gsub(/^ {8}/, '').strip
       result = template.wlang_instantiate({}, "anagram")
-      assert IntelligentBuffer===result
+      #assert IntelligentBuffer===result
 #      assert_equal("this is an anagram template", result)
 
       template = %q{
@@ -35,7 +35,7 @@ module WLang
         }
       }.gsub(/^ {8}/, '').strip
       result = template.wlang_instantiate({}, "anagram")
-      assert IntelligentBuffer===result
+      #assert IntelligentBuffer===result
       assert_equal("module MyModule\nend\n", result)
     end
     

data/test/{wlang → unit/wlang}/basic_ruleset_test.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'wlang'
-require 'wlang/test_utils'
+require File.join(File.dirname(__FILE__), 'test_utils.rb')
 require 'wlang/rulesets/basic_ruleset'
 require 'wlang/rulesets/context_ruleset'
 require 'wlang/rulesets/buffering_ruleset'

data/test/{wlang → unit/wlang}/buffering_ruleset_test.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'wlang'
-require 'wlang/test_utils.rb'
+require File.join(File.dirname(__FILE__), 'test_utils.rb')
 require 'wlang/rulesets/buffering_ruleset'
 
 # Tests the Scoping ruleset
@@ -31,7 +31,7 @@ class WLang::BufferingRuleSetTest < Test::Unit::TestCase
   def test_input_accepts_injection
     expected = read_relative_file("ruby_template.wrb", __FILE__)
     template = relative_template("<<{ruby_template.wrb}", "buffering-test", __FILE__)
-    result = template.instantiate("", "ext" => "wrb")
+    result = template.instantiate("ext" => "wrb")
     assert_equal(expected, result)
   end
   
@@ -40,7 +40,7 @@ class WLang::BufferingRuleSetTest < Test::Unit::TestCase
     output = relative_file("buffering_ruleset_test_output.txt", __FILE__)
     File.delete(output) if File.exists?(output)
     template = relative_template(">>{buffering_ruleset_test_output.txt}{an output}", "buffering-test", __FILE__)
-    assert_equal("", template.instantiate())
+    assert_equal("", template.instantiate)
     assert_equal("an output", File.read(output))
     File.delete(output) if File.exists?(output)
   end
@@ -50,7 +50,7 @@ class WLang::BufferingRuleSetTest < Test::Unit::TestCase
     output = relative_file("buffering_ruleset_test_output.txt", __FILE__)
     File.delete(output) if File.exists?(output)
     template = relative_template(">>{buffering_ruleset_test_output.${ext}}{an output}", "buffering-test", __FILE__)
-    assert_equal("", template.instantiate("", "ext" => "txt"))
+    assert_equal("", template.instantiate("ext" => "txt"))
     assert_equal("an output", File.read(output))
     File.delete(output) if File.exists?(output)
   end

data/test/unit/wlang/buffering_template4.wtpl

@@ -0,0 +1 @@
+<<+{buffering_template5.wtpl share all with who2: who, hello: 'world'}

data/test/unit/wlang/buffering_template5.wtpl

@@ -0,0 +1 @@
++{who2} +{hello}

data/test/{wlang → unit/wlang}/parser_test.rb

@@ -21,42 +21,41 @@ class ParserTest < Test::Unit::TestCase
   
   # Instantiate the given string as template
   def instantiate_str(str)
-    Parser.instantiator(Template.new(str, "example")).instantiate()[0]
+    WLang::template(str, "example").instantiate
   end
   
   # Asserts the result of an instanciation
-  def assert_instanciation_equal(expected, template, msg=nil)
-    template = Template.new(template, "example")
-    parser = Parser.instantiator(template)
-    assert_equal(expected, parser.instantiate()[0])
+  def assert_instantiation_equal(expected, template, msg=nil)
+    template = WLang::template(template, "example")
+    assert_equal(expected, template.instantiate)
   end
   
   def test_parser_accepts_whole_tag
     template, expected = "+{hello}", "HELLO"
-    assert_instanciation_equal(expected, template)
+    assert_instantiation_equal(expected, template)
     template, expected = " +{hello} ", " HELLO "
-    assert_instanciation_equal(expected, template)
+    assert_instantiation_equal(expected, template)
   end
 
   def test_parser_accepts_whole_block
     template, expected = "{hello}", "{hello}"
-    assert_instanciation_equal(expected, template)
+    assert_instantiation_equal(expected, template)
   end
         
   def test_parser_ignores_backslashed_tags
     template, expected = "\\+{hello\\}", "+{hello}"
-    assert_instanciation_equal(expected, template)
+    assert_instantiation_equal(expected, template)
   end
   
   def test_parser_ignores_backslashed_blocks
     template, expected = "\\{hello\\} world", "{hello} world"
-    assert_instanciation_equal(expected, template)
+    assert_instantiation_equal(expected, template)
   end
   
   def test_parser_on_a_complex_case
     template = "Hello \\\\} world! -{ITEMS AS I}{do +{something} \\{with \\} i} here is my name:+{name} and { that's not -{COMMON} text } !\\{"
     expected = "Hello \\} world! items as i{do SOMETHING {with } i} here is my name:NAME and { that's not common text } !\{"
-    assert_instanciation_equal(expected, template)
+    assert_instantiation_equal(expected, template)
   end
   
   def test_parser_raises_error

data/test/{wlang → unit/wlang}/specification_examples_test.rb

@@ -1,4 +1,4 @@
-require 'test/unit/testcase'
+require 'test/unit'
 require 'wlang'
 require 'wlang/dialects/standard_dialects'
 require "yaml"
@@ -11,7 +11,7 @@ class WLang::SpecificationExamplesTest < Test::Unit::TestCase
     context = {"name" => "O'Neil",
                "author" => "blambeau",
                "authors" => ["blambeau", "llambeau", "ancailliau"]}
-    spec_file = File.join(File.dirname(__FILE__),"../../doc/specification/specification.yml")
+    spec_file = File.join(File.dirname(__FILE__),"../../../doc/specification/specification.yml")
     spec = YAML.load(File.open(spec_file))
     spec["rulesets"].each do |ruleset|
       next if ruleset["examples"].nil?

data/test/{wlang → unit/wlang}/test_utils.rb

@@ -17,7 +17,7 @@ module WLang::TestUtils
   
   # Factors a template and fakes its source-file as from
   def relative_template(src, dialect, from=__FILE__)
-    template = WLang::Template.new(src, dialect)
+    template = WLang::template(src, dialect)
     template.source_file = from
     template
   end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wlang
 version: !ruby/object:Gem::Version 
-  version: 0.8.5
+  hash: 57
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Bernard Lambeau
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-21 00:00:00 +01:00
+date: 2010-05-20 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -22,16 +28,15 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 - LICENCE.rdoc
+- CHANGELOG.rdoc
 files: 
-- lib/wlang
-- lib/wlang/basic_object.rb
 - lib/wlang/dialect.rb
 - lib/wlang/dialect_dsl.rb
 - lib/wlang/dialect_loader.rb
-- lib/wlang/dialects
 - lib/wlang/dialects/coderay_dialect.rb
 - lib/wlang/dialects/plain_text_dialect.rb
 - lib/wlang/dialects/rdoc_dialect.rb
+- lib/wlang/dialects/redcloth_dialect.rb
 - lib/wlang/dialects/ruby_dialect.rb
 - lib/wlang/dialects/sql_dialect.rb
 - lib/wlang/dialects/standard_dialects.rb
@@ -39,13 +44,15 @@ files:
 - lib/wlang/encoder.rb
 - lib/wlang/encoder_set.rb
 - lib/wlang/errors.rb
+- lib/wlang/ext/hash_methodize.rb
+- lib/wlang/ext/string.rb
+- lib/wlang/hash_scope.rb
+- lib/wlang/hosted_language.rb
 - lib/wlang/intelligent_buffer.rb
 - lib/wlang/parser.rb
-- lib/wlang/parser_context.rb
-- lib/wlang/ruby_extensions.rb
+- lib/wlang/parser_state.rb
 - lib/wlang/rule.rb
 - lib/wlang/rule_set.rb
-- lib/wlang/rulesets
 - lib/wlang/rulesets/basic_ruleset.rb
 - lib/wlang/rulesets/buffering_ruleset.rb
 - lib/wlang/rulesets/context_ruleset.rb
@@ -56,38 +63,115 @@ files:
 - lib/wlang/wlang_command.rb
 - lib/wlang/wlang_command_options.rb
 - lib/wlang.rb
-- test/sandbox.rb
-- test/test_all.rb
-- test/wlang
-- test/wlang/anagram_bugs_test.rb
-- test/wlang/basic_ruleset_test.rb
-- test/wlang/buffering_ruleset_output
-- test/wlang/buffering_ruleset_output/subdir
-- test/wlang/buffering_ruleset_output/subdir/subdir
-- test/wlang/buffering_ruleset_test.rb
-- test/wlang/buffering_template1.wtpl
-- test/wlang/buffering_template2.wtpl
-- test/wlang/buffering_template3.wtpl
-- test/wlang/buffering_template4.wtpl
-- test/wlang/buffering_template5.wtpl
-- test/wlang/context_ruleset_test.rb
-- test/wlang/data.rb
-- test/wlang/encoder_set_test.rb
-- test/wlang/imperative_ruleset_test.rb
-- test/wlang/intelligent_buffer_test.rb
-- test/wlang/othersymbols_test.rb
-- test/wlang/parser_context_test.rb
-- test/wlang/parser_test.rb
-- test/wlang/plain_text_dialect_test.rb
-- test/wlang/ruby_dialect_test.rb
-- test/wlang/ruby_expected.rb
-- test/wlang/ruby_template.wrb
-- test/wlang/ruleset_utils_test.rb
-- test/wlang/specification_examples_test.rb
-- test/wlang/test_utils.rb
-- test/wlang/wlang_test.rb
+- test/blackbox/basic/execution_1.exp
+- test/blackbox/basic/execution_1.tpl
+- test/blackbox/basic/execution_2.exp
+- test/blackbox/basic/execution_2.tpl
+- test/blackbox/basic/execution_3.exp
+- test/blackbox/basic/execution_3.tpl
+- test/blackbox/basic/execution_4.exp
+- test/blackbox/basic/execution_4.tpl
+- test/blackbox/basic/inclusion_1.exp
+- test/blackbox/basic/inclusion_1.tpl
+- test/blackbox/basic/inclusion_2.exp
+- test/blackbox/basic/inclusion_2.tpl
+- test/blackbox/basic/injection_1.exp
+- test/blackbox/basic/injection_1.tpl
+- test/blackbox/basic/injection_2.exp
+- test/blackbox/basic/injection_2.tpl
+- test/blackbox/basic/modulation_1.exp
+- test/blackbox/basic/modulation_1.tpl
+- test/blackbox/basic/modulation_2.exp
+- test/blackbox/basic/modulation_2.tpl
+- test/blackbox/basic/recursive_app_1.exp
+- test/blackbox/basic/recursive_app_1.tpl
+- test/blackbox/basic/recursive_app_2.exp
+- test/blackbox/basic/recursive_app_2.tpl
+- test/blackbox/buffering/data_1.rb
+- test/blackbox/buffering/data_assignment_1.exp
+- test/blackbox/buffering/data_assignment_1.tpl
+- test/blackbox/buffering/data_assignment_2.exp
+- test/blackbox/buffering/data_assignment_2.tpl
+- test/blackbox/buffering/data_assignment_3.exp
+- test/blackbox/buffering/data_assignment_3.tpl
+- test/blackbox/buffering/data_assignment_4.exp
+- test/blackbox/buffering/data_assignment_4.tpl
+- test/blackbox/buffering/input_1.exp
+- test/blackbox/buffering/input_1.tpl
+- test/blackbox/buffering/input_2.exp
+- test/blackbox/buffering/input_2.tpl
+- test/blackbox/buffering/input_3.exp
+- test/blackbox/buffering/input_3.tpl
+- test/blackbox/buffering/input_inclusion.exp
+- test/blackbox/buffering/input_inclusion.tpl
+- test/blackbox/buffering/input_inclusion_1.exp
+- test/blackbox/buffering/input_inclusion_1.tpl
+- test/blackbox/buffering/input_inclusion_2.exp
+- test/blackbox/buffering/input_inclusion_2.tpl
+- test/blackbox/buffering/input_inclusion_3.exp
+- test/blackbox/buffering/input_inclusion_3.tpl
+- test/blackbox/buffering/input_inclusion_4.exp
+- test/blackbox/buffering/input_inclusion_4.tpl
+- test/blackbox/buffering/input_inclusion_5.exp
+- test/blackbox/buffering/input_inclusion_5.tpl
+- test/blackbox/buffering/input_inclusion_6.exp
+- test/blackbox/buffering/input_inclusion_6.tpl
+- test/blackbox/buffering/input_inclusion_7.exp
+- test/blackbox/buffering/input_inclusion_7.tpl
+- test/blackbox/buffering/text_1.txt
+- test/blackbox/buffering/wlang.txt
+- test/blackbox/context/assignment_1.exp
+- test/blackbox/context/assignment_1.tpl
+- test/blackbox/context/assignment_2.exp
+- test/blackbox/context/assignment_2.tpl
+- test/blackbox/context/assignment_3.exp
+- test/blackbox/context/assignment_3.tpl
+- test/blackbox/context/assignment_4.exp
+- test/blackbox/context/assignment_4.tpl
+- test/blackbox/context/block_assignment_1.exp
+- test/blackbox/context/block_assignment_1.tpl
+- test/blackbox/context/block_assignment_2.exp
+- test/blackbox/context/block_assignment_2.tpl
+- test/blackbox/context/modulo_assignment_1.exp
+- test/blackbox/context/modulo_assignment_1.tpl
+- test/blackbox/context/modulo_assignment_2.exp
+- test/blackbox/context/modulo_assignment_2.tpl
+- test/blackbox/data_1.rb
+- test/blackbox/test_all.rb
+- test/spec/basic_object.spec
+- test/spec/global_extensions.rb
+- test/spec/hash_scope.spec
+- test/spec/redcloth_dialect.spec
+- test/spec/test_all.rb
+- test/spec/wlang.spec
+- test/spec/xhtml_dialect.spec
+- test/unit/test_all.rb
+- test/unit/wlang/anagram_bugs_test.rb
+- test/unit/wlang/basic_ruleset_test.rb
+- test/unit/wlang/buffering_ruleset_test.rb
+- test/unit/wlang/buffering_template1.wtpl
+- test/unit/wlang/buffering_template2.wtpl
+- test/unit/wlang/buffering_template3.wtpl
+- test/unit/wlang/buffering_template4.wtpl
+- test/unit/wlang/buffering_template5.wtpl
+- test/unit/wlang/context_ruleset_test.rb
+- test/unit/wlang/data.rb
+- test/unit/wlang/encoder_set_test.rb
+- test/unit/wlang/imperative_ruleset_test.rb
+- test/unit/wlang/intelligent_buffer_test.rb
+- test/unit/wlang/othersymbols_test.rb
+- test/unit/wlang/parser_test.rb
+- test/unit/wlang/plain_text_dialect_test.rb
+- test/unit/wlang/ruby_dialect_test.rb
+- test/unit/wlang/ruby_expected.rb
+- test/unit/wlang/ruby_template.wrb
+- test/unit/wlang/ruleset_utils_test.rb
+- test/unit/wlang/specification_examples_test.rb
+- test/unit/wlang/test_utils.rb
+- test/unit/wlang/wlang_test.rb
 - bin/wlang
 - doc/specification/about.rdoc
+- doc/specification/dialect.wtpl
 - doc/specification/dialects.wtpl
 - doc/specification/examples.rb
 - doc/specification/glossary.wtpl
@@ -102,8 +186,11 @@ files:
 - doc/specification/symbols.wtpl
 - README.rdoc
 - LICENCE.rdoc
+- CHANGELOG.rdoc
 has_rdoc: true
 homepage: http://blambeau.github.com/wlang/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --title
@@ -114,23 +201,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: WLang code generator
 test_files: []