Preserve regex flags

Flags were being lost during reflagging. This fixes that bug. Closes #19
dagolden · Sep 21, 2015 · 67fe07b · hermidalc · Sep 22, 2015 · hermidalc
1 parent f3a81a8
commit 67fe07b
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 0 deletions.
diff --git a/Changes b/Changes
@@ -2,6 +2,11 @@ Revision history for Path-Iterator-Rule
 
 {{$NEXT}}
 
+    [FIXED]
+
+    - Regular expressions flags were being lost.  Now name(qr/foo/i) works
+      like iname(qr/foo/)
+
 1.008     2014-02-04 17:40:45-05:00 America/New_York
 
     [ADDED]

diff --git a/lib/Path/Iterator/Rule.pm b/lib/Path/Iterator/Rule.pm
@@ -432,6 +432,7 @@ sub _regexify {
     my ( $re, $add ) = @_;
     $add ||= '';
     my $new = ref($re) eq 'Regexp' ? $re : Text::Glob::glob_to_regex($re);
+    return $new unless $add;
     my ( $pattern, $flags ) = regexp_pattern($new);
     my $new_flags = $add ? _reflag( $flags, $add ) : "";
     return qr/$new_flags$pattern/;

diff --git a/t/names.t b/t/names.t
@@ -54,6 +54,32 @@ my $td = make_tree(@tree);
       or diag explain { got => \@files, expected => $expected };
 }
 
+{
+    my $rule     = Path::Iterator::Rule->new->name(qr/foo/i);
+    my $expected = [
+        qw(
+          lib/Foo.pm
+          lib/Foo.pod
+          )
+    ];
+    my @files = map { unixify( $_, $td ) } $rule->all($td);
+    cmp_deeply( \@files, $expected, "name(qr/Foo/) match" )
+      or diag explain { got => \@files, expected => $expected };
+}
+
+{
+    my $rule     = Path::Iterator::Rule->new->name(qr/ foo /ix);
+    my $expected = [
+        qw(
+          lib/Foo.pm
+          lib/Foo.pod
+          )
+    ];
+    my @files = map { unixify( $_, $td ) } $rule->all($td);
+    cmp_deeply( \@files, $expected, "name(qr/Foo/) match" )
+      or diag explain { got => \@files, expected => $expected };
+}
+
 {
     my $rule = Path::Iterator::Rule->new->name( "*.pod", "*.pm" );
     my $expected = [
@@ -80,6 +106,19 @@ my $td = make_tree(@tree);
       or diag explain { got => \@files, expected => $expected };
 }
 
+{
+    my $rule     = Path::Iterator::Rule->new->iname(qr/ foo /x);
+    my $expected = [
+        qw(
+          lib/Foo.pm
+          lib/Foo.pod
+          )
+    ];
+    my @files = map { unixify( $_, $td ) } $rule->all($td);
+    cmp_deeply( \@files, $expected, "iname(qr/foo/) match" )
+      or diag explain { got => \@files, expected => $expected };
+}
+
 {
     my $rule     = Path::Iterator::Rule->new->iname('foo.*');
     my $expected = [