barx 0.1.1 → 0.1.2

data/lib/xri_parser.rb

@@ -151,7 +151,7 @@ module XriParser
     
     def normalized
       if @root == '@' or @root == '='
-        @root + @subsegments.to_s[1..-1]
+        @root + ((@subsegments.to_s[0,1] == '!') ? @subsegments.to_s : @subsegments.to_s[1..-1])
       else
         @root + @subsegments.to_s
       end

data/lib/xri_resolver.rb

@@ -252,7 +252,11 @@ module XriResolver
       begin
         uri = @authority_uris.shift
         uri.path << '/'
-        hxri = uri.merge(subsegment)
+        if subsegment[1..-1] == CGI.unescape(subsegment[1..-1])
+          hxri = uri.merge("#{subsegment[0,1]}#{CGI.escape(subsegment[1..-1])}")
+        else
+          hxri = uri.merge(subsegment)
+        end
         resolved = fetch_uri(hxri)
         xml = resolved.content.unpack("C*").pack("U*") #convert to UTF8
       rescue Exception => e
@@ -522,7 +526,7 @@ module XriResolver
         end
 
         newxrdeles = xrd.elements.partition do |x|
-          after = xrd.elements['Query']
+          after = xrd.elements['Status'] || xrd.elements['Query']
           xrd.elements.index(x) <= xrd.elements.index(after)
         end
 
@@ -549,6 +553,20 @@ module XriResolver
       ## do SEP selection on last XRD
       seplist = SEPSelector.select(self, xrd_list.last, @req)
 
+      ## give XRD/[Ref|Redirect]s priority over XRD/Service/[Ref|Redirect]s per ED06
+      if xrd_list.last.elements['Ref'] or xrd_list.last.elements['Redirect']
+        xpath = "*[local-name()='Service']/*[(local-name()='Ref')|(local-name()='Redirect')]"
+        svclist = REXML::XPath.match(xrd_list.last, xpath, XRDNS).collect do |ele|
+          ele.name == 'Ref' ? noprefix(ele.text) : doappend(ele).text
+        end
+        unless svclist.empty?
+          xrds_list.delete_if do |xrds|
+            svclist.include?(noprefix(xrds.root.attributes['ref'] || xrds.root.attributes['redirect']))
+          end
+        end
+        seplist.clear
+      end
+
       if seplist.empty?
         ## no Service elements selected, so delete all Service/Ref(s) or Service/Redirect(s)
         xpath = "*[local-name()='Service']/*[(local-name()='Ref')|(local-name()='Redirect')]"
@@ -723,6 +741,11 @@ module XriResolver
           ## "SET Matched.x=TRUE"
           flag['Matched'][sel.name] = true
 
+          ## XRI Resolution WD11 ED07 Section 13.3.4
+          unless sel.text or sel.attributes['match']
+            sel.attributes << REXML::Attribute.new('match', 'null')
+          end
+
           ## determine match
           if sel.attributes['match'] and sel.attributes['match'] != 'content'
             ## determine match per XRI Resolution WD11 ED03 Section 10.3.2

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: barx
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2007-10-20 00:00:00 +00:00
+  version: 0.1.2
+date: 2007-11-04 00:00:00 -07:00
 summary: Provides XRI resolution services. Read more about XRI resolution at http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=xri.
 require_paths: 
 - lib
@@ -29,36 +29,36 @@ post_install_message:
 authors: 
 - Victor Grey and Kermit Snelson
 files: 
-- test
-- lib
 - examples
+- lib
 - MIT-LICENSE
 - README
+- test
+- lib/barx.rb
 - lib/httpclient
-- lib/httpclient/http.rb
-- lib/httpclient/cacert.p7s
-- lib/httpclient/cookie.rb
 - lib/httpclient.rb
 - lib/xri_parser.rb
 - lib/xri_resolver.rb
-- lib/barx.rb
+- lib/httpclient/cacert.p7s
+- lib/httpclient/cookie.rb
+- lib/httpclient/http.rb
+- test/authority_parser_profile.rb
+- test/test_helper.rb
 - test/unit
-- test/unit/multi_stage_resolution_test.rb
-- test/unit/authority_parser_test.rb
+- test/xrds_sources
 - test/unit/all.rb
+- test/unit/authority_parser_test.rb
 - test/unit/input_param_parser_test.rb
+- test/unit/multi_stage_resolution_test.rb
 - test/unit/sep_selection_test.rb
-- test/xrds_sources
-- test/xrds_sources/second_stage1
 - test/xrds_sources/empty_sels_no_append_qxri_sep
-- test/xrds_sources/sep1
 - test/xrds_sources/empty_sels_sep
 - test/xrds_sources/first_stage1
 - test/xrds_sources/no_svc_sep
-- test/test_helper.rb
-- test/authority_parser_profile.rb
-- examples/proxri
+- test/xrds_sources/second_stage1
+- test/xrds_sources/sep1
 - examples/dix
+- examples/proxri
 - examples/README
 - examples/xrioid
 test_files: []