/[suikacvs]/test/cvs
Suika

Diff of /test/cvs

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.20 by wakaba, Sat May 25 09:53:24 2002 UTC revision 1.26 by wakaba, Sun Jun 16 10:45:54 2002 UTC
# Line 30  push @ISA, qw(Message::Field::Structured Line 30  push @ISA, qw(Message::Field::Structured
30      -_HASH_NAME => 'value',      -_HASH_NAME => 'value',
31      -_METHODS   => [qw|field field_exist field_type add replace count delete subject id is|],      -_METHODS   => [qw|field field_exist field_type add replace count delete subject id is|],
32      -_MEMBERS   => [qw|value|],      -_MEMBERS   => [qw|value|],
     -M_namsepace_prefix_regex => qr/(?!)/,  
33      -_VALTYPE_DEFAULT   => ':default',      -_VALTYPE_DEFAULT   => ':default',
34      -by => 'name',      ## (Reserved for method level option)      -by => 'name',      ## (Reserved for method level option)
35      -field_format_pattern       => '%s: %s',      -field_format_pattern       => '%s: %s',
     -field_name_capitalize      => 1,  
36      -field_name_case_sensible   => 0,      -field_name_case_sensible   => 0,
37      -field_name_unsafe_rule     => 'NON_ftext',      -field_name_unsafe_rule     => 'NON_ftext',
38      -field_name_validation      => 1,   ## Method level option.      -field_name_validation      => 1,   ## Method level option.
# Line 42  push @ISA, qw(Message::Field::Structured Line 40  push @ISA, qw(Message::Field::Structured
40      #-format    => 'mail-rfc2822',      #-format    => 'mail-rfc2822',
41      -linebreak_strict   => 0,   ## Not implemented completely      -linebreak_strict   => 0,   ## Not implemented completely
42      -line_length_max    => 60,  ## For folding      -line_length_max    => 60,  ## For folding
43      -ns_default_uri     => $Message::Header::Default::OPTION{namespace_uri},      #ns_default_phuri
44      -output_bcc => 0,      -output_bcc => 0,
45      -output_folding     => 1,      -output_folding     => 1,
46      -output_mail_from   => 0,      -output_mail_from   => 0,
# Line 53  push @ISA, qw(Message::Field::Structured Line 51  push @ISA, qw(Message::Field::Structured
51      -use_folding        => 1,      -use_folding        => 1,
52      #-value_type      #-value_type
53  );  );
   $DEFAULT{-uri_mailto_safe}    = {  
         ## 1 all (no check)     2 no trace & bcc & from  
         ## 3 no sender's info   4 (default) (currently not used)  
         ## 5 only a few  
         ':default'      => 4,  
         'cc'    => 5,  
         'bcc'   => 1,  
         'body'  => 1,  
         'comment'       => 5,  
         'content-id'    => 1,  
         'date'  => 1,  
         'from'  => 1,  
         'keywords'      => 5,  
         'list-id'       => 1,  
         'mail-from'     => 1,  
         'message-id'    => 1,  
         'received'      => 1,  
         'resent-bcc'    => 1,  
         'resent-date'   => 1,  
         'resent-from'   => 1,  
         'resent-sender' => 1,  
         'return-path'   => 1,  
         'sender'        => 1,  
         'subject'       => 5,  
         'summary'       => 5,  
         'to'    => 5,  
         'user-agent'    => 3,  
         'x-face'        => 2,  
         'x-mailer'      => 3,  
         'x-nsubject'    => 5,  
         'x-received'    => 1,  
         'x400-received' => 1,  
         };  
54    
55  $DEFAULT{-value_type} = {  $DEFAULT{-value_type} = {
56          ':default'      => ['Message::Field::Unstructured'],          ':default'      => ['Message::Field::Unstructured'],
57                    
         received        => ['Message::Field::Received'],  
         'x-received'    => ['Message::Field::Received'],  
           
58          p3p     => ['Message::Field::Params'],          p3p     => ['Message::Field::Params'],
         'auto-submitted'        => ['Message::Field::ValueParams'],  
59          link    => ['Message::Field::ValueParams'],          link    => ['Message::Field::ValueParams'],
         archive => ['Message::Field::ValueParams'],  
         'x-face-type'   => ['Message::Field::ValueParams'],  
         'x-mozilla-draft-info'  => ['Message::Field::ValueParams'],  
           
         subject => ['Message::Field::Subject'],  
         'x-nsubject'    => ['Message::Field::Subject'],  
60                    
         'list-software' => ['Message::Field::UA'],  
61          'user-agent'    => ['Message::Field::UA'],          'user-agent'    => ['Message::Field::UA'],
         'resent-user-agent'     => ['Message::Field::UA'],  
62          server  => ['Message::Field::UA'],          server  => ['Message::Field::UA'],
           
         ## A message id  
         'message-id'    => ['Message::Field::MsgID'],  
         'resent-message-id'     => ['Message::Field::MsgID'],  
           
         ## Numeric value  
         lines   => ['Message::Field::Numval'],  
         'max-forwards'  => ['Message::Field::Numval'],  
         'mime-version'  => ['Message::Field::Numval'],  
         'x-jsmail-priority'     => ['Message::Field::Numval'],  
         'x-mail-count'  => ['Message::Field::Numval'],  
         'x-ml-count'    => ['Message::Field::Numval'],  
         'x-priority'    => ['Message::Field::Numval'],  
           
         path    => ['Message::Field::Path'],  
63  };  };
64  for (qw(archive cancel-lock  for (qw(date expires))
   disposition-notification-options encoding  
   importance injector-info  
   pics-label posted-and-mailed precedence list-id message-type  
   original-recipient priority x-list-id  
   sensitivity status x-face x-msmail-priority xref))  
   {$DEFAULT{-value_type}->{$_} = ['Message::Field::Structured']}  
         ## Not supported yet, but to be supported...  
         # x-list: unstructured, ml name  
 for (qw(abuse-reports-to apparently-to approved approved-by bcc cc complaints-to  
   delivered-to disposition-notification-to envelope-to  
   errors-to  from mail-copies-to mail-followup-to mail-reply-to  
   notice-requested-upon-delivery-to read-receipt-to register-mail-reply-requested-by  
   reply-to resent-bcc  
   resent-cc resent-to resent-from resent-sender return-path  
   return-receipt-to return-receipt-requested-to sender to x-abuse-reports-to  
   x-admin x-approved x-beenthere x-confirm-reading-to  
   x-complaints-to x-envelope-from x-envelope-sender  
   x-envelope-to x-ml-address x-ml-command x-ml-to x-nfrom x-nto  
   x-rcpt-to x-sender x-x-sender))  
   {$DEFAULT{-value_type}->{$_} = ['Message::Field::Addresses']}  
 for (qw(client-date date date-received delivery-date expires  
   expire-date nntp-posting-date posted posted-date received-date  
   reply-by resent-date  
   x-originalarrivaltime x-tcup-date))  
65    {$DEFAULT{-value_type}->{$_} = ['Message::Field::Date']}    {$DEFAULT{-value_type}->{$_} = ['Message::Field::Date']}
66  for (qw(article-updates in-reply-to  for (qw(accept accept-charset accept-encoding accept-language uri))
   obsoletes references replaces see-also supersedes))  
   {$DEFAULT{-value_type}->{$_} = ['Message::Field::MsgIDs']}  
 for (qw(accept accept-charset accept-encoding accept-language  
   content-language  
   encrypted followup-to keywords  
   list-archive list-digest list-help list-owner  
   list-post list-subscribe list-unsubscribe list-url uri newsgroups  
   posted-to))  
67    {$DEFAULT{-value_type}->{$_} = ['Message::Field::CSV']}    {$DEFAULT{-value_type}->{$_} = ['Message::Field::CSV']}
68  for (qw(x-brother x-boss x-classmate x-daughter x-dearfriend x-favoritesong  for (qw(location referer))
   x-friend x-me  
   x-moe x-respect  
   x-sublimate x-son x-sister x-wife))  
   {$DEFAULT{-value_type}->{$_} =[ 'Message::Field::CSV']}       ## NOT M::F::XMOE!  
 for (qw(location referer url x-home-page x-http_referer  
   x-info x-pgp-key x-ml-url x-uri x-url x-web))  
69    {$DEFAULT{-value_type}->{$_} = ['Message::Field::URI']}    {$DEFAULT{-value_type}->{$_} = ['Message::Field::URI']}
70    
71  my %header_goodcase = (  my %header_goodcase = (
# Line 176  my %header_goodcase = ( Line 76  my %header_goodcase = (
76          url     => 'URL',          url     => 'URL',
77          'www-authenticate'      => 'WWW-Authenticate',          'www-authenticate'      => 'WWW-Authenticate',
78  );  );
 $DEFAULT{-field_name_capitalize} = sub {  
   my $self = shift;  
   my $name = shift;  
   if ($header_goodcase{$name}) {  
     return $header_goodcase{$name};  
   }  
   $name =~ s/(?:^|-)cgi-/uc $&/ge;  
   $name =~ s/(?:^|-)[a-z]/uc $&/ge;  
   $name;  
 };  
79    
80  ## taken from L<HTTP::Header>  ## taken from L<HTTP::Header>
81  # "Good Practice" order of HTTP message headers:  # "Good Practice" order of HTTP message headers:
# Line 232  sub _init ($;%) { Line 122  sub _init ($;%) {
122    $self->SUPER::_init (%$DEFAULT, %options);    $self->SUPER::_init (%$DEFAULT, %options);
123    $self->{value} = [];    $self->{value} = [];
124    $self->_ns_load_ph ('default');    $self->_ns_load_ph ('default');
   $self->{ns}->{default_phuri} = $self->{ns}->{phname2uri}->{'default'};  
125    $self->_ns_load_ph ('rfc822');    $self->_ns_load_ph ('rfc822');
126    $self->{ns}->{default_phuri} = $self->{ns}->{phname2uri}->{'rfc822'};    $self->{option}->{ns_default_phuri} = $self->{ns}->{phname2uri}->{'rfc822'}
127        unless $self->{option}->{ns_default_phuri};
128        
129    my @new_fields = ();    my @new_fields = ();
130    for my $name (keys %options) {    for my $name (keys %options) {
# Line 257  sub _init ($;%) { Line 147  sub _init ($;%) {
147  sub _init_by_format ($$\%) {  sub _init_by_format ($$\%) {
148    my $self = shift;    my $self = shift;
149    my ($format, $option) = @_;    my ($format, $option) = @_;
150    if ($format =~ /rfc822/) {    if ($format =~ /cgi/) {
     $header_goodcase{bcc} = 'bcc';  
     $header_goodcase{cc} = 'cc';  
     $header_goodcase{'resent-bcc'} = 'Resent-bcc';  
     $header_goodcase{'resent-cc'} = 'Resent-cc';  
   } elsif ($format =~ /cgi/) {  
151      unshift @header_order, qw(content-type location);      unshift @header_order, qw(content-type location);
152      $option->{field_sort} = 'good-practice';      $option->{field_sort} = 'good-practice';
153      $option->{use_folding} = 0;      $option->{use_folding} = 0;
# Line 271  sub _init_by_format ($$\%) { Line 156  sub _init_by_format ($$\%) {
156    }    }
157    if ($format =~ /uri-url-mailto/) {    if ($format =~ /uri-url-mailto/) {
158      $option->{output_bcc} = 0;      $option->{output_bcc} = 0;
     $option->{field_name_capitalize} = 0;  
159      $option->{field_format_pattern} = '%s=%s';      $option->{field_format_pattern} = '%s=%s';
160      $option->{output_folding} = sub {      $option->{output_folding} = sub {
161        $_[1] =~ s/([^:@+\$A-Za-z0-9\-_.!~*])/sprintf('%%%02X', ord $1)/ge;        $_[1] =~ s/([^:@+\$A-Za-z0-9\-_.!~*])/sprintf('%%%02X', ord $1)/ge;
# Line 323  sub parse ($$;%) { Line 207  sub parse ($$;%) {
207        my ($s,undef,$value) = $self->_value_to_arrayitem        my ($s,undef,$value) = $self->_value_to_arrayitem
208          ($name => $body, $self->{option});          ($name => $body, $self->{option});
209        push @{$self->{value}}, $value if $s;        push @{$self->{value}}, $value if $s;
210        } elsif (length $field) {
211          my ($s,undef,$value) = $self->_value_to_arrayitem
212            ('x-unknown' => $field, $self->{option});
213          push @{$self->{value}}, $value if $s;
214      }      }
215    }    }
216    $self;    $self;
# Line 370  sub parse_array ($\@;%) { Line 258  sub parse_array ($\@;%) {
258        my ($s,undef,$value) = $self->_value_to_arrayitem        my ($s,undef,$value) = $self->_value_to_arrayitem
259          ($name => $body, $self->{option});          ($name => $body, $self->{option});
260        push @{$self->{value}}, $value if $s;        push @{$self->{value}}, $value if $s;
261        } elsif (length $field) {
262          my ($s,undef,$value) = $self->_value_to_arrayitem
263            ('x-unknown' => $field, $self->{option});
264          push @{$self->{value}}, $value if $s;
265      }      }
266      last if $#$header < 0;      last if $#$header < 0;
267    }    }
# Line 405  sub _item_match ($$\$\%\%) { Line 297  sub _item_match ($$\$\%\%) {
297        if ($s) {        if ($s) {
298          $l{$v->{name} . ':' . ( $option->{ns} || $v->{ns} ) } = 1;          $l{$v->{name} . ':' . ( $option->{ns} || $v->{ns} ) } = 1;
299        } else {        } else {
300          $l{$v->{name} .':'. ( $option->{ns} || $self->{ns}->{default_phuri} ) } = 1;          $l{$v->{name} .':'. ( $option->{ns} || $self->{option}->{ns_default_phuri} ) } = 1;
301        }        }
302      }      }
303      return 1 if $l{$$i->{name} . ':' . $$i->{ns}};      return 1 if $l{$$i->{name} . ':' . $$i->{ns}};
304      } elsif ($by eq 'ns') {
305        return 1 if $list->{ $$i->{ns} };
306    }    }
307    0;    0;
308  }  }
# Line 424  sub _item_return_value ($\$\%) { Line 318  sub _item_return_value ($\$\%) {
318      ${$_[1]}->{body};      ${$_[1]}->{body};
319    }    }
320  }  }
321    *_add_return_value = \&_item_return_value;
322    *_replace_return_value = \&_item_return_value;
323    
324  ## Returns returned (new created) item value    $name, \%option  ## Returns returned (new created) item value    $name, \%option
325  sub _item_new_value ($$\%) {  sub _item_new_value ($$\%) {
# Line 441  sub _parse_value ($$$;%) { Line 337  sub _parse_value ($$$;%) {
337    my $value = shift;  return $value if ref $value;    my $value = shift;  return $value if ref $value;
338    my %option = @_;    my %option = @_;
339    my $vtype; { no strict 'refs';    my $vtype; { no strict 'refs';
340      $vtype = ${&_NS_uri2phpackage ($option{ns}).'::OPTION'}{value_type};      my $vt = ${&_NS_uri2phpackage ($option{ns}).'::OPTION'}{value_type};
341      if (ref $vtype) { $vtype = $vtype->{$name} }      if (ref $vt) {
342      unless (ref $vtype) { $vtype = $vtype->{$self->{option}->{_VALTYPE_DEFAULT}} }        $vtype = $vt->{$name} || $vt->{$self->{option}->{_VALTYPE_DEFAULT}};
343        }
344      ## For compatiblity.      ## For compatiblity.
345      unless (ref $vtype) { $vtype = $self->{option}->{value_type}->{$name}      unless (ref $vtype) { $vtype = $self->{option}->{value_type}->{$name}
346        || $self->{option}->{value_type}->{$self->{option}->{_VALTYPE_DEFAULT}} }        || $self->{option}->{value_type}->{$self->{option}->{_VALTYPE_DEFAULT}} }
# Line 456  sub _parse_value ($$$;%) { Line 353  sub _parse_value ($$$;%) {
353      eval "require $vpackage" or Carp::croak qq{<parse>: $vpackage: Can't load package: $@};      eval "require $vpackage" or Carp::croak qq{<parse>: $vpackage: Can't load package: $@};
354      return $vpackage->parse ($value,      return $vpackage->parse ($value,
355        -format   => $self->{option}->{format},        -format   => $self->{option}->{format},
356          -field_ns => $option{ns},
357        -field_name       => $name,        -field_name       => $name,
358        -parse_all        => $self->{option}->{parse_all},        -parse_all        => $self->{option}->{parse_all},
359      %vopt);      %vopt);
# Line 463  sub _parse_value ($$$;%) { Line 361  sub _parse_value ($$$;%) {
361      eval "require $vpackage" or Carp::croak qq{<parse>: $vpackage: Can't load package: $@};      eval "require $vpackage" or Carp::croak qq{<parse>: $vpackage: Can't load package: $@};
362      return $vpackage->new (      return $vpackage->new (
363        -format   => $self->{option}->{format},        -format   => $self->{option}->{format},
364          -field_ns => $option{ns},
365        -field_name       => $name,        -field_name       => $name,
366        -parse_all        => $self->{option}->{parse_all},        -parse_all        => $self->{option}->{parse_all},
367      %vopt);      %vopt);
# Line 487  sub namespace_ph_default ($;$) { Line 386  sub namespace_ph_default ($;$) {
386    my $self = shift;    my $self = shift;
387    if (defined $_[0]) {    if (defined $_[0]) {
388      no strict 'refs';      no strict 'refs';
389      $self->{ns}->{default_phuri} = $_[0];      $self->{option}->{ns_default_phuri} = $_[0];
390      $self->_ns_load_ph (${&_NS_uri2phpackage ($self->{ns}->{default_phuri}).'::OPTION'}{namespace_phname});      $self->_ns_load_ph (${&_NS_uri2phpackage ($self->{option}->{ns_default_phuri}).'::OPTION'}{namespace_phname});
391    }    }
392    $self->{ns}->{default_phuri};    $self->{option}->{ns_default_phuri};
393  }  }
394    
395  =item $hdr->add ($field-name, $field-body, [$name, $body, ...])  =item $hdr->add ($field-name, $field-body, [$name, $body, ...])
# Line 529  sub _value_to_arrayitem ($$$\%) { Line 428  sub _value_to_arrayitem ($$$\%) {
428    if (ref $value eq 'ARRAY') {    if (ref $value eq 'ARRAY') {
429      ($value, %$value_option) = @$value;      ($value, %$value_option) = @$value;
430    }    }
431    my $nsuri = $self->{ns}->{default_phuri};    my $nsuri = $self->{option}->{ns_default_phuri};
432      
433    no strict 'refs';    no strict 'refs';
434    if ($option->{ns}) {    if ($value_option->{ns}) {
435        $nsuri = $value_option->{ns};
436      } elsif ($option->{ns}) {
437      $nsuri = $option->{ns};      $nsuri = $option->{ns};
438    } elsif ($name =~ s/^([Xx]-[A-Za-z]+|[A-Za-z]+)-//) {    } elsif ($name =~ s/^([Xx]-[A-Za-z]+|[A-Za-z]+)-//) {
439      my $oprefix = $1;      my $oprefix = $1;
# Line 542  sub _value_to_arrayitem ($$$\%) { Line 444  sub _value_to_arrayitem ($$$\%) {
444      $nsuri = $self->{ns}->{phname2uri}->{$prefix};      $nsuri = $self->{ns}->{phname2uri}->{$prefix};
445      unless ($nsuri) {      unless ($nsuri) {
446        $name = $oprefix . '-' . $name;        $name = $oprefix . '-' . $name;
447        $nsuri = $self->{ns}->{default_phuri};        $nsuri = $self->{option}->{ns_default_phuri};
448      }      }
449    }    }
450    $name    $name
# Line 551  sub _value_to_arrayitem ($$$\%) { Line 453  sub _value_to_arrayitem ($$$\%) {
453    Carp::croak "$name: invalid field-name"    Carp::croak "$name: invalid field-name"
454      if $option->{field_name_validation}      if $option->{field_name_validation}
455        && $name =~ /$REG{$option->{field_name_unsafe_rule}}/;        && $name =~ /$REG{$option->{field_name_unsafe_rule}}/;
456    $value = $self->_parse_value ($name => $value, ns => $nsuri) if $$option{parse};    $value = $self->_parse_value ($name => $value, ns => $nsuri)
457        if $$option{parse} || $$option{parse_all};
458    $$option{parse} = 0;    $$option{parse} = 0;
459    (1, $name.':'.$nsuri => {name => $name, body => $value, ns => $nsuri});    (1, $name.':'.$nsuri => {name => $name, body => $value, ns => $nsuri});
460  }  }
# Line 569  first one is used and the others are not Line 472  first one is used and the others are not
472  =cut  =cut
473    
474  sub _replace_hash_shift ($\%$\%) {  sub _replace_hash_shift ($\%$\%) {
475    shift; my $r = shift;  my $n = $_[0]->{name};    shift; my $r = shift;  my $n = $_[0]->{name} . ':' . $_[0]->{ns};
476    if ($$r{$n}) {    if ($$r{$n}) {
477      my $d = $$r{$n};      my $d = $$r{$n};
478      delete $$r{$n};      delete $$r{$n};
# Line 662  sub _n11n_field_name ($$) { Line 565  sub _n11n_field_name ($$) {
565    my $self = shift;    my $self = shift;
566    my $s = shift;    my $s = shift;
567    $s =~ s/^$REG{WSP}+//; $s =~ s/$REG{WSP}+$//;    $s =~ s/^$REG{WSP}+//; $s =~ s/$REG{WSP}+$//;
568    $s = lc $s ;#unless $self->{option}->{field_name_case_sensible};    $s = lc $s unless ${&_NS_uri2phpackage ($self->{option}->{ns_default_phuri}).'::OPTION'}{case_sensible};
569    $s;    $s;
570  }  }
571    
# Line 705  sub stringify ($;%) { Line 608  sub stringify ($;%) {
608        my $oname;        ## Outputed field-name        my $oname;        ## Outputed field-name
609        my $prefix = ${$nspackage.'::OPTION'} {namespace_phname_goodcase}        my $prefix = ${$nspackage.'::OPTION'} {namespace_phname_goodcase}
610                  || $self->{ns}->{uri2phname}->{$nsuri};                  || $self->{ns}->{uri2phname}->{$nsuri};
611        $prefix = undef if $nsuri eq $self->{ns}->{default_phuri};        $prefix = undef if $nsuri eq $self->{option}->{ns_default_phuri};
612        my $gc = ${$nspackage.'::OPTION'} {to_be_goodcase};        my $gc = ${$nspackage.'::OPTION'} {to_be_goodcase};
613        if (ref $gc) { $oname = &$gc ($self, $nspackage, $name) }        if (ref $gc) { $oname = &$gc ($self, $nspackage, $name, \%option) }
614        else { $oname = $name }        else { $oname = $name }
615        if ($prefix) { $oname = $prefix . '-' . $oname }        if ($prefix) { $oname = $prefix . '-' . $oname }
616        if ($option{format} =~ /uri-url-mailto/) {        if ($option{format} =~ /uri-url-mailto/) {
617          return if ((   $option{uri_mailto_safe}->{$name}          return if (( ${$nspackage.'::OPTION'} {uri_mailto_safe}->{$name}
618               || $option{uri_mailto_safe}->{':default'})                    || ${$nspackage.'::OPTION'} {uri_mailto_safe}->{':default'})
619                < $option{uri_mailto_safe_level});                    < $option{uri_mailto_safe_level});
620          if ($name eq 'to') {          if ($name eq 'to') {
621            $body = $self->field ('to', -new_item_unless_exist => 0);            $body = $self->field ('to', -new_item_unless_exist => 0);
622            if (ref $body && $body->have_group) {            if (ref $body && $body->have_group) {
# Line 816  sub _fold ($$;%) { Line 719  sub _fold ($$;%) {
719    $max = 20 if $max < 20;    $max = 20 if $max < 20;
720        
721    my $l = $option{-initial_length} || 0;    my $l = $option{-initial_length} || 0;
722    $string =~ s{([\x09\x20][^\x09\x20]+)}{    $string =~ s{((?:^|[\x09\x20])[^\x09\x20]+)}{
723      my $s = $1;      my $s = $1;
724      if ($l + length $s > $max) {      if ($l + length $s > $max) {
725        $s = "\x0D\x0A\x20" . $s;        $s = "\x0D\x0A\x20" . $s;
Legend:
Removed from v.1.20  
changed lines
  Added in v.1.26
admin@suikawiki.org
 ViewVC Help
Powered by ViewVC 1.1.24