barx 0.1.0 → 0.1.1

data/examples/proxri

@@ -30,9 +30,13 @@ begin
     end
   else
     unless ar.to_urilist.empty?
-      cgi.out("Location" => ar.to_urilist.first) { ar.to_urilist.first }
+      if URI.parse(ar.to_urilist.first).scheme
+        cgi.out("Location" => ar.to_urilist.first) { ar.to_urilist.first }
+      else
+        cgi.out("text/plain") { "an XRI error occurred: #{ar.to_urilist.join(' ')}" }
+      end
     else
-      cgi.out("text/plain") { "no services selected for this XRI" }
+      cgi.out("text/plain") { "an XRI error occurred" }
     end
   end
 

data/lib/xri_resolver.rb

@@ -183,7 +183,22 @@ module XriResolver
     end
     
     def to_urilist
-      SEPSelector.select(self, self.last_xrd, @req).to_urilist
+      if (code = get_xrd_status_code(self.last_xrd)) == '100'
+        urilist = SEPSelector.select(self, self.last_xrd, @req).to_urilist
+        if urilist.empty?
+          code = '241'
+          error = Array.new
+          error << code
+          error << ResponseStatus[code]
+        else
+          urilist
+        end
+      else
+        text = get_xrd_status_text(self.last_xrd)
+        error = Array.new
+        error << code
+        error << text unless text.empty?
+      end
     end
     
     private
@@ -208,7 +223,7 @@ module XriResolver
     end
     
     def get_xrd_status_text(xrd)
-      REXML::XPath.match(xrd, "*[local-name()='Status']", XRDNS).first.to_s rescue nil
+      REXML::XPath.match(xrd, "*[local-name()='Status']", XRDNS).first.text rescue ''
     end
     
     def get_xrd_query_string(xrd)
@@ -374,14 +389,16 @@ module XriResolver
               end
             else
               REXML::XPath.match(xrd[0], "*[local-name()='Status']", XRDNS).each do |status|
-                status.add_attribute('refs', 'false')
+                status.add_attribute('code', '262')
                 status.text = 'REF_CYCLE_DETECTED'
               end
             end
             @stack.pop
           else
             REXML::XPath.match(xrd[0], "*[local-name()='Status']", XRDNS).each do |status|
-              status.add_attribute('refs', 'false')
+              code = '262'
+              status.add_attribute('code', code)
+              status.text = ResponseStatus[code]
             end
           end
         end
@@ -505,7 +522,7 @@ module XriResolver
         end
 
         newxrdeles = xrd.elements.partition do |x|
-          after = xrd.elements['Status'] || xrd.elements['Query']
+          after = xrd.elements['Query']
           xrd.elements.index(x) <= xrd.elements.index(after)
         end
 
@@ -606,7 +623,7 @@ module XriResolver
           '202' => 'LIMIT_EXCEEDED',
           '210' => 'INVALID_INPUT',
           '211' => 'INVALID_QXRI',
-          '212' => 'INVALID_RES_MEDIA_TYPE',
+          '212' => 'INVALID_OUTPUT_FORMAT',
           '213' => 'INVALID_SEP_TYPE',
           '214' => 'INVALID_SEP_MEDIA_TYPE',
           '215' => 'UNKNOWN_ROOT',
@@ -614,6 +631,7 @@ module XriResolver
           '221' => 'AUTH_RES_NOT_FOUND',
           '222' => 'QUERY_NOT_FOUND',
           '223' => 'UNEXPECTED_XRD',
+          '224' => 'INACTIVE',
           '230' => 'TRUSTED_RES_ERROR',
           '231' => 'HTTPS_RES_NOT_FOUND',
           '232' => 'SAML_RES_NOT_FOUND',
@@ -621,8 +639,13 @@ module XriResolver
           '234' => 'UNVERIFIED_SIGNATURE',
           '240' => 'SEP_SELECTION_ERROR',
           '241' => 'SEP_NOT_FOUND',
-          '250' => 'REDIRECT_FAILED',
-          '251' => 'REDIRECT_SYNONYM_VERIFICATION_FAILED',
+          '250' => 'REDIRECT_ERROR',
+          '251' => 'INVALID_REDIRECT',
+          '252' => 'INVALID_HTTPS_REDIRECT',
+          '253' => 'REDIRECT_VERIFY_FAILED',
+          '260' => 'REF_ERROR',
+          '261' => 'INVALID_REF',
+          '262' => 'REF_NOT_FOLLOWED',
           '300' => 'TEMPORARY_FAIL',
           '301' => 'TIMEOUT_ERROR',
           '320' => 'NETWORK_ERROR',
@@ -936,7 +959,7 @@ module XriResolver
         @nodefault_p = has_true_value?(param_inputs[:nodefault_p]) ? true : false
         @nodefault_t = has_true_value?(param_inputs[:nodefault_t]) ? true : false
         @nodefault_m = has_true_value?(param_inputs[:nodefault_m]) ? true : false
-        @refs = param_inputs[:refs]
+        @refs = has_false_value?(param_inputs[:refs]) ? 'false' : 'true'
         @https = has_true_value?(param_inputs[:https]) ? true : false
         @saml = has_true_value?(param_inputs[:saml]) ? true : false
       else
@@ -947,7 +970,7 @@ module XriResolver
         @nodefault_p = has_true_value?(header_inputs[:nodefault_p]) ? true : false
         @nodefault_t = has_true_value?(header_inputs[:nodefault_t]) ? true : false
         @nodefault_m = has_true_value?(header_inputs[:nodefault_m]) ? true : false
-        @refs = header_inputs[:refs]
+        @refs = has_false_value?(header_inputs[:refs]) ? 'false' : 'true'
         @https = has_true_value?(header_inputs[:https]) ? true : false
         @saml = has_true_value?(header_inputs[:saml]) ? true : false
       end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: barx
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-10-17 00:00:00 +00:00
+  version: 0.1.1
+date: 2007-10-20 00:00:00 +00: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