malt 0.3.0 → 0.4.0

data/lib/malt/formats/markdown.rb

@@ -3,6 +3,9 @@ require 'malt/formats/html'
 require 'malt/formats/latex'
 require 'malt/engines/rdiscount'
 require 'malt/engines/bluecloth'
+require 'malt/engines/maruku'
+require 'malt/engines/redcarpet'
+require 'malt/engines/kramdown'
 
 module Malt::Format
  
@@ -12,22 +15,24 @@ module Malt::Format
     register('markdown', 'md')
 
     #
-    def html(*)
-      render_engine.render(:text=>text, :file=>file, :format=>:html)
+    def markdown(*)
+      text
     end
 
-    #
-    def latex(*)
-      render_engine.render(:text=>text, :file=>file, :format=>:latex)
-    end
+    alias_method :md, :markdown
 
     #
-    def markdown(*)
-      text
+    def to_markdown(*)
+      self
     end
 
+    alias_method :to_md, :to_markdown
+
     #
-    alias_method :md, :markdown
+    def html(*data, &context)
+      #engine.render(:text=>text, :file=>file, :format=>:html)
+      render_into(:html, *data, &context)
+    end
 
     # Convert to HTML.
     def to_html(*)
@@ -35,49 +40,43 @@ module Malt::Format
       HTML.new(opts)
     end
 
+    #
+    def latex(*data, &content)
+      render_into(:latex, *data, &content)
+      #render_engine.render(:text=>text, :file=>file, :format=>:latex)
+    end
+
     # Latex is only supported by the Kramdown engine.
     def to_latex(*)
       opts = options.merge(:text=>html, :file=>refile(:latex), :type=>:latex)
       Latex.new(opts)
     end
 
-    #
-    def to_markdown(*)
-      self
+=begin
+   private
+
+    # Select rendering engine.
+    def render_engine
+      @render_engine ||= (
+        case engine
+        when :bluecloth
+          Malt::Engine::BlueCloth.new(options)
+        when :kramdown
+          Malt::Engine::Kramdown.new(options)
+        when :rdiscount
+          Malt::Engine::RDiscount.new(options)
+        when :redcarpet
+          Malt::Engine::Redcarpet.new(options)
+        when :maruku
+          Malt::Engine::Maruku.new(options)
+        else
+          #Malt::Engine::Redcarpet.new(options)  # TODO: new default ?
+          Malt::Engine::RDiscount.new(options)
+        end
+      )
     end
-
-    #
-    alias_method :to_md, :to_markdown
-
-    #
-    #def render_to(to, *)
-    #  case to
-    #  when :markdown, :md
-    #    text
-    #  when :html
-    #    malt_engine.render_html(text, file)
-    #  when :txt  # THINK: Does this make sense?
-    #    text
-    #  end
-    #end
-
-    private
-
-      #
-      def render_engine
-        @render_engine ||= (
-          case engine
-          when :bluecloth
-            Malt::Engine::BlueCloth.new(options)
-          when :kramdown
-            Malt::Engine::Kramdown.new(options)
-          else
-            Malt::Engine::RDiscount.new(options)
-          end
-        )
-      end
+=end
 
   end
 
 end
-

data/lib/malt/formats/mediawiki.rb

@@ -0,0 +1,70 @@
+require 'malt/formats/abstract'
+require 'malt/formats/html'
+#require 'malt/formats/latex'
+require 'malt/engines/creole'
+require 'malt/engines/wikicloth'
+
+module Malt::Format
+ 
+  #
+  class MediaWiki < Abstract
+
+    file_extension 'mediawiki', 'mw'
+
+    #
+    def mediawiki(*)
+      text
+    end
+
+    #
+    def to_mediawiki(*)
+      self
+    end
+
+    alias_method :mw, :mediawiki
+    alias_method :to_mw, :to_mediawiki
+
+    #
+    def html(*data, &content)
+      #render_engine.render(:text=>text, :file=>file, :format=>:html)
+      render_into(:html, *data, &content)
+    end
+
+    # Convert to HTML.
+    def to_html(*)
+      opts = options.merge(:text=>html, :file=>refile(:html), :type=>:html)
+      HTML.new(opts)
+    end
+
+    #
+    #def latex(*)
+    #  render_engine.render(:text=>text, :file=>file, :format=>:latex)
+    #end
+
+    # Latex is only supported by the Kramdown engine.
+    #def to_latex(*)
+    #  opts = options.merge(:text=>html, :file=>refile(:latex), :type=>:latex)
+    #  Latex.new(opts)
+    #end
+
+=begin
+   private
+
+    # Select rendering engine.
+    def render_engine
+      @render_engine ||= (
+        case engine
+        when :creole
+          Malt::Engine::Creole.new(options)
+        when :wikicloth
+          Malt::Engine::WikiCloth.new(options)
+        else
+          Malt::Engine::WikiCloth.new(options)
+        end
+      )
+    end
+=end
+
+  end
+
+end

data/lib/malt/formats/mustache.rb

@@ -9,7 +9,7 @@ module Malt::Format
   #
   class Mustache < AbstractTemplate
 
-    register('mustache')
+    file_extension 'mustache'
 
     #
     def mustache(*)
@@ -21,12 +21,12 @@ module Malt::Format
       self
     end
 
-    private
+    #private
 
     #
-    def render_engine
-      @render_engine ||= Malt::Engine::Mustache.new(options)
-    end
+    #def render_engine
+    #  @render_engine ||= Malt::Engine::Mustache.new(options)
+    #end
 
   end
 

data/lib/malt/formats/pdf.rb

@@ -5,7 +5,7 @@ module Malt::Format
   #
   class PDF < Abstract
 
-    register 'pdf'
+    file_extension 'pdf'
 
     #
     def pdf(*)
@@ -17,12 +17,6 @@ module Malt::Format
       self
     end
 
-    private
-
-      #
-      def render_engine
-      end
-
   end
 
 end

data/lib/malt/formats/radius.rb

@@ -23,13 +23,14 @@ module Malt::Format
     end
 
     #
-    def html(data=nil, &yld)
-      render_engine.render(:text=>text, :file=>file, :data=>data, &yld)
+    def html(*data, &content)
+      render_into(:html, *data, &content)
+      #render_engine.render(:text=>text, :file=>file, :data=>data, &yld)
     end
 
     #
-    def to_html(data=nil, &yld)
-      text = html(data, &yld)
+    def to_html(*data, &content)
+      text = html(*data, &content)
       opts = options.merge(:text=>text, :file=>refile(:html), :type=>:html)
       HTML.new(opts)
     end

data/lib/malt/formats/ragtag.rb

@@ -11,38 +11,39 @@ module Malt::Format
   #
   class RagTag < Abstract
 
-    register('ragtag', 'rt')
+    file_extension 'ragtag', 'rt'
 
     #
-    def html(data=nil, &yld)
-      render_engine.render(:text=>text, :data=>data, &yld)
+    def html(*data, &content)
+      render_into(:html, *data, &content)
+      #render_engine.render(:text=>text, :data=>data, &yld)
     end
 
     #
-    def to_html(data=nil, &yld)
-      text = html(data, &yld)
+    def to_html(*data, &yld)
+      text = html(*data, &yld)
       opts = options.merge(:text=>text, :file=>refile(:html), :type=>:html)
       HTML.new(opts)
     end
 
     #
-    def xml(data=nil, &yld)
-      render_engine.render(:text=>text, :data=>data, &yld)
+    def xml(*data, &yld)
+      render_into(:xml, *data, &content)
     end
 
     #
-    def to_xml(data=nil, &yld)
-      text = xml(data, &yld)
+    def to_xml(*data, &yld)
+      text = xml(*data, &yld)
       opts = options.merge(:text=>text, :file=>refile(:xml), :type=>:xml)
       XML.new(opts)
     end
 
-    private
+    #private
 
       #
-      def render_engine
-        @render_engine ||= Malt::Engine::RagTag.new(options)
-      end
+      #def render_engine
+      #  @render_engine ||= Malt::Engine::RagTag.new(options)
+      #end
 
   end
 

data/lib/malt/formats/rbhtml.rb

@@ -8,8 +8,27 @@ module Malt::Format
   # RBHTML is a variant of Tenjin, but limited to HTML conversion.
   class RBHTML < Abstract
 
-    register 'rbhtml'
+    file_extension 'rbhtml'
 
+    #
+    def html(*data, &content)
+      render_into(:html, *data, &content)
+    end
+
+    #
+    def to_html(*data, &yld)
+      text = html(*data, &yld)
+      opts = options.merge(
+        :text   => text,
+        :file   => refile(:html),
+        :type   => :html,
+        :engine => nil
+      )
+      HTML.new(opts)
+    end
+
+    # TODO: to_rb
+=begin
     # RHTML templates can be "pre-compiled" into Ruby templates.
     def rb(*)
       render_engine.compile(:text=>text, :file=>file)
@@ -26,25 +45,14 @@ module Malt::Format
 
     #
     alias_method(:precompile, :to_rb)
-
-    #
-    def html(data=nil, &yld)
-      render_engine.render(:text=>text, :file=>file, :data=>data, :format=>:html, &yld)
-    end
-
-    #
-    def to_html(data=nil, &yld)
-      text = html(data, &yld)
-      opts = options.merge(:text=>text, :file=>refile(:html), :type=>:html)
-      HTML.new(opts)
-    end
-
-    private
-
-    #
-    def render_engine
-      @render_engine ||= Malt::Engine::Tenjin.new(options)
-    end
+=end
+
+   #private
+   #
+   # #
+   # def render_engine
+   #   @render_engine ||= Malt::Engine::Tenjin.new(options)
+   # end
 
   end
 

data/lib/malt/formats/rdoc.rb

@@ -7,7 +7,7 @@ module Malt::Format
   #
   class RDoc < Abstract
 
-    register('rdoc')
+    file_extension 'rdoc'
 
     #
     def rdoc(*)
@@ -20,13 +20,14 @@ module Malt::Format
     end
 
     #
-    def html(*)
-      render_engine.render(:text=>text, :file=>file, :format=>:html)
+    def html(*data, &content)
+      render_into(:html, *data, &content)
+      #render_engine.render(:format=>:html, :text=>text, :file=>file)
     end
 
     #
     def to_html(*)
-      opts = options.merge(:text=>html, :file=>refile(:html), :type=>:html)
+      opts = options.merge(:type=>:html, :text=>html, :file=>refile(:html))
       HTML.new(opts)
     end
 

data/lib/malt/formats/rhtml.rb

@@ -8,8 +8,9 @@ module Malt::Format
   # RHTML is a variant of Erb files which are limited to conversion to HTML.
   class RHTML < Abstract
 
-    register 'rhtml'
+    file_extension 'rhtml'
 
+=begin
     # RHTML templates can be "pre-compiled" into Ruby templates.
     def rb(*)
       render_engine.compile(:text=>text, :file=>file)
@@ -26,60 +27,35 @@ module Malt::Format
 
     #
     alias_method(:precompile, :to_rb)
+=end
 
     #
-    def html(data=nil, &yld)
-      render_engine.render(:text=>text, :file=>file, :format=>:html)
+    def html(*data, &content)
+      render_into(:html, *data, &content)
+      #render_engine.render(:text=>text, :file=>file, :data=>data, :to=>:html, &yld)
     end
 
     #
-    def to_html(data=nil, &yld)
+    def to_html(*data, &yld)
       text = html(data, &yld)
       opts = options.merge(:text=>text, :file=>refile(:html), :type=>:html)
       HTML.new(opts)
     end
 
-    #
-    #def render(data, &yld)
-    #  if options[:recompile]
-    #    result = render_engine.render(db, &yld)
-    #  else
-    #    result = precompile.compile(db, &yld)
-    #  end
-    #
-    #  HTML.new(:text=>result, :file=>refile(:html))
-    #end
-
-    #
-    #def to_html(db, &yld)
-    #  # unless pre-compilation is turned off, convert to ruby
-    #  return to_ruby.to_html(db, &yld) unless options[:recompile]
-    #  convert(:html, db, &yld)
-    #end
-
-    #
-    #def render_to(to, db, &yld)
-    #  #if options[:recompile]
-    #    render_engine.render(text, file, db, &yld)
-    #  #else
-    #  #  to_ruby.render(db, &yld)
-    #  #end
+   #private
+
+    ##
+    #def render_engine
+    #  @render_engine ||= (
+    #    case engine
+    #    when :erubis
+    #      Malt::Engine::Erubis.new(options)
+    #    else
+    #      Malt::Engine::Erb.new(options)
+    #    end
+    #  )
     #end
 
-    private
-
-    #
-    def render_engine
-      @render_engine ||= (
-        case engine
-        when :erubis
-          Malt::Engine::Erubis.new(options)
-        else
-          Malt::Engine::Erb.new(options)
-        end
-      )
-    end
-
   end
 
 end