This is 0.15 on the way up to the CPAN.

diff --git a/Changes b/Changes
index a111b7c..b36f012 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,10 @@
 Revision history for Catalyst::Authentication::Credential::OpenID
 
-0.14.05 Sat Sep 26 16:17:15 PDT 2009
+0.15  Mon Oct 12 18:18:21 PDT 2009
+      - Patches from Zbigniew Lukasiak to correct inappropriate configuaration settings applied.
+      - Spelling fixes, argument clarification in Pod.
+
+0.14_05 Sat Sep 26 16:17:15 PDT 2009
       - Moving live-app.t back to on demand and only if everything is
         there to even try.
       

diff --git a/README b/README
index 27a1d74..c6e096f 100644 (file)
--- a/README
+++ b/README
@@ -3,11 +3,11 @@ NAME
     Catalyst::Plugin::Authentication framework.
 
 VERSION
-    0.14_05
+    0.15
 
 BACKWARDS COMPATIBILITY CHANGES
-  EXTENTION_ARGS v EXTENSIONS
-    NB: The extenstions were previously configured under the key
+  EXTENSION_ARGS v EXTENSIONS
+    NB: The extensions were previously configured under the key
     "extension_args". They are now configured under "extensions". This
     prevents the need for double configuration but it breaks extensions in
     your application if you do not change the name. The old version is
@@ -42,8 +42,8 @@ SYNOPSIS
              <openid>
                  <credential>
                      class   OpenID
+                     ua_class   LWP::UserAgent
                  </credential>
-                 ua_class   LWP::UserAgent
              </openid>
          </realms>
      </Plugin::Authentication>
@@ -56,7 +56,7 @@ SYNOPSIS
          openid:
            credential:
              class: OpenID
-           ua_class: LWP::UserAgent
+             ua_class: LWP::UserAgent
 
     In a controller, perhaps "Root::openid"-
 
@@ -179,24 +179,25 @@ CONFIGURATION
                               }
                   },
                   openid => {
-                      consumer_secret => "Don't bother setting",
-                      ua_class => "LWP::UserAgent",
-                      ua_args => {
-                          whitelisted_hosts => [qw/ 127.0.0.1 localhost /],
-                      },
                       credential => {
                           class => "OpenID",
                           store => {
                               class => "OpenID",
                           },
-                      },
-                      extensions => [
-                          'http://openid.net/extensions/sreg/1.1',
-                          {
-                           required => 'email',
-                           optional => 'fullname,nickname,timezone',
+                          consumer_secret => "Don't bother setting",
+                          ua_class => "LWP::UserAgent",
+                          # whitelist is only relevant for LWPx::ParanoidAgent
+                          ua_args => {
+                              whitelisted_hosts => [qw/ 127.0.0.1 localhost /],
                           },
-                      ],
+                          extensions => [
+                              'http://openid.net/extensions/sreg/1.1',
+                              {
+                               required => 'email',
+                               optional => 'fullname,nickname,timezone',
+                              },
+                          ],
+                      },
                   },
               },
           }
@@ -225,23 +226,23 @@ CONFIGURATION
                  </credential>
              </members>
              <openid>
-                 <ua_args>
-                     whitelisted_hosts   127.0.0.1
-                     whitelisted_hosts   localhost
-                 </ua_args>
-                 consumer_secret   Don't bother setting
-                 ua_class   LWP::UserAgent
                  <credential>
                      <store>
                          class   OpenID
                      </store>
                      class   OpenID
+                     <ua_args>
+                         whitelisted_hosts   127.0.0.1
+                         whitelisted_hosts   localhost
+                     </ua_args>
+                     consumer_secret   Don't bother setting
+                     ua_class   LWP::UserAgent
+                     <extensions>
+                         http://openid.net/extensions/sreg/1.1
+                         required   email
+                         optional   fullname,nickname,timezone
+                     </extensions>
                  </credential>
-                 <extensions>
-                     http://openid.net/extensions/sreg/1.1
-                     required   email
-                     optional   fullname,nickname,timezone
-                 </extensions>
              </openid>
          </realms>
      </Plugin::Authentication>
@@ -268,16 +269,17 @@ CONFIGURATION
              class: OpenID
              store:
                class: OpenID
-           consumer_secret: Don't bother setting
-           ua_class: LWP::UserAgent
-           ua_args:
-             whitelisted_hosts:
-               - 127.0.0.1
-               - localhost
-           extensions:
-               - http://openid.net/extensions/sreg/1.1
-               - required: email
-                 optional: fullname,nickname,timezone
+             consumer_secret: Don't bother setting
+             ua_class: LWP::UserAgent
+             ua_args:
+               # whitelist is only relevant for LWPx::ParanoidAgent
+               whitelisted_hosts:
+                 - 127.0.0.1
+                 - localhost
+             extensions:
+                 - http://openid.net/extensions/sreg/1.1
+                 - required: email
+                   optional: fullname,nickname,timezone
 
     NB: There is no OpenID store yet.
 
@@ -290,8 +292,6 @@ CONFIGURATION
     here to stay.
 
   MORE ON CONFIGURATION
-    These are set in your realm. See above.
-
     ua_args and ua_class
         LWPx::ParanoidAgent is the default agent — "ua_class" — if it's
         available, LWP::UserAgent if not. You don't have to set it. I
@@ -384,3 +384,10 @@ SEE ALSO
     Miscellaneous
         Catalyst::Manual::Tutorial, Template, LWPx::ParanoidAgent.
 
+POD ERRORS
+    Hey! The above document had some coding errors, which are explained
+    below:
+
+    Around line 464:
+        '=item' outside of any '=over'
+

diff --git a/lib/Catalyst/Authentication/Credential/OpenID.pm b/lib/Catalyst/Authentication/Credential/OpenID.pm
index a23947f..61d0617 100644 (file)
--- a/lib/Catalyst/Authentication/Credential/OpenID.pm
+++ b/lib/Catalyst/Authentication/Credential/OpenID.pm
@@ -7,7 +7,7 @@ BEGIN {
     __PACKAGE__->mk_accessors(qw/ _config realm debug secret /);
 }
 
-our $VERSION = "0.14_05";
+our $VERSION = "0.15";
 
 use Net::OpenID::Consumer;
 use Catalyst::Exception ();
@@ -161,13 +161,13 @@ Catalyst::Authentication::Credential::OpenID - OpenID credential for Catalyst::P
 
 =head1 VERSION
 
-0.14_05
+0.15
 
 =head1 BACKWARDS COMPATIBILITY CHANGES
 
-=head2 EXTENTION_ARGS v EXTENSIONS
+=head2 EXTENSION_ARGS v EXTENSIONS
 
-B<NB>: The extenstions were previously configured under the key C<extension_args>. They are now configured under C<extensions>. This prevents the need for double configuration but it breaks extensions in your application if you do not change the name. The old version is supported for now but may be phased out at any time.
+B<NB>: The extensions were previously configured under the key C<extension_args>. They are now configured under C<extensions>. This prevents the need for double configuration but it breaks extensions in your application if you do not change the name. The old version is supported for now but may be phased out at any time.
 
 As previously noted, L</EXTENSIONS TO OPENID>, I have not tested the extensions. I would be grateful for any feedback or, better, tests.
 
@@ -194,8 +194,8 @@ Somewhere in myapp.conf-
          <openid>
              <credential>
                  class   OpenID
+                 ua_class   LWP::UserAgent
              </credential>
-             ua_class   LWP::UserAgent
          </openid>
      </realms>
  </Plugin::Authentication>
@@ -208,7 +208,7 @@ Or in your myapp.yml if you're using L<YAML> instead-
      openid:
        credential:
          class: OpenID
-       ua_class: LWP::UserAgent
+         ua_class: LWP::UserAgent
 
 In a controller, perhaps C<Root::openid>-
 
@@ -353,24 +353,25 @@ clear text passwords and one called "openid" which uses... uh, OpenID.
                           }
               },
               openid => {
-                  consumer_secret => "Don't bother setting",
-                  ua_class => "LWP::UserAgent",
-                  ua_args => {
-                      whitelisted_hosts => [qw/ 127.0.0.1 localhost /],
-                  },
                   credential => {
                       class => "OpenID",
                       store => {
                           class => "OpenID",
                       },
-                  },
-                  extensions => [
-                      'http://openid.net/extensions/sreg/1.1',
-                      {
-                       required => 'email',
-                       optional => 'fullname,nickname,timezone',
+                      consumer_secret => "Don't bother setting",
+                      ua_class => "LWP::UserAgent",
+                      # whitelist is only relevant for LWPx::ParanoidAgent
+                      ua_args => {
+                          whitelisted_hosts => [qw/ 127.0.0.1 localhost /],
                       },
-                  ],
+                      extensions => [
+                          'http://openid.net/extensions/sreg/1.1',
+                          {
+                           required => 'email',
+                           optional => 'fullname,nickname,timezone',
+                          },
+                      ],
+                  },
               },
           },
       }
@@ -398,23 +399,23 @@ This is the same configuration in the default L<Catalyst> configuration format f
              </credential>
          </members>
          <openid>
-             <ua_args>
-                 whitelisted_hosts   127.0.0.1
-                 whitelisted_hosts   localhost
-             </ua_args>
-             consumer_secret   Don't bother setting
-             ua_class   LWP::UserAgent
              <credential>
                  <store>
                      class   OpenID
                  </store>
                  class   OpenID
+                 <ua_args>
+                     whitelisted_hosts   127.0.0.1
+                     whitelisted_hosts   localhost
+                 </ua_args>
+                 consumer_secret   Don't bother setting
+                 ua_class   LWP::UserAgent
+                 <extensions>
+                     http://openid.net/extensions/sreg/1.1
+                     required   email
+                     optional   fullname,nickname,timezone
+                 </extensions>
              </credential>
-             <extensions>
-                 http://openid.net/extensions/sreg/1.1
-                 required   email
-                 optional   fullname,nickname,timezone
-             </extensions>
          </openid>
      </realms>
  </Plugin::Authentication>
@@ -440,16 +441,17 @@ And now, the same configuration in L<YAML>. B<NB>: L<YAML> is whitespace sensiti
          class: OpenID
          store:
            class: OpenID
-       consumer_secret: Don't bother setting
-       ua_class: LWP::UserAgent
-       ua_args:
-         whitelisted_hosts:
-           - 127.0.0.1
-           - localhost
-       extensions:
-           - http://openid.net/extensions/sreg/1.1
-           - required: email
-             optional: fullname,nickname,timezone
+         consumer_secret: Don't bother setting
+         ua_class: LWP::UserAgent
+         ua_args:
+           # whitelist is only relevant for LWPx::ParanoidAgent
+           whitelisted_hosts:
+             - 127.0.0.1
+             - localhost
+         extensions:
+             - http://openid.net/extensions/sreg/1.1
+             - required: email
+               optional: fullname,nickname,timezone
 
 B<NB>: There is no OpenID store yet.
 
@@ -459,10 +461,6 @@ The Simple Registration--L<http://openid.net/extensions/sreg/1.1>--(SREG) extens
 
 =head2 MORE ON CONFIGURATION
 
-These are set in your realm. See above.
-
-=over 4
-
 =item ua_args and ua_class
 
 L<LWPx::ParanoidAgent> is the default agent E<mdash> C<ua_class> E<mdash> if it's available, L<LWP::UserAgent> if not. You don't have to set

diff --git a/t/Consumer/lib/TestApp.pm b/t/Consumer/lib/TestApp.pm
index 6a13bf9..07c638b 100644 (file)
--- a/t/Consumer/lib/TestApp.pm
+++ b/t/Consumer/lib/TestApp.pm
@@ -41,27 +41,27 @@ __PACKAGE__->config
                           }
               },
               openid => {
-                  errors_are_fatal => 1,
-                  # ua_class => "LWPx::ParanoidAgent",
-                  ua_class => "LWP::UserAgent",
-                  ua_args => {
-                      whitelisted_hosts => [qw/ 127.0.0.1 localhost /],
-                      timeout => 10,
-                  },
-                  extensions => [
-                      'http://openid.net/extensions/sreg/1.1',
-                      {
-                       required => 'email',
-                       optional => 'fullname,nickname,timezone',
-                      },
-                  ],
-                  debug => 1,
                   credential => {
                       class => "OpenID",
 #DOES NOTHING                      use_session => 1,
                       store => {
                           class => "OpenID",
                       },
+                      errors_are_fatal => 1,
+                      # ua_class => "LWPx::ParanoidAgent",
+                      ua_class => "LWP::UserAgent",
+                      ua_args => {
+                          whitelisted_hosts => [qw/ 127.0.0.1 localhost /],
+                          timeout => 10,
+                      },
+                      extensions => [
+                          'http://openid.net/extensions/sreg/1.1',
+                          {
+                           required => 'email',
+                           optional => 'fullname,nickname,timezone',
+                          },
+                      ],
+                      debug => 1,
                   },
               },
           },

diff --git a/t/live-app.t b/t/live-app.t
index a3a9e34..1a5199e 100644 (file)
--- a/t/live-app.t
+++ b/t/live-app.t
@@ -31,7 +31,7 @@ if ( $@ )
 }
 elsif ( not $ENV{TEST_HTTP} )
 {
-    plan skip_all => 'set TEST_HTTP to enable this test';
+    plan skip_all => 'Set TEST_HTTP to enable this test';
 }
 else
 {