From 5b45f8f3518a5c460cabe692fadc1b1a751b04ba Mon Sep 17 00:00:00 2001
From: Steven Bazyl <sqrrrl@gmail.com>
Date: Mon, 30 Jan 2012 23:28:55 -0800
Subject: [PATCH] Rename 'resources' method due to conflict with one of the
 APIs.

---
 lib/google/api_client/discovery/api.rb      | 8 ++++----
 lib/google/api_client/discovery/resource.rb | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/google/api_client/discovery/api.rb b/lib/google/api_client/discovery/api.rb
index 57ca339bb..c02947135 100644
--- a/lib/google/api_client/discovery/api.rb
+++ b/lib/google/api_client/discovery/api.rb
@@ -44,7 +44,7 @@ module Google
         @document_base = Addressable::URI.parse(document_base)
         @discovery_document = discovery_document
         metaclass = (class <<self; self; end)
-        self.resources.each do |resource|
+        self.discovered_resources.each do |resource|
           method_name = Google::INFLECTOR.underscore(resource.name).to_sym
           if !self.respond_to?(method_name)
             metaclass.send(:define_method, method_name) { resource }
@@ -164,7 +164,7 @@ module Google
       #   The new base URI to use for the service.
       def method_base=(new_method_base)
         @method_base = Addressable::URI.parse(new_method_base)
-        self.resources.each do |resource|
+        self.discovered_resources.each do |resource|
           resource.method_base = @method_base
         end
         self.methods.each do |method|
@@ -207,7 +207,7 @@ module Google
       # API.
       #
       # @return [Array] A list of {Google::APIClient::Resource} objects.
-      def resources
+      def discovered_resources
         return @resources ||= (
           (@discovery_document['resources'] || []).inject([]) do |accu, (k, v)|
             accu << Google::APIClient::Resource.new(
@@ -252,7 +252,7 @@ module Google
           self.methods.each do |method|
             methods_hash[method.id] = method
           end
-          self.resources.each do |resource|
+          self.discovered_resources.each do |resource|
             methods_hash.merge!(resource.to_h)
           end
           methods_hash
diff --git a/lib/google/api_client/discovery/resource.rb b/lib/google/api_client/discovery/resource.rb
index ecd94e365..6d9d7638c 100644
--- a/lib/google/api_client/discovery/resource.rb
+++ b/lib/google/api_client/discovery/resource.rb
@@ -42,7 +42,7 @@ module Google
         @name = resource_name
         @discovery_document = discovery_document
         metaclass = (class <<self; self; end)
-        self.resources.each do |resource|
+        self.discovered_resources.each do |resource|
           method_name = Google::INFLECTOR.underscore(resource.name).to_sym
           if !self.respond_to?(method_name)
             metaclass.send(:define_method, method_name) { resource }
@@ -82,7 +82,7 @@ module Google
       #   The new base URI to use for the resource.
       def method_base=(new_method_base)
         @method_base = Addressable::URI.parse(new_method_base)
-        self.resources.each do |resource|
+        self.discovered_resources.each do |resource|
           resource.method_base = @method_base
         end
         self.methods.each do |method|
@@ -94,7 +94,7 @@ module Google
       # A list of sub-resources available on this resource.
       #
       # @return [Array] A list of {Google::APIClient::Resource} objects.
-      def resources
+      def discovered_resources
         return @resources ||= (
           (@discovery_document['resources'] || []).inject([]) do |accu, (k, v)|
             accu << Google::APIClient::Resource.new(
@@ -129,7 +129,7 @@ module Google
           self.methods.each do |method|
             methods_hash[method.id] = method
           end
-          self.resources.each do |resource|
+          self.discovered_resources.each do |resource|
             methods_hash.merge!(resource.to_h)
           end
           methods_hash