malt 0.1.1 → 0.2.0

data/lib/malt/engines/rdiscount.rb

@@ -16,7 +16,7 @@ module Malt::Engine
 
     # Convert Markdown text to HTML text.
     def render(params)
-      case params[:format]
+      case params[:to]
       when :html, nil
         intermediate(params).to_html
       else

data/lib/malt/engines/rdoc.rb

@@ -15,9 +15,9 @@ module Malt::Engine
 
     # Convert rdoc text to html.
     def render(params)
-      text   = params[:text]
-      format = params[:format]
-      case format
+      text = params[:text]
+      into = params[:to]
+      case into
       when :html, nil
         html_engine.convert(text).to_s
       else

data/lib/malt/engines/redcloth.rb

@@ -14,7 +14,7 @@ module Malt::Engine
     #   :format => Symbol of the format to render [:html]
     #
     def render(params={})
-      case params[:format]
+      case params[:to]
       when :html, nil
         intermediate(params).to_html
       else

data/lib/malt/engines/sass.rb

@@ -10,11 +10,11 @@ module Malt::Engine
 
     #
     def render(params, &yld)
-      text   = params[:text]
-      file   = params[:file]
-      format = params[:format]
+      text = params[:text]
+      file = params[:file]
+      into = params[:to]
 
-      case format
+      case into
       when :css, nil
         engine = intermediate(params)
         engine.render
@@ -39,10 +39,10 @@ module Malt::Engine
       require_library 'sass'
     end
 
-    def engine_options
-      opts = {}
-      opts
-    end
+    #def engine_options
+    #  opts = {}
+    #  opts
+    #end
 
   end
 

data/lib/malt/engines/tenjin.rb

@@ -15,13 +15,13 @@ module Malt::Engine
 
     #
     def render(params, &yld)
-      text   = params[:text]
-      file   = params[:file]
-      data   = params[:data]
-      type   = params[:type]
-      format = params[:format] || :html
+      text = params[:text]
+      file = params[:file]
+      data = params[:data]
+      type = params[:type]
+      into = params[:to] || :html
 
-      return super(params, &yld) if type == :rbhtml && format != :html
+      return super(params, &yld) if type == :rbhtml && into != :html
 
       data = make_hash(data, &yld)
       template = intermediate(params)

data/lib/malt/formats/abstract.rb

@@ -28,7 +28,9 @@ module Format
       @extensions
     end
 
-    #
+    #--
+    # TODO: warning: instance variable @engine not initialized
+    #++
     def self.engine(set=nil)
       @engine = set if set
       @engine
@@ -47,7 +49,6 @@ module Format
     def initialize_engine
     end
 
-
     public
 
     # Access to the options given to the initializer.
@@ -160,6 +161,11 @@ module Format
       text
     end
 
+    #
+    def to_default(data=nil, &yld)
+      to(default, data, &yld)
+    end
+
     # Default rendering type is +:html+. Override if it
     # differs for the subclassing format.
     def default

data/lib/malt/formats/builder.rb

@@ -0,0 +1,56 @@
+require 'malt/formats/abstract'
+require 'malt/formats/html'
+require 'malt/engines/builder'
+
+module Malt::Format
+
+  # Builder looks like a Markup format, but it is a template format
+  # as Ruby code.
+  #
+  #   http://builder.rubyforge.org/
+  #
+  class Builder < Abstract
+
+    register 'builder'
+
+    #
+    def builder(*)
+      text
+    end
+
+    #
+    def to_builder(*)
+      self
+    end
+
+    #
+    def html(data=nil, &yld)
+      render_engine.render(:format=>:html, :text=>text, :file=>file, :data=>data, &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
+
+    #
+    #def to_ruby(db, &yld)
+    #  @ruby ||= (
+    #    source = engine.compile(text, file)
+    #    Ruby.new(:text=>source, :file=>refile(:rb))
+    #  )
+    #end
+
+    private
+
+      #
+      def render_engine
+        @render_engine ||= Malt::Engine::Builder.new(options)
+      end
+
+  end
+
+end
+

data/lib/malt/formats/css.rb

@@ -19,14 +19,14 @@ module Malt::Format
 
     private
 
-      #
-      def render_engine
-      end
-
-      # CSS default output type is itself.
-      def default
-        :css
-      end
+    #
+    def render_engine
+    end
+
+    # CSS default output type is itself.
+    def default
+      :css
+    end
 
   end
 

data/lib/malt/formats/erector.rb

@@ -0,0 +1,53 @@
+require 'malt/formats/abstract'
+require 'malt/formats/html'
+require 'malt/engines/erector'
+
+module Malt::Format
+
+  # Erecotr looks like a Markup format, but it is a template format
+  # Much like pure Ruby too.
+  class Erector < Abstract
+
+    register 'erector'
+
+    #
+    def erector(*)
+      text
+    end
+
+    #
+    def to_erector(*)
+      self
+    end
+
+    #
+    def html(data=nil, &yld)
+      render_engine.render(:format=>:html, :text=>text, :file=>file, :data=>data, &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
+
+    #
+    #def to_ruby(db, &yld)
+    #  @ruby ||= (
+    #    source = engine.compile(text, file)
+    #    Ruby.new(:text=>source, :file=>refile(:rb))
+    #  )
+    #end
+
+    private
+
+      #
+      def render_engine
+        @render_engine ||= Malt::Engine::Erector.new(options)
+      end
+
+  end
+
+end
+

data/lib/malt/formats/haml.rb

@@ -11,12 +11,12 @@ module Malt::Format
     register 'haml'
 
     #
-    def haml
+    def haml(*)
       text
     end
 
     #
-    def to_haml
+    def to_haml(*)
       self
     end
 

data/lib/malt/formats/html.rb

@@ -19,9 +19,9 @@ module Malt::Format
 
     private
 
-      #
-      def render_engine
-      end
+    #
+    def render_engine
+    end
 
   end
 

data/lib/malt/formats/latex.rb

@@ -9,22 +9,22 @@ module Malt::Format
     register 'latex'
 
     #
-    def latex
+    def latex(*)
       text
     end
 
     #
-    def to_latex
+    def to_latex(*)
       self
     end
 
     # TODO
-    def pdf
+    def pdf(*)
       raise "not implemented yet"
     end
 
     # TODO
-    def to_pdf
+    def to_pdf(*)
       text = pdf
       opts = options.merge(:text=>text, :file=>refile(:pdf), :type=>:pdf)
       PDF.new(opts)

data/lib/malt/formats/less.rb

@@ -12,24 +12,24 @@ module Malt::Format
     register('less')
 
     #
-    def less
+    def less(*)
       text
     end
 
     #
-    def to_less
+    def to_less(*)
       self
     end
 
     #
-    def css
+    def css(*)
       render_engine.render(:text=>text, :file=>:file, :format=>:css)
     end
 
     #
-    def to_css
+    def to_css(*)
       text = css
-      opts = options.merge(:text=>text, file=>refile(:css), :type=>:css)
+      opts = options.merge(:text=>text, :file=>refile(:css), :type=>:css)
       CSS.new(opts)
     end
 

data/lib/malt/formats/liquid.rb

@@ -9,7 +9,17 @@ module Malt::Format
   #
   class Liquid < AbstractTemplate
 
-    register 'liquid'
+    register('liquid')
+
+    #
+    def liquid(*)
+      text
+    end
+
+    #
+    def to_liquid(*)
+      self
+    end
 
 #    #
 #    def to(type, data=nil, &yld)

data/lib/malt/formats/markaby.rb

@@ -0,0 +1,53 @@
+require 'malt/formats/abstract'
+require 'malt/formats/html'
+require 'malt/engines/markaby'
+
+module Malt::Format
+
+  # Erecotr looks like a Markup format, but it is a template format
+  # Much like pure Ruby too.
+  class Markaby < Abstract
+
+    register 'markaby', 'mab'
+
+    #
+    def markaby(*)
+      text
+    end
+
+    #
+    def to_markaby(*)
+      self
+    end
+
+    #
+    def html(data=nil, &yld)
+      render_engine.render(:format=>:html, :text=>text, :file=>file, :data=>data, &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
+
+    #
+    #def to_ruby(db, &yld)
+    #  @ruby ||= (
+    #    source = engine.compile(text, file)
+    #    Ruby.new(:text=>source, :file=>refile(:rb))
+    #  )
+    #end
+
+    private
+
+      #
+      def render_engine
+        @render_engine ||= Malt::Engine::Markaby.new(options)
+      end
+
+  end
+
+end
+

data/lib/malt/formats/markdown.rb

@@ -12,17 +12,17 @@ module Malt::Format
     register('markdown', 'md')
 
     #
-    def html
+    def html(*)
       render_engine.render(:text=>text, :file=>file, :format=>:html)
     end
 
     #
-    def latex
+    def latex(*)
       render_engine.render(:text=>text, :file=>file, :format=>:latex)
     end
 
     #
-    def markdown
+    def markdown(*)
       text
     end
 
@@ -30,19 +30,19 @@ module Malt::Format
     alias_method :md, :markdown
 
     # Convert to HTML.
-    def to_html
+    def to_html(*)
       opts = options.merge(:text=>html, :file=>refile(:html), :type=>:html)
       HTML.new(opts)
     end
 
     # Latex is only supported by the Kramdown engine.
-    def to_latex
+    def to_latex(*)
       opts = options.merge(:text=>html, :file=>refile(:latex), :type=>:latex)
       Latex.new(opts)
     end
 
     #
-    def to_markdown
+    def to_markdown(*)
       self
     end