google-api-client 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef77b9ca9950251544f7a6d1fd8fd9c99183f1be
-  data.tar.gz: ca8d37c5dba0325c3bf68ae98717fc2d633f59a5
+  metadata.gz: d98c9d4c3597c0f77ce1d7b3dcb9b0a6a06a47b4
+  data.tar.gz: 9c2be2c71a31ee33b6b73f9ce2d6930dffbccf9f
 SHA512:
-  metadata.gz: 92511cbedf49028e4f2c80bf6090686fd666e347ef4d4b55a7eccc857dbc1d06971f3e3be0787f2b0c2625d5ff6de4ffe470d3083834c4648c94568e1d3c3e98
-  data.tar.gz: d235456f2bbd555734323cfc43b49e1aa1bfa6f4893ce9b2cf45d89dc4178400bdefb660389c46686bf269b5092fcdf0223b1e2983996b56df610459c9ac6f21
+  metadata.gz: ee8acbd64242aec823310e25be8a78138d99ddca198e7264375a5411d3dd070ade27bce415bf0d8560eea7d0be40bf92c25375f973433b9a726f8b177d23b0ab
+  data.tar.gz: 33300789f9bab5f084f20bccbe0c622b5bc93349d4aeab1e60d5c84744e9e91c8287392dc66ded38288cbdd2bf8b332db291420cce58a831b433aabf9aeec74e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.8.6
+* Use discovered 'rootUrl' as base URI for services
+* Respect discovered methods with colons in path
+
 # 0.8.5
 * Corrects the regression Rails 4 support in the 0.8.4 release.
 

data/lib/google/api_client/discovery/api.rb

@@ -30,7 +30,7 @@ module Google
       # Creates a description of a particular version of a service.
       #
       # @param [String] document_base
-      #   Base URI for the service
+      #   Base URI for the discovery document.
       # @param [Hash] discovery_document
       #   The section of the discovery document that applies to this service
       #   version.
@@ -126,6 +126,16 @@ module Google
         return @discovery_document['features'] || []
       end
 
+      ##
+      # Returns the root URI for this service.
+      #
+      # @return [Addressable::URI] The root URI.
+      def root_uri
+        return @root_uri ||= (
+          Addressable::URI.parse(self.discovery_document['rootUrl'])
+        )
+      end
+
       ##
       # Returns true if this API uses a data wrapper.
       #
@@ -148,7 +158,7 @@ module Google
       def method_base
         if @discovery_document['basePath']
           return @method_base ||= (
-            self.document_base.join(Addressable::URI.parse(@discovery_document['basePath']))
+            self.root_uri.join(Addressable::URI.parse(@discovery_document['basePath']))
           ).normalize
         else
           return nil

data/lib/google/api_client/discovery/method.rb

@@ -108,7 +108,7 @@ module Google
       # @return [Addressable::Template] The URI template.
       def uri_template
         return @uri_template ||= Addressable::Template.new(
-          self.method_base.join(Addressable::URI.parse(@discovery_document['path']))
+          self.method_base.join(Addressable::URI.parse("./" + @discovery_document['path']))
         )
       end
 

data/lib/google/api_client/discovery/schema.rb

@@ -41,7 +41,6 @@ module Google
           api.document_base +
           (schema_name[0..0] != '#' ? '#' + schema_name : schema_name)
         )
-        # puts schema_uri
 
         # Due to an oversight, schema IDs may not be URI references.
         # TODO(bobaman): Remove this whole lambda once this has been resolved.
@@ -75,7 +74,6 @@ module Google
           end
         end
         schema_data = reformat_references.call(schema_data)
-        # puts schema_data.inspect
 
         if schema_name
           api_name_string = ActiveSupport::Inflector.camelize(api.name)

data/lib/google/api_client/version.rb

@@ -18,7 +18,7 @@ module Google
     module VERSION
       MAJOR = 0
       MINOR = 8
-      TINY  = 5
+      TINY  = 6
       PATCH = nil
       STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
     end

data/spec/google/api_client/discovery_spec.rb

@@ -473,6 +473,10 @@ RSpec.describe Google::APIClient do
         ).to_env(CLIENT.connection)
       end).to raise_error(ArgumentError)
     end
+
+    it 'should correctly determine the service root_uri' do
+      expect(@plus.root_uri.to_s).to eq('https://www.googleapis.com/')
+    end
   end
 
   describe 'with the adsense API' do
@@ -659,4 +663,46 @@ RSpec.describe Google::APIClient do
       expect(@drive.files.insert.media_upload.max_size).not_to eq(nil)
     end
   end
+
+  describe 'with the Pub/Sub API' do
+    before do
+      CLIENT.authorization = nil
+      @pubsub = CLIENT.discovered_api('pubsub', 'v1beta2')
+    end
+
+    it 'should generate requests against the correct URIs' do
+      conn = stub_connection do |stub|
+        stub.get('/v1beta2/projects/12345/topics') do |env|
+          expect(env[:url].host).to eq('pubsub.googleapis.com')
+          [200, {}, '{}']
+        end
+      end
+      request = CLIENT.execute(
+        :api_method => @pubsub.projects.topics.list,
+        :parameters => {'project' => 'projects/12345'},
+        :connection => conn
+      )
+      conn.verify
+    end
+
+    it 'should correctly determine the service root_uri' do
+      expect(@pubsub.root_uri.to_s).to eq('https://pubsub.googleapis.com/')
+    end
+
+    it 'should discover correct method URIs' do
+      list = CLIENT.discovered_method(
+        "pubsub.projects.topics.list", "pubsub", "v1beta2"
+      )
+      expect(list.uri_template.pattern).to eq(
+        "https://pubsub.googleapis.com/v1beta2/{+project}/topics"
+      )
+
+      publish = CLIENT.discovered_method(
+        "pubsub.projects.topics.publish", "pubsub", "v1beta2"
+      )
+      expect(publish.uri_template.pattern).to eq(
+        "https://pubsub.googleapis.com/v1beta2/{+topic}:publish"
+      )
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-api-client
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Bob Aman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable