deplate 0.7.3 → 0.8

data/lib/deplate/common.rb

@@ -3,8 +3,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     02-Aug-2004.
-# @Last Change: 01-Nov-2005.
-# @Revision:    0.636
+# @Last Change: 05-Jun-2006.
+# @Revision:    0.805
 # 
 # = Description:
 # Misc classes
@@ -13,18 +13,20 @@
 
 module Deplate::CommonGround
     #### pointer to the master deplater
-    attr_reader   :deplate
+    attr_accessor :deplate
     attr_writer   :container
+    attr_accessor :indentation
+    attr_accessor :indentation_level
     attr_accessor :args
     attr_accessor :styles
     attr_writer   :doc_type
-    attr_accessor :doc_slot
-    attr_reader   :label_mode
+    attr_writer   :doc_slot
     attr_accessor :keep_whitespace
     attr_accessor :match
     attr_accessor :level_as_string
     attr_accessor :level_as_list
     attr_accessor :level
+    attr_reader :prototype
 
     #### the element's parsed value
     attr_accessor :elt
@@ -33,18 +35,18 @@ module Deplate::CommonGround
     attr_accessor :prologue
     attr_accessor :epilogue
     # attr_accessor :expected
- 
+    
     def initialize(deplate, args={})
         @deplate         = deplate
-        @level_as_string = args[:level_as_string] || deplate.get_current_heading
+        # @args          = {:class => self.class, :self => self, :deplate => deplate}
+        @args            = args[:args] || {:self => self, :deplate => deplate}
+        self.level_as_string = args[:level_as_string] || deplate.get_current_heading
         @level_as_list   = args[:level_as_string] || deplate.current_heading.dup
         @elt             = args[:elt]      || nil
         @text            = args[:text]     || nil
         @styles          = args[:styles]   || []
         @source          = args[:source]   || nil
         @expected        = args[:expected] || nil
-        # @args          = {:class => self.class, :self => self, :deplate => deplate}
-        @args            = args[:args] || {:self => self, :deplate => deplate}
         @container       = args[:container]       || nil
         @prologue        = args[:prologue]        || []
         @epilogue        = args[:epilogue]        || []
@@ -52,7 +54,6 @@ module Deplate::CommonGround
         @keep_whitespace = args[:keep_whitespace] || false
         @doc_slot        = args[:doc_slot]        || nil
         @doc_type        = args[:doc_type]        || nil
-        @label_mode      = args[:label_mode]      || nil
     end
  
     def container
@@ -69,35 +70,41 @@ module Deplate::CommonGround
     end
 
     def update_styles(styles=nil)
-        styles = @args["style"]
-        if styles
-            @styles += styles.split(/[ ,;]/)
+        styles ||= @args['style']
+        case styles
+        when String
+            styles = styles.split(/[ ,;]/)
+        end
+        if styles and !styles.empty?
+            @styles += styles
             @styles.uniq!
         end
     end
+    alias :push_styles :update_styles
 
     def update_id(opts={})
         my_id = @args['id']
-        if my_id != @args[:id]
+        if my_id and my_id != @args[:id]
             aid = @args[:id]
             @label << aid if aid
             @args[:id] = my_id
             if block_given?
-                yield
+                yield(my_id)
             end
         end
     end
    
-    def get_explicit_id
-        @args[:id] || @args['id']
+    def get_explicit_id(args=@args)
+        args[:id] || args['id']
     end
+    module_function :get_explicit_id
     
     def get_id
         # get_explicit_id || @label[0]
         get_explicit_id
     end
     
-    def styles_as_string(sep=" ")
+    def styles_as_string(sep=' ')
         if @styles.empty?
             nil
         else
@@ -117,18 +124,18 @@ module Deplate::CommonGround
         if kind_of?(Deplate::Regions::Inlatex)
             return
         elsif expected
-            if defined?(@prototype)
-                cc = element_or_particle(@prototype)
-                cl = @prototype.class
+            if defined?(invoker.prototype)
+                cc = element_or_particle(invoker.prototype || self)
+                cl = invoker.prototype.class
             else
                 cc = expected
                 cl = self.class
             end
             unless kind_of?(expected) or expected != cc
-                invoker.log(["Expected something of a different class", expected, cl, invoker.class], :error)
+                invoker.log(['Expected something of a different class', expected, cl, invoker.class], :error)
             end
         # else
-            # invoker.log("Neither element nor particle", :anyway)
+            # invoker.log('Neither element nor particle', :anyway)
         end
     end
     
@@ -137,18 +144,18 @@ module Deplate::CommonGround
             obj = obj.elt.first
         end
         for c in [Deplate::Element, Deplate::Particle]
-            if obj.kind_of?(c)
+            if obj == c or obj === c or obj.kind_of?(c)
                 return c
             end
         end
-        log(["Neither block element nor inline text particle", self.class], :error)
+        log(['Neither block element nor inline text particle', self.class, obj], :error)
         return nil
     end
     
     def doc_slot(default=:body, overwrite=false)
         if (overwrite and default) or !@doc_slot
-            if @args["slot"]
-                @doc_slot = @args["slot"]
+            if @args['slot']
+                @doc_slot = @args['slot']
             else
                 @doc_slot = default
             end
@@ -158,7 +165,7 @@ module Deplate::CommonGround
    
     def doc_type(default=:body, overwrite=false)
         if (overwrite and default) or !@doc_type
-            @doc_type = @args["type"] || default
+            @doc_type = @args['type'] || default
         end
         return @doc_type
     end
@@ -176,7 +183,7 @@ module Deplate::CommonGround
     end
 
     def warn_unpexpected(expected, got)
-        msg = "Expected %s but got %s" % [expected, got]
+        msg = 'Expected %s but got %s' % [expected, got]
         if @invoker
             @invoker.log(msg, :error)
         else
@@ -189,7 +196,7 @@ module Deplate::CommonGround
     end
 
     def plain_caption?
-        @deplate.variables["headings"] == "plain" or @args["plain"]
+        @deplate.variables['headings'] == 'plain' or @args['plain']
     end
 
     def output_file_name(args={})
@@ -201,7 +208,7 @@ module Deplate::CommonGround
         if level_as_string
             rv = @deplate.file_name_by_level(level_as_string)
         elsif label
-            rv = @deplate.get_filename_for_label(self, label) || ""
+            rv = @deplate.get_filename_for_label(self, label) || ''
         else
             if obj.kind_of?(Deplate::BaseParticle) or obj.kind_of?(Deplate::BaseParticle)
                 obj = obj.container
@@ -214,16 +221,21 @@ module Deplate::CommonGround
         if rv
             if basename
                 return File.basename(rv)
-            elsif relative == ""
+            elsif relative == ''
                 return File.basename(rv)
             elsif relative
-                dir = File.dirname(relative.output_file_name)
-                return @deplate.relative_path(rv, dir)
+                out = relative.output_file_name
+                if out == rv
+                    return ''
+                else
+                    dir = File.dirname(out)
+                    return @deplate.relative_path(rv, dir)
+                end
             else
                 return rv
             end
         else
-            log(["Internal error in #output_file_name", obj.class.name], :error)
+            log(['Internal error in #output_file_name', obj.class.name], :error)
             raise Exception
         end
     end
@@ -239,8 +251,34 @@ module Deplate::CommonGround
         location = [output_file_name(args)]
         id = get_id
         location << id if id
-        location.join("#")
+        location.join('#')
+    end
+
+    def post_process_text(text, args=@args)
+        sub  = args['sub'] || args['s']
+        if sub
+            sep = sub[0..0]
+            rx, rp = sub[1..-1].split(Regexp.new(Regexp.quote(sep)))
+            text.gsub!(Regexp.new(rx), rp)
+        end
+        tr = args['tr']
+        if tr
+            sep = tr[0..0]
+            rx, rp = tr[1..-1].split(Regexp.new(Regexp.quote(sep)))
+            text.tr!(rx, rp)
+        end
+        if args['upcase']
+            text.upcase!
+        end
+        if args['downcase']
+            text.downcase!
+        end
+        if args['capitalize']
+            text.capitalize!
+        end
+        text
     end
+    module_function :post_process_text
 end
 
 
@@ -264,10 +302,10 @@ module Deplate::CommonParticle
         return @deplate.formatter.format_particle(agent, *args)
     end
 
-    def format_as_string(object)
+    def format_as_string
         # <+TBD+>: Doesn't work because the particles don't give info 
         # about their formatting method
-        # @deplate.formatter.format_particle_as_string(object)
+        # @deplate.formatter.format_particle_as_string(self)
     end
 end
 
@@ -277,11 +315,11 @@ module Deplate::CommonElement
     #### accumulated lines
     attr_accessor :accum
 
-    def format_as_string(object)
-        klass = object.class
+    def format_as_string
+        klass = self.class
         fm    = klass.formatter
         if fm
-            return @deplate.formatter.format_element_as_string(object, fm)
+            return @deplate.formatter.format_element_as_string(fm, self)
         else
             log(["Don't know how to format an object of this class", klass], :error)
         end
@@ -298,29 +336,151 @@ module Deplate::CommonElement
     end
 
     def update_id(opts={})
-        super {@deplate.add_label(self, get_explicit_id, @level_as_string, :anyway => true)}
+        super do |id|
+            @deplate.add_label(self, get_explicit_id, level_as_string, :anyway => true)
+        end
     end
 end
 
 
-class Deplate::Base
-    include Deplate::CommonGround
+class Deplate::CommonObject
+    @class_attributes = {}
+    @class_meta_attributes = {}
 
     class << self
-        attr_reader :formatter, :formatter2
+        def class_attributes
+            class_attributes_ensure
+            @class_attributes
+        end
+        # protected :class_attributes
+        
+        def class_meta_attributes
+            class_attributes_ensure
+            @class_meta_attributes
+        end
+        
+        def class_attributes=(value)
+            class_attributes_ensure
+            @class_attributes = value
+        end
+        protected :class_attributes=
+ 
+        def class_attributes_ensure
+            @class_attributes ||= {}
+            @class_meta_attributes ||= {}
+        end
+        private :class_attributes_ensure
+        
+        def class_attribute(name, default=nil, args=nil)
+            class_attributes_ensure
+            @class_attributes[name] = default
+            if args
+                @class_meta_attributes ||= {}
+                if @class_meta_attributes[name]
+                    @class_meta_attributes[name].merge!(args)
+                else
+                    @class_meta_attributes[name] = args
+                end
+            end
+        end
 
+        def inherited(subclass)
+            subclass.class_attributes.merge!(@class_attributes.dup) do |key, ov, nv|
+            end
+            subclass.class_meta_attributes.merge!(@class_meta_attributes.dup) do |key, ov, nv|
+            end
+        end
+            
+        def method_missing(method, *args)
+            # p "DBG method_missing: #{method} #{args}"
+            class_attributes_ensure
+            method_s = method.to_s
+            if method_s =~ /=$/
+                method_s = method_s[0..-2]
+                method_y = method_s.intern
+                setter   = true
+            else
+                method_y = method
+                setter   = false
+            end
+            if @class_attributes.keys.include?(method_y)
+                pre = "hook_pre_#{method}"
+                if respond_to?(pre)
+                    send(pre, *args)
+                end
+                if setter
+                    if args.size > 1
+                        raise "Wrong number of arguments: #{method} #{args}"
+                    end
+                    rv = @class_attributes[method_y] = args[0]
+                else
+                    rv = @class_attributes[method_y]
+                end
+                post = "hook_post_#{method}"
+                if respond_to?(post)
+                    send(post, *args)
+                end
+                # p "DBG method_missing => #{rv}"
+                return rv
+            else
+                super
+            end
+        end
+
+        def respond_to?(symbol, *args)
+            class_attributes_ensure
+            super or @class_attributes.keys.include?(symbol)
+        end
+    end
+end
+
+
+class Deplate::Base <  Deplate::CommonObject
+    include Deplate::CommonGround
+
+    class << self
         def set_rx(rx)
-            @rx = rx
+            self.rx = rx
         end
 
+        def def_get(name, arg=nil)
+            mname = "get_#{name}"
+            case arg
+            when Array
+                define_method(mname) do 
+                    for i in arg
+                        rv = @match[i]
+                        return rv if rv
+                    end
+                end
+            when Proc
+                define_method(mname, arg)
+            when Numeric
+                define_method(mname) {@match[arg]}
+            else
+                define_method(mname) {nil}
+            end
+        end
+        
         def set_formatter(formatter, alt=false)
             if alt
-                @formatter2 = formatter
+                self.formatter2 = formatter
             else
-                @formatter = formatter
+                self.formatter = formatter
             end
         end
     end
+
+    def label_mode
+        self.class.label_mode
+    end
+
+    class_attribute :formatter
+    class_attribute :formatter2
+    class_attribute :rx
+    class_attribute :indentation_mode, :auto
+    class_attribute :label_mode
+    class_attribute :volatile, false
 end
 
 
@@ -330,6 +490,7 @@ end
 
 
 class Deplate::BaseParticle < Deplate::Base
+    class_attribute :pre_condition, nil
     include Deplate::CommonParticle
 end
 

data/lib/deplate/converter.rb

@@ -4,8 +4,8 @@
 # @Website:     http://deplate.sf.net/
 # @License:     GPL (see http://www.gnu.org/licenses/gpl.txt)
 # @Created:     14-Okt-2004.
-# @Last Change: 23-Okt-2005.
-# @Revision:    0.125
+# @Last Change: 07-Apr-2006.
+# @Revision:    0.128
 # 
 # = Description
 # = Usage
@@ -56,10 +56,8 @@ class Deplate::Converter
         @deplate = Deplate::Core.new(formatter, :options => @options)
         vars   = args[:variables]
         vars ||= @master.variables.dup if @master
-        @deplate.instance_eval do
-            @variables = vars if vars
-        end
-        @formatter_method = "to_%s" % formatter.gsub(/[^a-zA-Z_]/, "_")
+        @deplate.instance_eval {@variables = vars} if vars
+        @formatter_method = "to_%s" % formatter.gsub(/[^[:alnum:]_]/, "_")
     end
     
     def convert_string(string)
@@ -69,6 +67,14 @@ class Deplate::Converter
     def convert_file(filename)
         @deplate.send(@formatter_method, nil, filename)
     end
+    
+    def method_missing(method, *args, &block)
+        if @deplate.respond_to?(method)
+            @deplate.send(method, *args, &block)
+        else
+            super
+        end
+    end
 end
 
 # if __FILE__ == $0