unapi 0.0.2 → 0.0.3

data/lib/unapi/service.rb

@@ -7,7 +7,7 @@ module UnAPI
   # a class that represents the UnAPI Service
   
   class Service
-    attr_reader :url, :status_code, :document, :content_type
+    attr_reader :url, :status_code, :document, :content_type, :last_url
 
     def initialize(url)
       @url = url
@@ -21,26 +21,28 @@ module UnAPI
       @document.elements.each('.//formats/format') do |e|
         formats << Format.new_from_element(e)
       end
+      @last_url = @url
       return formats
     end
 
     def formats_for_uri(uri)
       formats = []
-      uri_esc = CGI.escape(uri)
-      @status_code, @document, @content_type = 
-        Utils.get_document(@url + "?uri=#{uri_esc}")
+      request_url = @url + "?uri=#{CGI.escape(uri)}"
+      @status_code, @document, @content_type = Utils.get_document request_url
       @document.elements.each('.//formats/format') do |e|
         formats << Format.new_from_element(e)
       end
+      @last_url = request_url
       return formats
     end
 
     def get_uri_in_format(uri, format)
       uri_esc = CGI.escape(uri)
       format_esc = CGI.escape(format)
+      request_url = @url + "?uri=#{uri_esc}&format=#{format_esc}"
       @document = nil
-      @status_code, body, @content_type = 
-        Utils.get(@url + "?uri=#{uri_esc}&format=#{format_esc}")
+      @status_code, body, @content_type = Utils.get url
+      @last_url = request_url
       return body
     end
   end

data/lib/unapi/validator.rb

@@ -5,11 +5,11 @@ require 'unapi'
 module UnAPI
 
   class Message < String
-    attr_accessor :for_url
+    attr_accessor :url
 
     def initialize(string, url=nil)
       super string
-      @for_url = url
+      @url = url
     end
   end
 
@@ -27,14 +27,14 @@ module UnAPI
       @failures = 0
     end
 
-    def pass(msg)
+    def pass(msg, url=nil)
       @passes += 1
-      handle Pass.new(msg)
+      handle Pass.new(msg, url)
     end
 
-    def fail(msg)
+    def fail(msg, url=nil)
       @failures += 1
-      handle Fail.new(msg)
+      handle Fail.new(msg, url)
     end
 
     def count
@@ -52,7 +52,7 @@ module UnAPI
       @filehandle.print "#{count}: "
       case msg
       when Pass: @filehandle.print("PASS: #{msg}\n")
-      when Fail: @filehandle.print("FAIL: #{msg}\n")
+      when Fail: @filehandle.print("FAIL: #{msg} #{msg.url}\n")
       when Warn: @filehandle.print("WARN: #{msg}\n")
       end
     end
@@ -86,7 +86,7 @@ module UnAPI
     def check_service(page)
       # make sure there is a service url
       service_url = page.service_url
-      test service_url, "<link> url for unapi service"
+      test service_url, "<link> url for unapi service", service_url
       return unless service_url
 
       # get the unapi service from the page
@@ -105,7 +105,7 @@ module UnAPI
 
       # go through each identifier
       uris.each do |uri|
-        @handler.pass "got unapi-uri #{uri}" 
+        @handler.pass "got unapi-uri #{uri}"
 
         # verify it has formats available
         formats = service.formats_for_uri(uri)
@@ -121,31 +121,37 @@ module UnAPI
         formats.each do |format|
           content = service.get_uri_in_format(uri, format.name)
           test service.status_code == 200,
-            "request for #{uri} content responded with 200 status code"
+            "request for #{uri} content responded with 200 status code",
+            service.last_url
           test (content != nil and content.length > 0),
-            "request for #{uri} returned data"
+            "request for #{uri} returned data",
+            service.last_url
           test service.content_type == format.type,
-            "request for #{uri} returned mime type #{service.content_type}"
+            "request for #{uri} returned mime type #{service.content_type}",
+            service.last_url
 
           # request an invalid uri with a valid format
           service.get_uri_in_format('invaliduriinvaliduri', format.name)
           test service.status_code == 404,
             "request for invalid uri with valid format #{format.name} " + 
-            "returned 404"
+            "returned 404", service.last_url
         end
       end
     end
 
     def check_formats(formats, service, target) 
       test service.content_type == 'application/xml',
-        "formats request for #{target} has content-type #{service.content_type}"
+        "formats for #{target} has content-type #{service.content_type}",
+        service.last_url
 
       if target == 'unapi service' 
         test service.status_code == 200,
-          "formats request for #{target} returned 200 status code"
+          "formats request for #{target} returned 200 status code", 
+          service.last_url
       else 
         test service.status_code == 300,
-          "formats request for #{target} return 300 status code"
+          "formats request for #{target} return 300 status code",
+          service.last_url
       end
 
       if formats.length > 0
@@ -159,15 +165,15 @@ module UnAPI
             "format #{count} for #{target} has a type" 
         end
       else 
-        @handler.fail "no formats found for #{target}"
+        @handler.fail "no formats found for #{target}", service.last_url
       end
     end
 
-    def test(ok, msg)
+    def test(ok, msg, url=nil)
       if ok
-        @handler.pass(msg)
+        @handler.pass(msg, url)
       else
-        @handler.fail(msg)
+        @handler.fail(msg, url)
       end
     end
 

metadata

@@ -1,13 +1,13 @@
---- !ruby/object:Gem::Specification 
+!ruby/object:Gem::Specification 
 rubygems_version: 0.8.11
 specification_version: 1
 name: unapi
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2006-03-14 00:00:00 -06:00
+  version: 0.0.3
+date: 2006-03-14 00:00:00 -05:00
 summary: A library for working with the unapi protocol
 require_paths: 
-  - lib
+- lib
 email: ehs@pobox.com
 homepage: http://www.textualize.com/unapi
 rubyforge_project: 
@@ -18,43 +18,46 @@ bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
 signing_key: 
 cert_chain: 
 authors: 
-  - Ed Summers
+- Ed Summers
 files: 
-  - lib/unapi
-  - lib/unapi.rb
-  - lib/unapi/format.rb
-  - lib/unapi/page.rb
-  - lib/unapi/service.rb
-  - lib/unapi/utils.rb
-  - lib/unapi/validator.rb
-  - test/index.html
-  - test/unapi_servlet.rb
-  - test/unapi_test.rb
-  - test/validate_test.rb
+- lib/unapi
+- lib/unapi.rb
+- lib/unapi/validator.rb
+- lib/unapi/service.rb
+- lib/unapi/utils.rb
+- lib/unapi/format.rb
+- lib/unapi/page.rb
+- test/unapi_servlet.rb
+- test/index.html
+- test/unapi_test.rb
+- test/validate_test.rb
 test_files: 
-  - test.rb
+- test.rb
 rdoc_options: []
+
 extra_rdoc_files: []
+
 executables: []
+
 extensions: []
+
 requirements: []
+
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: rubyful_soup
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.0.4
-      version: 
+- !ruby/object:Gem::Dependency 
+  name: rubyful_soup
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.4
+    version: