Data::Rmap replaced by own function.

Data::Rmap has wrong behavior in my case on perl 5.18.0 and higher.

Author: Eugene Ponizovsky

.gitignore

@@ -12,7 +12,6 @@ nytprof.out
 .lwpcookies
 Makefile
 Makefile.old
-MANIFEST
 MANIFEST.bak
 MANIFEST.skip
 pm_to_blib

Changes

@@ -2,4 +2,3 @@ Revision history for Perl extension Config::Processor.
 
 0.02 Wed Apr 27 11:55:00 MSK 2016
   - Initial release.
-

MANIFEST

@@ -0,0 +1,31 @@
+Changes
+examples/etc/db.json
+examples/etc/db_connectors/default.yml
+examples/etc/db_connectors/default_test.yml
+examples/etc/dirs.yml
+examples/example.pl
+lib/Config/Processor.pm
+Makefile.PL
+MANIFEST			This list of files
+README
+t/00-base.t
+t/01-accessors.t
+t/02-processing.t
+t/03-exceptions.t
+t/04-pod-coverage.t
+t/etc/bar_A.json
+t/etc/bar_B.jsn
+t/etc/foo_A.yaml
+t/etc/foo_B.yml
+t/etc/includes/moo_A.yml
+t/etc/includes/moo_B.json
+t/etc/includes/moo_C.yml
+t/etc/invalid.json
+t/etc/invalid.yml
+t/etc/jar.json
+t/etc/moo.yml
+t/etc/yar.yml
+t/etc/yar_A.yml
+t/etc/yar_B.yml
+t/etc/yar_C.yml
+t/etc/zoo.yml

Makefile.PL

@@ -9,7 +9,6 @@ WriteMakefile(
     'YAML::XS'         => '0.62',
     'Cpanel::JSON::XS' => '3.0213',
     'Hash::Merge'      => '0.200',
-    'Data::Rmap'       => '0.64',
     'Carp'             => '0',
   },
   CONFIGURE_REQUIRES => {

README

@@ -1,4 +1,4 @@
-Config-Processor version 0.01_01
+Config-Processor version 0.03_01
 ========================
 
 INSTALLATION

examples/etc/db_connectors/default.yml

@@ -5,3 +5,4 @@ default:
     PrintWarn:  0
     PrintError: 0
     RaiseError: 1
+

examples/etc/db_connectors/default_test.yml

@@ -1,3 +1,4 @@
 default_test:
   underlay: { var: myapp.db.connectors.default }
   host: 'stat-test.mydb.com'
+

examples/etc/dirs.yml

@@ -9,3 +9,4 @@ myapp:
       - "${myapp.dirs.root_dir}/medis/${myapp.media_formats.0}"
       - "${myapp.dirs.root_dir}/media/${myapp.media_formats.1}"
       - "${myapp.dirs.root_dir}/media/${myapp.media_formats.2}"
+

examples/example.pl

@@ -11,7 +11,9 @@
 );
 
 # Load all configuration sections
-my $config = $config_processor->load( qw( dirs.yml db.json ),
+my $config = $config_processor->load(
+  qw( dirs.yml db.json ),
+
   { myapp => {
       db => {
         connectors => {

lib/Config/Processor.pm

@@ -4,13 +4,12 @@ use 5.008000;
 use strict;
 use warnings;
 
-our $VERSION = '0.02';
+our $VERSION = '0.03_01';
 
 use File::Spec;
 use YAML::XS qw( LoadFile );
 use Cpanel::JSON::XS;
 use Hash::Merge;
-use Data::Rmap qw( rmap_to :types );
 use Carp qw( croak );
 
 my %FILE_EXTENSIONS_MAP = (
@@ -81,11 +80,8 @@ sub load {
   my $self            = shift;
   my @config_sections = @_;
 
-  $self->{_config} = $self->_build_tree( @config_sections );
-
-  rmap_to {
-    $_ = $self->_process_node( $_ );
-  } HASH|VALUE, $self->{_config};
+  $self->{_config} = $self->_build_tree(@config_sections);
+  $self->_process_tree( $self->{_config} );
 
   $self->{_vars} = {};
 
@@ -182,13 +178,36 @@ sub _load_json_file {
   return @data;
 }
 
+sub _process_tree {
+  my $self = shift;
+
+  $_[0] = $self->_process_node( $_[0] );
+
+  if ( ref( $_[0] ) eq 'HASH' ) {
+    foreach ( values %{ $_[0] } ) {
+      $self->_process_tree($_);
+    }
+  }
+  elsif ( ref( $_[0] ) eq 'ARRAY' ) {
+    foreach ( @{ $_[0] } ) {
+      $self->_process_tree($_);
+    }
+  }
+
+  return;
+}
+
 sub _process_node {
   my $self = shift;
   my $node = shift;
 
   return unless defined $node;
 
-  if ( ref($node) eq 'HASH' && $self->{process_directives} ) {
+  if ( !ref($node) && $self->{interpolate_variables} ) {
+    $node =~ s/\$((\$?)\{([^\}]*)\})/
+        $2 ? $1 : $self->_resolve_var( $3 )/ge;
+  }
+  elsif ( ref($node) eq 'HASH' && $self->{process_directives} ) {
     if ( defined $node->{var} ) {
       $node = $self->_resolve_var( $node->{var} );
     }
@@ -209,10 +228,6 @@ sub _process_node {
       }
     }
   }
-  elsif ( $self->{interpolate_variables} ) { # SCALAR
-    $node =~ s/\$((\$?)\{([^\}]*)\})/
-        $2 ? $1 : $self->_resolve_var( $3 )/ge;
-  }
 
   return $node;
 }
@@ -312,7 +327,9 @@ features
     dirs => [ qw( /etc/myapp /home/username/etc/myapp ) ],
   );
 
-  my $config = $config_processor->load( qw( dirs.yml db.json metrics/* ),
+  my $config = $config_processor->load(
+    qw( dirs.yml db.json metrics/* ),
+
     { myapp => {
         db => {
           connectors => {
@@ -339,7 +356,7 @@ F<.yaml>, F<.jsn>, F<.json>.
 =head2 new( %params )
 
   my $config_processor = Config::Processor->new(
-    dirs => [ qw( /etc/myapp /home/username/myapp/etc ) ],
+    dirs => [ qw( /etc/myapp /home/username/etc/myapp ) ],
   );
 
   $config_processor = Config::Processor->new(
@@ -368,9 +385,6 @@ Enables or disables directive processing. Enabled by default.
 
 =head2 load( @config_sections )
 
-  my $config = $config_processor->load( qw( dirs.yml db.json metrics/* ),
-      \%local_config );
-
 Attempts to load all configuration sections and returns reference to resulting
 configuration tree.