added base class without require support to Mojo::Base

mojolicious · Apr 2, 2012 · 7707cd8 · 7707cd8
1 parent 971b327
commit 7707cd8
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 14 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,7 @@
 This file documents the revision history for Perl extension Mojolicious.
 
 2.71  2012-04-02
+  - Added base class without require support to Mojo::Base.
   - Improved Hypnotoad error handling.
   - Improved version command to detect proxy servers automatically.
   - Improved documentation.

diff --git a/lib/Mojo/Base.pm b/lib/Mojo/Base.pm
@@ -29,7 +29,7 @@ sub import {
   else {
     my $file = $flag;
     $file =~ s/::|'/\//g;
-    require "$file.pm" unless $flag->can('new');
+    require "$file.pm" unless $flag =~ s/^\+//;
   }
 
   # ISA
@@ -142,9 +142,10 @@ L<Mojo::Base> is a simple base class for L<Mojo> projects.
   # Automatically enables "strict", "warnings" and Perl 5.10 features
   use Mojo::Base -strict;
   use Mojo::Base -base;
+  use Mojo::Base '+SomeBaseClass';
   use Mojo::Base 'SomeBaseClass';
 
-All three forms save a lot of typing.
+All four forms save a lot of typing.
 
   # use Mojo::Base -strict;
   use strict;
@@ -159,6 +160,14 @@ All three forms save a lot of typing.
   push @ISA, 'Mojo::Base';
   sub has { Mojo::Base::attr(__PACKAGE__, @_) }
 
+  # use Mojo::Base '+SomeBaseClass';
+  use strict;
+  use warnings;
+  use feature ':5.10';
+  push @ISA, 'SomeBaseClass';
+  use Mojo::Base;
+  sub has { Mojo::Base::attr(__PACKAGE__, @_) }
+
   # use Mojo::Base 'SomeBaseClass';
   use strict;
   use warnings;

diff --git a/lib/Mojolicious/Guides/Rendering.pod b/lib/Mojolicious/Guides/Rendering.pod
@@ -742,7 +742,7 @@ support in your application is the plugin L<Mojolicious::Plugin::I18N> and a
 few lexicon classes.
 
   package MyApp::I18N::de;
-  use base 'MyApp::I18N';
+  use Mojo::Base '+MyApp::I18N';
 
   our %Lexicon = ('Hello World' => 'Hallo Welt');
 

diff --git a/lib/Mojolicious/Plugin/I18N.pm b/lib/Mojolicious/Plugin/I18N.pm
@@ -13,10 +13,10 @@ sub register {
   # Initialize
   my $namespace = $conf->{namespace} || ((ref $app) . "::I18N");
   my $default   = $conf->{default}   || 'en';
-  eval "package $namespace; use base 'Locale::Maketext'; 1;";
+  eval "package $namespace; use Mojo::Base 'Locale::Maketext'; 1;";
   eval "require ${namespace}::${default};";
   unless (eval "\%${namespace}::${default}::Lexicon") {
-    eval "package ${namespace}::$default; use base '$namespace';"
+    eval "package ${namespace}::$default; use Mojo::Base '+$namespace';"
       . 'our %Lexicon = (_AUTO => 1); 1;';
     die qq/Couldn't initialize I18N class "$namespace": $@/ if $@;
   }
@@ -112,9 +112,9 @@ code by default.
 
   # $self->plugin('I18N');
   package MyApp::I18N;
-  use base 'Locale::Maketext';
+  use Mojo::Base 'Locale::Maketext';
   package MyApp::I18N::en;
-  use base 'MyApp::I18N';
+  use Mojo::Base '+MyApp::I18N';
   our %Lexicon = (_AUTO => 1);
   1;
 

diff --git a/t/mojo/base.t b/t/mojo/base.t
@@ -17,6 +17,9 @@ use base 'BaseTest::Base2';
 __PACKAGE__->attr(heads => 1);
 __PACKAGE__->attr('name');
 
+package BaseTestTest;
+use Mojo::Base '+BaseTest';
+
 package main;
 
 use Mojo::Base;
@@ -32,7 +35,7 @@ for my $i (1 .. 50) {
   is $monkeys->[$i]->bananas, $i, 'right attribute value';
 }
 for my $i (51 .. 100) {
-  $monkeys->[$i] = BaseTest->new(bananas => $i);
+  $monkeys->[$i] = BaseTestTest->new(bananas => $i);
   is $monkeys->[$i]->bananas, $i, 'right attribute value';
 }
 

diff --git a/t/mojolicious/i18n_lite_app.t b/t/mojolicious/i18n_lite_app.t
@@ -9,8 +9,7 @@ BEGIN {
 use Test::More tests => 24;
 
 package MyTestApp::I18N::de;
-use Mojo::Base -strict;
-use base 'MyTestApp::I18N';
+use Mojo::Base '+MyTestApp::I18N';
 
 our %Lexicon = (hello => 'hallo');
 

diff --git a/t/mojolicious/i18n_shortcut_lite_app.t b/t/mojolicious/i18n_shortcut_lite_app.t
@@ -9,14 +9,12 @@ BEGIN {
 use Test::More tests => 24;
 
 package MyTestApp::I18N::en;
-use Mojo::Base -strict;
-use base 'MyTestApp::I18N';
+use Mojo::Base '+MyTestApp::I18N';
 
 our %Lexicon = (hello => 'Hello World');
 
 package MyTestApp::I18N::de;
-use Mojo::Base -strict;
-use base 'MyTestApp::I18N';
+use Mojo::Base '+MyTestApp::I18N';
 
 our %Lexicon = (hello => 'Hallo Welt');