ruby-openid 1.1.2 → 1.1.3

data/lib/openid/consumer.rb

@@ -352,16 +352,24 @@ module OpenID
         resp = @consumer.complete(query, service)
       end
 
-      disco = self.get_discovery(resp.identity_url)
-
-      if [SUCCESS, CANCEL].member?(resp.status)
-        if resp.identity_url
-          resp.service = disco.finish
+      # If the response has an non-nil identity_url attribute,
+      # then we can get te discovery object and finalize the request.
+      # Otherwise it is a failure or replay, and we set the response
+      # servce to nil.
+      if resp.identity_url
+        disco = self.get_discovery(resp.identity_url)
+        if [SUCCESS, CANCEL].member?(resp.status)
+          if resp.identity_url
+            resp.service = disco.finish
+          end
+        else
+          resp.service = disco.current
         end
       else
-        resp.service = disco.current
+        resp.service = nil
       end
 
+
       # want to delete service unless status is SETUP_NEEDED,
       # because we still need the service info when the user returns from
       # the server

data/lib/openid/trustroot.rb

@@ -19,8 +19,9 @@ module OpenID
     end
 
     def TrustRoot.parse(trust_root)
-      return nil unless trust_root.instance_of?(String)
+      return nil unless trust_root.instance_of?(String)    
 
+      trust_root = trust_root.dup      
       unparsed = trust_root.dup
 
       # look for wildcard

data/test/data/brianellin.mylid.xrds

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<XRDS xmlns="xri://$xrds" xmlns:xrd="xri://$xrd*($v*2.0)">
+ <xrd:XRD>
+  <xrd:Service priority="1">
+   <xrd:Type>http://lid.netmesh.org/minimum-lid/2.0b9</xrd:Type>
+   <xrd:URI>http://mylid.net/brianellin</xrd:URI>
+  </xrd:Service>
+  <xrd:Service priority="2">
+   <xrd:Type>http://lid.netmesh.org/sso/2.0b9</xrd:Type>
+   <xrd:URI>http://mylid.net/brianellin</xrd:URI>
+  </xrd:Service>
+  <xrd:Service priority="3">
+   <xrd:Type>http://lid.netmesh.org/sso/1.0</xrd:Type>
+   <xrd:URI>http://mylid.net/brianellin</xrd:URI>
+  </xrd:Service>
+  <xrd:Service priority="4">
+   <xrd:Type>http://lid.netmesh.org/relying-party/2.0b9</xrd:Type>
+   <xrd:URI>http://mylid.net/brianellin</xrd:URI>
+  </xrd:Service>
+  <xrd:Service priority="5">
+   <xrd:Type>http://lid.netmesh.org/traversal/2.0b9</xrd:Type>
+   <xrd:URI>http://mylid.net/brianellin</xrd:URI>
+  </xrd:Service>
+  <xrd:Service priority="6">
+   <xrd:Type>http://lid.netmesh.org/format-negotiation/2.0b9</xrd:Type>
+   <xrd:URI>http://mylid.net/brianellin</xrd:URI>
+  </xrd:Service>
+  <xrd:Service priority="7">
+   <xrd:Type>http://lid.netmesh.org/post/sender/2.0b9</xrd:Type>
+   <xrd:URI>http://mylid.net/brianellin</xrd:URI>
+  </xrd:Service>
+  <xrd:Service priority="8">
+   <xrd:Type>http://lid.netmesh.org/post/receiver/2.0b9</xrd:Type>
+   <xrd:URI>http://mylid.net/brianellin</xrd:URI>
+  </xrd:Service>
+  <xrd:Service priority="9">
+   <xrd:Type>http://openid.net/signon/1.0</xrd:Type>
+   <xrd:URI>http://mylid.net/brianellin</xrd:URI>
+   <openid:Delegate xmlns:openid="http://openid.net/xmlns/1.0">http://mylid.net/brianellin</openid:Delegate>
+  </xrd:Service>
+ </xrd:XRD>
+</XRDS>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ruby-openid
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
-date: 2006-08-23 00:00:00 -07:00
+  version: 1.1.3
+date: 2006-09-20 00:00:00 -07:00
 summary: A library for consuming and serving OpenID identities.
 require_paths: 
 - lib
@@ -177,6 +177,7 @@ files:
 - test/urinorm.rb
 - test/data/urinorm.txt
 - test/data/brian.xrds
+- test/data/brianellin.mylid.xrds
 - README
 - INSTALL
 - COPYING