r13925@rob-kinyons-powerbook58: rob | 2006-06-02 14:29:05 -0400

[p5sagit/Excel-Template.git] / lib / Excel / Template / Factory.pm

diff --git a/lib/Excel/Template/Factory.pm b/lib/Excel/Template/Factory.pm
index cdb465a..ed87510 100644 (file)
--- a/lib/Excel/Template/Factory.pm
+++ b/lib/Excel/Template/Factory.pm
@@ -2,11 +2,7 @@ package Excel::Template::Factory;
 
 use strict;
 
-BEGIN {
-    use vars qw(%Manifest %isBuildable);
-}
-
-%Manifest = (
+my %Manifest = (
 
 # These are the instantiable nodes
     'IF'        => 'Excel::Template::Container::Conditional',
@@ -16,11 +12,13 @@ BEGIN {
     'WORKBOOK'  => 'Excel::Template::Container::Workbook',
     'WORKSHEET' => 'Excel::Template::Container::Worksheet',
 
-    'BACKREF'   => 'Excel::Template::Element::Backref',
-    'CELL'      => 'Excel::Template::Element::Cell',
-    'FORMULA'   => 'Excel::Template::Element::Formula',
-    'RANGE'     => 'Excel::Template::Element::Range',
-    'VAR'       => 'Excel::Template::Element::Var',
+    'BACKREF'     => 'Excel::Template::Element::Backref',
+    'CELL'        => 'Excel::Template::Element::Cell',
+    'FORMULA'     => 'Excel::Template::Element::Formula',
+    'FREEZEPANES' => 'Excel::Template::Element::FreezePanes',
+    'IMAGE'       => 'Excel::Template::Element::Image',
+    'RANGE'       => 'Excel::Template::Element::Range',
+    'VAR'         => 'Excel::Template::Element::Var',
 
     'FORMAT'    => 'Excel::Template::Container::Format',
 
@@ -34,6 +32,8 @@ BEGIN {
     'SHADOW'    => 'Excel::Template::Container::Shadow',
     'STRIKEOUT' => 'Excel::Template::Container::Strikeout',
 
+    'KEEP_LEADING_ZEROS' => 'Excel::Template::Container::KeepLeadingZeros',
+
 # These are the helper objects
 # They are also in here to make E::T::Factory::isa() work.
     'CONTEXT'    => 'Excel::Template::Context',
@@ -46,93 +46,102 @@ BEGIN {
     'BASE'       => 'Excel::Template::Base',
 );
 
-%isBuildable = map { $_ => 1 } qw(
-    BOLD
-    CELL
-    FORMAT
-    FORMULA
-    IF
-    HIDDEN
-    ITALIC
-    LOCKED
-    OUTLINE
-    LOOP
-    BACKREF
-    RANGE
-    ROW
-    SCOPE
-    SHADOW
-    STRIKEOUT
-    VAR
-    WORKBOOK
-    WORKSHEET
+my %isBuildable = map { $_ => ~~1 } qw(
+    WORKBOOK WORKSHEET
+    FORMAT BOLD HIDDEN ITALIC LOCKED OUTLINE SHADOW STRIKEOUT
+    IF ROW LOOP SCOPE KEEP_LEADING_ZEROS
+    CELL FORMULA FREEZEPANES IMAGE
+    VAR BACKREF RANGE
 );
 
-sub register
 {
-    my %params = @_;
-
-    my @param_names = qw(name class isa);
-    for (@param_names)
+    my %Loaded;
+    sub _load_class
     {
-        unless ($params{$_})
+        my $self = shift;
+        my ($class) = @_;
+
+        unless ( exists $Loaded{$class} )
         {
-            warn "$_ was not supplied to register()\n" if $^W;
-            return 0;
+            (my $filename = $class) =~ s!::!/!g;
+            eval {
+                require "$filename.pm";
+            }; if ($@) {
+                die "Cannot find or compile PM file for '$class' ($filename)\n";
+            }
+
+            $Loaded{$class} = ~~1;
         }
-    }
 
-    my $name = uc $params{name};
-    if (exists $Manifest{$name})
-    {
-        warn "$params{name} already exists in the manifest.\n" if $^W;
-        return 0;
+        return ~~1;
     }
+}
 
-    my $isa = uc $params{isa};
-    unless (exists $Manifest{$isa})
+{
+    my @param_names = qw(name class isa);
+    sub register
     {
-        warn "$params{isa} does not exist in the manifest.\n" if $^W;
-        return 0;
-    }
+        my $self = shift;
+        my %params = @_;
 
-    $Manifest{$name} = $params{class};
-    $isBuildable{$name} = 1;
+        for (@param_names)
+        {
+            unless ($params{$_})
+            {
+                warn "$_ was not supplied to register()\n" if $^W;
+                return;
+            }
+        }
 
-    {
-        no strict 'refs';
-        unshift @{"$params{class}::ISA"}, $Manifest{$isa};
-    }
+        my $name = uc $params{name};
+        if (exists $Manifest{$name})
+        {
+            warn "$params{name} already exists in the manifest.\n" if $^W;
+            return;
+        }
+
+        my $isa = uc $params{isa};
+        unless (exists $Manifest{$isa})
+        {
+            warn "$params{isa} does not exist in the manifest.\n" if $^W;
+            return;
+        }
+
+        {
+            no strict 'refs';
+            unshift @{"$params{class}::ISA"}, $Manifest{$isa};
+        }
+
+        $self->_load_class( $Manifest{$isa} );
+        $self->_load_class( $params{class} );
+
+        $Manifest{$name} = $params{class};
+        $isBuildable{$name} = ~~1;
 
-    return 1;
+        return ~~1;
+    }
 }
 
 sub _create
 {
-    my $class = shift;
+    my $self = shift;
     my $name = uc shift;
 
     return unless exists $Manifest{$name};
 
-    (my $filename = $Manifest{$name}) =~ s!::!/!g;
- 
-    eval {
-        require "$filename.pm";
-    }; if ($@) {
-        die "Cannot find or compile PM file for '$name' ($filename)\n";
-    }
+    $self->_load_class( $Manifest{$name} );
  
     return $Manifest{$name}->new(@_);
 }
 
 sub _create_node
 {
-    my $class = shift;
+    my $self = shift;
     my $name = uc shift;
 
     return unless exists $isBuildable{$name};
 
-    return $class->_create($name, @_);
+    return $self->_create($name, @_);
 }
 
 sub isa