Always load Mouse::Util first, which will be load Mouse::XS in the future

[gitmo/Mouse.git] / lib / Mouse / Util.pm

diff --git a/lib/Mouse/Util.pm b/lib/Mouse/Util.pm
index bcb865e..1e8d028 100644 (file)
--- a/lib/Mouse/Util.pm
+++ b/lib/Mouse/Util.pm
@@ -2,21 +2,47 @@ package Mouse::Util;
 use strict;
 use warnings;
 use base qw/Exporter/;
+
 use Carp qw(confess);
 use B ();
 
 our @EXPORT_OK = qw(
+    find_meta
+    does_role
+    resolve_metaclass_alias
+    english_list
+
     load_class
     is_class_loaded
-    get_linear_isa
+
     apply_all_roles
-    get_code_info
     not_supported
+
+    get_linear_isa
+    get_code_info
 );
 our %EXPORT_TAGS = (
     all  => \@EXPORT_OK,
 );
 
+# Moose::Util compatible utilities
+
+sub find_meta{
+    return Mouse::Meta::Module::class_of( $_[0] );
+}
+
+sub does_role{
+    my ($class_or_obj, $role) = @_;\r
+\r
+    my $meta = Mouse::Meta::Module::class_of($class_or_obj);\r
+\r
+    return 0 unless defined $meta;\r
+    return 1 if $meta->does_role($role);\r
+    return 0;
+}
+
+
+
 BEGIN {
     my $impl;
     if ($] >= 5.009_005) {
@@ -75,31 +101,30 @@ BEGIN {
     }\r
 }
 
-# taken from Class/MOP.pm
+# taken from Mouse::Util (0.90)
 {
     my %cache;
 
-    sub resolve_metaclass_alias {
-        my ( $type, $metaclass_name, %options ) = @_;
-
-        my $cache_key = $type;
-        return $cache{$cache_key}{$metaclass_name}
-          if $cache{$cache_key}{$metaclass_name};
-
-        my $possible_full_name =
-            'Mouse::Meta::' 
-          . $type
-          . '::Custom::'
-          . $metaclass_name;
-
-        my $loaded_class =
-          load_first_existing_class( $possible_full_name,
-            $metaclass_name );
+    sub resolve_metaclass_alias {\r
+        my ( $type, $metaclass_name, %options ) = @_;\r
+\r
+        my $cache_key = $type . q{ } . ( $options{trait} ? '-Trait' : '' );\r
 
-        return $cache{$cache_key}{$metaclass_name} =
-            $loaded_class->can('register_implementation')
-          ? $loaded_class->register_implementation
-          : $loaded_class;
+        return $cache{$cache_key}{$metaclass_name} ||= do{\r
+\r
+            my $possible_full_name = join '::',
+                'Mouse::Meta', $type, 'Custom', ($options{trait} ? 'Trait' : ()), $metaclass_name
+            ;
+
+            my $loaded_class = load_first_existing_class(\r
+                $possible_full_name,\r
+                $metaclass_name\r
+            );\r
+\r
+            $loaded_class->can('register_implementation')\r
+                ? $loaded_class->register_implementation\r
+                : $loaded_class;
+        };\r
     }
 }
 
@@ -238,6 +263,19 @@ sub apply_all_roles {
     return;
 }
 
+# taken from Moose::Util 0.90
+sub english_list {
+    return $_[0] if @_ == 1;\r
+
+    my @items = sort @_;\r
+\r
+    return "$items[0] and $items[1]" if @items == 2;\r
+\r
+    my $tail = pop @items;\r
+\r
+    return join q{, }, @items, "and $tail";\r
+}
+
 sub not_supported{
     my($feature) = @_;