0
@@ -1,5 +1,19 @@
0
 module OEmbed
0
-  NotFound = Class.new(StandardError)
0
-  UnknownFormat = Class.new(StandardError)
0
-  UnknownResponse = Class.new(StandardError)
0
+  class NotFound < StandardError
0
+    def to_s
0
+      "No embeddable content at '#{super}'"
0
+    end
0
+  end
0
+  
0
+  class UnknownFormat < StandardError
0
+    def to_s
0
+      "The provider doesn't support the '#{super}' format"
0
+    end
0
+  end
0
+  
0
+  class UnknownResponse < StandardError
0
+    def to_s
0
+      "Got unkown response (#{super}) from server"
0
+    end
0
+  end
0
 end
0
\ No newline at end of file

0
@@ -16,7 +16,7 @@ module OEmbed
0
     end
0
     
0
     def build(url, options = {})
0
-      raise OEmbed::NotFound, "No embeddable content at '#{url}'" unless include?(url)
0
+      raise OEmbed::NotFound, url unless include?(url)
0
       query = options.merge({:url => url})
0
       endpoint = @endpoint.clone
0
       
0
@@ -31,7 +31,10 @@ module OEmbed
0
         "#{key}=#{value}&#{memo}"
0
       end.chop
0
       
0
-      URI.parse(endpoint + query_string)      
0
+      URI.parse(endpoint + query_string).instance_eval do
1
+        @format = format; def format; @format; end
0
+        self
0
+      end      
0
     end
0
     
0
     def raw(url, options = {})
0
@@ -43,13 +46,13 @@ module OEmbed
0
       
0
       case res
0
       when Net::HTTPNotImplemented
0
-        raise OEmbed::UnknownFormat, "The provider doesn't support the '#{format}' format"
0
+        raise OEmbed::UnknownFormat, uri.format
0
       when Net::HTTPNotFound
0
-        raise OEmbed::NotFound, "No embeddable content at '#{url}'"
0
+        raise OEmbed::NotFound, url
0
       when Net::HTTPOK
0
         res.body
0
       else
0
-        raise OEmbed::UnknownResponse, "Got unkown response (#{res.code}) from server"
0
+        raise OEmbed::UnknownResponse, res.code
0
       end
0
     end
0