Changeset 21768

Timestamp:

10/21/08 13:09:12 (5 years ago)

Author:

ktat

Message:

remove normalize, camelize and camelize_children.
Instead of them, new functions, dir_case and subdir_case.

Location:

lang/perl/Helper-Simple/trunk

Files:

• .t (deleted)
• MANIFEST (modified) (1 diff)
• lib/Helper/Simple.pm (modified) (11 diffs)
• t/01-helper-separate-files.t (modified) (7 diffs)
• t/04-check_created_files2.t (modified) (1 diff)
• t/lib/MyHelper.pm (modified) (1 diff)
• t/lib/MyHelper/Doc/CameLize.pm (modified) (1 diff)
• t/lib/MyHelper2/Test.pm (modified) (5 diffs)
• t/pod-coverage.t (modified) (1 diff)

lang/perl/Helper-Simple/trunk/MANIFEST

@@ -10 +10 @@
 t/02-helper-one-file.t
 t/03-create_files.t
-t/04-create_files2.t
+t/03-create_files2.t
+t/04-check_created_files_content.t
+t/04-check_created_files.t
+t/04-check_created_files2.t
 t/boilerplate.t
 t/pod-coverage.t

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

@@ -23 +23 @@
 use Clone ();
 
-our @EXPORT_FUNCS = qw/file copy camelize normalize my_var
+our @EXPORT_FUNCS = qw/file copy my_var dir_case subdir_case
                        template_option template_tags var default_var
-                       download dl camelize_children
+                       download dl
                       /;
 our %DATA =
@@ -43 +43 @@
     default =>
     {
-     normalize       => undef,
+     asis            => undef,
      my_vars         => {},
      vars            => {},
@@ -120 +120 @@
 sub root { $DATA{_ROOT_}; }
 
-sub _parent {
-  my ($self) = @_;
-
-  my $root_class = $self->root_class;
-  my $pkg = ref $self || $self;
-  $pkg =~ s/::\w+$//;
-  $pkg = $root_class if $pkg !~/^${root_class}::/;
-
-  return $self->pkg($pkg);
-}
-
 sub root_dir {
   my ($class, $dir) = @_;
@@ -145 +134 @@
 }
 
-sub camelize {
-  my ($self) = _here(@_);
-  $self->{normalize} = 0;
-  return ((! $self->_normalize) || 0);
-}
-
-sub _camelize {
-  my ($self) = @_;
-  return ((! $self->_normalize) || 0);
-}
-
-sub normalize {
-  my ($self, $v) = _here(@_);
-  $self->{normalize} = defined $v ? $v : 1;
-  return $self->_normalize;
-}
-
-sub _normalize {
+sub dir_case {
   my ($self, $v) = _here(@_);
   if (defined $v) {
-    return $self->{normalize} = $v;
+    if ($v eq 'lc') {
+      $self->normalize;
+    } elsif ($v eq 'asis') {
+      $self->asis;
+    } else {
+      Carp::croak("dircase lc or asis")
+    }
+  } else {
+    return $self->_normalize ? 'lc' : 'asis';
+  }
+}
+
+sub subdir_case {
+  my ($self, $v) = _here(@_);
+  if (defined $v) {
+    if ($v eq 'lc') {
+      $self->asis_children(0);
+    } elsif ($v eq 'asis') {
+      $self->asis_children(1);
+    } else {
+      Carp::croak("dircase lc or asis")
+    }
+  } else {
+    return $self->_asis_children ? 'lc' : 'asis';
+  }
+}
+
+sub normalize {
+  my ($self, $v) = @_;
+  $self->{asis} = defined $v ? (! $v) || 0 : 0;
+  return ((! $self->_asis) || 0);
+}
+
+sub _normalize {
+  my ($self) = @_;
+  return ((! $self->_asis) || 0);
+}
+
+sub asis {
+  my ($self, $v) = @_;
+  $self->{asis} = defined $v ? $v : 1;
+  return $self->_asis;
+}
+
+sub _asis {
+  my ($self, $v) = @_;
+  if (defined $v) {
+    return $self->{asis} = $v;
   } else {
     my $v;
@@ -172 +191 @@
        sub {
          my ($o, $pkg, $v) = @_;
-         if (defined $o->{normalize}) {
-           $$v = $o->{normalize};
+         if (defined $o->{asis}) {
+           $$v = $o->{asis};
          }
        }, \$v
       );
+
     return defined $v ? $v : 1;
   }
 }
 
-sub camelize_children {
-  my ($self) = _here(@_);
-  $self->_camelize_children(1);
-}
-
-sub _camelize_children {
+sub asis_children {
   my ($self, $v) = @_;
-
-  if (defined $v) {
-    return $self->{camelize_children} = $v;
-  } else {
-    my $v;
-    $self->_inherit_resolver
-      (
-       sub {
-         my ($o, $pkg, $v) = @_;
-         if (defined $o->{camelize_children}) {
-           $$v = $o->{camelize_children};
-         }
-       }, \$v
-      );
-    return defined $v ? $v : 0;
-  }
+  return $self->{asis_children} = defined $v ? $v : 1;
 }
 
@@ -481 +481 @@
   if (my $name = ref $proto) {
     my $path = "";
-    my $camelize = 0;
+    my $asis = 1;
+    my $asis_children = 0;
     $proto->_inherit_resolver
       (
@@ -488 +489 @@
          my $dir_name = $pkg_name;
          if (blessed $o) {
-           if (blessed $o->_parent) {
-             $camelize ||= $o->_parent->_camelize_children;
+           $asis = $o->{asis} if defined $o->{asis};
+
+           if (! defined $o->{asis}) {
+             $asis = $asis_children;
            }
-           if ($o->{normalize}) {
-             $camelize = 0;
-             $o->_camelize_children(0);
+           if (defined $o->{asis_children}) {
+             $asis_children = $o->{asis_children};
+           } else {
+             $asis_children = $asis;
            }
          }
-         if (! $camelize and (! ref $o or (ref $o and $o->_normalize))) {
+         if (! $asis) {
            $dir_name = $proto->_normalization($pkg_name);
          }
@@ -512 +516 @@
 sub _normalization {
   my ($self, $name) = @_;
-  if ($self->_normalize == 2) {
-    $name =~ s/([A-Z][^A-Z])/_$1/g;
-    $name =~ s/^_//;
-  }
   return lc $name;
 }
@@ -808 +808 @@
 like this, you don't need to call 'use Helper::Simple' except your helper root module.
 
-=head2 camelize
-
- camelize;
-
-This is shortcut of the following. see C<normalize>.
-
- normalize 0;
-
-=head2 normalize
-
- normalize 0;
- normalize 1; # default
- normalize 2;
-
-This change behavior to change pakcage name to directory name.
-
-This is inheritable setting. Namespaces under the namespace which this function is used,
-same setting is applied.
-
-Example;
-
-When normalize is 1 (default behavior)
-
- NormaLize -> normalize
-
-When normalize is 2
-
- NormaLize -> norma_lize
-
-When normalize is 0
-
- NormaLize -> NormaLize
-
-
-=head2 camelize_children
-
- camelize_children;
-
-This camelize effects sub directories.
-
-For example;
-
- package MyApp::Lib; # this directory is lib
- 
- camelize_children;
- 
- package MyApp::Lib::Hoge; # this directory is lib/Hoge
-
- file { X.pm => "package X;\n1;"};
-
 =head2 file
 
@@ -969 +919 @@
 If you change this, the change effects only the namespaces.
 
+=head2 dir_case
+
+ dir_case 'asis'; # default
+ dir_case 'lc';
+
+This changes behavior to change pakcage name to directory name.
+In dfault, Helper::Simple doesn't change package name.
+So if you want lower case directory name, you'd beter use lower case to package name.
+
+For example (base module name is YourApp::Helper);
+
+ package YourApp::Helper::lib;
+ # ...
+ 1;
+ 
+ package YourApp::Helper::lib::YourApp;
+ # ...
+ 1;
+
+These directories are;
+
+ lib/
+ lib/YourApp/
+
+If you don't like lower case in package name, you can use this function.
+
+ package YourApp::Helper::Lib;
+
+ dir_case 'lc';
+ subdir_case 'asis';
+ # ...
+ 1;
+ 
+ package YourApp::Helper::Lib::YourApp;
+ # ...
+ 1;
+
+These directories are;
+
+ lib/
+ lib/YourApp/
+
+In YourApp::Hlper::Lib, C<dir_case 'lc'> is used,
+so package name is changed to lower case.
+In YourApp::Hlper::Lib, C<subdir_case 'asis'> is used,
+this effects sub modules of the module calling C<subdir_case 'asis'>.
+
+This is inheritable setting. Namespaces under the namespace which this function is used,
+same setting is applied.
+
+=head2 subdir_case
+
+ subdir_case 'lc';
+ subdir_case 'asis';
+
+This effects sub directories.
+
+For example;
+
+ package MyApp;
+ 
+ dir_case 'lc';
+ 
+ package MyApp::Lib; # this directory is lib
+ 
+ sub_dircase 'asis';
+ 
+ package MyApp::Lib::Hoge; # this directory is lib/Hoge
+
+This is inheritable setting. Namespaces under the namespace which this function is used,
+same setting is applied.
+
+See also C<dir_case>.
+
 =head1 SPECIAL FUNCTION
 
@@ -978 +1002 @@
 It is not recommended to use.
 
- package YourHelper::Lib::Hoge;
+ package YourHelper::Llib::Hoge;
  
- here->dir; # returns "lib/hoge/"
+ here->dir; # returns "lib/Hoge/"
 
 =head1 AUTHOR
 
-Ktat, C<< <KTAT at cpan.org> >>
+Ktat, C<< <ktat at cpan.org> >>
 
 =head1 BUGS

lang/perl/Helper-Simple/trunk/t/01-helper-separate-files.t

@@ -53 +53 @@
   admin  => 1,
 }
-=== camelize default
+=== asis default
 --- i
 package MyHelper;
-$_ = here->_camelize
+$_ = here->_asis
 --- o
 0
@@ -65 +65 @@
 --- o
 1
-=== camelize specified
+=== asis specified
 --- i
 package MyHelper::Doc::CameLize;
-$_ = here->_camelize
+$_ = here->_asis
 --- o
 1
@@ -80 +80 @@
 --- i
 package MyHelper::Doc::CameLize::CaMeLiZe;
-$_ = here->_camelize
+$_ = here->_asis
 --- o
 1
@@ -165 +165 @@
 --- i
 package MyHelper::Doc::CameLize;
-here->dir =~ m{.+(doc/.+$)};
+here->dir =~ m{.+(doc/.+$)}i;
 $1;
 --- o
@@ -172 +172 @@
 --- i
 package MyHelper::Doc::CameLize::CaMeLiZe;
-here->dir =~ m{.+(doc/.+$)};
+here->dir =~ m{.+(doc/.+$)}i;
 $1;
 --- o
@@ -179 +179 @@
 --- i
 package MyHelper::DocCamel;
-here->dir =~ m{.+(doc_?camel.+)};
+here->dir =~ m{.+(doc_?camel.+)}i;
 $1
 --- o
@@ -186 +186 @@
 --- i
 package MyHelper::Doc;
-here->dir =~ m{.+(doc/$)};
+here->dir =~ m{.+(doc/$)}i;
 $1;
 --- o

lang/perl/Helper-Simple/trunk/t/04-check_created_files2.t

@@ -39 +39 @@
 --- i : -e './t/tmp2/lib/two/Y/Z/AbCde/AbCde.pm'
 --- o : 1
-=== t/tmp2/lib/two/Y/Z/xyz/aaa/aaa.pm
---- i : -e './t/tmp2/lib/two/Y/Z/xyz/aaa/aaa.pm'
+=== t/tmp2/lib/two/Y/Z/Xyz/aaa/aaa.pm
+--- i : -e './t/tmp2/lib/two/Y/Z/Xyz/aaa/aaa.pm'
 --- o : 1
 === t/tmp2/lib/two/Y.pm

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

@@ -8 +8 @@
   var  => 'in MyHelper',
 };
+
+dir_case 'lc';
 
 file <<_FILES;

lang/perl/Helper-Simple/trunk/t/lib/MyHelper/Doc/CameLize.pm

@@ -3 +3 @@
 use strict;
 
-normalize 0;
+dir_case 'asis';
 copy ['./t/data/test.zip', {zip => 1, omit => 'test'}];
 

lang/perl/Helper-Simple/trunk/t/lib/MyHelper2/Test.pm

@@ -2 +2 @@
 
 use Helper::Simple;
+
+dir_case 'lc';
 
 copy 't/lib/';
@@ -43 +45 @@
 package MyHelper2::Test::Lib::One;
 
-camelize;
+dir_case 'asis';
 
 file <<_FILES;
@@ -54 +56 @@
 package MyHelper2::Test::Lib::X::Y;
 
-camelize;
+dir_case 'asis';
 
 file <<_FILES;
@@ -65 +67 @@
 package MyHelper2::Test::Lib::Two;
 
-camelize_children;
+subdir_case 'asis';
 
 var {
@@ -109 +111 @@
 package MyHelper2::Test::Lib::Two::Y::Z::Xyz;
 
-normalize;
+subdir_case 'lc';
 
 package MyHelper2::Test::Lib::Two::Y::Z::Xyz::AAA;

lang/perl/Helper-Simple/trunk/t/pod-coverage.t

@@ -5 +5 @@
 plan skip_all => "Test::Pod::Coverage 1.04 required for testing POD coverage" if $@;
 all_pod_coverage_ok(
-    {also_private => [qw/appname dir mk_dir pkg root root_class root_dir default_var/],}
+    {also_private => [qw/appname dir mk_dir pkg root root_class root_dir default_var asis asis_children normalize/],}
     );