From: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
Date: Tue, 20 Mar 2018 21:42:16 +0000 (+0000)
Subject: Inline String::CamelCase::wordsplit() due to RT#123030
X-Git-Tag: v0.07049~7
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4a0dee31ab22653d1249298776935d7be8e66f3b;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

Inline String::CamelCase::wordsplit() due to RT#123030

The bug breaks installing DBICSL with anything that cares about
META.yml, e.g. Carton.
---

diff --git a/Changes b/Changes
index 87172f7..b8645c4 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 Revision history for Perl extension DBIx::Class::Schema::Loader
 
         - Fix tests when the path to perl has spaces in it (GH#19)
+        - Inline String::CamelCase::wordsplit() due to RT#123030
 
 0.07048_01 - 2018-02-23
         - Convert from Module::Install to ExtUtils::MakeMaker + Distar (GH#17)
diff --git a/Makefile.PL b/Makefile.PL
index a3735bc..c699884 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -47,7 +47,6 @@ my %eumm_args = (
         'namespace::clean'            => '0.23',
         'Scope::Guard'                => '0.20',
         'String::ToIdentifier::EN'    => '0.05',
-        'String::CamelCase'           => '0.02',
         '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 4fc5fb6..66a92c7 100644
--- a/lib/DBIx/Class/Schema/Loader/Utils.pm
+++ b/lib/DBIx/Class/Schema/Loader/Utils.pm
@@ -4,7 +4,6 @@ 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;
@@ -22,6 +21,12 @@ 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) = @_;