fixed a few plugin examples

mojolicious · May 4, 2012 · c273e15 · c273e15
1 parent 15b474f
commit c273e15
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 35 deletions.
diff --git a/lib/Mojolicious/Command/generate/plugin.pm b/lib/Mojolicious/Command/generate/plugin.pm
@@ -69,7 +69,7 @@ L<Mojolicious::Plugin> and implements the following new ones.
 
 <% %>=head2 C<register>
 
-  $plugin->register;
+  $plugin->register($app);
 
 Register plugin in L<Mojolicious> application.
 

diff --git a/lib/Mojolicious/Plugin/Charset.pm b/lib/Mojolicious/Plugin/Charset.pm
@@ -8,7 +8,7 @@ sub register {
   my ($self, $app, $conf) = @_;
 
   # Change default charset on all layers
-  return unless my $c = ($conf || {})->{charset};
+  return unless my $c = $conf->{charset};
   $app->types->type(html => "text/html;charset=$c");
   $app->renderer->encoding($c);
   $app->hook(before_dispatch => sub { shift->req->default_charset($c) });
@@ -52,7 +52,7 @@ L<Mojolicious::Plugin> and implements the following new ones.
 
 =head2 C<register>
 
-  $plugin->register;
+  $plugin->register($app, $conf);
 
 Register plugin hooks in L<Mojolicious> application.
 

diff --git a/lib/Mojolicious/Plugin/Config.pm b/lib/Mojolicious/Plugin/Config.pm
@@ -34,7 +34,6 @@ sub parse {
 
 sub register {
   my ($self, $app, $conf) = @_;
-  $conf ||= {};
 
   # Config file
   my $file = $conf->{file} || $ENV{MOJO_CONFIG};
@@ -176,7 +175,7 @@ Parse configuration file.
 
 =head2 C<register>
 
-  my $config = $plugin->register;
+  my $config = $plugin->register($app, $conf);
 
 Register plugin in L<Mojolicious> application.
 

diff --git a/lib/Mojolicious/Plugin/DefaultHelpers.pm b/lib/Mojolicious/Plugin/DefaultHelpers.pm
@@ -290,7 +290,7 @@ L<Mojolicious::Plugin> and implements the following new ones.
 
 =head2 C<register>
 
-  $plugin->register;
+  $plugin->register($app);
 
 Register helpers in L<Mojolicious> application.
 

diff --git a/lib/Mojolicious/Plugin/EPLRenderer.pm b/lib/Mojolicious/Plugin/EPLRenderer.pm
@@ -104,7 +104,7 @@ L<Mojolicious::Plugin> and implements the following new ones.
 
 =head2 C<register>
 
-  $plugin->register;
+  $plugin->register($app);
 
 Register renderer in L<Mojolicious> application.
 

diff --git a/lib/Mojolicious/Plugin/EPRenderer.pm b/lib/Mojolicious/Plugin/EPRenderer.pm
@@ -9,7 +9,6 @@ use Mojo::Util qw/encode md5_sum/;
 #  Wishful thinking. We have long since evolved beyond the need for asses."
 sub register {
   my ($self, $app, $conf) = @_;
-  $conf ||= {};
 
   # Custom sandbox
   my $template = $conf->{template} || {};
@@ -129,7 +128,7 @@ L<Mojolicious::Plugin> and implements the following new ones.
 
 =head2 C<register>
 
-  $plugin->register;
+  $plugin->register($app, $conf);
 
 Register renderer in L<Mojolicious> application.
 

diff --git a/lib/Mojolicious/Plugin/HeaderCondition.pm b/lib/Mojolicious/Plugin/HeaderCondition.pm
@@ -82,7 +82,7 @@ L<Mojolicious::Plugin> and implements the following new ones.
 
 =head2 C<register>
 
-  $plugin->register;
+  $plugin->register($app);
 
 Register condition in L<Mojolicious> application.
 

diff --git a/lib/Mojolicious/Plugin/I18N.pm b/lib/Mojolicious/Plugin/I18N.pm
@@ -8,7 +8,6 @@ use I18N::LangTags::Detect;
 #  No, the cat shelter’s onto me."
 sub register {
   my ($self, $app, $conf) = @_;
-  $conf ||= {};
 
   # Initialize
   my $namespace = $conf->{namespace} || ((ref $app) . "::I18N");
@@ -165,7 +164,7 @@ and implements the following new ones.
 
 =head2 C<register>
 
-  $plugin->register;
+  $plugin->register($app, $conf);
 
 Register plugin hooks and helpers in L<Mojolicious> application.
 

diff --git a/lib/Mojolicious/Plugin/JSONConfig.pm b/lib/Mojolicious/Plugin/JSONConfig.pm
@@ -23,26 +23,14 @@ sub parse {
   return $config;
 }
 
-sub register {
-  my ($self, $app, $conf) = @_;
-  $conf->{ext} = 'json' unless exists $conf->{ext};
-  $self->SUPER::register($app, $conf);
-}
+sub register { shift->SUPER::register(shift, {ext => 'json', %{shift()}}) }
 
 sub render {
   my ($self, $content, $file, $conf, $app) = @_;
 
-  # Instance
-  my $prepend = 'my $app = shift;';
-
-  # Be less strict
-  $prepend .= q/no strict 'refs'; no warnings 'redefine';/;
-
-  # Helper
-  $prepend .= "sub app; *app = sub { \$app };";
-
-  # Be strict again
-  $prepend .= q/use Mojo::Base -strict;/;
+  # Application instance and helper
+  my $prepend = q/my $app = shift; no strict 'refs'; no warnings 'redefine';/;
+  $prepend .= q/sub app; *app = sub { $app }; use Mojo::Base -strict;/;
 
   # Render
   my $mt = Mojo::Template->new($conf->{template} || {});
@@ -118,7 +106,7 @@ Process content with C<render> and parse it with L<Mojo::JSON>.
 
 =head2 C<register>
 
-  my $config = $plugin->register;
+  my $config = $plugin->register($app, $conf);
 
 Register plugin in L<Mojolicious> application.
 

diff --git a/lib/Mojolicious/Plugin/Mount.pm b/lib/Mojolicious/Plugin/Mount.pm
@@ -64,7 +64,7 @@ and implements the following new ones.
 
 =head2 C<register>
 
-  my $route = $plugin->register;
+  my $route = $plugin->register($app, $conf);
 
 Mount L<Mojolicious> application.
 

diff --git a/lib/Mojolicious/Plugin/PODRenderer.pm b/lib/Mojolicious/Plugin/PODRenderer.pm
@@ -18,7 +18,6 @@ my $PERLDOC = $Mojolicious::Controller::H->slurp_rel_file('perldoc.html.ep');
 #  pleasant one."
 sub register {
   my ($self, $app, $conf) = @_;
-  $conf ||= {};
 
   # Add "pod" handler
   my $preprocess = $conf->{preprocess} || 'ep';
@@ -206,7 +205,7 @@ L<Mojolicious::Plugin> and implements the following new ones.
 
 =head2 C<register>
 
-  my $route = $plugin->register;
+  my $route = $plugin->register($app, $conf);
 
 Register renderer in L<Mojolicious> application.
 

diff --git a/lib/Mojolicious/Plugin/PoweredBy.pm b/lib/Mojolicious/Plugin/PoweredBy.pm
@@ -54,7 +54,7 @@ L<Mojolicious::Plugin> and implements the following new ones.
 
 =head2 C<register>
 
-  $plugin->register;
+  $plugin->register($app, $conf);
 
 Register plugin hooks in L<Mojolicious> application.
 

diff --git a/lib/Mojolicious/Plugin/RequestTimer.pm b/lib/Mojolicious/Plugin/RequestTimer.pm
@@ -72,7 +72,7 @@ L<Mojolicious::Plugin> and implements the following new ones.
 
 =head2 C<register>
 
-  $plugin->register;
+  $plugin->register($app);
 
 Register plugin hooks in L<Mojolicious> application.
 

diff --git a/lib/Mojolicious/Plugin/TagHelpers.pm b/lib/Mojolicious/Plugin/TagHelpers.pm
@@ -601,7 +601,7 @@ L<Mojolicious::Plugin> and implements the following new ones.
 
 =head2 C<register>
 
-  $plugin->register;
+  $plugin->register($app);
 
 Register helpers in L<Mojolicious> application.