google-cloud-language 0.30.0 → 0.31.0

data/lib/google/cloud/language/v1beta2.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,47 +16,73 @@ require "google/cloud/language/v1beta2/language_service_client"
 
 module Google
   module Cloud
-    # rubocop:disable LineLength
-
-    ##
-    # # Ruby Client for Google Cloud Natural Language API ([Beta](https://github.com/GoogleCloudPlatform/google-cloud-ruby#versioning))
-    #
-    # [Google Cloud Natural Language API][Product Documentation]:
-    # Google Cloud Natural Language API provides natural language understanding
-    # technologies to developers. Examples include sentiment analysis, entity
-    # recognition, and text annotations.
-    # - [Product Documentation][]
-    #
-    # ## Quick Start
-    # In order to use this library, you first need to go through the following
-    # steps:
-    #
-    # 1. [Select or create a Cloud Platform project.](https://console.cloud.google.com/project)
-    # 2. [Enable the Google Cloud Natural Language API.](https://console.cloud.google.com/apis/api/language)
-    # 3. [Setup Authentication.](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud/master/guides/authentication)
-    #
-    # ### Preview
-    # #### LanguageServiceClient
-    # ```rb
-    # require "google/cloud/language/v1beta2"
-    #
-    # language_service_client = Google::Cloud::Language::V1beta2.new
-    # content = "Hello, world!"
-    # type = :PLAIN_TEXT
-    # document = { content: content, type: type }
-    # response = language_service_client.analyze_sentiment(document)
-    # ```
-    #
-    # ### Next Steps
-    # - Read the [Google Cloud Natural Language API Product documentation][Product Documentation]
-    #   to learn more about the product and see How-to Guides.
-    # - View this [repository's main README](https://github.com/GoogleCloudPlatform/google-cloud-ruby/blob/master/README.md)
-    #   to see the full list of Cloud APIs that we cover.
-    #
-    # [Product Documentation]: https://cloud.google.com/natural-language
-    #
-    #
     module Language
+      # rubocop:disable LineLength
+
+      ##
+      # # Ruby Client for Google Cloud Natural Language API ([Alpha](https://github.com/GoogleCloudPlatform/google-cloud-ruby#versioning))
+      #
+      # [Google Cloud Natural Language API][Product Documentation]:
+      # Google Cloud Natural Language API provides natural language understanding
+      # technologies to developers. Examples include sentiment analysis, entity
+      # recognition, and text annotations.
+      # - [Product Documentation][]
+      #
+      # ## Quick Start
+      # In order to use this library, you first need to go through the following
+      # steps:
+      #
+      # 1. [Select or create a Cloud Platform project.](https://console.cloud.google.com/project)
+      # 2. [Enable billing for your project.](https://cloud.google.com/billing/docs/how-to/modify-project#enable_billing_for_a_project)
+      # 3. [Enable the Google Cloud Natural Language API.](https://console.cloud.google.com/apis/library/language.googleapis.com)
+      # 4. [Setup Authentication.](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud/master/guides/authentication)
+      #
+      # ### Preview
+      # #### LanguageServiceClient
+      # ```rb
+      # require "google/cloud/language"
+      #
+      # language_service_client = Google::Cloud::Language.new(version: :v1beta2)
+      # content = "Hello, world!"
+      # type = :PLAIN_TEXT
+      # document = { content: content, type: type }
+      # response = language_service_client.analyze_sentiment(document)
+      # ```
+      #
+      # ### Next Steps
+      # - Read the [Google Cloud Natural Language API Product documentation][Product Documentation]
+      #   to learn more about the product and see How-to Guides.
+      # - View this [repository's main README](https://github.com/GoogleCloudPlatform/google-cloud-ruby/blob/master/README.md)
+      #   to see the full list of Cloud APIs that we cover.
+      #
+      # [Product Documentation]: https://cloud.google.com/natural-language
+      #
+      # ## Enabling Logging
+      #
+      # To enable logging for this library, set the logger for the underlying [gRPC](https://github.com/grpc/grpc/tree/master/src/ruby) library.
+      # The logger that you set may be a Ruby stdlib [`Logger`](https://ruby-doc.org/stdlib-2.5.0/libdoc/logger/rdoc/Logger.html) as shown below,
+      # or a [`Google::Cloud::Logging::Logger`](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-logging/latest/google/cloud/logging/logger)
+      # that will write logs to [Stackdriver Logging](https://cloud.google.com/logging/). See [grpc/logconfig.rb](https://github.com/grpc/grpc/blob/master/src/ruby/lib/grpc/logconfig.rb)
+      # and the gRPC [spec_helper.rb](https://github.com/grpc/grpc/blob/master/src/ruby/spec/spec_helper.rb) for additional information.
+      #
+      # Configuring a Ruby stdlib logger:
+      #
+      # ```ruby
+      # require "logger"
+      #
+      # module MyLogger
+      #   LOGGER = Logger.new $stderr, level: Logger::WARN
+      #   def logger
+      #     LOGGER
+      #   end
+      # end
+      #
+      # # Define a gRPC module-level logger method before grpc/logconfig.rb loads.
+      # module GRPC
+      #   extend MyLogger
+      # end
+      # ```
+      #
       module V1beta2
         # rubocop:enable LineLength
 
@@ -88,28 +114,27 @@ module Google
         #   or the specified config is missing data points.
         # @param timeout [Numeric]
         #   The default timeout, in seconds, for calls made through this client.
+        # @param metadata [Hash]
+        #   Default metadata to be sent with each request. This can be overridden on a per call basis.
+        # @param exception_transformer [Proc]
+        #   An optional proc that intercepts any exceptions raised during an API call to inject
+        #   custom error handling.
         def self.new \
-            service_path: nil,
-            port: nil,
-            channel: nil,
-            chan_creds: nil,
-            updater_proc: nil,
             credentials: nil,
             scopes: nil,
             client_config: nil,
             timeout: nil,
+            metadata: nil,
+            exception_transformer: nil,
             lib_name: nil,
             lib_version: nil
           kwargs = {
-            service_path: service_path,
-            port: port,
-            channel: channel,
-            chan_creds: chan_creds,
-            updater_proc: updater_proc,
             credentials: credentials,
             scopes: scopes,
             client_config: client_config,
             timeout: timeout,
+            metadata: metadata,
+            exception_transformer: exception_transformer,
             lib_name: lib_name,
             lib_version: lib_version
           }.select { |_, v| v != nil }

data/lib/google/cloud/language/v1beta2/credentials.rb

@@ -0,0 +1,40 @@
+# Copyright 2018 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "googleauth"
+
+module Google
+  module Cloud
+    module Language
+      module V1beta2
+        class Credentials < Google::Auth::Credentials
+          SCOPE = [
+            "https://www.googleapis.com/auth/cloud-platform"
+          ].freeze
+          PATH_ENV_VARS = %w(LANGUAGE_CREDENTIALS
+                             LANGUAGE_KEYFILE
+                             GOOGLE_CLOUD_CREDENTIALS
+                             GOOGLE_CLOUD_KEYFILE
+                             GCLOUD_KEYFILE)
+          JSON_ENV_VARS = %w(LANGUAGE_CREDENTIALS_JSON
+                             LANGUAGE_KEYFILE_JSON
+                             GOOGLE_CLOUD_CREDENTIALS_JSON
+                             GOOGLE_CLOUD_KEYFILE_JSON
+                             GCLOUD_KEYFILE_JSON)
+          DEFAULT_PATHS = ["~/.config/gcloud/application_default_credentials.json"]
+        end
+      end
+    end
+  end
+end

data/lib/google/cloud/language/v1beta2/doc/google/cloud/language/v1beta2/language_service.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,17 +15,6 @@
 module Google
   module Cloud
     module Language
-      ##
-      # # Google Cloud Natural Language API Contents
-      #
-      # | Class | Description |
-      # | ----- | ----------- |
-      # | [LanguageServiceClient][] | Google Cloud Natural Language API provides natural language understanding technologies to developers. Examples include sentiment analysis, entity recognition, and text annotations. |
-      # | [Data Types][] | Data types for Google::Cloud::Language::V1beta2 |
-      #
-      # [LanguageServiceClient]: https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-language/latest/google/cloud/language/v1beta2/languageserviceclient
-      # [Data Types]: https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-language/latest/google/cloud/language/v1beta2/datatypes
-      #
       module V1beta2
         # ================================================================ #
         #

data/lib/google/cloud/language/v1beta2/doc/overview.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ module Google
     # rubocop:disable LineLength
 
     ##
-    # # Ruby Client for Google Cloud Natural Language API ([Beta](https://github.com/GoogleCloudPlatform/google-cloud-ruby#versioning))
+    # # Ruby Client for Google Cloud Natural Language API ([Alpha](https://github.com/GoogleCloudPlatform/google-cloud-ruby#versioning))
     #
     # [Google Cloud Natural Language API][Product Documentation]:
     # Google Cloud Natural Language API provides natural language understanding
@@ -30,8 +30,9 @@ module Google
     # steps:
     #
     # 1. [Select or create a Cloud Platform project.](https://console.cloud.google.com/project)
-    # 2. [Enable the Google Cloud Natural Language API.](https://console.cloud.google.com/apis/api/language)
-    # 3. [Setup Authentication.](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud/master/guides/authentication)
+    # 2. [Enable billing for your project.](https://cloud.google.com/billing/docs/how-to/modify-project#enable_billing_for_a_project)
+    # 3. [Enable the Google Cloud Natural Language API.](https://console.cloud.google.com/apis/library/language.googleapis.com)
+    # 4. [Setup Authentication.](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud/master/guides/authentication)
     #
     # ### Installation
     # ```
@@ -58,10 +59,35 @@ module Google
     #
     # [Product Documentation]: https://cloud.google.com/natural-language
     #
+    # ## Enabling Logging
+    #
+    # To enable logging for this library, set the logger for the underlying [gRPC](https://github.com/grpc/grpc/tree/master/src/ruby) library.
+    # The logger that you set may be a Ruby stdlib [`Logger`](https://ruby-doc.org/stdlib-2.5.0/libdoc/logger/rdoc/Logger.html) as shown below,
+    # or a [`Google::Cloud::Logging::Logger`](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-logging/latest/google/cloud/logging/logger)
+    # that will write logs to [Stackdriver Logging](https://cloud.google.com/logging/). See [grpc/logconfig.rb](https://github.com/grpc/grpc/blob/master/src/ruby/lib/grpc/logconfig.rb)
+    # and the gRPC [spec_helper.rb](https://github.com/grpc/grpc/blob/master/src/ruby/spec/spec_helper.rb) for additional information.
+    #
+    # Configuring a Ruby stdlib logger:
+    #
+    # ```ruby
+    # require "logger"
+    #
+    # module MyLogger
+    #   LOGGER = Logger.new $stderr, level: Logger::WARN
+    #   def logger
+    #     LOGGER
+    #   end
+    # end
+    #
+    # # Define a gRPC module-level logger method before grpc/logconfig.rb loads.
+    # module GRPC
+    #   extend MyLogger
+    # end
+    # ```
     #
     module Language
       module V1beta2
       end
     end
   end
-end
+end

data/lib/google/cloud/language/v1beta2/language_service_client.rb

@@ -1,4 +1,4 @@
-# Copyright 2017 Google LLC
+# Copyright 2018 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,9 +18,6 @@
 # and updates to that file get reflected here through a refresh process.
 # For the short term, the refresh process will only be runnable by Google
 # engineers.
-#
-# The only allowed edits are to method and file documentation. A 3-way
-# merge preserves those additions if the generated source changes.
 
 require "json"
 require "pathname"
@@ -28,7 +25,7 @@ require "pathname"
 require "google/gax"
 
 require "google/cloud/language/v1beta2/language_service_pb"
-require "google/cloud/language/credentials"
+require "google/cloud/language/v1beta2/credentials"
 
 module Google
   module Cloud
@@ -48,6 +45,9 @@ module Google
           # The default port of the service.
           DEFAULT_SERVICE_PORT = 443
 
+          # The default set of gRPC interceptors.
+          GRPC_INTERCEPTORS = []
+
           DEFAULT_TIMEOUT = 30
 
           # The scopes needed to make gRPC calls to all of the methods defined in
@@ -56,6 +56,7 @@ module Google
             "https://www.googleapis.com/auth/cloud-platform"
           ].freeze
 
+
           # @param credentials [Google::Auth::Credentials, String, Hash, GRPC::Core::Channel, GRPC::Core::ChannelCredentials, Proc]
           #   Provides the means for authenticating requests made by the client. This parameter can
           #   be many types.
@@ -80,16 +81,18 @@ module Google
           #   or the specified config is missing data points.
           # @param timeout [Numeric]
           #   The default timeout, in seconds, for calls made through this client.
+          # @param metadata [Hash]
+          #   Default metadata to be sent with each request. This can be overridden on a per call basis.
+          # @param exception_transformer [Proc]
+          #   An optional proc that intercepts any exceptions raised during an API call to inject
+          #   custom error handling.
           def initialize \
-              service_path: SERVICE_ADDRESS,
-              port: DEFAULT_SERVICE_PORT,
-              channel: nil,
-              chan_creds: nil,
-              updater_proc: nil,
               credentials: nil,
               scopes: ALL_SCOPES,
               client_config: {},
               timeout: DEFAULT_TIMEOUT,
+              metadata: nil,
+              exception_transformer: nil,
               lib_name: nil,
               lib_version: ""
             # These require statements are intentionally placed here to initialize
@@ -98,21 +101,10 @@ module Google
             require "google/gax/grpc"
             require "google/cloud/language/v1beta2/language_service_services_pb"
 
-            if channel || chan_creds || updater_proc
-              warn "The `channel`, `chan_creds`, and `updater_proc` parameters will be removed " \
-                "on 2017/09/08"
-              credentials ||= channel
-              credentials ||= chan_creds
-              credentials ||= updater_proc
-            end
-            if service_path != SERVICE_ADDRESS || port != DEFAULT_SERVICE_PORT
-              warn "`service_path` and `port` parameters are deprecated and will be removed"
-            end
-
-            credentials ||= Google::Cloud::Language::Credentials.default
+            credentials ||= Google::Cloud::Language::V1beta2::Credentials.default
 
             if credentials.is_a?(String) || credentials.is_a?(Hash)
-              updater_proc = Google::Cloud::Language::Credentials.new(credentials).updater_proc
+              updater_proc = Google::Cloud::Language::V1beta2::Credentials.new(credentials).updater_proc
             end
             if credentials.is_a?(GRPC::Core::Channel)
               channel = credentials
@@ -127,13 +119,16 @@ module Google
               updater_proc = credentials.updater_proc
             end
 
+            package_version = Gem.loaded_specs['google-cloud-language'].version.version
+
             google_api_client = "gl-ruby/#{RUBY_VERSION}"
             google_api_client << " #{lib_name}/#{lib_version}" if lib_name
-            google_api_client << " gapic/0.6.8 gax/#{Google::Gax::VERSION}"
+            google_api_client << " gapic/#{package_version} gax/#{Google::Gax::VERSION}"
             google_api_client << " grpc/#{GRPC::VERSION}"
             google_api_client.freeze
 
             headers = { :"x-goog-api-client" => google_api_client }
+            headers.merge!(metadata) unless metadata.nil?
             client_config_file = Pathname.new(__dir__).join(
               "language_service_client_config.json"
             )
@@ -145,9 +140,14 @@ module Google
                 Google::Gax::Grpc::STATUS_CODE_NAMES,
                 timeout,
                 errors: Google::Gax::Grpc::API_ERRORS,
-                kwargs: headers
+                metadata: headers
               )
             end
+
+            # Allow overriding the service path/port in subclasses.
+            service_path = self.class::SERVICE_ADDRESS
+            port = self.class::DEFAULT_SERVICE_PORT
+            interceptors = self.class::GRPC_INTERCEPTORS
             @language_service_stub = Google::Gax::Grpc.create_stub(
               service_path,
               port,
@@ -155,32 +155,39 @@ module Google
               channel: channel,
               updater_proc: updater_proc,
               scopes: scopes,
+              interceptors: interceptors,
               &Google::Cloud::Language::V1beta2::LanguageService::Stub.method(:new)
             )
 
             @analyze_sentiment = Google::Gax.create_api_call(
               @language_service_stub.method(:analyze_sentiment),
-              defaults["analyze_sentiment"]
+              defaults["analyze_sentiment"],
+              exception_transformer: exception_transformer
             )
             @analyze_entities = Google::Gax.create_api_call(
               @language_service_stub.method(:analyze_entities),
-              defaults["analyze_entities"]
+              defaults["analyze_entities"],
+              exception_transformer: exception_transformer
             )
             @analyze_entity_sentiment = Google::Gax.create_api_call(
               @language_service_stub.method(:analyze_entity_sentiment),
-              defaults["analyze_entity_sentiment"]
+              defaults["analyze_entity_sentiment"],
+              exception_transformer: exception_transformer
             )
             @analyze_syntax = Google::Gax.create_api_call(
               @language_service_stub.method(:analyze_syntax),
-              defaults["analyze_syntax"]
+              defaults["analyze_syntax"],
+              exception_transformer: exception_transformer
             )
             @classify_text = Google::Gax.create_api_call(
               @language_service_stub.method(:classify_text),
-              defaults["classify_text"]
+              defaults["classify_text"],
+              exception_transformer: exception_transformer
             )
             @annotate_text = Google::Gax.create_api_call(
               @language_service_stub.method(:annotate_text),
-              defaults["annotate_text"]
+              defaults["annotate_text"],
+              exception_transformer: exception_transformer
             )
           end
 
@@ -198,25 +205,31 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Cloud::Language::V1beta2::AnalyzeSentimentResponse]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Cloud::Language::V1beta2::AnalyzeSentimentResponse]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/language/v1beta2"
+          #   require "google/cloud/language"
           #
-          #   language_service_client = Google::Cloud::Language::V1beta2.new
+          #   language_service_client = Google::Cloud::Language.new(version: :v1beta2)
+          #
+          #   # TODO: Initialize +document+:
           #   document = {}
           #   response = language_service_client.analyze_sentiment(document)
 
           def analyze_sentiment \
               document,
               encoding_type: nil,
-              options: nil
+              options: nil,
+              &block
             req = {
               document: document,
               encoding_type: encoding_type
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Cloud::Language::V1beta2::AnalyzeSentimentRequest)
-            @analyze_sentiment.call(req, options)
+            @analyze_sentiment.call(req, options, &block)
           end
 
           # Finds named entities (currently proper names and common nouns) in the text
@@ -232,25 +245,31 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Cloud::Language::V1beta2::AnalyzeEntitiesResponse]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Cloud::Language::V1beta2::AnalyzeEntitiesResponse]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/language/v1beta2"
+          #   require "google/cloud/language"
+          #
+          #   language_service_client = Google::Cloud::Language.new(version: :v1beta2)
           #
-          #   language_service_client = Google::Cloud::Language::V1beta2.new
+          #   # TODO: Initialize +document+:
           #   document = {}
           #   response = language_service_client.analyze_entities(document)
 
           def analyze_entities \
               document,
               encoding_type: nil,
-              options: nil
+              options: nil,
+              &block
             req = {
               document: document,
               encoding_type: encoding_type
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Cloud::Language::V1beta2::AnalyzeEntitiesRequest)
-            @analyze_entities.call(req, options)
+            @analyze_entities.call(req, options, &block)
           end
 
           # Finds entities, similar to {Google::Cloud::Language::V1beta2::LanguageService::AnalyzeEntities AnalyzeEntities} in the text and analyzes
@@ -265,25 +284,31 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Cloud::Language::V1beta2::AnalyzeEntitySentimentResponse]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Cloud::Language::V1beta2::AnalyzeEntitySentimentResponse]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/language/v1beta2"
+          #   require "google/cloud/language"
           #
-          #   language_service_client = Google::Cloud::Language::V1beta2.new
+          #   language_service_client = Google::Cloud::Language.new(version: :v1beta2)
+          #
+          #   # TODO: Initialize +document+:
           #   document = {}
           #   response = language_service_client.analyze_entity_sentiment(document)
 
           def analyze_entity_sentiment \
               document,
               encoding_type: nil,
-              options: nil
+              options: nil,
+              &block
             req = {
               document: document,
               encoding_type: encoding_type
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Cloud::Language::V1beta2::AnalyzeEntitySentimentRequest)
-            @analyze_entity_sentiment.call(req, options)
+            @analyze_entity_sentiment.call(req, options, &block)
           end
 
           # Analyzes the syntax of the text and provides sentence boundaries and
@@ -299,25 +324,31 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Cloud::Language::V1beta2::AnalyzeSyntaxResponse]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Cloud::Language::V1beta2::AnalyzeSyntaxResponse]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/language/v1beta2"
+          #   require "google/cloud/language"
+          #
+          #   language_service_client = Google::Cloud::Language.new(version: :v1beta2)
           #
-          #   language_service_client = Google::Cloud::Language::V1beta2.new
+          #   # TODO: Initialize +document+:
           #   document = {}
           #   response = language_service_client.analyze_syntax(document)
 
           def analyze_syntax \
               document,
               encoding_type: nil,
-              options: nil
+              options: nil,
+              &block
             req = {
               document: document,
               encoding_type: encoding_type
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Cloud::Language::V1beta2::AnalyzeSyntaxRequest)
-            @analyze_syntax.call(req, options)
+            @analyze_syntax.call(req, options, &block)
           end
 
           # Classifies a document into categories.
@@ -329,23 +360,29 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Cloud::Language::V1beta2::ClassifyTextResponse]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Cloud::Language::V1beta2::ClassifyTextResponse]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/language/v1beta2"
+          #   require "google/cloud/language"
           #
-          #   language_service_client = Google::Cloud::Language::V1beta2.new
+          #   language_service_client = Google::Cloud::Language.new(version: :v1beta2)
+          #
+          #   # TODO: Initialize +document+:
           #   document = {}
           #   response = language_service_client.classify_text(document)
 
           def classify_text \
               document,
-              options: nil
+              options: nil,
+              &block
             req = {
               document: document
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Cloud::Language::V1beta2::ClassifyTextRequest)
-            @classify_text.call(req, options)
+            @classify_text.call(req, options, &block)
           end
 
           # A convenience method that provides all syntax, sentiment, entity, and
@@ -364,13 +401,20 @@ module Google
           # @param options [Google::Gax::CallOptions]
           #   Overrides the default settings for this call, e.g, timeout,
           #   retries, etc.
+          # @yield [result, operation] Access the result along with the RPC operation
+          # @yieldparam result [Google::Cloud::Language::V1beta2::AnnotateTextResponse]
+          # @yieldparam operation [GRPC::ActiveCall::Operation]
           # @return [Google::Cloud::Language::V1beta2::AnnotateTextResponse]
           # @raise [Google::Gax::GaxError] if the RPC is aborted.
           # @example
-          #   require "google/cloud/language/v1beta2"
+          #   require "google/cloud/language"
+          #
+          #   language_service_client = Google::Cloud::Language.new(version: :v1beta2)
           #
-          #   language_service_client = Google::Cloud::Language::V1beta2.new
+          #   # TODO: Initialize +document+:
           #   document = {}
+          #
+          #   # TODO: Initialize +features+:
           #   features = {}
           #   response = language_service_client.annotate_text(document, features)
 
@@ -378,14 +422,15 @@ module Google
               document,
               features,
               encoding_type: nil,
-              options: nil
+              options: nil,
+              &block
             req = {
               document: document,
               features: features,
               encoding_type: encoding_type
             }.delete_if { |_, v| v.nil? }
             req = Google::Gax::to_proto(req, Google::Cloud::Language::V1beta2::AnnotateTextRequest)
-            @annotate_text.call(req, options)
+            @annotate_text.call(req, options, &block)
           end
         end
       end