Revert inlining of String::CamelCase::wordsplit() (RT#125929)

RT#123030 has been fixed in String::CamelCase 0.04

diff --git a/Changes b/Changes
index 48af457..6d9b5b5 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
 Revision history for Perl extension DBIx::Class::Schema::Loader
 
+        - Revert inlining of String::CamelCase::wordsplit() (RT#125929)
+
 0.07049 - 2018-03-21
         - Fix tests when the path to perl has spaces in it (GH#19)
         - Inline String::CamelCase::wordsplit() due to RT#123030

diff --git a/Makefile.PL b/Makefile.PL
index ed58c3d..c906839 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -45,6 +45,7 @@ my %eumm_args = (
         'namespace::clean'            => '0.23',
         'Scope::Guard'                => '0.20',
         'String::ToIdentifier::EN'    => '0.05',
+        'String::CamelCase'           => '0.04',
         'Sub::Util'                   => '1.40',
         'Try::Tiny'                   => 0,
         # core, but specific versions not available on older perls

diff --git a/lib/DBIx/Class/Schema/Loader/Utils.pm b/lib/DBIx/Class/Schema/Loader/Utils.pm
index 66a92c7..4fc5fb6 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/Utils.pm
+++ b/lib/DBIx/Class/Schema/Loader/Utils.pm
@@ -4,6 +4,7 @@ package # hide from PAUSE
 use strict;
 use warnings;
 use Test::More;
+use String::CamelCase 'wordsplit';
 use Carp::Clan qw/^DBIx::Class/;
 use List::Util 'all';
 use namespace::clean;
@@ -21,12 +22,6 @@ use constant BY_NON_ALPHANUM =>
 my $LF   = "\x0a";
 my $CRLF = "\x0d\x0a";
 
-# Copied from String::CamelCase because of RT#123030
-sub wordsplit {
-    my $s = shift;
-    split /[_\s]+|\b|(?<![A-Z])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])/, $s;
-}
-
 sub split_name($;$) {
     my ($name, $v) = @_;
 

diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash
index ca08b37..34b86bb 100755 (executable)
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -97,7 +97,7 @@ else
   parallel_installdeps_notest YAML LWP Class::Trigger JSON::XS DateTime::Format::Builder Class::Accessor::Grouped Package::Variant
   parallel_installdeps_notest SQL::Abstract Moose Module::Install JSON SQL::Translator File::Which
   parallel_installdeps_notest Module::Install::ReadmeFromPod Module::Install::AuthorTests
-  parallel_installdeps_notest Math::Base36 DBD::mysql DBD::Pg Math::BigInt
+  parallel_installdeps_notest Math::Base36 DBD::mysql DBD::Pg Math::BigInt String::CamelCase
   parallel_installdeps_notest MooseX::NonMoose MooseX::MarkAsMethods namespace::autoclean curry
 
   if env | grep -q '^DBICTEST_.*_ODBC_DSN'; then