Changeset 27120 for lang/perl/Data-XMind

Timestamp:

12/20/08 15:56:50 (4 years ago)

Author:

woremacx

Message:

support sheet, add tests

Location:

lang/perl/Data-XMind/trunk

Files:

• eg/generate-xmind-from-text.pl (added)
• lib/Data/XMind.pm (modified) (4 diffs)
• lib/Data/XMind/Content.pm (modified) (2 diffs)
• lib/Data/XMind/Sheet.pm (added)
• t/10_simple.t (added)
• t/TestDataXMind.pm (added)

lang/perl/Data-XMind/trunk/lib/Data/XMind.pm

@@ -9 +9 @@
 use Archive::Zip qw( :ERROR_CODES :CONSTANTS );
 
+use Data::XMind::Sheet;
 use Data::XMind::Content;
 use Data::XMind::Util qw(newid);
@@ -22 +23 @@
     $self->{id} ||= newid;
 
-    my $content = Data::XMind::Content->new(
-        title => $self->{title},
-    );
-    $content->{parent} = $self;
-
-    $self->{depth} = 0;
-    $self->{content} = $content;
-    $self->{last_content} = $self->{content};
-    $self->{parent} = undef;
+    unless ($self->{sheets}) {
+        $self->new_sheet;
+    }
 
     $self;
 }
 
-sub title {
+sub new_sheet {
     my $self = shift;
 
-    if (scalar(@_)) {
-        $self->{content}->{title} = shift;
+    my $sheet = Data::XMind::Sheet->new;
+    if ($_[0]) {
+        $sheet->title($_[0]);
     }
 
-    $self->{content}->{title};
+    push(@{ $self->{sheets} }, $sheet);
 }
 
-sub add {
-    my $self = shift;
-    my $opt = ref($_[0]) ? $_[0] : {@_};
 
-    die unless defined($opt->{depth}) && $opt->{depth} > 0;
-    die unless defined($opt->{title}) && length($opt->{title});
+sub last_sheet { shift->{sheets}->[-1] };
 
-    my $opt_depth = $opt->{depth};
-    my $last_depth = $self->{last_content}->{depth};
+# proxy
+sub title    { shift->last_sheet->title(@_); }
+sub add      { shift->last_sheet->add(@_); }
+sub add_note { shift->last_sheet->add_note(@_); }
 
-    die if ($opt_depth == 0);
-
-    my $content = Data::XMind::Content->new(
-        title => $opt->{title},
-    );
-
-    if ($opt_depth < $last_depth) {
-        my $done = 0;
-        my $last_content = $self->{last_content};
-        my $parent;
-        while ($parent = $last_content->{parent}) {
-            if ($opt_depth == $parent->{depth}) {
-                $self->{last_content} = $parent;
-                $last_depth = $self->{last_content}->{depth};
-                $done++;
-                last;
-            }
-            $last_content = $parent;
-        }
-        die unless $done;
-    }
-
-    if ($opt_depth == $last_depth) {
-        $self->{last_content} = $self->{last_content}->{parent}->add($content);
-    }
-    elsif ($opt_depth == ($last_depth + 1)) {
-        $self->{last_content} = $self->{last_content}->add($content);
-    }
-
-    $self->{last_content};
-}
-
-sub add_note {
-    my $self = shift;
-    my $str = shift;
-
-    my $content = $self->{last_content};
-    $content->add_note($str);
-}
 
 my $template = << '__TMPL__';
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <xmap-content xmlns="urn:xmind:xmap:xmlns:content:2.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xlink="http://www.w3.org/1999/xlink" version="2.0">
-<sheet id="[% id %]">
-<title>[% title %]</title>
-[%- content -%]
-</sheet>
+[% FOR sheet IN sheets %]
+[% sheet %]
+[% END %]
 </xmap-content>
 __TMPL__
@@ -108 +62 @@
     my $self = shift;
 
+    my @sheets;
+    for my $sheet (@{ $self->{sheets} }) {
+        push @sheets, $sheet->as_xml,
+    }
+
     my $vars = {
-        id => $self->{id},
-        title => $self->{title},
-        content => $self->{content}->as_xml,
+        sheets => \@sheets,
     };
 
@@ -140 +97 @@
     unless ($zip->writeToFileNamed($name) == AZ_OK) {
         die 'write error';
+    }
+}
+
+sub _parse_private {
+    my ($self, $text) = @_;
+
+    my @lines = split(/\r?\n/, $text);
+
+    $self->title(shift(@lines));
+
+    for my $line (@lines) {
+        if ($line =~ /^\#/) {
+            next;
+        }
+        elsif ($line =~ /^\%\s*(.*)$/) {
+            $self->new_sheet($1);
+        }
+        elsif ($line =~ /^(\*+)\s*(.*)$/) {
+            $self->add(
+                depth => length($1),
+                title => $2,
+            );
+        }
+        elsif ($line =~ /^\!\s+([^=]+)=\"(.*?)\"$/) {
+            $self->{sheets}->[-1]->{last_content}->{attr}->{$1} = $2;
+        }
+        else {
+            $self->add_note($line);
+        }
     }
 }

lang/perl/Data-XMind/trunk/lib/Data/XMind/Content.pm

@@ -54 +54 @@
 
 my $template = << '__TMPL__';
-  <topic id="[% id %]">
+  <topic id="[% id %]"[% attr %]>
     <title>[% title %]</title>
 
@@ -82 +82 @@
     my $self = shift;
 
+    my $attr;
+    if (defined($self->{attr})) {
+        while (my ($key, $val) = each(%{ $self->{attr} })) {
+            $attr .= sprintf(q{ %s="%s"}, $key, $val);
+        }
+    }
+
     my $vars = {
         id => $self->{id},
         title => $self->{title},
+        ($attr ? (attr => $attr) : ()),
         (scalar(@{ $self->{notes} }) ? (notes => $self->{notes}) : ()),
     };