Improved coverage in tests and fixed a URI join bug.

git-svn-id: https://google-api-ruby-client.googlecode.com/svn/trunk@36 c1d61fac-ed7f-fcc1-18f7-ff78120a04ef

lib/google/api_client/discovery.rb

@@ -168,8 +168,11 @@ module Google #:nodoc:
       end
 
       def uri_template
+        # TODO(bobaman) We shouldn't be calling #to_s here, this should be
+        # a join operation on a URI, but we have to treat these as Strings
+        # because of the way the discovery document provides the URIs.
         return @uri_template ||=
-          Addressable::Template.new(base + self.description['pathUrl'])
+          Addressable::Template.new(base.to_s + self.description['pathUrl'])
       end
 
       def normalize_parameters(parameters={})