From 1a381ab963d8b8c70a8b8ffd05afa64f6e06ebb0 Mon Sep 17 00:00:00 2001
From: Bob Aman <bobaman@google.com>
Date: Fri, 10 Feb 2012 17:26:44 +0300
Subject: [PATCH] Method renames to be consistent with change to resources.

---
 lib/google/api_client/discovery/api.rb      | 12 ++++++------
 lib/google/api_client/discovery/resource.rb | 12 ++++++------
 lib/google/api_client/discovery/schema.rb   |  4 +++-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/lib/google/api_client/discovery/api.rb b/lib/google/api_client/discovery/api.rb
index c02947135..9979ed79d 100644
--- a/lib/google/api_client/discovery/api.rb
+++ b/lib/google/api_client/discovery/api.rb
@@ -50,7 +50,7 @@ module Google
             metaclass.send(:define_method, method_name) { resource }
           end
         end
-        self.methods.each do |method|
+        self.discovered_methods.each do |method|
           method_name = Google::INFLECTOR.underscore(method.name).to_sym
           if !self.respond_to?(method_name)
             metaclass.send(:define_method, method_name) { method }
@@ -167,7 +167,7 @@ module Google
         self.discovered_resources.each do |resource|
           resource.method_base = @method_base
         end
-        self.methods.each do |method|
+        self.discovered_methods.each do |method|
           method.method_base = @method_base
         end
       end
@@ -208,7 +208,7 @@ module Google
       #
       # @return [Array] A list of {Google::APIClient::Resource} objects.
       def discovered_resources
-        return @resources ||= (
+        return @discovered_resources ||= (
           (@discovery_document['resources'] || []).inject([]) do |accu, (k, v)|
             accu << Google::APIClient::Resource.new(
               self, self.method_base, k, v
@@ -223,8 +223,8 @@ module Google
       # API.
       #
       # @return [Array] A list of {Google::APIClient::Method} objects.
-      def methods
-        return @methods ||= (
+      def discovered_methods
+        return @discovered_methods ||= (
           (@discovery_document['methods'] || []).inject([]) do |accu, (k, v)|
             accu << Google::APIClient::Method.new(self, self.method_base, k, v)
             accu
@@ -249,7 +249,7 @@ module Google
       def to_h
         return @hash ||= (begin
           methods_hash = {}
-          self.methods.each do |method|
+          self.discovered_methods.each do |method|
             methods_hash[method.id] = method
           end
           self.discovered_resources.each do |resource|
diff --git a/lib/google/api_client/discovery/resource.rb b/lib/google/api_client/discovery/resource.rb
index 6d9d7638c..d8a3affae 100644
--- a/lib/google/api_client/discovery/resource.rb
+++ b/lib/google/api_client/discovery/resource.rb
@@ -48,7 +48,7 @@ module Google
             metaclass.send(:define_method, method_name) { resource }
           end
         end
-        self.methods.each do |method|
+        self.discovered_methods.each do |method|
           method_name = Google::INFLECTOR.underscore(method.name).to_sym
           if !self.respond_to?(method_name)
             metaclass.send(:define_method, method_name) { method }
@@ -85,7 +85,7 @@ module Google
         self.discovered_resources.each do |resource|
           resource.method_base = @method_base
         end
-        self.methods.each do |method|
+        self.discovered_methods.each do |method|
           method.method_base = @method_base
         end
       end
@@ -95,7 +95,7 @@ module Google
       #
       # @return [Array] A list of {Google::APIClient::Resource} objects.
       def discovered_resources
-        return @resources ||= (
+        return @discovered_resources ||= (
           (@discovery_document['resources'] || []).inject([]) do |accu, (k, v)|
             accu << Google::APIClient::Resource.new(
               @api, self.method_base, k, v
@@ -109,8 +109,8 @@ module Google
       # A list of methods available on this resource.
       #
       # @return [Array] A list of {Google::APIClient::Method} objects.
-      def methods
-        return @methods ||= (
+      def discovered_methods
+        return @discovered_methods ||= (
           (@discovery_document['methods'] || []).inject([]) do |accu, (k, v)|
             accu << Google::APIClient::Method.new(@api, self.method_base, k, v)
             accu
@@ -126,7 +126,7 @@ module Google
       def to_h
         return @hash ||= (begin
           methods_hash = {}
-          self.methods.each do |method|
+          self.discovered_methods.each do |method|
             methods_hash[method.id] = method
           end
           self.discovered_resources.each do |resource|
diff --git a/lib/google/api_client/discovery/schema.rb b/lib/google/api_client/discovery/schema.rb
index 42e5ea192..f3499ebdc 100644
--- a/lib/google/api_client/discovery/schema.rb
+++ b/lib/google/api_client/discovery/schema.rb
@@ -75,7 +75,9 @@ module Google
           api_version_string =
             Google::INFLECTOR.camelize(api.version).gsub('.', '_')
           if Google::APIClient::Schema.const_defined?(api_name_string, false)
-            api_name = Google::APIClient::Schema.const_get(api_name_string, false)
+            api_name = Google::APIClient::Schema.const_get(
+              api_name_string, false
+            )
           else
             api_name = Google::APIClient::Schema.const_set(
               api_name_string, Module.new