RubyGems - unapi - Versions diffs - 0.0.4 → 0.0.5 - Mend

unapi 0.0.4 → 0.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

data/lib/unapi/page.rb CHANGED

@@ -6,11 +6,11 @@ require 'unapi/utils'
 module UnAPI
   class Page
-    attr_reader :status_code, :document
+    attr_reader :status_code, :document, :uri
     # initialize the UnAPI::URI object with a web page url
     def initialize(url)
-      @page_uri = URI.parse(url)
+      @uri = URI.parse(url)
       @status_code, @document = Utils.get_html_document(url)
     end
@@ -23,12 +23,12 @@ module UnAPI
       end
       return nil if not link_url
-      # if the host isn't mentioned then we'll assume relative to page_uri
+      # if the host isn't mentioned then we'll assume relative to @uri
       service_uri = URI.parse(link_url)
       if service_uri.relative?
-        service_uri.host = @page_uri.host
-        service_uri.port = @page_uri.port
-        service_uri.scheme = @page_uri.scheme
+        service_uri.host = @uri.host
+        service_uri.port = @uri.port
+        service_uri.scheme = @uri.scheme
       end
       # if they included a ? let's get rid of that

data/lib/unapi/validator.rb CHANGED

@@ -4,13 +4,17 @@ require 'unapi'
 module UnAPI
-  class Message < String
-    attr_accessor :url
+  class Message
+    attr_accessor :msg, :value, :url
-    def initialize(string, url=nil, advice=nil)
-      super string
+    def initialize(msg, value=nil, url=nil)
+      @msg = msg
+      @value = value
       @url = url
-      @advice = advice
+    end
+    def to_s
+      return @msg
     end
   end
@@ -32,39 +36,39 @@ module UnAPI
       @warnings = 0
     end
-    def test(ok, msg, url=nil, advice=nil)
+    def test(ok, test_msg, value=nil, url=nil)
       if ok
-        pass(msg, url)
+        pass(test_msg, value, url)
       else
-        fail(msg, url, advice)
+        fail(test_msg, value, url)
       end
     end
-    def check(ok, msg, url=nil, advice=nil)
+    def check(ok, test_msg, value=nil, url=nil)
       if ok
-        pass(msg, url)
+        pass(test_msg, value, url)
       else
-        warn(msg, url, advice)
+        warn(test_msg, value, url)
       end
     end
-    def pass(msg, url=nil)
+    def pass(test_msg, value=nil, url=nil)
       @passes += 1
-      handle Pass.new(msg, url)
+      handle Pass.new(test_msg, value, url)
     end
-    def fail(msg, url=nil, advice=nil)
+    def fail(test_msg, value=nil, url=nil)
       @failures += 1
-      handle Fail.new(msg, url, advice)
+      handle Fail.new(test_msg, value, url)
     end
-    def warn(msg, url=nil, advice=nil)
+    def warn(test_msg, value=nil, url=nil)
       @warnings += 1
-      handle Warn.new(msg, url, advice)
+      handle Warn.new(test_msg, value, url)
     end
     def count
-      return @passes + @failures
+      return @passes + @failures + @warnings
     end
   end
@@ -78,8 +82,8 @@ module UnAPI
       @filehandle.print "#{count}: "
       case msg
       when Pass: @filehandle.print("PASS: #{msg}\n")
-      when Fail: @filehandle.print("FAIL: #{msg} #{msg.url}\n")
-      when Warn: @filehandle.print("WARN: #{msg}\n")
+      when Fail: @filehandle.print("FAIL: #{msg} [found #{msg.value}]\n")
+      when Warn: @filehandle.print("WARN: #{msg} [found #{msg.value}]\n")
       end
     end
   end
@@ -112,10 +116,10 @@ module UnAPI
       # make sure there is a service url
       service_url = page.service_url
       @handler.test(
-        service_url,
-        "<link> url for unapi service",
+        service_url != nil,
+        "page should have <link> url for unapi service",
         service_url,
-        "add an unAPI <link> element to the <head> of your html document")
+        service_url)
       # get the unapi service from the page
       service = page.service
@@ -129,18 +133,18 @@ module UnAPI
     end
     def check_uris(page)
-      # look for unap-uris on the page
       service = page.service
-      if not service:
-        @handler.fail "couldn't find service"
-      end
+      return if not service
+      # look for unap-uris on the page
       uris = page.uris
-      @handler.test uris.length > 0, "found unapi-uris on the page"
+      @handler.test uris.length > 0,
+        "page should > 0 elements with class unapi-uri",
+        uris.length,
+        page.uri
       # go through each identifier
       uris.each do |uri|
-        @handler.pass "got unapi-uri #{uri}"
         # verify it has formats available
         formats = service.formats_for_uri(uri)
@@ -149,61 +153,77 @@ module UnAPI
         # request an invalid format
         content = service.get_uri_in_format(uri, 'thisformatdoesnotexist')
         @handler.check service.status_code == 415,
-          "request for uri #{uri} with bad format returns 415"
+          "request for uri #{uri} with bad format should return with " +
+          "status code 415",
+          service.status_code,
+          service.last_url
         # verify that each format is available
         content = ''
         formats.each do |format|
           content = service.get_uri_in_format(uri, format.name)
           @handler.check service.status_code == 200,
-            "request for #{uri} content responded with 200 status code",
+            "request for #{uri} content should return with 200 status code",
+            service.status_code,
             service.last_url
           @handler.test((content != nil and content.length > 0),
-            "request for #{uri} returned data",
+            "request for #{uri} should return data",
+            "#{content.length} bytes",
             service.last_url)
-          @handler.test service.content_type == format.type,
-            "request for #{uri} returned mime type #{service.content_type}",
+          @handler.test service.content_type.include?(format.type),
+            "request for #{uri} should return with content-type #{format.type}",
+            service.content_type,
             service.last_url
           # request an invalid uri with a valid format
           service.get_uri_in_format('invaliduriinvaliduri', format.name)
           @handler.check service.status_code == 404,
             "request for invalid uri with valid format #{format.name} " +
-            "returned 404", service.last_url
+            "should return with 404 status code",
+            service.status_code,
+            service.last_url
         end
       end
     end
     def check_formats(formats, service, target)
-      @handler.test service.content_type == 'application/xml',
-        "formats for #{target} has content-type #{service.content_type}",
-        service.last_url,
+      @handler.test service.content_type.include?('application/xml'),
+        "formats request for #{target} should return with content-type "+
+        "application/xml",
+        service.content_type,
+        service.last_url
       if target == 'unapi service'
         @handler.check service.status_code == 200,
-          "formats request for #{target} returned 200 status code",
+          "formats request for #{target} should return with 200 status code",
+          service.status_code,
           service.last_url
       else
         @handler.check service.status_code == 300,
-          "formats request for #{target} return 300 status code",
+          "formats request for #{target} should return with 300 status code",
+          service.status_code,
           service.last_url
       end
-      if formats.length > 0
-        @handler.pass "found #{formats.length} formats for #{target}"
-        count = 0
-        formats.each do |format|
-          count += 1
-          @handler.test format.name,
-            "format #{count} for #{target} has a name"
-          @handler.test format.type,
-            "format #{count} for #{target} has a type"
-        end
-      else
-        @handler.fail "no formats found for #{target}", service.last_url
+      # make sure there are some formats
+      @handler.test formats.length > 0,
+        "formats request for #{target} should return > 0 formats",
+        formats.length,
+        service.last_url
+      # examine each format
+      count = 0
+      formats.each do |format|
+        count += 1
+        @handler.test format.name,
+          "format #{count} for #{target} should have a name",
+          format.name,
+          service.last_url
+        @handler.test format.type,
+          "format #{count} for #{target} should have a type",
+          format.type,
+          service.last_url
       end
     end
   end
 end

metadata CHANGED

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: unapi
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-date: 2006-03-19 00:00:00 -06:00
+  version: 0.0.5
+date: 2006-04-30 00:00:00 -05:00
 summary: A library for working with the unapi protocol
 require_paths:
   - lib