ruby-openid 2.0.3 → 2.0.4

data/CHANGELOG

@@ -1,60 +1,41 @@
-Fri Jan 11 11:31:29 PST 2008  cygnus@janrain.com
-  tagged 2.0.3
-
-Fri Jan 11 11:29:57 PST 2008  cygnus@janrain.com
-  * Set version to 2.0.3
-
-Thu Jan 10 15:23:31 PST 2008  Kevin Turner <kevin@janrain.com>
-  * UPGRADE: formatting
-
-Thu Jan 10 15:18:17 PST 2008  Kevin Turner <kevin@janrain.com>
-  * Consumer.Response: documentation for identity_url and display_identifier
-  
-  Too bad that rdoc doesn't automatically display this in the documentation for
-  SuccessResponse; you have to follow the link to the Response docs.
-
-Tue Jan  8 16:14:56 PST 2008  Kevin Turner <kevin@janrain.com>
-  * examples/discover: correct namespace of DiscoveryFailure
+Tue Feb 12 18:02:31 PST 2008  Kevin Turner <kevin@janrain.com>
+  tagged 2.0.4
 
-Thu Jan 10 10:15:04 PST 2008  cygnus@janrain.com
-  * Catch HTTPStatusError when making KV post in association manager
+Tue Feb 12 18:01:44 PST 2008  Kevin Turner <kevin@janrain.com>
+  * set version to 2.0.4
 
-Wed Jan  9 17:39:53 PST 2008  cygnus@janrain.com
-  * Fix FetchRequest.ns_uri
+Tue Feb 12 17:49:53 PST 2008  Kevin Turner <kevin@janrain.com>
+  * HTMLTokenizer: raise OpenIDError instead of RuntimeError
 
-Wed Jan  9 17:02:49 PST 2008  cygnus@janrain.com
-  * Fix FetchResponse.from_success_response, assign correct NS_URI value for AX messages
+Thu Jan 31 11:34:11 PST 2008  Kevin Turner <kevin@janrain.com>
+  * Consumer.IdResHandler.verify_return_to_args: include more details in exception messages.
 
-Tue Jan  8 15:46:43 PST 2008  Kevin Turner <kevin@janrain.com>
-  * examples/rails_openid/app/controllers: render_text was deprecated, use render :text.
+Mon Jan 21 15:50:54 PST 2008  Kevin Turner <kevin@janrain.com>
+  * StandardFetcher.fetch: catch more exceptions to wrap in to FetchingErrors.
 
-Tue Jan  8 13:56:39 PST 2008  Kevin Turner <kevin@janrain.com>
-  * Yadis.discover: add more information to exception messages.
+Mon Jan 21 14:23:10 PST 2008  Kevin Turner <kevin@janrain.com>
+  * OpenID::normalize_url: urinorm raises URI::Error, not ArgumentError.
 
-Mon Jan  7 18:48:50 PST 2008  Kevin Turner <kevin@janrain.com>
-  * OpenIDServiceEndpoint.display_identifier: leave off the fragment from claimed_id.  [#99]
+Tue Jan 15 11:48:49 PST 2008  rubys@intertwingly.net
+  * The following set of changes gets ruby-openid to work with Ruby 1.9,
+  revision 15006 and REXML revision 1301.  The codebase with this
+  patch continues to work on Ruby 1.8.6.
 
-Tue Jan  8 09:32:27 PST 2008  http://j3h.us/
-  * MalformedTrustRoot raised by the library now gets passed the OpenID Message object instead of nil
-
-Fri Dec 21 15:05:32 PST 2007  http://j3h.us/
-  * whitespace
-
-Mon Jan  7 17:40:45 PST 2008  Kevin Turner <kevin@janrain.com>
-  * Yadis: remove mkXRDTag, mkXRDSTag.  These don't seem to make as much sense with REXML as they did with ElementTree.
-
-Mon Jan  7 17:33:41 PST 2008  Kevin Turner <kevin@janrain.com>
-  * remove comment applicable to Python
+Mon Jan 14 18:06:29 PST 2008  Kevin Turner <kevin@janrain.com>
+  * Consumer.complete_id_res: catch all OpenIDError instead of just DiscoveryFailure and ProtocolError.  Fixes #104.
+  
+  This seems to be the desired behavior.
+  
+  IdResHandler.check_auth: don't bother casting an OpenIDError to another OpenIDError.
 
-Mon Jan  7 17:00:17 PST 2008  Kevin Turner <kevin@janrain.com>
-  * test_xrds: add test for Yadis.get_canonical_id with subsegments [#93]
+Mon Jan 14 17:59:38 PST 2008  Kevin Turner <kevin@janrain.com>
+  * OpenID::ServerError: add server_url to attributes.
 
-Fri Dec 28 16:25:19 PST 2007  Kevin Turner <kevin@janrain.com>
-  * Yadis::get_canonical_id: fixes for delegated xris [#93]
-  patch contributed by =masaki
+Mon Jan 14 17:21:10 PST 2008  Kevin Turner <kevin@janrain.com>
+  * ProtocolError, ServerError: subclass OpenIDError
 
-Thu Jan  3 14:46:44 PST 2008  Kevin Turner <kevin@janrain.com>
-  * examples/discover: correct fetcher_use_env_http_proxy
+Mon Jan 14 17:20:01 PST 2008  Kevin Turner <kevin@janrain.com>
+  * UPGRADE: fix typo in example path
 
-Fri Dec 21 20:44:22 PST 2007  Kevin Turner <kevin@janrain.com>
-  tagged 2.0.2
+Fri Jan 11 11:31:29 PST 2008  cygnus@janrain.com
+  tagged 2.0.3

data/UPGRADE

@@ -4,7 +4,7 @@
 
 The flow is largely the same, however there are a number of significant 
 changes.  The consumer example is helpful to look at:
-examples/ruby_openid/app/controllers/consumer_controller.rb
+examples/rails_openid/app/controllers/consumer_controller.rb
 
 
 === Stores

data/lib/openid/association.rb

@@ -223,7 +223,7 @@ module OpenID
         self.class.check_session_type(assoc_type, session_type)
         session_types = [session_type]
       end
-      session_types.each do |session_type|
+      for session_type in session_types do
         @allowed_types << [assoc_type, session_type]
       end
     end

data/lib/openid/consumer.rb

@@ -383,7 +383,7 @@ module OpenID
 
       begin
         idres = handle_idres(message, current_url)
-      rescue DiscoveryFailure, ProtocolError => why
+      rescue OpenIDError => why
         return FailureResponse.new(last_requested_endpoint, why.message)
       else
         return SuccessResponse.new(idres.endpoint, message,

data/lib/openid/consumer/associationmanager.rb

@@ -287,7 +287,7 @@ module OpenID
         expires_in = self.class.extract_expires_in(assoc_response)
 
         # OpenID 1 has funny association session behaviour.
-        if assoc_response.is_openid1:
+        if assoc_response.is_openid1
             session_type = get_openid1_session_type(assoc_response)
         else
           session_type = assoc_response.get_arg(OPENID2_NS, 'session_type',

data/lib/openid/consumer/discovery.rb

@@ -284,8 +284,8 @@ module OpenID
     # DiscoveryFailure
     begin
       normalized = URINorm.urinorm(url)
-    rescue ArgumentError => why
-      raise DiscoveryFailure.new(sprintf('Normalizing identifier: %s', why[0]), nil)
+    rescue URI::Error => why
+      raise DiscoveryFailure.new("Error normalizing #{url}: #{why.message}", nil)
     else
       defragged = URI::parse(normalized)
       defragged.fragment = nil

data/lib/openid/consumer/html_parse.rb

@@ -2,10 +2,8 @@ require "openid/yadis/htmltokenizer"
 
 module OpenID
 
-  REFLAGS = Regexp::MULTILINE | Regexp::IGNORECASE | Regexp::EXTENDED
-
   # Stuff to remove before we start looking for tags
-  REMOVED_RE = Regexp.compile('
+  REMOVED_RE = /
     # Comments
     <!--.*?-->
 
@@ -18,9 +16,9 @@ module OpenID
     # make sure script is not an XML namespace
     (?!:)
 
-    [^>]*>.*?</script>
+    [^>]*>.*?<\/script>
 
-  ', REFLAGS, 'u')
+  /mixu 
 
   def OpenID.openid_unescape(s)
     s.gsub('&amp;','&').gsub('&lt;','<').gsub('&gt;','>').gsub('&quot;','"')
@@ -75,7 +73,7 @@ module OpenID
         end
         
       end
-    rescue RuntimeError # just stop parsing if there's an error
+    rescue Exception # just stop parsing if there's an error
     end
     return links
   end

data/lib/openid/consumer/idres.rb

@@ -160,17 +160,28 @@ module OpenID
         return_to_parsed_query.each_pair do |rt_key, rt_val|
           msg_val = query[rt_key]
           if msg_val.nil?
-            raise ProtocolError, "Message missing return_to argument #{rt_key}"
+            raise ProtocolError, "Message missing return_to argument '#{rt_key}'"
           elsif msg_val != rt_val
-            raise ProtocolError, ("Parameter #{rt_key} value "\
+            raise ProtocolError, ("Parameter '#{rt_key}' value "\
                                   "#{msg_val.inspect} does not match "\
                                   "return_to's value #{rt_val.inspect}")
           end
         end
         @message.get_args(BARE_NS).each_pair do |bare_key, bare_val|
-          if return_to_parsed_query[bare_key] != bare_val
-            raise ProtocolError, ("Parameter #{bare_key} does not match "\
-                                  "return_to URL")
+          rt_val = return_to_parsed_query[bare_key]
+          if not return_to_parsed_query.has_key? bare_key
+            # This may be caused by your web framework throwing extra
+            # entries in to your parameters hash that were not GET or
+            # POST parameters.  For example, Rails has been known to
+            # add "controller" and "action" keys; another server adds
+            # at least a "format" key.
+            raise ProtocolError, ("Unexpected parameter (not on return_to): "\
+                                  "'#{bare_key}'=#{rt_val.inspect})")
+          end
+          if rt_val != bare_val
+            raise ProtocolError, ("Parameter '#{bare_key}' value "\
+                                  "#{bare_val.inspect} does not match "\
+                                  "return_to's value #{rt_val.inspect}")
           end
         end
       end
@@ -222,12 +233,7 @@ module OpenID
                                "request: #{why.message}"
         end
 
-        begin
-          response = OpenID.make_kv_post(request, server_url)
-        rescue ServerError => why
-          raise ProtocolError, "Error from #{server_url} during "\
-                               "check_authentication: #{why.message}"
-        end
+        response = OpenID.make_kv_post(request, server_url)
 
         process_check_auth_response(response)
       end

data/lib/openid/cryptutil.rb

@@ -1,8 +1,12 @@
 require "openid/util"
 require "digest/sha1"
 require "digest/sha2"
-require "hmac/sha1"
-require "hmac/sha2"
+begin
+  require "digest/hmac"
+rescue LoadError
+  require "hmac/sha1"
+  require "hmac/sha2"
+end
 
 module OpenID
   # This module contains everything needed to perform low-level
@@ -26,7 +30,11 @@ module OpenID
     end
 
     def CryptUtil.hmac_sha1(key, text)
-      return HMAC::SHA1.digest(key, text)
+      if Digest.const_defined? :HMAC      
+        Digest::HMAC.new(key,Digest::SHA1).update(text).digest
+      else
+        return HMAC::SHA1.digest(key, text)
+      end
     end
 
     def CryptUtil.sha256(text)
@@ -34,7 +42,11 @@ module OpenID
     end
 
     def CryptUtil.hmac_sha256(key, text)
-      return HMAC::SHA256.digest(key, text)
+      if Digest.const_defined? :HMAC      
+        Digest::HMAC.new(key,Digest::SHA256).update(text).digest
+      else
+        return HMAC::SHA256.digest(key, text)
+      end
     end
 
     # Generate a random string of the given length, composed of the

data/lib/openid/dh.rb

@@ -56,9 +56,13 @@ module OpenID
           "Inputs were #{s.inspect} and #{t.inspect}"
       end
 
-      indices = 0...(s.length)
-      chrs = indices.collect {|i| (s[i]^t[i]).chr}
-      chrs.join("")
+      if String.method_defined? :bytes
+        s.bytes.zip(t.bytes).map{|sb,tb| sb^tb}.pack('C*')
+      else
+        indices = 0...(s.length)
+        chrs = indices.collect {|i| (s[i]^t[i]).chr}
+        chrs.join("")
+      end
     end
 
     # This code is taken from this post:

data/lib/openid/extensions/pape.rb

@@ -133,7 +133,7 @@ module OpenID
           end
           if nist_level and nist_level >= 0 and nist_level < 5
             @nist_auth_level = nist_level
-          elsif strict:
+          elsif strict
             raise ArgumentError, "nist_auth_level must be an integer 0 through 4, not #{nist_level_str.inspect}"
           end
         end

data/lib/openid/extensions/sreg.rb

@@ -194,7 +194,8 @@ module OpenID
 
       # Add the given list of fields to the request.
       def request_fields(field_names, required = false, strict = false)
-        raise ArgumentError unless field_names[0].is_a?(String)
+        raise ArgumentError unless field_names.respond_to?(:each) and
+                                   field_names[0].is_a?(String)
         field_names.each{|fn|request_field(fn, required, strict)}
       end
 

data/lib/openid/fetchers.rb

@@ -112,7 +112,7 @@ module OpenID
   
   class StandardFetcher
 
-    USER_AGENT = "ruby-openid/#{OpenID::VERSION} (#{PLATFORM})"
+    USER_AGENT = "ruby-openid/#{OpenID::VERSION} (#{RUBY_PLATFORM})"
 
     REDIRECT_LIMIT = 5
 
@@ -196,6 +196,12 @@ module OpenID
         }
       rescue OpenSSL::SSL::SSLError => why
         raise SSLFetchingError, "Error connecting to SSL URL #{url}: #{why}"
+      rescue FetchingError => why
+        raise why
+      rescue Exception => why
+        # Things we've caught here include a Timeout::Error, which descends
+        # from SignalException.
+        raise FetchingError, "Error fetching #{url}: #{why}"
       end
 
       case response

data/lib/openid/kvpost.rb

@@ -4,21 +4,22 @@ require "openid/fetchers"
 module OpenID
   # Exception that is raised when the server returns a 400 response
   # code to a direct request.
-  class ServerError < Exception
+  class ServerError < OpenIDError
     attr_reader :error_text, :error_code, :message
 
-    def initialize(error_text, error_code, message)
+    def initialize(error_text, error_code, message, server_url)
       super(error_text)
       @error_text = error_text
       @error_code = error_code
+      @server_url = server_url
       @message = message
     end
 
-    def self.from_message(msg)
+    def self.from_message(msg, server_url)
       error_text = msg.get_arg(OPENID_NS, 'error',
                                '<no error message supplied>')
       error_code = msg.get_arg(OPENID_NS, 'error_code')
-      return self.new(error_text, error_code, msg)
+      return self.new(error_text, error_code, msg, server_url)
     end
   end
 
@@ -34,7 +35,7 @@ module OpenID
       when 200
         return msg
       when 400
-        raise ServerError.from_message(msg)
+        raise ServerError.from_message(msg, server_url)
       else
         error_message = "bad status code from server #{server_url}: "\
         "#{response.code}"

data/lib/openid/protocolerror.rb

@@ -1,6 +1,8 @@
+require 'openid/util'
+
 module OpenID
 
   # An error in the OpenID protocol
-  class ProtocolError < Exception
+  class ProtocolError < OpenIDError
   end
 end

data/lib/openid/server.rb

@@ -430,7 +430,7 @@ module OpenID
       # mode:: +checkid_immediate+ or +checkid_setup+
       attr_accessor :mode
 
-      attr_accessor :return_to, :op_endpoint
+      attr_accessor :op_endpoint
 
       # These parameters are assigned directly as attributes,
       # see the #CheckIDRequest class documentation for their

data/lib/openid/store/filesystem.rb

@@ -174,7 +174,7 @@ module OpenID
       end
 
       def cleanup_associations
-        association_filenames = Dir[@association_dir.join("*")]
+        association_filenames = Dir[@association_dir.join("*").to_s]
         count = 0
         association_filenames.each do |af|
           begin
@@ -204,7 +204,7 @@ module OpenID
       end
 
       def cleanup_nonces
-        nonces = Dir[@nonce_dir.join("*")]
+        nonces = Dir[@nonce_dir.join("*").to_s]
         now = Time.now.to_i
 
         count = 0

data/lib/openid/util.rb

@@ -1,4 +1,3 @@
-require "base64"
 require "cgi"
 require "uri"
 require "logger"
@@ -12,7 +11,7 @@ module OpenID
   class AssertionError < Exception
   end
 
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 
   # Exceptions that are raised by the library are subclasses of this
   # exception type, so if you want to catch all exceptions raised by
@@ -38,7 +37,7 @@ module OpenID
     end
 
     def Util.to_base64(s)
-      Base64.encode64(s).gsub("\n", "")
+      [s].pack('m').gsub("\n", "")
     end
 
     def Util.from_base64(s)
@@ -46,7 +45,7 @@ module OpenID
       if !BASE64_RE.match(without_newlines)
         raise ArgumentError, "Malformed input: #{s.inspect}"
       end
-      Base64.decode64(without_newlines)
+      without_newlines.unpack('m').first
     end
 
     def Util.urlencode(args)

data/lib/openid/yadis/htmltokenizer.rb

@@ -74,7 +74,7 @@ class HTMLTokenizer
         # Token is a comment
         tag_end = @page.index('-->', (@cur_pos + 1))
         if tag_end.nil?
-          raise "No end found to started comment:\n#{@page[@cur_pos,80]}"
+          raise OpenIDError, "No end found to started comment:\n#{@page[@cur_pos,80]}"
         end
         # p @page[@cur_pos .. (tag_end+2)]
         HTMLComment.new(@page[@cur_pos .. (tag_end + 2)])
@@ -82,7 +82,7 @@ class HTMLTokenizer
         # Token is a html tag
         tag_end = @page.index('>', (@cur_pos + 1))
         if tag_end.nil?
-          raise "No end found to started tag:\n#{@page[@cur_pos,80]}"
+          raise OpenIDError, "No end found to started tag:\n#{@page[@cur_pos,80]}"
         end
         # p @page[@cur_pos .. tag_end]
         HTMLTag.new(@page[@cur_pos .. tag_end])
@@ -209,7 +209,7 @@ class HTMLComment < HTMLToken
     super(text)
     temp_arr = text.scan(/^<!--\s*(.*?)\s*-->$/m)
     if temp_arr[0].nil?
-      raise "Text passed to HTMLComment.initialize is not a comment"
+      raise OpenIDError, "Text passed to HTMLComment.initialize is not a comment"
     end
 
     @contents = temp_arr[0][0]
@@ -222,7 +222,7 @@ class HTMLTag < HTMLToken
   def initialize(text)
     super(text)
     if ?< != text[0] or ?> != text[-1]
-      raise "Text passed to HTMLComment.initialize is not a comment"
+      raise OpenIDError, "Text passed to HTMLComment.initialize is not a comment"
     end
 
     @attr_hash = Hash.new
@@ -230,7 +230,7 @@ class HTMLTag < HTMLToken
 
     tag_name = text.scan(/[\w:-]+/)[0]
     if tag_name.nil?
-      raise "Error, tag is nil: #{tag_name}"
+      raise OpenIDError, "Error, tag is nil: #{tag_name}"
     end
 
     if ?/ == text[1]

data/lib/openid/yadis/parsehtml.rb

@@ -15,7 +15,7 @@ module OpenID
         return nil if ['/head', 'body', '/body'].member?(el.tag_name)
 
         if el.tag_name == 'head'
-          unless el.to_s[-2] == 47 # tag ends with a /: a short tag
+          unless el.to_s[-2] == ?/ # tag ends with a /: a short tag
             in_head = true
           end
         end

data/test/test_associationmanager.rb

@@ -279,7 +279,7 @@ module OpenID
         def request_association(assoc_type, session_type)
           m = @responses.shift
           if m.is_a?(Message)
-            raise ServerError.from_message(m)
+            raise ServerError.from_message(m, nil)
           else
             return m
           end

data/test/test_checkid_request.rb

@@ -7,9 +7,6 @@ require "util"
 module OpenID
   class Consumer
     class CheckIDRequest
-      # For testing
-      attr_reader :message
-
       class DummyEndpoint
         attr_accessor :preferred_namespace, :local_id, :server_url,
           :is_op_identifier, :claimed_id

data/test/test_consumer.rb

@@ -100,7 +100,7 @@ module OpenID
 
           consumer = Consumer.new(@session, nil)
           consumer.extend(InstanceDefExtension)
-          consumer.instance_def(:association_manager) do
+          consumer.instance_def(:association_manager) do |service|
             assoc_manager
           end
           consumer

data/test/test_cryptutil.rb

@@ -1,5 +1,7 @@
+# coding: ASCII-8BIT
 require 'test/unit'
 require "openid/cryptutil"
+require "pathname"
 
 class CryptUtilTestCase < Test::Unit::TestCase
   BIG = 2 ** 256

data/test/test_discover.rb

@@ -777,4 +777,13 @@ module OpenID
       assert_equal 'http://recycled.invalid/', @endpoint.display_identifier
     end
   end
+
+
+  class TestNormalizeURL < Test::Unit::TestCase
+    def test_no_host
+      assert_raise(DiscoveryFailure) {
+        OpenID::normalize_url('http:///too-many.invalid/slashes')
+      }
+    end
+  end
 end

data/test/test_fetchers.rb

@@ -266,6 +266,11 @@ EOF
   class FakeConnection < Net::HTTP
     attr_reader :use_ssl, :ca_file
 
+    def initialize *args
+      super
+      @ca_file = nil
+    end
+
     def use_ssl=(v)
       @use_ssl = v
     end
@@ -362,7 +367,26 @@ EOF
     }
   end
 
-  class TestingException < Exception; end
+  class TimeoutConnection
+    def start(&block)
+      raise Timeout::Error
+    end
+  end
+
+  def test_fetchingerror
+    f = OpenID::StandardFetcher.new
+
+    f.extend(OpenID::InstanceDefExtension)
+    f.instance_def(:make_connection) do |uri|
+      TimeoutConnection.new
+    end
+
+    assert_raise(OpenID::FetchingError) {
+      f.fetch("https://bogus.com/")
+    }
+  end
+  
+  class TestingException < OpenID::FetchingError; end
 
   class NoSSLSupportConnection
     def supports_ssl?
@@ -420,7 +444,7 @@ EOF
     }
   end
 
-  class PostConnectionCheckException < Exception; end
+  class PostConnectionCheckException < OpenID::FetchingError; end
 
   class UseSSLConnection < NoSSLSupportConnection
     def use_ssl?
@@ -473,13 +497,20 @@ end
 
 class ProxyTest < Test::Unit::TestCase
   def test_proxy_unreachable
-    assert_raise(Errno::ECONNREFUSED) {
+    begin
       f = OpenID::StandardFetcher.new('127.0.0.1', 1)
       # If this tries to connect to the proxy (on port 1), I expect
       # a 'connection refused' error.  If it tries to contact the below
       # URI first, it will get some other sort of error.
       f.fetch("http://unittest.invalid")
-    }
+    rescue OpenID::FetchingError => why
+      # XXX: Is this a translatable string that is going to break?
+      if why.message =~ /Connection refused/
+        return
+      end
+      raise why
+    end
+    flunk "expected Connection Refused, but it passed."
   end
 
   def test_proxy_env

data/test/test_filters.rb

@@ -84,28 +84,28 @@ module OpenID
 
     def test_nil_filter
       # A transform filter with a single nil filter should return nil.
-      endpoint = "unused"
       nil_filter = Proc.new { |endpoint| nil }
       t = Yadis::TransformFilterMaker.new([nil_filter])
+      endpoint = "unused"
       assert(t.apply_filters(endpoint).nil?)
     end
 
     def test_identity_filter
       # A transform filter with an identity filter should return the
       # input.
-      endpoint = "unused"
       identity_filter = Proc.new { |endpoint| endpoint }
       t = Yadis::TransformFilterMaker.new([identity_filter])
+      endpoint = "unused"
       assert(t.apply_filters(endpoint) == endpoint)
     end
 
     def test_return_different_endpoint
       # Make sure the result of the filter is returned, rather than
       # the input.
-      endpoint = "unused"
       returned_endpoint = "returned endpoint"
       filter = Proc.new { |endpoint| returned_endpoint }
       t = Yadis::TransformFilterMaker.new([filter])
+      endpoint = "unused"
       assert(t.apply_filters(endpoint) == returned_endpoint)
     end
 

data/test/test_idres.rb

@@ -145,7 +145,7 @@ module OpenID
         end
 
         def test_unexpected_arg_okay
-          assert_bad_args("Parameter foo does", {
+          assert_bad_args("Unexpected parameter", {
               'openid.mode' => 'id_res',
               'openid.return_to' => 'http://example.com/',
               'foo' => 'bar',
@@ -158,7 +158,7 @@ module OpenID
             'openid.return_to' => 'http://example.com/?foo=bar',
             })
 
-          assert_bad_args('Parameter foo val', {
+          assert_bad_args("Parameter 'foo' val", {
             'openid.mode' => 'id_res',
             'openid.return_to' => 'http://example.com/?foo=bar',
             'foo' => 'foos',
@@ -314,22 +314,6 @@ module OpenID
           }
         end
 
-        def test_kv_server_error
-          OpenID.extend(OverrideMethodMixin)
-          send_error = lambda do |req, server_url|
-            msg = Message.new(OPENID2_NS)
-            raise ServerError.from_message(msg), 'For you!'
-          end
-
-          OpenID.with_method_overridden(:make_kv_post, send_error) do
-            assert_protocol_error("Error from") {
-              call_check_auth do |idres|
-                idres.instance_def(:create_check_auth_request) { nil }
-              end
-            }
-          end
-        end
-
         def test_check_auth_okay
           OpenID.extend(OverrideMethodMixin)
           me = self
@@ -619,7 +603,9 @@ module OpenID
                                  'identity' => 'sour grapes',
                                  'claimed_id' => 'monkeysoft',
                                  'op_endpoint' => 'Phone Home'}) do |idres|
-              idres.instance_def(:discover_and_verify) {@endpoint = endpoint}
+              idres.instance_def(:discover_and_verify) do |to_match|
+                @endpoint = endpoint
+              end
             end
           }
           assert(endpoint.equal?(result))
@@ -640,7 +626,9 @@ module OpenID
                                  'claimed_id' => 'monkeysoft',
                                  'op_endpoint' => 'Green Cheese'}) do |idres|
                         idres.extend(InstanceDefExtension)
-              idres.instance_def(:discover_and_verify) {@endpoint = endpoint}
+              idres.instance_def(:discover_and_verify) do |to_match|
+                @endpoint = endpoint
+              end
             end
           }
           assert(endpoint.equal?(result))
@@ -721,7 +709,7 @@ module OpenID
             assert_raises(verified_error) {
               call_verify_modify({'ns' => OPENID1_NS,
                                    'identity' => @endpoint.local_id}) { |idres|
-                idres.instance_def(:discover_and_verify) do
+                idres.instance_def(:discover_and_verify) do |to_match|
                   raise verified_error
                 end
               }

data/test/test_linkparse.rb

@@ -6,8 +6,8 @@ class LinkParseTestCase < Test::Unit::TestCase
   include OpenID::TestDataMixin
 
   def attr_cmp(expected, found)
-    e = expected.to_a
-    f = found.to_a
+    e = expected.to_a.sort
+    f = found.to_a.sort
     while (ep = e.shift)
       ek, ev = ep
       fk, fv = f.shift

data/test/test_server.rb

@@ -1784,7 +1784,7 @@ module OpenID
       monkeycalled = Counter.new()
 
       @server.extend(InstanceDefExtension)
-      @server.instance_def(:openid_monkeymode) do
+      @server.instance_def(:openid_monkeymode) do |request|
         raise UnhandledError
       end
 

data/test/test_sreg.rb

@@ -1,6 +1,7 @@
 require 'openid/extensions/sreg'
 require 'openid/message'
 require 'openid/server'
+require 'test/unit'
 
 module OpenID
   module SReg

data/test/test_util.rb

@@ -1,3 +1,4 @@
+# coding: ASCII-8BIT
 require 'test/unit'
 
 require "openid/util"

data/test/testutil.rb

@@ -63,12 +63,20 @@ module OpenID
     def with_method_overridden(method_name, proc)
       original = method(method_name)
       begin
+        # TODO: find a combination of undef calls which prevent the warning
+        verbose, $VERBOSE = $VERBOSE, false
         define_method(method_name, proc)
         module_function(method_name)
+        $VERBOSE = verbose
         yield
       ensure
-        define_method(method_name, original)
-        module_function(method_name)
+        if original.respond_to? :owner
+          original.owner.send(:undef_method, method_name)
+          original.owner.send :define_method, method_name, original
+        else
+          define_method(method_name, original)
+          module_function(method_name)
+        end
       end
     end
   end
@@ -84,7 +92,10 @@ module OpenID
   module InstanceDefExtension
     def instance_def(method_name, &proc)
       (class << self;self;end).instance_eval do
+        # TODO: find a combination of undef calls which prevent the warning
+        verbose, $VERBOSE = $VERBOSE, false
         define_method(method_name, proc)
+        $VERBOSE = verbose
       end
     end
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ruby-openid
 version: !ruby/object:Gem::Version 
-  version: 2.0.3
-date: 2008-01-11 00:00:00 -08:00
+  version: 2.0.4
+date: 2008-02-13 00:00:00 -08:00
 summary: A library for consuming and serving OpenID identities.
 require_paths: 
 - lib