Changeset 25992

Timestamp:

12/06/08 14:07:56 (4 years ago)

Author:

ktat

Message:

decompress -> extract; remove appname and appclass"

Location:

lang/perl/Helper-Simple/trunk/lib/Helper

Files:

• Simple.pm (modified) (12 diffs)
• Simple/Const.pm (modified) (3 diffs)

lang/perl/Helper-Simple/trunk/lib/Helper/Simple.pm

@@ -21 +21 @@
 use Config;
 use MIME::Base64 qw/encode_base64 decode_base64/;
-use Tie::Trace qw/watch/;
 
 local $@;
@@ -33 +32 @@
    _ROOT_ =>
    {
-    appname => '',
     class   => '',
     dir     => '',
@@ -43 +41 @@
      '.zip'    => '',
      '.gz'     => '',
+     '.bz2'    => '',
+     '.jpg'    => '',
+     '.png'    => '',
+     '.gif'    => '',
+     '.bmp'    => '',
     },
     default =>
@@ -231 +234 @@
       $zip->addTree($target);
       $zip->writeToFileHandle($fh);
-      $option->{decompress}  = 'zip';
+      $option->{extract}  = 'zip';
       ($option->{extract_to}) = ($target =~ m{([^/]+)/?$});
       $option->{content} = encode_base64($option->{content});
@@ -356 +359 @@
     if (defined $file and -e $dir . $file) {
       _ok(exists  => $dir . $file);
-    } elsif (ref $c and my $compress = $c->{decompress}) {
-      my $dir, $pkg->_decompress($compress, $file, decode_base64($c->{content}), $path_exchanger, $c);
+    } elsif (ref $c and my $compress = $c->{extract}) {
+      my $dir, $pkg->_extract($compress, $file, decode_base64($c->{content}), $path_exchanger, $c);
       if (defined $c->{render_file} and $c->{render_file}) {
         $pkg->_render_file_recursive($c->{extract_to}, $path_exchanger);
@@ -441 +444 @@
   my ($self) = _here(@_);
   return {
-          appname    => $self->appname,
-          appclass   => $self->appclass,
           root_class => $self->root_class,
           startperl  => $Config{startperl},
@@ -471 +472 @@
   my $data = {};
   if (defined $vars) {
-    while (my ($k, $v) = each %$vars) {
-      $self->{vars}->{$k} = $v;
-    }
-    $self->var;
+    if (ref $vars eq 'HASH') {
+      while (my ($k, $v) = each %$vars) {
+        $self->{vars}->{$k} = $v;
+      }
+      return $self->var;
+    } else {
+      return $self->var->{$vars}
+    }
   } else {
     $self->_inherit_resolver
@@ -528 +533 @@
 }
 
-sub appname {
-  my ($self, $name) = @_;
-  if (@_ == 2) {
-    $self->root->{appname} = $name;
-  } else {
-    unless (my $name = $self->root->{appname}) {
-      my $base = $self->appclass || ref $self;
-      $base =~ m{^(\w+)};
-      return  lc($1 || $base);
-    } else {
-      return $name;
-    }
-  }
-}
-
-sub appclass {
-  my ($self, $name) = @_;
-  if (@_ == 2) {
-    $self->root->{appclass} = $name;
-  } else {
-    unless (my $name = $self->root->{appclass}) {
-      return  $self->root_class;
-    } else {
-      return $name;
-    }
-  }
-}
-
 sub pkg {
   my ($class, $pkg) = @_;
@@ -577 +554 @@
     }
     if ($success) {
-      if (my $compress = $option->{decompress}) {
-        $pkg->_decompress($compress, $target, $content, undef, $option);
+      if (my $compress = $option->{extract}) {
+        $pkg->_extract($compress, $target, $content, undef, $option);
       } else {
         my $name = $option->{filename};
@@ -589 +566 @@
 }
 
-sub _decompress {
+sub _extract {
   my ($pkg, $compress, $target, $content, $path_exchanger, $option) = @_;
   Carp::croak "cannot use $compress as compress option." unless $pkg->can("_extract_" . $compress);
 
-  my $decompress = '_extract_' . $compress;
-  $pkg->$decompress($target, $content, $path_exchanger, $option);
+  my $extract = '_extract_' . $compress;
+  $pkg->$extract($target, $content, $path_exchanger, $option);
 }
 
@@ -892 +869 @@
 
 This copy file/directory from local.
-For $option, you can use C<decompress>, c<omit> and C<render_file> of C<download>.
+For $option, you can use C<extract>, c<omit> and C<render_file> of C<download>.
 
 =head2 download / dl
@@ -906 +883 @@
 default values is 0.
 
-=head3 decompress => zip
+=head3 extract => zip
 
 If target is compressed file and you want to extract it,

lang/perl/Helper-Simple/trunk/lib/Helper/Simple/Const.pm

@@ -2 +2 @@
 
 use constant {
-    JQUERY_UI                => ['http://jquery-ui.googlecode.com/files/jquery.ui-1.5.2.zip', {decompress => 'zip'} ],
+    JQUERY_UI                => ['http://jquery-ui.googlecode.com/files/jquery.ui-1.5.2.zip', {extract => 'zip'} ],
     JQUERY_SUGGEST           => ['http://www.vulgarisoip.com/files/jquery.suggest.js'],
     JQUERY_MULTI_FILE_UPLOAD => ['http://www.fyneworks.com/jquery/multiple-file-upload/multiple-file-upload.zip' ],
-    JQUERY_FILE_TREE         => ['http://abeautifulsite.net/notebook_files/58/jqueryFileTree.zip',       {decompress => 'zip'} ],
-    TINYMCE                  => ['http://nchc.dl.sourceforge.net/sourceforge/tinymce/tinymce_3_1_1.zip', {decompress => 'zip'}],
+    JQUERY_FILE_TREE         => ['http://abeautifulsite.net/notebook_files/58/jqueryFileTree.zip',       {extract => 'zip'} ],
+    TINYMCE                  => ['http://nchc.dl.sourceforge.net/sourceforge/tinymce/tinymce_3_1_1.zip', {extract => 'zip'}],
     TINYMCE_LANG             =>
       [
        'http://services.moxiecode.com/i18n/download.aspx',
        {
-        decompress => 'zip',
+        extract => 'zip',
         method => 'post',
         form    => {
@@ -35 +35 @@
 =head1 NAME
 
-Helper::Simple::Const - constants for copy/copies
+Helper::Simple::Const - constants for download
 
 =head1 VERSION
@@ -49 +49 @@
 use this for copy/copies
 
- copies(JQUERY_UI);
- copies(TINY_MCE);
+ dl JQUERY_UI;
+ dl TINY_MCE;
 
 =head1 ACKNOWLEDGEMENTS