malt 0.1.1 → 0.2.0

data/lib/malt/formats/mustache.rb

@@ -0,0 +1,34 @@
+require 'malt/formats/abstract_template'
+require 'malt/engines/mustache'
+
+module Malt::Format
+ 
+  # Mustache templates
+  #
+  #   http://github.com/defunkt/mustache
+  #
+  class Mustache < AbstractTemplate
+
+    register('mustache')
+
+    #
+    def mustache(*)
+      text
+    end
+
+    #
+    def to_mustache(*)
+      self
+    end
+
+    private
+
+    #
+    def render_engine
+      @render_engine ||= Malt::Engine::Mustache.new(options)
+    end
+
+  end
+
+end
+

data/lib/malt/formats/pdf.rb

@@ -8,12 +8,12 @@ module Malt::Format
     register 'pdf'
 
     #
-    def pdf
+    def pdf(*)
       text
     end
 
     #
-    def to_pdf
+    def to_pdf(*)
       self
     end
 

data/lib/malt/formats/radius.rb

@@ -13,22 +13,22 @@ module Malt::Format
     register('radius')
 
     #
-    def radius
+    def radius(*)
       text
     end
 
     #
-    def to_radius
+    def to_radius(*)
       self
     end
 
     #
-    def html(data, &yld)
+    def html(data=nil, &yld)
       render_engine.render(:text=>text, :file=>file, :data=>data, &yld)
     end
 
     #
-    def to_html(data, &yld)
+    def to_html(data=nil, &yld)
       text = html(data, &yld)
       opts = options.merge(:text=>text, :file=>refile(:html), :type=>:html)
       HTML.new(opts)

data/lib/malt/formats/{rtals.rb → ragtag.rb}

@@ -1,43 +1,47 @@
 require 'malt/formats/abstract'
 require 'malt/formats/html'
-require 'malt/engines/rtals'
+require 'malt/formats/xml'
+require 'malt/engines/ragtag'
 
 module Malt::Format
 
+  # RagTag
   #
-  class Rtals < Abstract
+  #  http://github.com/rubyworks/ragtag
+  #
+  class RagTag < Abstract
 
-    register('rtal')
+    register('ragtag', 'rt')
 
     #
-    def html(data, &yld)
+    def html(data=nil, &yld)
       render_engine.render(:text=>text, :data=>data, &yld)
     end
 
     #
-    def to_html(data, &yld)
+    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 xml(data, &yld)
+    def xml(data=nil, &yld)
       render_engine.render(:text=>text, :data=>data, &yld)
     end
 
     #
-    def to_xml(data, &yld)
+    def to_xml(data=nil, &yld)
       text = xml(data, &yld)
       opts = options.merge(:text=>text, :file=>refile(:xml), :type=>:xml)
-      HTML.new(opts)
+      XML.new(opts)
     end
 
     private
 
       #
       def render_engine
-        @render_engine ||= Malt::Engine::RTALS.new(options)
+        @render_engine ||= Malt::Engine::RagTag.new(options)
       end
 
   end

data/lib/malt/formats/rdoc.rb

@@ -10,22 +10,22 @@ module Malt::Format
     register('rdoc')
 
     #
-    def rdoc
+    def rdoc(*)
       text
     end
 
     #
-    def to_rdoc
+    def to_rdoc(*)
       self
     end
 
     #
-    def html
+    def html(*)
       render_engine.render(:text=>text, :file=>file, :format=>:html)
     end
 
     #
-    def to_html
+    def to_html(*)
       opts = options.merge(:text=>html, :file=>refile(:html), :type=>:html)
       HTML.new(opts)
     end

data/lib/malt/formats/ruby.rb

@@ -20,11 +20,11 @@ module Malt::Format
     register 'rb'
 
     #
-    def rb ; text ; end
+    def rb(*) ; text ; end
     alias_method :ruby, :rb
 
     #
-    def to_rb ; self ; end
+    def to_rb(*) ; self ; end
     alias_method :to_ruby, :to_rb
 
     #

data/lib/malt/formats/sass.rb

@@ -10,6 +10,16 @@ module Malt::Format
 
     register 'sass'
 
+    #
+    def sass(*)
+      text
+    end
+
+    #
+    def to_sass(*)
+      self
+    end
+
     #
     def css(data=nil, &yld)
       render_engine.render(:format=>:css, :text=>text, :file=>file, :type=>type)

data/lib/malt/formats/scss.rb

@@ -11,6 +11,16 @@ module Malt::Format
 
     register 'scss'
 
+    #
+    def scss(*)
+      text
+    end
+
+    #
+    def to_scss(*)
+      self
+    end
+
     #
     def css(data=nil, &yld)
       render_engine.render(:format=>:css, :text=>text, :file=>file, :type=>type)

data/lib/malt/formats/tenjin.rb

@@ -12,12 +12,12 @@ module Malt::Format
 
     register 'tenjin'
 
-    def rb
+    def rb(*)
       render_engine.compile(text, file)
     end
 
     # Erb templates can be "precompiled" into Ruby templates.
-    def to_rb
+    def to_rb(*)
       text = rb
       Ruby.new(:text=>text, :file=>refile(:rb), :type=>:rb)
     end
@@ -25,12 +25,12 @@ module Malt::Format
     alias_method(:to_ruby, :to_rb)
 
     #
-    def html
+    def html(data=nil, &yld)
       render(:html, data, &yld)
     end
 
     #
-    def to_html(data, &yld)
+    def to_html(data=nil, &yld)
       new_text    = render(:html, data, &yld)
       new_file    = refile(:html)
       new_options = options.merge(:text=>new_text, :file=>new_file, :type=>:html)

data/lib/malt/formats/textile.rb

@@ -9,12 +9,7 @@ module Malt::Format
     register('textile', 'tt')
 
     #
-    def html
-      render_engine.render(:format=>:html, :text=>text, :file=>file)
-    end
-
-    #
-    def textile
+    def textile(*)
       text
     end
 
@@ -22,17 +17,22 @@ module Malt::Format
     alias_method :tt, :textile
 
     #
-    def to_html
-      opts = options.merge(:text=>html, :file=>refile(:html), :type=>:html)
-      HTML.new(opts)
+    def to_textile(*)
+      self
     end
 
+    alias_method :to_tt, :to_textile
+
     #
-    def to_textile
-      self
+    def html(*)
+      render_engine.render(:format=>:html, :text=>text, :file=>file)
     end
 
-    alias_method :to_tt, :to_textile
+    #
+    def to_html(*)
+      opts = options.merge(:text=>html, :file=>refile(:html), :type=>:html)
+      HTML.new(opts)
+    end
 
     #
     #def render_to(to, *)

data/lib/malt/formats/xml.rb

@@ -0,0 +1,29 @@
+require 'malt/formats/abstract'
+
+module Malt::Format
+
+  # TODO: Add conversion to_html.
+  class XML < Abstract
+
+    register 'xml'
+
+    #
+    def xml(*)
+      text
+    end
+
+    # XML is XML ;)
+    def to_xml(*)
+      self
+    end
+
+    private
+
+    #
+    def render_engine
+    end
+
+  end
+
+end
+

data/lib/malt/formats/yaml.rb

@@ -26,12 +26,12 @@ module Malt::Format
 
     # Converting a plan YAML file to HTML makes no sense so we
     # just wrap it in +pre+ tags.
-    def html
+    def html(*)
       "<pre>\n#{h text}\n</pre>"
     end
 
     #
-    def to_html
+    def to_html(*)
       text = html
       opts = options.merge(:text=>text, :file=>refile(:html), :type=>:html)
       HTML.new(opts)

data/lib/malt/meta/data.rb

@@ -4,10 +4,10 @@ module Malt
 
   DIRECTORY = File.dirname(__FILE__)
 
-  def self.gemfile
-    @gemfile ||= (
+  def self.package
+    @package ||= (
       require 'yaml'
-      YAML.load(File.new(DIRECTORY + '/gemfile'))
+      YAML.load(File.new(DIRECTORY + '/package'))
     )
   end
 
@@ -20,7 +20,7 @@ module Malt
 
   def self.const_missing(name)
     key = name.to_s.downcase
-    gemfile[key] || profile[key] || super(name)
+    package[key] || profile[key] || super(name)
   end
 
 end

data/lib/malt/meta/{gemfile → package}

@@ -1,6 +1,6 @@
 name    : malt
-date    : 2010-10-21
-version : 0.1.1
+date    : 2010-10-22
+version : 0.2.0
 
 requires:
   - syckle   (build)
@@ -14,4 +14,8 @@ requires:
   - rtals     (test)
   - liquid    (test)
   - erubis    (test)
+  - mustache  (test)
+  - erector   (test)
+  - markaby   (test)
+  - builder   (test)
 

data/lib/malt/render.rb

@@ -1,32 +1,54 @@
+require 'malt/kernel'
 require 'malt/config'
 require 'malt/core_ext'
 
 module Malt
 
+  extend Kernel
+
   # 
   def self.config
     @config ||= Config.new
   end
 
+  # Render template.
+  #
+  # parameters[:file]   - File name of template. Used to read text.
+  # parameters[:text]   - Text of template document.
+  # parameters[:type]   - File type/extension used to look up engine.
+  # parameters[:pass]   - If not a supported type return text rather than raise an error.
+  # parameters[:engine] - Force the use of a this specific engine.
+  # parameters[:to]     - Format to convert to (usual default is `html`).
   #
   def self.render(parameters={}, &body)
     type   = parameters[:type]
     file   = parameters[:file]
+    text   = parameters[:text]
     engine = parameters[:engine]
 
-    type   = file_type(file) unless type
+    type   = file_type(file, type)
     text   = file_read(file) unless text
-    engine = engine(type, engine).new
 
-    parameters[:type] = type
-    parameters[:text] = text
+    engine_class = engine(type, engine)
+
+    if engine_class
+      parameters[:type] = type
+      parameters[:text] = text
 
-    engine.render(parameters, &body)
+      engine = engine_class.new
+      engine.render(parameters, &body)
+    else
+      if parameters[:pass]
+        text
+      else
+        raise "no engine to handle `#{type}' format"      
+      end
+    end
   end
 
   #
   def self.engine(type, engine=nil)
-    type   = type.to_sym
+    type   = ext_to_type(type)
     engine = engine || config.engine[type]
     case engine
     when Class
@@ -39,14 +61,14 @@ module Malt
       if Engine.registry[type]
         Engine.registry[type].first
       else
-        raise "no engine to handle `#{type}' format"
+        nil
       end
     end
   end
 
   #
-  def self.file_type(file)
-    ext = File.extname(file)
+  def self.file_type(file, type=nil)
+    ext = type || File.extname(file)
     ext = ext.to_s.downcase
     if ext.empty?
       nil
@@ -57,9 +79,15 @@ module Malt
     end
   end
 
+  #
+  #def self.ext_type(type)
+  #  type.to_s.downcase.sub(/^\./,'').to_sym
+  #end
+
   # TODO: Handle File objects and URLs.
   def self.file_read(file)
     File.read(file)
   end
 
 end
+