ruby-yadis 0.3.1 → 0.3.2

data/lib/yadis/service.rb

@@ -8,7 +8,6 @@ class ServiceEndpoint
     @uri = nil
     @yadis_uri = nil
     @element = nil
-    @yadis_uri = nil
   end
 
   def match_type_uris(type_uris)

data/lib/yadis/xrds.rb

@@ -96,7 +96,7 @@ class XRDS
     service.uri = nil
     service.service_types = []
 
-    service_element.elements.each('Type') do |t|
+    REXML::XPath.each(service_element, 'xrdns:Type', @@namespaces) do |t|
       # XXX: If the Type element is empty, should we add an empty element
       # to our list, or none at all?
       service.service_types << t.text.strip unless t.text.nil?
@@ -104,23 +104,23 @@ class XRDS
 
     sp = service_element.attributes['priority']
     service_priority = sp ? sp.to_i : -1
+    has_uri = false
 
-    if service.element.elements['URI']
-      service.element.elements.each('URI') do |uri|
-        _service = service.dup
-        _service.uri = uri.text.strip
-        
-        up = uri.attributes['priority']
-        uri_priority = up ? up.to_i : -1
-        priority = [service_priority, uri_priority]
-        
-        _add_service(priority, _service)
-      end
+    REXML::XPath.each(service.element, 'xrdns:URI', @@namespaces) do |uri|
+      has_uri = true
+      _service = service.dup
+      _service.uri = uri.text.strip
+      
+      up = uri.attributes['priority']
+      uri_priority = up ? up.to_i : -1
+      priority = [service_priority, uri_priority]
       
-    else
+      _add_service(priority, _service)
+    end
+      
+    unless has_uri
       priority = [service_priority, -1]
       _add_service(priority, service)
-
     end
 
   end

data/test/test_xrds.rb

@@ -14,6 +14,10 @@ class XRDSTestCase < Test::Unit::TestCase
       xrds = XRDS.new(f.read)
       assert_not_nil(xrds)
       assert_equal(xrds.services.length, 9)
+
+      service = xrds.services[0]
+      assert_not_nil(service)
+      assert_not_nil(service.uri)
     end
   end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ruby-yadis
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
-date: 2006-06-09 00:00:00 -07:00
+  version: 0.3.2
+date: 2006-06-26 00:00:00 -07:00
 summary: A library for performing Yadis service discovery
 require_paths: 
 - lib