deplate 0.7.3 → 0.8

data/lib/deplate/template.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     10-Aug-2004.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.445
+# @Last Change: 28-Mai-2006.
+# @Revision:    0.465
 # 
 # Description:
 # 
@@ -25,6 +25,7 @@ end
 
 
 class Deplate::Command::Matter < Deplate::Command
+    set_formatter :fill_in_template
     def process
         id = @args["id"] || @accum[0]
         @elt = template_get_content(id)
@@ -38,28 +39,25 @@ class Deplate::Command::Matter < Deplate::Command
 end
 
 class Deplate::Command::PREMATTER < Deplate::Command::Matter
-    @formatter = :fill_in_template
     def template_get_content(arg)
         @deplate.options.template_manager.template_get_content(:pre, arg)
     end
 end
 
 class Deplate::Command::POSTMATTER < Deplate::Command::Matter
-    @formatter = :fill_in_template
     def template_get_content(arg)
         @deplate.options.template_manager.template_get_content(:post, arg)
     end
 end
 
 class Deplate::Command::BODY < Deplate::Command::Matter
-    @formatter = :fill_in_template
     def template_get_content(arg)
         @deplate.options.template_manager.template_get_content(:body, arg)
     end
 end
 
 class Deplate::Regions::Mingle < Deplate::Region
-    @line_cont = false
+    set_line_cont false
 
     def finish
         finish_accum
@@ -100,7 +98,7 @@ end
 class Deplate::Template
     attr_reader :mingled
 
-    @@templateKeys         = ["pre", "body", "post", "doc", "ARG", "arg", "clip"]
+    @@templateKeys         = ['pre', 'body', 'post', 'doc', 'ARG', 'arg', 'clip']
     @@deplate_for_template = nil
     @@deplate_options = {
         :formatter          => Deplate::Formatter::Template,
@@ -113,28 +111,30 @@ class Deplate::Template
             Deplate::Element::Command, 
             Deplate::Element::Whitespace,
         ],
+
         :commands  => {
-            "INC"        => Deplate::Command::INC,
-            "INCLUDE"    => Deplate::Command::INC,
-            "GET"        => Deplate::Command::GET,
-            "ARG"        => Deplate::Command::ARG,
-            "XARG"       => Deplate::Command::XARG,
-            "VAL"        => Deplate::Command::ARG,
-            "XVAL"       => Deplate::Command::XARG,
-            "DOC"        => Deplate::Command::DOC,
-            "VAR"        => Deplate::Command::DOC,
-            "OPT"        => Deplate::Command::OPT,
-            "PREMATTER"  => Deplate::Command::PREMATTER,
-            "POSTMATTER" => Deplate::Command::POSTMATTER,
-            "BODY"       => Deplate::Command::BODY,
+            'INC'        => Deplate::Command::INC,
+            'INCLUDE'    => Deplate::Command::INC,
+            'GET'        => Deplate::Command::GET,
+            'ARG'        => Deplate::Command::ARG,
+            'XARG'       => Deplate::Command::XARG,
+            'VAL'        => Deplate::Command::ARG,
+            'XVAL'       => Deplate::Command::XARG,
+            'DOC'        => Deplate::Command::VAR,
+            'VAR'        => Deplate::Command::VAR,
+            'OPT'        => Deplate::Command::OPT,
+            'PREMATTER'  => Deplate::Command::PREMATTER,
+            'POSTMATTER' => Deplate::Command::POSTMATTER,
+            'BODY'       => Deplate::Command::BODY,
         },
+
         :regions   => {
-            "Foreach" => Deplate::Regions::Foreach,
-            "Mingle"  => Deplate::Regions::Mingle,
-            "Native"  => Deplate::Regions::Native,
-            "Ruby"    => Deplate::Regions::Ruby,
-            "Doc"     => Deplate::Regions::Doc,
-            "Var"     => Deplate::Regions::Doc,
+            'Foreach' => Deplate::Regions::Foreach,
+            'Mingle'  => Deplate::Regions::Mingle,
+            'Native'  => Deplate::Regions::Native,
+            'Ruby'    => Deplate::Regions::Ruby,
+            'Doc'     => Deplate::Regions::Doc,
+            'Var'     => Deplate::Regions::Doc,
         },
         
         :particles => [
@@ -142,17 +142,19 @@ class Deplate::Template
             Deplate::Particle::Macro,
             Deplate::Particle::Whitespace,
         ],
+
         :macros    => {
-            "get"  => Deplate::Macro::Clip,
-            "clip" => Deplate::Macro::Clip,
-            "opt"  => Deplate::Macro::Opt,
-            "arg"  => Deplate::Macro::Arg,
-            "xarg" => Deplate::Macro::XArg,
-            "val"  => Deplate::Macro::Arg,
-            "xval" => Deplate::Macro::XArg,
-            "doc"  => Deplate::Macro::Doc,
-            "var"  => Deplate::Macro::Doc,
-            "ruby" => Deplate::Macro::Ruby,
+            'get'  => Deplate::Macro::Clip,
+            'clip' => Deplate::Macro::Clip,
+            'opt'  => Deplate::Macro::Opt,
+            'arg'  => Deplate::Macro::Arg,
+            'xarg' => Deplate::Macro::XArg,
+            'val'  => Deplate::Macro::Arg,
+            'xval' => Deplate::Macro::XArg,
+            'var'  => Deplate::Macro::Var,
+            'doc'  => Deplate::Macro::Var,
+            'ruby' => Deplate::Macro::Ruby,
+            'msg'  => Deplate::Macro::Msg,
         },
     }
    
@@ -160,6 +162,23 @@ class Deplate::Template
         def deplate_options
             @@deplate_options
         end
+
+        def copy(deplate, src, dest, invoker=nil)
+            tpl = File.open(src) {|io| io.read}
+            src = invoker ? invoker.source : nil
+            tpl = Deplate::Template.new(:template  => tpl,
+                                        :source => src,
+                                        :container => self)
+            args = {}
+            if block_given?
+                yield(args)
+            end
+            Deplate::Define.let_variables(deplate, args) do
+                tpl = tpl.fill_in(deplate, :source => src)
+            end
+            tpl = tpl.join("\n")
+            File.open(dest, 'w') {|io| io.puts(tpl)}
+        end
     end
     
     attr_reader :template, :pre, :body, :post
@@ -181,14 +200,19 @@ class Deplate::Template
         file = args[:file]
         if file
             if File.exists?(file)
-                File.open(file) do |io|
-                    @template = io.read
+                begin
+                    File.open(file) do |io|
+                        @template = io.read
+                    end
+                rescue Exception => e
+                    Deplate::DeplateForTemplates.log([e.message], :error, @source)
+                    @template = ''
                 end
             else
-                Deplate::DeplateForTemplates.log(["Template not found", file], :error, @source)
+                Deplate::DeplateForTemplates.log(['Template not found', file], :error, @source)
             end
         else
-            Deplate::DeplateForTemplates.log("No template defined", :error, @source)
+            Deplate::DeplateForTemplates.log('No template defined', :error, @source)
         end
     end
     
@@ -205,7 +229,7 @@ class Deplate::Template
             :post => [],
         }
         @keep_whitespace = args.has_key?(:keep_whitespace) ? args[:keep_whitespace] : true
-        if deplate.variables["template_version"] == "1"
+        if deplate.variables['template_version'] == '1'
             fill_in_1
         else
             fill_in_2
@@ -216,7 +240,7 @@ class Deplate::Template
         if @@deplate_for_template
             d = @@deplate_for_template
         else
-            d = @@deplate_for_template = Deplate::DeplateForTemplates.new("", @@deplate_options)
+            d = @@deplate_for_template = Deplate::DeplateForTemplates.new('', @@deplate_options)
         end
         keep_whitespace  = d.options.keep_whitespace
         master           = d.options.master
@@ -224,7 +248,7 @@ class Deplate::Template
         begin
             d.reset
             d.variables    = @deplate.variables.dup
-            d.doc_services = @deplate.doc_services
+            # d.doc_services = @deplate.doc_services
             d.set_all_clips(@deplate.get_unprocessed_clips)
             d.options.template_manager    = self
             d.options.keep_whitespace     = @keep_whitespace

data/lib/deplate/templates/html-tabbar-right-pcomments.php

@@ -0,0 +1,22 @@
+#Mingle type=pre slot=css:
+<!--[if IE]>
+<link rel="stylesheet" type="text/css" href="tabbar-right-ie.css" media="screen">
+<![endif]-->
+#End
+#PREMATTER
+
+<div id="tabFrame">
+    <div id="tabBodyFrame">
+        <div id="tabBody">
+            <img width="600px" height="1px" src="spacer.png" alt="" />
+            #BODY: -navbar_top -navbar_bottom
+        </div>
+        #ARG: pageComment()
+        #POSTMATTER: html_pageicons_beg..html_pageicons_end
+    </div>
+    <div id="tabBar">
+        #ARG: tabBarRight(spacer=spacer.png depth=2 depthInactive=1)
+    </div>
+</div>
+
+#POSTMATTER

data/lib/deplate/templates/html-tabbar-right-step.html

@@ -0,0 +1,24 @@
+#Mingle type=pre slot=css:
+<!--[if IE]>
+<link rel="stylesheet" type="text/css" href="tabbar-right-ie.css" media="screen">
+<![endif]-->
+#End
+#PREMATTER
+
+<div id="tabFrame">
+    <div id="tabBodyFrame">
+        <div id="tabBody">
+            <img width="600px" height="1px" src="spacer.png" alt="" />
+            #BODY: -navbar_top -navbar_bottom
+        </div>
+        #POSTMATTER: html_pageicons_beg..html_pageicons_end
+    </div>
+    <div id="tabBar">
+        #ARG: tabBarRight(spacer=spacer.png depth=2 depthInactive=1)
+    </div>
+    #ARG: navigationKeys()
+    #ARG: stepwiseDisplay()
+    #ARG: navigationHandleKeys()
+</div>
+
+#POSTMATTER

data/lib/deplate/templates/html-tabbar-right.html

@@ -1,8 +1,6 @@
 #Mingle type=pre slot=css:
 <!--[if IE]>
-<style type="text/css">
-    <link rel="stylesheet" type="text/css" href="tabbar-right-ie.css" media="screen">
-</style>
+<link rel="stylesheet" type="text/css" href="tabbar-right-ie.css" media="screen">
 <![endif]-->
 #End
 #PREMATTER
@@ -16,7 +14,7 @@
         #POSTMATTER: html_pageicons_beg..html_pageicons_end
     </div>
     <div id="tabBar">
-        #ARG: tabBarRight(progressBar! nextKey! spacer=spacer.png depth=2 depthInactive=1)
+        #ARG: tabBarRight(spacer=spacer.png depth=2 depthInactive=1)
     </div>
 </div>
 

data/lib/deplate/templates/html-tabbar-top.html

@@ -1,13 +1,4 @@
 #Mingle type=pre slot=css:
-<style type="text/css">
-    <!--
-    @media screen {
-        body {
-            background-color: #e9e9ff;
-        }
-    }
-    -->
-</style>
 <!--[if IE]>
 <style type="text/css">
     @media screen {

data/lib/deplate/variables.rb

@@ -0,0 +1,127 @@
+# variables.rb
+# @Author:      Thomas Link (samul AT web de)
+# @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
+# @Created:     31-Dez-2005.
+# @Last Change: 18-Apr-2006.
+# @Revision:    0.37
+
+class Deplate::Variables < Hash
+    attr_accessor :deplate
+    
+    def initialize(deplate=nil)
+        super()
+        @deplate = deplate
+    end
+  
+    def log(*args)
+        Deplate::Core.log(*args)
+    end
+
+    def update(hash)
+        for key, val in hash
+            self[key] = val
+        end
+    end
+    
+    def []=(name, value)
+        if name.kind_of?(String) and (m = /^(\S+)\[(\S+)?\]$/.match(name))
+            key   = m[1]
+            field = m[2]
+            var   = self[key]
+            if !var
+                if !field
+                    self[key] = [value]
+                elsif field =~ /^[0-9]$/
+                    self[key] = []
+                    self[key][field.to_i] = value
+                else
+                    self[key] = {field => value}
+                end
+            elsif var.kind_of?(Struct) || var.kind_of?(OpenStruct)
+                var.send("#{field}=", value)
+            elsif var.kind_of?(Hash)
+                var[field] = value
+            elsif var.kind_of?(Array)
+                if !field
+                    var << value
+                elsif field =~ /^[0-9]+$/
+                    field = field.to_i
+                    var[field] = value
+                else
+                    Deplate::Core.log(["Wrong index", field, name, var.class], :error)
+                end
+            elsif var
+                Deplate::Core.log(["Doc variable has wrong type", key, var.class], :error)
+            end
+        else
+            super
+        end
+    end
+    
+    def [](name)
+        begin
+            if !name.kind_of?(String) or keys.include?(name)
+                return super
+            # elsif name =~ /^no(\S+)$/ and (keys.include?($1) or keys.include?(name))
+            #     return !super($1)
+            elsif name =~ /^\S+\(.*?\)$/
+                m = /^(\S+)\((.*?)?\)$/.match(name)
+                if m
+                    method = m[1]
+                    args   = m[2]
+                    args, text = @deplate.input.parse_args(args, nil, false)
+                    rv = @deplate.formatter.invoke_service(method, args, text)
+                    return rv
+                else
+                    Deplate::Core.log(['Malformed variable name', name], :error)
+                end
+            elsif name =~ /^:(\S+)$/
+                n = $1
+                if @deplate.is_allowed?(':', :logger => self)
+                    return @deplate.options.send(n)
+                end
+            elsif (m = /^(\S+)\[(\S+)\]$/.match(name))
+                key   = m[1]
+                field = m[2]
+                val   = self[key]
+                return extract(val, key, field)
+            elsif (m = /^(\S+)\.(\S+)$/.match(name))
+                if @deplate.is_allowed?('.', :logger => self)
+                    key  = m[1]
+                    meth = m[2]
+                    val  = self[key]
+                    begin
+                        return val.send(meth)
+                    rescue Exception => e
+                        log(['Invoking method failed', meth, val.class], :error)
+                    end
+                else
+                    log(['No permission', name], :anyway)
+                end
+            end
+        rescue Exception => e
+            Deplate::Core.log(['Retrieving doc variable failed', name, e], :error)
+        end
+        return nil
+    end
+
+    def extract(val, key, field)
+        if val.nil?
+            Deplate::Core.log(['Unknown variable', key], :error)
+        elsif val.kind_of?(Struct) || val.kind_of?(OpenStruct)
+            return val.send(field)
+        elsif val.kind_of?(Hash)
+            return val[field]
+        elsif val.kind_of?(Array)
+            if field =~ /^[0-9]+$/
+                field = field.to_i
+                return val[field]
+            else
+                Deplate::Core.log(['Wrong index', field, name, val.class], :error)
+            end
+        else
+            Deplate::Core.log(['Variable has wrong type', key, val.class], :warning)
+        end
+    end
+end
+

data/lib/deplate/wiki-markup.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     10-M�r-2005.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.221
+# @Last Change: 30-Mrz-2006.
+# @Revision:    0.260
 #
 # = Description
 # Various elements for defining input filters
@@ -12,48 +12,116 @@
 # = TODO
 # = CHANGES
 
+require "deplate/abstract-class"
+
 module Deplate::Input::Wiki; end
 
+# Textstyles
+# Italic
 class Deplate::Input::Wiki::ItalicWordSingleUnderscore < Deplate::Particle::Emphasize
-    @rx = /^\b_(\S+?)_\b/
+    set_rx(/^\b_(\S+?)_\b/)
 end
 
-class Deplate::Input::Wiki::BoldWordSingleAsterisk < Deplate::Particle::Emphasize
-    @rx = /^\B\*(\S+?)\*\B/
+class Deplate::Input::Wiki::ItalicDoubleSlash < Deplate::Particle::Emphasize
+    set_rx(/^\b\/\/(\S+?)\/\/\b/)
 end
 
-class Deplate::Input::Wiki::TypewriterWordSinglePlus < Deplate::Particle::Code
-    @rx = /^\B\+(\S+?)\+\B/
+
+# Bold 
+class Deplate::Input::Wiki::Bold < Deplate::Particle::Emphasize
+    def setup
+        @args['style'] = 'bold'
+        update_styles
+        super
+    end
 end
 
-# Treat a reference to an image as included images. Requires subclassing and a 
-# definition of @rx.
-class Deplate::Input::Wiki::AbstractImgUrl < Deplate::HyperLink::Url
-    def get_destination
-        @match[1]
+class Deplate::Input::Wiki::BoldWordSingleAsterisk < Deplate::Input::Wiki::Bold
+    set_rx(/^\B\*(\S+?)\*\B/)
+end
+
+class Deplate::Input::Wiki::BoldDoubleAsterisk < Deplate::Input::Wiki::Bold
+    set_rx(/^\*\*(\S+?)\*\*/)
+end
+
+
+# Superscript
+class Deplate::Input::Wiki::Superscript < Deplate::SimpleParticle
+    set_formatter :format_superscript
+end
+
+class Deplate::Input::Wiki::SuperscriptTagSup < Deplate::Input::Wiki::Superscript
+    set_rx(/^<sup>(.*?)<\/sup>/)
+end
+
+
+# Subscript
+class Deplate::Input::Wiki::Subscript < Deplate::SimpleParticle
+    set_formatter :format_subscript
+end
+
+class Deplate::Input::Wiki::SubscriptTagSub < Deplate::Input::Wiki::Subscript
+    set_rx(/^<sub>(.*?)<\/sub>/)
+end
+
+
+# Strikethrough
+class Deplate::Input::Wiki::StrikeThrough < Deplate::Particle::Emphasize
+    def setup
+        @args['style'] = 'strikethrough'
+        update_styles
+        super
     end
+end
+
+class Deplate::Input::Wiki::StrikethroughTagDeleted < Deplate::Input::Wiki::StrikeThrough
+    set_rx(/^<deleted>(.*?)<\/deleted>/)
+end
+
+
+# Typewriter
+class Deplate::Input::Wiki::TypewriterWordSinglePlus < Deplate::Particle::Code
+    set_rx(/^\B\+(\S+?)\+\B/)
+end
 
-    def get_anchor
-        nil
+module Deplate::Input::Wiki::AbstractImg
+    def image_args
+        {}
     end
     
-    def process
-        @elt = @deplate.formatter.include_image(@dest, @args, true)
+    def image_process
+        args = @args.dup
+        args.update(image_args)
+        @elt = @deplate.formatter.include_image(self, @dest, args, true)
     end
 end
 
+# Treat a reference to an image as included images. Requires subclassing and a 
+# definition of @rx.
+class Deplate::Input::Wiki::ImgUrl < Deplate::HyperLink::Url
+    set_rx(/^((file|https?|mailto|ftps?|www):(\S+?)\.(png|jpg|jpeg|gif|bmp))\b/)
+    include Deplate::Input::Wiki::AbstractImg
+    alias :process :image_process
+end
+
 # Treat non-indented text as paragraph, indented as verbatim.
 class Deplate::Input::Wiki::ParagraphIndentedVerbatim < Deplate::Element::Paragraph
-    @rx = /^([ \t]*)(.+)[ \t]*$/
+    set_rx(/^([ \t]*)(.+)[ \t]*$/)
+    set_formatter nil
+
     def get_text
         @leading_whitespace = @match[1]
         @keep_whitespace    = !@leading_whitespace.empty?
         @match[2]
     end
     
-    def to_be_continued?(line)
-        indent = get_indent(line).size
-        return @level > 0 || indent == 0
+    def to_be_continued?(line, klass, match)
+        if super
+            indent = get_indent(line).size
+            return @level > 0 || indent == 0
+        else
+            return false
+        end
     end
     
     def format_special
@@ -84,34 +152,32 @@ module Deplate::Input::Wiki::ListExtra
     end
 end
 
-class Deplate::Input::Wiki::NumberedNotIndented < Deplate::List::Numbered
+class Deplate::Input::Wiki::OrderedNotIndented < Deplate::List::Ordered
     include Deplate::Input::Wiki::ListExtra
-    @formatter = :format_list
-    @name = "Numbered"
-    @rx   = /^(()([0-9]+\.|[a-zA-Z]\.)[ \t]+)(.+)$/
+    set_rx(/^(()([0-9]+\.|[a-zA-Z]\.)[ \t]+)(.+)$/)
 end
 
 class Deplate::Input::Wiki::ItemizeNotIndented < Deplate::List::Itemize
     include Deplate::Input::Wiki::ListExtra
-    @formatter = :format_list
-    @name = "Itemize"
-    @rx   = /^(()([-*])[ \t]+)(.+)$/
+    set_rx(/^(()([-*])[ \t]+)(.+)$/)
 end
 
 # Requires subclassing & definition of @rx.
 class Deplate::Input::Wiki::AbstractDescription < Deplate::List::Description
     include Deplate::Input::Wiki::ListExtra
-    @formatter = :format_list
-    @name = "Description"
 end
 
+# Heading
 class Deplate::Input::Wiki::HeadingPrefixEqual < Deplate::Element::Heading
-    @formatter = :format_heading
-    @rx = /^(=+)[ \t]+(.*?)$/
+    set_rx(/^(=+)[ \t]+(.*?)$/)
+end
+
+class Deplate::Input::Wiki::HeadingEqual < Deplate::Element::Heading
+    set_rx(/^(=+)[[:blank:]]*(.*?)[[:blank:]]*\1$/)
 end
 
+# Page Break
 class Deplate::Input::Wiki::Break3Hyphens < Deplate::Element::Break
-    @formatter = :format_break
-    @rx = /^\s*-{3,}\s*$/
+    set_rx(/^\s*-{3,}\s*$/)
 end