malt 0.1.0 → 0.1.1

data/History.rdoc

@@ -1,6 +1,20 @@
 = Release History
 
-== 0.1.0 | 2010-06-23
+== 0.1.1 | 2010-09-21
+
+This release simple fixes two bugs. One to handle variant arity
+in format class #render methods. Currently the interface can vary
+dependent on whether they accept interpolation data or not (this will
+probably be uniform in the future). The other fix raises an error if
+no engine exists to handle a given format.
+
+Changes:
+
+* Bug fix to raise error if format not handled by any engine.
+* Bug fix to underlying #render calls to handle variant arities. 
+
+
+== 0.1.0 | 2010-08-23
 
 This if the initial release of Malt. I have no doubt the code base
 still needs some fine-tuning --hence the 0.1 version, but I have put

data/Syckfile

@@ -0,0 +1,80 @@
+---
+box:
+  service: Box
+  types  : [gem]
+  active : true
+
+dnote:
+  service  : DNote
+  loadpath : ~
+  labels   : ~
+  output   : ~
+  format   : ~
+  active   : true
+
+stats:
+  service  : Stats
+  title    : ~
+  loadpath : ~
+  exclude  : ~
+  output   : ~
+  active   : true
+
+rdoc:
+  service : rdoc
+  template: newfish
+  exclude : [Syckfile]
+  output  : site/docs/api
+  active  : true
+
+ridoc:
+  service : RIDoc
+  include : ~
+  exclude : ~
+  output  : ri
+  active  : true
+
+qedoc:
+  service : Custom
+  cycle   : main
+  document: |
+    system 'qedoc -o site/docs/qed -t "Malt Demonstrandum" qed/'
+
+testrb:
+  service  : testrb
+  tests    : ~
+  exclude  : ~
+  loadpath : ~
+  requires : ~
+  live     : false   
+  active   : false
+
+grancher:
+  service: Grancher
+  active: true
+
+gemcutter:
+  active: true
+
+email:
+  service : Email
+  file    : ~
+  subject : ~
+  mailto  : ruby-talk@ruby-lang.org
+#  from    : transfire@gmail.com
+#  server  : <%= ENV['EMAIL_SERVER'] %>
+#  port    : <%= ENV['EMAIL_PORT'] %>
+#  account : <%= ENV['EMAIL_ACCOUNT'] %>
+#  domain  : <%= ENV['EMAIL_DOMAIN'] %>
+#  login   : <%= ENV['EMAIL_LOGIN'] %>
+#  secure  : <%= ENV['EMAIL_SECURE'] %>
+  active  : true
+
+vclog:
+  service  : VClog
+  format   : html   # xml, txt
+  layout   : rel    # gnu
+  typed    : false
+  output   : ~
+  active   : false
+

data/lib/malt.rb

@@ -38,7 +38,7 @@ module Malt
     end
     type = options[:type] || options[:format] || ext
     type = ext_to_type(type)
-    malt_class = registry[type] || Formats::Text
+    malt_class = registry[type] || Format::Text
     #raise "unkown type -- #{type}" unless malt_class
     malt_class.new(options.merge(:text=>text,:file=>file,:type=>type))
   end

data/lib/malt/config.rb

@@ -0,0 +1,12 @@
+module Malt
+
+  class Config
+
+    #
+    def engine
+      @engine ||= {}
+    end
+
+  end
+
+end

data/lib/malt/engines.rb

@@ -1,6 +1,6 @@
 module Malt
   #
-  module Engines
+  module Engine
   end
 end
 

data/lib/malt/engines/abstract.rb

@@ -1,7 +1,7 @@
 require 'malt/kernel'
 
 module Malt
-module Engines
+module Engine
 
   class << self
     include Malt::Kernel
@@ -31,7 +31,7 @@ module Engines
 
     # Register the class to an extension type.
     def self.register(*exts)
-      Engines.register(self, *exts)
+      Engine.register(self, *exts)
     end
 
     # Register and set as the default for given extensions.

data/lib/malt/engines/bluecloth.rb

@@ -1,6 +1,6 @@
 require 'malt/engines/abstract'
 
-module Malt::Engines
+module Malt::Engine
 
   #
   class BlueCloth < Abstract

data/lib/malt/engines/erb.rb

@@ -1,6 +1,6 @@
 require 'malt/engines/abstract'
 
-module Malt::Engines
+module Malt::Engine
 
   # ERB template implementation.
   #

data/lib/malt/engines/erubis.rb

@@ -1,6 +1,6 @@
 require 'malt/engines/abstract'
 
-module Malt::Engines
+module Malt::Engine
 
   # Erubis template implementation.
   #

data/lib/malt/engines/haml.rb

@@ -1,6 +1,6 @@
 require 'malt/engines/abstract'
 
-module Malt::Engines
+module Malt::Engine
 
   # Haml
   #

data/lib/malt/engines/kramdown.rb

@@ -1,6 +1,6 @@
 require 'malt/engines/abstract'
 
-module Malt::Engines
+module Malt::Engine
 
   # Discount Markdown implementation.
   #

data/lib/malt/engines/less.rb

@@ -1,6 +1,6 @@
 require 'malt/engines/abstract'
 
-module Malt::Engines
+module Malt::Engine
 
   # LESS
   #

data/lib/malt/engines/liquid.rb

@@ -1,6 +1,6 @@
 require 'malt/engines/abstract'
 
-module Malt::Engines
+module Malt::Engine
 
   # Liquid
   #

data/lib/malt/engines/radius.rb

@@ -1,6 +1,6 @@
 require 'malt/engines/abstract'
 
-module Malt::Engines
+module Malt::Engine
 
   # Radius Template
   #

data/lib/malt/engines/rdiscount.rb

@@ -2,7 +2,7 @@ require 'malt/engines/abstract'
 require 'malt/formats/rdoc'
 require 'malt/formats/html'
 
-module Malt::Engines
+module Malt::Engine
 
   # Discount Markdown implementation.
   #

data/lib/malt/engines/rdoc.rb

@@ -1,6 +1,6 @@
 require 'malt/engines/abstract'
 
-module Malt::Engines
+module Malt::Engine
 
   # RDoc template.
   #

data/lib/malt/engines/redcloth.rb

@@ -1,6 +1,6 @@
 require 'malt/engines/abstract'
 
-module Malt::Engines
+module Malt::Engine
 
   #
   class RedCloth < Abstract

data/lib/malt/engines/rtals.rb

@@ -1,6 +1,6 @@
 require 'malt/engines/abstract'
 
-module Malt::Engines
+module Malt::Engine
 
   # RTALS
   #

data/lib/malt/engines/ruby.rb

@@ -1,6 +1,6 @@
 require 'malt/engines/abstract'
 
-module Malt::Engines
+module Malt::Engine
 
   # Ruby as a template engine.
   #

data/lib/malt/engines/sass.rb

@@ -1,6 +1,6 @@
 require 'malt/engines/abstract'
 
-module Malt::Engines
+module Malt::Engine
 
   # Sass Malt Engine
   #

data/lib/malt/engines/tenjin.rb

@@ -1,6 +1,6 @@
 require 'malt/engines/abstract'
 
-module Malt::Engines
+module Malt::Engine
 
   # Tenjin
   #

data/lib/malt/formats.rb

@@ -1,6 +1,6 @@
 module Malt
   #
-  module Formats
+  module Format
   end
 end
 

data/lib/malt/formats/abstract.rb

@@ -1,7 +1,7 @@
 require 'malt/kernel'
 
 module Malt
-module Formats
+module Format
 
   # Abstract format class serves as the base
   # class for all other format classes.
@@ -87,7 +87,9 @@ module Formats
     # it is taken to be the database for rendering template variables.
     def render(*type_and_data, &yld)
       type, data = parse_type_and_data(type_and_data)
-      __send__(type || default, data, &yld)
+      meth = method(type || default)
+      #__send__(type || default, data, &yld)
+      meth.arity == 0 ?  meth.call(&yld) :  meth.call(data, &yld)
     end
 
     #
@@ -178,7 +180,7 @@ module Formats
 
   end
 
-  #
+  # TODO: Is this needed anymore, if so where?
   class UnsupportedConversion < Exception
     def initialize(from_type, to_type)
       @from_type = from_type

data/lib/malt/formats/abstract_template.rb

@@ -0,0 +1,45 @@
+require 'malt/formats/abstract'
+
+module Malt
+module Format
+
+  # An AbstractTemplate is a subclass of Abstract. It is used as the base class
+  # for general purpose template formats which can be used to render any other
+  # type of format.
+  class AbstractTemplate < Abstract
+
+    #
+    def to(type, data=nil, &yld)
+      new_class   = Malt.registry[type.to_sym]
+      new_text    = render(type, data, &yld)
+      new_file    = refile(type)
+      new_options = options.merge(:text=>new_text, :file=>new_file, :type=>type)
+      new_class.new(new_options)
+    end
+     
+    #
+    def render(*type_and_data, &yld)
+      type, data = parse_type_and_data(type_and_data)
+      opts = options.merge(:format=>type, :text=>text, :file=>file, :data=>data)
+      render_engine.render(opts, &yld)
+      #opts = options.merge(:format=>type, :text=>text, :file=>file, :data=>data, :engine=>engine)
+      #Malt.render(opts, &yld)
+    end
+
+    # ERB templates can be any type.
+    def method_missing(sym, *args, &yld)
+      if Malt.registry.key?(sym)
+        return render(sym, *args, &yld).to_s
+      elsif md = /^to_/.match(sym.to_s)
+        type = md.post_match.to_sym
+        if Malt.registry.key?(type)
+          return to(type, *args, &yld)
+        end
+      end
+      super(sym, *args, &yld)
+    end
+
+  end
+
+end
+end

data/lib/malt/formats/css.rb

@@ -1,6 +1,6 @@
 require 'malt/formats/abstract'
 
-module Malt::Formats
+module Malt::Format
 
   #
   class CSS < Abstract

data/lib/malt/formats/erb.rb

@@ -3,7 +3,7 @@ require 'malt/formats/html'
 require 'malt/engines/erb'
 require 'malt/engines/erubis'
 
-module Malt::Formats
+module Malt::Format
 
   #
   class Erb < AbstractTemplate
@@ -90,9 +90,9 @@ module Malt::Formats
       @render_engine ||= (
         case engine
         when :erubis
-          Malt::Engines::Erubis.new(options)
+          Malt::Engine::Erubis.new(options)
         else
-          Malt::Engines::Erb.new(options)
+          Malt::Engine::Erb.new(options)
         end
       )
     end

data/lib/malt/formats/haml.rb

@@ -2,7 +2,7 @@ require 'malt/formats/abstract'
 require 'malt/formats/html'
 require 'malt/engines/haml'
 
-module Malt::Formats
+module Malt::Format
 
   # Haml looks like a Markup format, but it turns out to be
   # a template format too.
@@ -44,7 +44,7 @@ module Malt::Formats
 
       #
       def render_engine
-        @render_engine ||= Malt::Engines::Haml.new(options)
+        @render_engine ||= Malt::Engine::Haml.new(options)
       end
 
   end

data/lib/malt/formats/html.rb

@@ -1,6 +1,6 @@
 require 'malt/formats/abstract'
 
-module Malt::Formats
+module Malt::Format
 
   #
   class HTML < Abstract

data/lib/malt/formats/latex.rb

@@ -1,7 +1,7 @@
 require 'malt/formats/abstract'
 require 'malt/formats/pdf'
 
-module Malt::Formats
+module Malt::Format
 
   #
   class Latex < Abstract

data/lib/malt/formats/less.rb

@@ -1,7 +1,7 @@
 require 'malt/formats/abstract'
 require 'malt/engines/less'
 
-module Malt::Formats
+module Malt::Format
 
   # = LESS
   #
@@ -37,7 +37,7 @@ module Malt::Formats
 
     #
     def render_engine
-      @render_engine ||= Malt::Engines::Less.new(options)
+      @render_engine ||= Malt::Engine::Less.new(options)
     end
 
     # LESS default output type is CSS.