Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix used_plugins to only return real traits using proper format #142

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix used_plugins to only return real traits using proper format #142

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 14 additions & 17 deletions lib/DBIx/Class/Migration/RunScript.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,23 +111,20 @@ sub used_plugins {
#We find them by looking for packages loaded in %INC that have
#the key matching the namespace defined by $path
my $path = 'DBIx/Class/Migration/RunScript/Trait/';
my $match = "$path(.+).pm";

#however, there's one danger: if there's already been a
#migration object created, which will have MANY matches for
#$path in it, along with __AND and other things that
#Moox::Traits::Util names a package with dynamic roles, we
#shouldn't try to include that. Packages made that way get the
#same %INC value as MooX::Traits::Util, so let's save that.
my $traits_path = $INC{'MooX/Traits/Util.pm'};

#so we get the list of packages loaded that match $path
my @traits = grep { m[$path]x } keys %INC;
#filter out any that were made via MooX::Traits::Util, if it was
#loaded at all, yet
@traits = grep { $INC{$_} ne $traits_path } @traits if $traits_path;
#and return the last part of the path, the name of the plugin
return map { m[$match]x } @traits;

# there may be entries in %INC for traits that are generated, and not
# originals. search our traits, filtering out anything that wasn't sourced
# from a regular file.
my @traits = grep { m[$path]x && $INC{$_} =~ /\Q$_\E\z/ } keys %INC;

# and return the last part of the path, the name of the plugin
for (@traits) {
s/\.pm\z//;
s/\A\Q$path//;
s{/}{::}g;
}

return @traits;
}

sub builder(&) {
Expand Down