wlang 0.9.1 → 0.9.2

data/CHANGELOG.rdoc

@@ -1,5 +1,13 @@
 == Changelog
 
+=== Version 0.9.2
+
+==== New features (by order of importance)
+
+- Implements main transformer on dialects
+- Makes coderay encoders available without options using a bit of meta programming
+- System-local absolute paths (i.e. starting with '/') are recognized by buffer rulesets
+
 === Version 0.9.1
 
 ==== Bug fixes

data/lib/wlang.rb

@@ -20,7 +20,7 @@ require 'wlang/intelligent_buffer'
 module WLang
   
   # Current version of WLang
-  VERSION = "0.9.1".freeze
+  VERSION = "0.9.2".freeze
 
   ######################################################################## About files and extensions
   

data/lib/wlang/dialect.rb

@@ -51,6 +51,9 @@ module WLang
     # Sub dialects by name
     attr_reader :dialects
     
+    # Post transformer
+    attr_accessor :post_transformer
+    
     #
     # Creates a dialect instance. _builder_ block is a chunk of code of the DSL
     # that will be executed twice: once at construction time to create sub dialects
@@ -123,7 +126,7 @@ module WLang
       @ruleset = RuleSet.new if @ruleset.nil?
       @ruleset.add_rules(mod, pairs)
     end
-  
+    
     ### Query API ################################################################
   
     # Returns qualified name of this dialect
@@ -167,6 +170,18 @@ module WLang
         return child_dialect.dialect(name[1..-1]) 
       end
     end
+    
+    # Applies post transformation 
+    def apply_post_transform(text)
+      case self.post_transformer
+        when String
+          WLang::encode(text, self.post_transformer, {})
+        when Proc
+          self.post_transformer.call(text)
+        else
+          text
+      end
+    end
   
     #
     # Finds an encoder by name.
@@ -221,7 +236,8 @@ module WLang
   
     # Factors a spacing friendly buffer for instantiation in this dialect
     def factor_buffer
-      IntelligentBuffer.new
+      #IntelligentBuffer.new
+      ""
     end
   
     # Returns a string representation   

data/lib/wlang/dialect_dsl.rb

@@ -85,6 +85,11 @@ module WLang
         @dialect.add_child_dialect(name, child)
       end
   
+      #
+      # Sets a transformer to use at end of generation time.
+      #
+      def post_transform(transformer = nil, &block) end
+  
       #
       # Adds a dialect encoder under _name_. Encoder's code is provided by the block.
       # This block should always take <tt>|src, options|</tt> arguments: _src_ is

data/lib/wlang/dialect_loader.rb

@@ -39,6 +39,11 @@ module WLang
       # See WLang::Dialect::DSL#dialect
       def dialect(name, *extensions, &block) end
   
+      # See WLang::Dialect::DSL::post_transformer
+      def post_transform(transformer = nil, &block) 
+        @dialect.post_transformer = (transformer || block)
+      end
+  
       # See WLang::Dialect::DSL#encoder
       def encoder(name, &block) 
         @dialect.add_encoder(name, &block)

data/lib/wlang/dialects/coderay_dialect.rb

@@ -11,14 +11,15 @@ module WLang
     #
     module CodeRayEncoderSet
 
+      # Coderay recognized formats
+      RECOGNIZED = ["java", "ruby", "html", "yaml", "sql", "css", "javascript", "json", "php", "xml"]
+
       # Default encoders  
-      DEFAULT_ENCODERS = {"java" => :coderay, "ruby" => :coderay, "html" => :coderay, 
-                          "yaml" => :coderay, "sql" => :coderay, "css" => :coderay,
-                          "javascript" => :coderay, "json" => :coderay, "php" => :coderay,
-                          "xml" => :coderay}
+      DEFAULT_ENCODERS = {}
+      RECOGNIZED.each{|f| DEFAULT_ENCODERS[f] = f.to_sym}
   
       # Upcase encoding
-      def self.coderay(src, options);
+      def self.coderay(src, options)
         /([a-z]+)$/ =~ options['_encoder_']
         encoder = $1.to_sym
         tokens = CodeRay.scan src, encoder
@@ -28,6 +29,14 @@ module WLang
         )
         return highlighted
       end
+      
+      RECOGNIZED.each{|f|
+        module_eval <<-EOF
+          def self.#{f}(src, options) 
+            WLang::EncoderSet::CodeRayEncoderSet.coderay(src, options.merge('_encoder_' => #{f.inspect}))
+          end
+        EOF
+      }
   
     end # module CodeRay  
     

data/lib/wlang/parser.rb

@@ -69,7 +69,6 @@ module WLang
     
     # Resolves an URI throught the current template
     def file_resolve(uri)
-      # TODO: refactor me to handle absolute URIs
       template.file_resolve(uri)
     end
     
@@ -185,7 +184,7 @@ module WLang
         self.<<(source_text[self.offset, 1+source_text.length-self.offset], false)
         self.offset = source_text.length
       end
-      [buffer, self.offset-1]
+      [dialect.apply_post_transform(buffer), self.offset-1]
     end
   
     ###################################################################### Callbacks for rule sets

data/lib/wlang/template.rb

@@ -33,13 +33,20 @@ module WLang
   
     # Resolved a relative uri
     def file_resolve(uri, exists=false)
-      raise("Unable to resolve #{uri}, this template is not attached to a file")\
-        unless @source_file
-      target = File.join(File.dirname(@source_file), uri)
-      if exists and not(File.exists?(target))
-        raise "File '#{uri}' does not exists"
+      require 'uri'
+      real_uri = URI::parse(uri)
+      if real_uri.absolute?
+        raise WLang::Error, "Unable to resolve #{uri}, absolute uri are not supported"
+      elsif real_uri.path[0, 1] == '/'
+        real_uri.path
+      else
+        raise WLang::Error, "Unable to resolve #{uri}, this template is not attached to a file" unless @source_file
+        target = File.join(File.dirname(@source_file), uri)
+        if exists and not(File.exists?(target))
+          raise WLang::Error, "File '#{uri}' does not exists"
+        end
+        target
       end
-      target
     end
   
     # Returns template's source text

data/test/blackbox/postblock/hello.exp

@@ -0,0 +1 @@
+<pre>hello</pre>

data/test/blackbox/postblock/hello.pre

@@ -0,0 +1 @@
+puts "Hello world"

data/test/blackbox/postblock/hello.tpl

@@ -0,0 +1 @@
+hello

data/test/blackbox/postblock/hello_input_inclusion.exp

@@ -0,0 +1 @@
+<pre><pre>puts "Hello world"</pre></pre>

data/test/blackbox/postblock/hello_input_inclusion.tpl

@@ -0,0 +1 @@
+<<+{hello.pre}

data/test/blackbox/poststring/hello.exp

@@ -0,0 +1 @@
+HELLO

data/test/blackbox/poststring/hello.tpl

@@ -0,0 +1 @@
+hello

data/test/blackbox/test_all.rb

@@ -24,6 +24,15 @@ module WLang
           rules WLang::RuleSet::Basic
           rules WLang::RuleSet::Buffering
         }
+        dialect("postblock", ".pre") {
+          post_transform{|txt| "<pre>#{txt}</pre>"}
+          rules WLang::RuleSet::Basic
+          rules WLang::RuleSet::Buffering
+        }
+        dialect("poststring") {
+          post_transform "plain-text/upcase"
+          rules WLang::RuleSet::Basic
+        }
       end
       hosted = ::WLang::HostedLanguage.new
       def hosted.variable_missing(name)

data/test/spec/coderay_dialect.spec

@@ -0,0 +1,8 @@
+require "wlang"
+describe("WLang should support coderay encoder") do
+  
+  it("should support basic coderay encoding") {
+    WLang::encode("<h1>This is a title</h1>", "xhtml/coderay/html").should_not be_nil
+  }
+  
+end

data/test/spec/dialect/apply_post_transform.spec

@@ -0,0 +1,16 @@
+describe "WLang::Dialect#post_transform" do
+  
+  let(:dialect){ WLang::Dialect.new("test", nil) }
+  subject{ dialect.apply_post_transform("hello") }
+  
+  context "when a string has been installed" do
+    before{ dialect.post_transformer = "plain-text/upcase" }
+    it{ should == "HELLO" }
+  end
+  
+  context "when a a has been installed" do
+    before{ dialect.post_transformer = lambda{|txt| "yes!#{txt}"} }
+    it{ should == "yes!hello" }
+  end
+  
+end

data/test/unit/test_all.rb

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

data/test/unit/wlang/anagram_bugs_test.rb

@@ -1,111 +1,111 @@
-require 'test/unit'
-require 'wlang'
-module WLang
-
-  # Tests the IntelligentBuffer class
-  class AnagramBugsTest < Test::Unit::TestCase
-    include IntelligentBuffer::Methods
-   
-    def test_on_anagram_spacing_policy
-      WLang::dialect("anagram") do
-        rule '=~' do |parser,offset|
-          match, reached = parser.parse(offset, "wlang/dummy")
-          block, reached = parser.parse_block(reached, "wlang/dummy")
-
-          # puts "Here is the block ==="
-          # puts "#{block.gsub(/ /, '.').gsub(/\n/, "\\n\n")}"
-          # puts "=== Here is the block"
-
-          [block, reached]
-        end
-      end
-      template = %q{
-        =~{String}{
-          this is an anagram template
-        }
-      }.gsub(/^ {8}/, '').strip
-      result = template.wlang_instantiate({}, "anagram")
-      #assert IntelligentBuffer===result
-#      assert_equal("this is an anagram template", result)
-
-      template = %q{
-        =~{String}{
-          module MyModule
-          end
-        }
-      }.gsub(/^ {8}/, '').strip
-      result = template.wlang_instantiate({}, "anagram")
-      #assert IntelligentBuffer===result
-      assert_equal("module MyModule\nend\n", result)
-    end
-    
-    def test_missing_end_bug
-      WLang::dialect("anagram") do
-        rules WLang::RuleSet::Basic
-        rules WLang::RuleSet::Imperative
-        rule '=~' do |parser,offset|
-          match, reached = parser.parse(offset, "wlang/dummy")
-          match = parser.evaluate(match)
-          block, reached = parser.parse_block(reached, "wlang/dummy")
-          block = block.strip_block(block)
-          block = block.tabto(block,0)
-          parser.evaluate("matching_rules") << [match, block]
-    
-          # puts "Here is the block ==="
-          # puts "#{block.gsub(/ /, '.').gsub(/\n/, "\\n\n")}"
-          # puts "=== Here is the block"
-    
-          ["", reached]
-        end
-        rule '+~' do |parser,offset|
-          what, reached = parser.parse(offset, "wlang/dummy")
-          evaluated = parser.evaluate(what)
-          raise "Unexpected case, #{what} leads to nil" unless evaluated
-    
-          rules = parser.evaluate("matching_rules")
-          found = rules.find {|r| r[0]===evaluated}
-          raise "Unexpected case: no match for #{what.class}" unless found
-    
-          context = {"n" => evaluated, "matching_rules" => rules}
-          inst = found[1].wlang_instantiate(context, "anagram")
-          
-          inst2 = inst.gsub(/ /, '.').gsub(/\n/, "\\n\n")
-          # puts "Here is the inst ==="
-          # puts "#{inst2}"
-          # puts "=== Here is the inst"
-          
-          found = [inst, reached]
-        end
-      end
-      template = %Q{
-        =~{Array}{
-          module MyModule
-            *{n as c}{
-              +~{c}
-            }
-          end
-        }
-        =~{Integer}{
-          +{n}
-        }
-        +~{n}
-      }.gsub(/ {8}/,'').strip
-      context = {'n' => [10, 20, 30], 'matching_rules' => []}
-      result = template.wlang_instantiate(context, "anagram")
-    
-      # template = template.gsub(/ /, '.').gsub(/\n/, "\\n\n")
-      # puts "Here is the template ==="
-      # puts "#{template}"
-      # puts "=== Here is the template"
-    
-      # result = result.gsub(/ /, '.').gsub(/\n/, "\\n\n")
-      # puts "Here is the result ==="
-      # puts "#{result}"
-      # puts "=== Here is the result"
-      result = result.strip
-      expected = "module MyModule\n  10\n  \n  20\n  \n  30\n\nend"
-      assert_equal expected, result
-    end
-    
-  end
-end
+# require 'test/unit'
+# require 'wlang'
+# module WLang
+# 
+#   # Tests the IntelligentBuffer class
+#   class AnagramBugsTest < Test::Unit::TestCase
+#     include IntelligentBuffer::Methods
+#    
+#     def test_on_anagram_spacing_policy
+#       WLang::dialect("anagram") do
+#         rule '=~' do |parser,offset|
+#           match, reached = parser.parse(offset, "wlang/dummy")
+#           block, reached = parser.parse_block(reached, "wlang/dummy")
+# 
+#           # puts "Here is the block ==="
+#           # puts "#{block.gsub(/ /, '.').gsub(/\n/, "\\n\n")}"
+#           # puts "=== Here is the block"
+# 
+#           [block, reached]
+#         end
+#       end
+#       template = %q{
+#         =~{String}{
+#           this is an anagram template
+#         }
+#       }.gsub(/^ {8}/, '').strip
+#       result = template.wlang_instantiate({}, "anagram")
+#       #assert IntelligentBuffer===result
+# #      assert_equal("this is an anagram template", result)
+# 
+#       template = %q{
+#         =~{String}{
+#           module MyModule
+#           end
+#         }
+#       }.gsub(/^ {8}/, '').strip
+#       result = template.wlang_instantiate({}, "anagram")
+#       #assert IntelligentBuffer===result
+#       assert_equal("module MyModule\nend\n", result)
+#     end
+#     
+#     def test_missing_end_bug
+#       WLang::dialect("anagram") do
+#         rules WLang::RuleSet::Basic
+#         rules WLang::RuleSet::Imperative
+#         rule '=~' do |parser,offset|
+#           match, reached = parser.parse(offset, "wlang/dummy")
+#           match = parser.evaluate(match)
+#           block, reached = parser.parse_block(reached, "wlang/dummy")
+#           block = block.strip_block(block)
+#           block = block.tabto(block,0)
+#           parser.evaluate("matching_rules") << [match, block]
+#     
+#           # puts "Here is the block ==="
+#           # puts "#{block.gsub(/ /, '.').gsub(/\n/, "\\n\n")}"
+#           # puts "=== Here is the block"
+#     
+#           ["", reached]
+#         end
+#         rule '+~' do |parser,offset|
+#           what, reached = parser.parse(offset, "wlang/dummy")
+#           evaluated = parser.evaluate(what)
+#           raise "Unexpected case, #{what} leads to nil" unless evaluated
+#     
+#           rules = parser.evaluate("matching_rules")
+#           found = rules.find {|r| r[0]===evaluated}
+#           raise "Unexpected case: no match for #{what.class}" unless found
+#     
+#           context = {"n" => evaluated, "matching_rules" => rules}
+#           inst = found[1].wlang_instantiate(context, "anagram")
+#           
+#           inst2 = inst.gsub(/ /, '.').gsub(/\n/, "\\n\n")
+#           # puts "Here is the inst ==="
+#           # puts "#{inst2}"
+#           # puts "=== Here is the inst"
+#           
+#           found = [inst, reached]
+#         end
+#       end
+#       template = %Q{
+#         =~{Array}{
+#           module MyModule
+#             *{n as c}{
+#               +~{c}
+#             }
+#           end
+#         }
+#         =~{Integer}{
+#           +{n}
+#         }
+#         +~{n}
+#       }.gsub(/ {8}/,'').strip
+#       context = {'n' => [10, 20, 30], 'matching_rules' => []}
+#       result = template.wlang_instantiate(context, "anagram")
+#     
+#       # template = template.gsub(/ /, '.').gsub(/\n/, "\\n\n")
+#       # puts "Here is the template ==="
+#       # puts "#{template}"
+#       # puts "=== Here is the template"
+#     
+#       # result = result.gsub(/ /, '.').gsub(/\n/, "\\n\n")
+#       # puts "Here is the result ==="
+#       # puts "#{result}"
+#       # puts "=== Here is the result"
+#       result = result.strip
+#       expected = "module MyModule\n  10\n  \n  20\n  \n  30\n\nend"
+#       assert_equal expected, result
+#     end
+#     
+#   end
+# end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wlang
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Bernard Lambeau
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-20 00:00:00 +02:00
+date: 2010-07-21 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -137,8 +137,17 @@ files:
 - test/blackbox/context/modulo_assignment_2.exp
 - test/blackbox/context/modulo_assignment_2.tpl
 - test/blackbox/data_1.rb
+- test/blackbox/postblock/hello.exp
+- test/blackbox/postblock/hello.pre
+- test/blackbox/postblock/hello.tpl
+- test/blackbox/postblock/hello_input_inclusion.exp
+- test/blackbox/postblock/hello_input_inclusion.tpl
+- test/blackbox/poststring/hello.exp
+- test/blackbox/poststring/hello.tpl
 - test/blackbox/test_all.rb
 - test/spec/basic_object.spec
+- test/spec/coderay_dialect.spec
+- test/spec/dialect/apply_post_transform.spec
 - test/spec/global_extensions.rb
 - test/spec/hash_scope.spec
 - test/spec/redcloth_dialect.spec