cvs commit: p5ee/App-Context/lib/App Context.pm

[Stephen Adkins]

cvsuser     05/08/09 12:11:17

  Modified:    App-Context/lib/App Context.pm
  Log:
  change containment separator from . to -
  
  Revision  Changes    Path
  1.21      +16 -23    p5ee/App-Context/lib/App/Context.pm
  
  Index: Context.pm
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Context/lib/App/Context.pm,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Context.pm        14 Mar 2005 17:37:04 -0000      1.20
  +++ Context.pm        9 Aug 2005 19:11:17 -0000       1.21
  @@ -13,7 +13,7 @@
   
   =head1 NAME
   
  -App::Context - context in which we are currently running
  +App::Context - an application development framework which allows application 
logic to be written which will run in a variety of runtime application contexts 
(web app, cmdline utility, server program, daemon, etc.)
   
   =head1 SYNOPSIS
   
  @@ -783,17 +783,10 @@
   sub get_option {
       &App::sub_entry if ($App::trace);
       my ($self, $var, $default) = @_;
  -    my ($value, $var2, $value2);
  -    $value = $self->{options}{$var};
  -    while ($value =~ /\{([^\{\}]+)\}/) {
  -        $var2 = $1;
  -        $value2 = $self->{options}{$var2};
  -        $value =~ s/\{$var2\}/$value2/g;
  -    }
  -    $self->dbgprint("Context->get_option($var) = [$value]")
  -        if ($App::DEBUG && $self->dbg(3));
  -    &App::sub_exit((defined $value) ? $value : $default) if ($App::trace);
  -    return (defined $value) ? $value : $default;
  +    my $value = $self->{options}{$var};
  +    $value = $default if (!defined $value);
  +    &App::sub_exit($value) if ($App::trace);
  +    return($value);
   }
   
   #############################################################################
  @@ -832,7 +825,7 @@
               $name = $1;
               $var = $2;
           }
  -        elsif ($name =~ /^([a-zA-Z0-9_\.-]+)\.([a-zA-Z0-9_]+)$/) {
  +        elsif ($name =~ /^([a-zA-Z0-9_\.-]+)-([a-zA-Z0-9_]+)$/) {
               $name = $1;
               $var = $2;
           }
  @@ -842,7 +835,7 @@
           }
       }
   
  -    if ($var !~ /[\[\]\{\}]/) {         # no special chars, "foo.bar"
  +    if ($var !~ /[\[\]\{\}]/) {         # no special chars, "foo-bar"
           my $cached_service = $self->{session}{cache}{SessionObject}{$name};
           if (!defined $cached_service || ref($cached_service) eq "HASH") {
               $cached_service = $self->session_object($name);
  @@ -858,7 +851,7 @@
           $self->dbgprint("Context->so_get($name,$var) (value) = [$value]")
               if ($App::DEBUG && $self->dbg(3));
       }
  -    elsif ($var =~ /^\{([^\{\}]+)\}$/) {  # a simple "{foo.bar}"
  +    elsif ($var =~ /^\{([^\{\}]+)\}$/) {  # a simple "{foo-bar}"
           $var = $1;
           $value = $self->{session}{cache}{SessionObject}{$name}{$var};
           if (!defined $value && defined $default) {
  @@ -933,7 +926,7 @@
                   $name = $1;
                   $var = $2;
               }
  -            elsif ($name =~ /^([a-zA-Z0-9_\.-]+)\.([a-zA-Z0-9_]+)$/) {
  +            elsif ($name =~ /^([a-zA-Z0-9_\.-]+)-([a-zA-Z0-9_]+)$/) {
                   $name = $1;
                   $var = $2;
               }
  @@ -943,7 +936,7 @@
               }
           }
   
  -        if ($var !~ /[\[\]\{\}]/) {         # no special chars, "foo.bar"
  +        if ($var !~ /[\[\]\{\}]/) {         # no special chars, "foo-bar"
               $self->{session}{store}{SessionObject}{$name}{$var} = $value;
               $self->{session}{cache}{SessionObject}{$name}{$var} = $value;
                   # ... we used to only set the cache attribute when the
  @@ -951,7 +944,7 @@
                   # if (defined $self->{session}{cache}{SessionObject}{$name});
               $retval = 1;
           } # match {
  -        elsif ($var =~ /^\{([^\}]+)\}$/) {  # a simple "{foo.bar}"
  +        elsif ($var =~ /^\{([^\}]+)\}$/) {  # a simple "{foo-bar}"
               $var = $1;
               $self->{session}{store}{SessionObject}{$name}{$var} = $value;
               $self->{session}{cache}{SessionObject}{$name}{$var} = $value
  @@ -1033,7 +1026,7 @@
       Sample Usage: 
   
       $context->so_delete("default", "cname");
  -    $context->so_delete("main.app.toolbar.calc", "width");
  +    $context->so_delete("main-app-toolbar-calc", "width");
       $context->so_delete("xyz", "{arr}[1][2]");
       $context->so_delete("xyz", "{arr.totals}");
   
  @@ -1052,7 +1045,7 @@
               $name = $1;
               $var = $2;
           }
  -        elsif ($name =~ /^([a-zA-Z0-9_\.-]+)\.([a-zA-Z0-9_]+)$/) {
  +        elsif ($name =~ /^([a-zA-Z0-9_\.-]+)-([a-zA-Z0-9_]+)$/) {
               $name = $1;
               $var = $2;
           }
  @@ -1062,12 +1055,12 @@
           }
       }
   
  -    if ($var !~ /[\[\]\{\}]/) {         # no special chars, "foo.bar"
  +    if ($var !~ /[\[\]\{\}]/) {         # no special chars, "foo-bar"
           delete $self->{session}{store}{SessionObject}{$name}{$var};
           delete $self->{session}{cache}{SessionObject}{$name}{$var}
               if (defined $self->{session}{cache}{SessionObject}{$name});
       } # match {
  -    elsif ($var =~ /^\{([^\}]+)\}$/) {  # a simple "{foo.bar}"
  +    elsif ($var =~ /^\{([^\}]+)\}$/) {  # a simple "{foo-bar}"
           $var = $1;
           delete $self->{session}{store}{SessionObject}{$name}{$var};
           delete $self->{session}{cache}{SessionObject}{$name}{$var}