[Jifty-commit] jifty-plugin-openid branch, plack, updated. ea56e427ebeef4416390587595ea0af5bad99e6a

Jifty commits jifty-commit at lists.jifty.org
Mon Feb 8 08:32:48 EST 2010


The branch, plack has been updated
       via  ea56e427ebeef4416390587595ea0af5bad99e6a (commit)
       via  cfdf300af58e044e3cc901460b6461e6e7ca5f69 (commit)
       via  b5370aec270ad7550ded264f7a255f3e4f3eef23 (commit)
      from  b49846be2868528b44285d3a5c8b9ff3b98cb791 (commit)

Summary of changes:
 lib/Jifty/Plugin/OpenID.pm                     |    2 +-
 lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm |    5 +++--
 t/TestApp/etc/config.yml                       |    2 +-
 t/TestApp/t/00-openid-test.t                   |   14 ++++++--------
 4 files changed, 11 insertions(+), 12 deletions(-)

- Log -----------------------------------------------------------------
commit b5370aec270ad7550ded264f7a255f3e4f3eef23
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Feb 8 20:06:25 2010 +0800

    switch the order of the 2 servers to avoid the weird hang forever problem

diff --git a/t/TestApp/t/00-openid-test.t b/t/TestApp/t/00-openid-test.t
index cebf1cf..17ee17c 100644
--- a/t/TestApp/t/00-openid-test.t
+++ b/t/TestApp/t/00-openid-test.t
@@ -1,12 +1,15 @@
 #!/usr/bin/env perl
-use Jifty::Test tests => 12;
+use Jifty::Test tests => 12, actual_server => 1;
 use strict;
 use warnings;
 use Jifty::Test::WWW::Mechanize;
 
-
-
 use Test::OpenID::Server;
+my $server = Jifty::Test->make_server;
+isa_ok( $server, 'Jifty::Server' );
+my $URL = $server->started_ok;
+my $mech = Jifty::Test::WWW::Mechanize->new;
+
 my $test_openid_server   = Test::OpenID::Server->new;
 my $test_openid_url = $test_openid_server->started_ok("server started ok");
 
@@ -14,11 +17,6 @@ diag $test_openid_url;
 
 my $openid = "$test_openid_url/c9s";
 
-
-my $server = Jifty::Test->make_server;
-isa_ok( $server, 'Jifty::Server' );
-my $URL = $server->started_ok;
-my $mech = Jifty::Test::WWW::Mechanize->new;
 $mech->get_ok( $URL . '/' , "get mainpage" );
 $mech->content_contains( 'Login with OpenID' );
 $mech->content_contains( 'OpenID URL' );

commit cfdf300af58e044e3cc901460b6461e6e7ca5f69
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Feb 8 21:30:58 2010 +0800

    use jifty's new api

diff --git a/lib/Jifty/Plugin/OpenID.pm b/lib/Jifty/Plugin/OpenID.pm
index c3a130e..dc4834d 100644
--- a/lib/Jifty/Plugin/OpenID.pm
+++ b/lib/Jifty/Plugin/OpenID.pm
@@ -136,7 +136,7 @@ sub get_csr {
     return Net::OpenID::Consumer->new(
         ua              => $class->new_ua ,
         cache           => Cache::FileCache->new,
-        args            => scalar Jifty->handler->cgi->Vars,
+        args            => Jifty->web->request->parameters,
         consumer_secret => Jifty->config->app('OpenIDSecret'),
         @_,
     );
diff --git a/lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm b/lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm
index d93c959..c81e221 100644
--- a/lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm
+++ b/lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm
@@ -34,9 +34,10 @@ sub take_action {
 # XXX HACK: some OpenID servers (LJ and myopenid.com included) don't seem
 # to properly escape plus signs (+) in openid.sig when returning the user
 # back to us.  We need to convert the pluses back from spaces to pluses again.
-    my $sig = Jifty->handler->cgi->param('openid.sig');
+    my $parameters = Jifty->web->request->parameters;
+    my $sig        = $parameters->{'openid.sig'};
     $sig =~ s/ /+/g;
-    Jifty->handler->cgi->param( 'openid.sig' => $sig );
+    $parameters->{'openid.sig'} = $sig;
 
     my $csr = Jifty::Plugin::OpenID->get_csr;
 

commit ea56e427ebeef4416390587595ea0af5bad99e6a
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Mon Feb 8 21:31:13 2010 +0800

    tests update

diff --git a/t/TestApp/etc/config.yml b/t/TestApp/etc/config.yml
index e81c462..4ebfee6 100644
--- a/t/TestApp/etc/config.yml
+++ b/t/TestApp/etc/config.yml
@@ -7,7 +7,7 @@ framework:
   ApplicationClass: TestApp
   ApplicationName: TestApp
   ApplicationUUID: B2B2509E-3EC4-11DE-A47C-73233554FF8D
-  ConfigFileVersion: 4
+  ConfigFileVersion: 5
   Database: 
     AutoUpgrade: 1
     CheckSchema: 1
diff --git a/t/TestApp/t/00-openid-test.t b/t/TestApp/t/00-openid-test.t
index 17ee17c..4f83982 100644
--- a/t/TestApp/t/00-openid-test.t
+++ b/t/TestApp/t/00-openid-test.t
@@ -6,7 +6,7 @@ use Jifty::Test::WWW::Mechanize;
 
 use Test::OpenID::Server;
 my $server = Jifty::Test->make_server;
-isa_ok( $server, 'Jifty::Server' );
+isa_ok( $server, 'Jifty::TestServer' );
 my $URL = $server->started_ok;
 my $mech = Jifty::Test::WWW::Mechanize->new;
 

-----------------------------------------------------------------------


More information about the Jifty-commit mailing list