google-cloud-language 0.27.0 → 0.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89d4be2c4b1d9af5da4037f60f42c408cef4b589
-  data.tar.gz: fe682c17f648587d334f61a837ba2bb6a8cc251f
+  metadata.gz: 640b2b45f1a1c1591831ec87517594559da9089e
+  data.tar.gz: 667181d885dd29cb5bf5638d9671b4e5070bfd75
 SHA512:
-  metadata.gz: 87e01d2e80b17b82f267311495b93355a949a8b0c06752eefee33b2f01dde921b660665c3d7b1a7a7d34362da81e282aca33c465d5e89284199a40a672da50e0
-  data.tar.gz: f67601acb34cfb93759978c23d1519b7105769de4f071e43cd988310af97922370af9b02f409dc22a4d1884ab1ca55d8d1670ad97dbc7ac76e1a2d1f2bee8987
+  metadata.gz: e7466b754816e35ad9da93f510a7666073c5e4852310f4d9ee8b76700ebf51fa4be842eb868fce581fb7a55df349d81c25cddaec3ce12a92b10b4b37de3ce692
+  data.tar.gz: a0dbb87e8d94baadbf8c7e9110775bbf11c007754aa73c49b8da878ba9461809d7ecaaf8be064806b0e8313156340ac1ba9b71d5b3197e1315cc66488acc66b9

data/.yardopts

@@ -1,6 +1,10 @@
 --no-private
 --title=Google Cloud Language
 --exclude lib/google/cloud/language/v1.rb
+--exclude lib/google/cloud/language/v1/language_service_pb.rb
+--exclude lib/google/cloud/language/v1/language_service_services_pb.rb
+--exclude lib/google/cloud/language/v1beta2/language_service_pb.rb
+--exclude lib/google/cloud/language/v1beta2/language_service_services_pb.rb
 --markup markdown
 
 ./lib/**/*.rb

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

@@ -37,9 +37,8 @@ module Google
         #     The language of the document (if not specified, the language is
         #     automatically detected). Both ISO and BCP-47 language codes are
         #     accepted.<br>
-        #     **Current Language Restrictions:**
-        #
-        #      * Only English, Spanish, and Japanese textual content are supported.
+        #     [Language Support](https://cloud.google.com/natural-language/docs/languages)
+        #     lists currently supported languages for each API method.
         #     If the language (either specified by the caller or automatically detected)
         #     is not supported by the called API method, an +INVALID_ARGUMENT+ error
         #     is returned.
@@ -63,8 +62,8 @@ module Google
         #     The sentence text.
         # @!attribute [rw] sentiment
         #   @return [Google::Cloud::Language::V1beta2::Sentiment]
-        #     For calls to AnalyzeSentiment or if
-        #     AnnotateTextRequest::Features#extract_document_sentiment is set to
+        #     For calls to {AnalyzeSentiment} or if
+        #     {Google::Cloud::Language::V1beta2::AnnotateTextRequest::Features#extract_document_sentiment AnnotateTextRequest::Features#extract_document_sentiment} is set to
         #     true, this field will contain the sentiment for the sentence.
         class Sentence; end
 
@@ -97,8 +96,8 @@ module Google
         #     supports proper noun mentions.
         # @!attribute [rw] sentiment
         #   @return [Google::Cloud::Language::V1beta2::Sentiment]
-        #     For calls to AnalyzeEntitySentiment or if
-        #     AnnotateTextRequest::Features#extract_entity_sentiment is set to
+        #     For calls to {AnalyzeEntitySentiment} or if
+        #     {Google::Cloud::Language::V1beta2::AnnotateTextRequest::Features#extract_entity_sentiment AnnotateTextRequest::Features#extract_entity_sentiment} is set to
         #     true, this field will contain the aggregate sentiment expressed for this
         #     entity in the provided document.
         class Entity
@@ -142,7 +141,7 @@ module Google
         #     Dependency tree parse for this token.
         # @!attribute [rw] lemma
         #   @return [String]
-        #     {Lemma}[https://en.wikipedia.org/wiki/Lemma_%28morphology%29] of the token.
+        #     [Lemma](https://en.wikipedia.org/wiki/Lemma_%28morphology%29) of the token.
         class Token; end
 
         # Represents the feeling associated with the entire text or entities in
@@ -743,8 +742,8 @@ module Google
         #     The type of the entity mention.
         # @!attribute [rw] sentiment
         #   @return [Google::Cloud::Language::V1beta2::Sentiment]
-        #     For calls to AnalyzeEntitySentiment or if
-        #     AnnotateTextRequest::Features#extract_entity_sentiment is set to
+        #     For calls to {AnalyzeEntitySentiment} or if
+        #     {Google::Cloud::Language::V1beta2::AnnotateTextRequest::Features#extract_entity_sentiment AnnotateTextRequest::Features#extract_entity_sentiment} is set to
         #     true, this field will contain the sentiment expressed for this mention of
         #     the entity in the provided document.
         class EntityMention
@@ -768,14 +767,23 @@ module Google
         # @!attribute [rw] begin_offset
         #   @return [Integer]
         #     The API calculates the beginning offset of the content in the original
-        #     document according to the EncodingType specified in the API request.
+        #     document according to the {Google::Cloud::Language::V1beta2::EncodingType EncodingType} specified in the API request.
         class TextSpan; end
 
+        # Represents a category returned from the text classifier.
+        # @!attribute [rw] name
+        #   @return [String]
+        #     The name of the category representing the document.
+        # @!attribute [rw] confidence
+        #   @return [Float]
+        #     The classifier's confidence of the category. Number represents how certain
+        #     the classifier is that this category represents the given text.
+        class ClassificationCategory; end
+
         # The sentiment analysis request message.
         # @!attribute [rw] document
         #   @return [Google::Cloud::Language::V1beta2::Document]
-        #     Input document. Currently, +analyzeSentiment+ only supports English text
-        #     (Document#language="EN").
+        #     Input document.
         # @!attribute [rw] encoding_type
         #   @return [Google::Cloud::Language::V1beta2::EncodingType]
         #     The encoding type used by the API to calculate sentence offsets for the
@@ -790,6 +798,7 @@ module Google
         #   @return [String]
         #     The language of the text, which will be the same as the language specified
         #     in the request or, if not specified, the automatically-detected language.
+        #     See {Google::Cloud::Language::V1beta2::Document#language Document#language} field for more details.
         # @!attribute [rw] sentences
         #   @return [Array<Google::Cloud::Language::V1beta2::Sentence>]
         #     The sentiment for all the sentences in the document.
@@ -812,7 +821,7 @@ module Google
         #   @return [String]
         #     The language of the text, which will be the same as the language specified
         #     in the request or, if not specified, the automatically-detected language.
-        #     See Document#language field for more details.
+        #     See {Google::Cloud::Language::V1beta2::Document#language Document#language} field for more details.
         class AnalyzeEntitySentimentResponse; end
 
         # The entity analysis request message.
@@ -832,7 +841,7 @@ module Google
         #   @return [String]
         #     The language of the text, which will be the same as the language specified
         #     in the request or, if not specified, the automatically-detected language.
-        #     See Document#language field for more details.
+        #     See {Google::Cloud::Language::V1beta2::Document#language Document#language} field for more details.
         class AnalyzeEntitiesResponse; end
 
         # The syntax analysis request message.
@@ -855,9 +864,21 @@ module Google
         #   @return [String]
         #     The language of the text, which will be the same as the language specified
         #     in the request or, if not specified, the automatically-detected language.
-        #     See Document#language field for more details.
+        #     See {Google::Cloud::Language::V1beta2::Document#language Document#language} field for more details.
         class AnalyzeSyntaxResponse; end
 
+        # The document classification request message.
+        # @!attribute [rw] document
+        #   @return [Google::Cloud::Language::V1beta2::Document]
+        #     Input document.
+        class ClassifyTextRequest; end
+
+        # The document classification response message.
+        # @!attribute [rw] categories
+        #   @return [Array<Google::Cloud::Language::V1beta2::ClassificationCategory>]
+        #     Categories representing the input document.
+        class ClassifyTextResponse; end
+
         # The request message for the text annotation API, which can perform multiple
         # analysis types (sentiment, entities, and syntax) in one call.
         # @!attribute [rw] document
@@ -884,6 +905,9 @@ module Google
           # @!attribute [rw] extract_entity_sentiment
           #   @return [true, false]
           #     Extract entities and their associated sentiment.
+          # @!attribute [rw] classify_text
+          #   @return [true, false]
+          #     Classify the full document into categories.
           class Features; end
         end
 
@@ -891,26 +915,29 @@ module Google
         # @!attribute [rw] sentences
         #   @return [Array<Google::Cloud::Language::V1beta2::Sentence>]
         #     Sentences in the input document. Populated if the user enables
-        #     AnnotateTextRequest::Features#extract_syntax.
+        #     {Google::Cloud::Language::V1beta2::AnnotateTextRequest::Features#extract_syntax AnnotateTextRequest::Features#extract_syntax}.
         # @!attribute [rw] tokens
         #   @return [Array<Google::Cloud::Language::V1beta2::Token>]
         #     Tokens, along with their syntactic information, in the input document.
         #     Populated if the user enables
-        #     AnnotateTextRequest::Features#extract_syntax.
+        #     {Google::Cloud::Language::V1beta2::AnnotateTextRequest::Features#extract_syntax AnnotateTextRequest::Features#extract_syntax}.
         # @!attribute [rw] entities
         #   @return [Array<Google::Cloud::Language::V1beta2::Entity>]
         #     Entities, along with their semantic information, in the input document.
         #     Populated if the user enables
-        #     AnnotateTextRequest::Features#extract_entities.
+        #     {Google::Cloud::Language::V1beta2::AnnotateTextRequest::Features#extract_entities AnnotateTextRequest::Features#extract_entities}.
         # @!attribute [rw] document_sentiment
         #   @return [Google::Cloud::Language::V1beta2::Sentiment]
         #     The overall sentiment for the document. Populated if the user enables
-        #     AnnotateTextRequest::Features#extract_document_sentiment.
+        #     {Google::Cloud::Language::V1beta2::AnnotateTextRequest::Features#extract_document_sentiment AnnotateTextRequest::Features#extract_document_sentiment}.
         # @!attribute [rw] language
         #   @return [String]
         #     The language of the text, which will be the same as the language specified
         #     in the request or, if not specified, the automatically-detected language.
-        #     See Document#language field for more details.
+        #     See {Google::Cloud::Language::V1beta2::Document#language Document#language} field for more details.
+        # @!attribute [rw] categories
+        #   @return [Array<Google::Cloud::Language::V1beta2::ClassificationCategory>]
+        #     Categories identified in the input document.
         class AnnotateTextResponse; end
 
         # Represents the text encoding that the caller uses to process the output.

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

@@ -28,6 +28,7 @@ require "pathname"
 require "google/gax"
 
 require "google/cloud/language/v1beta2/language_service_pb"
+require "google/cloud/language/credentials"
 
 module Google
   module Cloud
@@ -55,17 +56,21 @@ module Google
             "https://www.googleapis.com/auth/cloud-platform"
           ].freeze
 
-          # @param service_path [String]
-          #   The domain name of the API remote host.
-          # @param port [Integer]
-          #   The port on which to connect to the remote host.
-          # @param channel [Channel]
-          #   A Channel object through which to make calls.
-          # @param chan_creds [Grpc::ChannelCredentials]
-          #   A ChannelCredentials for the setting up the RPC client.
-          # @param updater_proc [Proc]
-          #   A function that transforms the metadata for requests, e.g., to give
-          #   OAuth credentials.
+          # @param credentials
+          #   [Google::Gax::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.
+          #   A `Google::Gax::Credentials` uses a the properties of its represented keyfile for
+          #   authenticating requests made by this client.
+          #   A `String` will be treated as the path to the keyfile to be used for the construction of
+          #   credentials for this client.
+          #   A `Hash` will be treated as the contents of a keyfile to be used for the construction of
+          #   credentials for this client.
+          #   A `GRPC::Core::Channel` will be used to make calls through.
+          #   A `GRPC::Core::ChannelCredentials` for the setting up the RPC client. The channel credentials
+          #   should already be composed with a `GRPC::Core::CallCredentials` object.
+          #   A `Proc` will be used as an updater_proc for the Grpc channel. The proc transforms the
+          #   metadata for requests, generally, to give OAuth credentials.
           # @param scopes [Array<String>]
           #   The OAuth scopes for this service. This parameter is ignored if
           #   an updater_proc is supplied.
@@ -82,11 +87,10 @@ module Google
               channel: nil,
               chan_creds: nil,
               updater_proc: nil,
+              credentials: nil,
               scopes: ALL_SCOPES,
               client_config: {},
               timeout: DEFAULT_TIMEOUT,
-              app_name: nil,
-              app_version: nil,
               lib_name: nil,
               lib_version: ""
             # These require statements are intentionally placed here to initialize
@@ -95,9 +99,33 @@ 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 || port
+              warn "`service_path` and `port` parameters are deprecated and will be removed"
+            end
 
-            if app_name || app_version
-              warn "`app_name` and `app_version` are no longer being used in the request headers."
+            credentials ||= Google::Cloud::Language::Credentials.default
+
+            if credentials.is_a?(String) || credentials.is_a?(Hash)
+              updater_proc = Google::Cloud::Language::Credentials.new(credentials).updater_proc
+            end
+            if credentials.is_a?(GRPC::Core::Channel)
+              channel = credentials
+            end
+            if credentials.is_a?(GRPC::Core::ChannelCredentials)
+              chan_creds = credentials
+            end
+            if credentials.is_a?(Proc)
+              updater_proc = credentials
+            end
+            if credentials.is_a?(Google::Gax::Credentials)
+              updater_proc = credentials.updater_proc
             end
 
             google_api_client = "gl-ruby/#{RUBY_VERSION}"
@@ -147,6 +175,10 @@ module Google
               @language_service_stub.method(:analyze_syntax),
               defaults["analyze_syntax"]
             )
+            @classify_text = Google::Gax.create_api_call(
+              @language_service_stub.method(:classify_text),
+              defaults["classify_text"]
+            )
             @annotate_text = Google::Gax.create_api_call(
               @language_service_stub.method(:annotate_text),
               defaults["annotate_text"]
@@ -157,9 +189,10 @@ module Google
 
           # Analyzes the sentiment of the provided text.
           #
-          # @param document [Google::Cloud::Language::V1beta2::Document]
-          #   Input document. Currently, +analyzeSentiment+ only supports English text
-          #   (Document#language="EN").
+          # @param document [Google::Cloud::Language::V1beta2::Document | Hash]
+          #   Input document.
+          #   A hash of the same form as `Google::Cloud::Language::V1beta2::Document`
+          #   can also be provided.
           # @param encoding_type [Google::Cloud::Language::V1beta2::EncodingType]
           #   The encoding type used by the API to calculate sentence offsets for the
           #   sentence sentiment.
@@ -171,21 +204,19 @@ module Google
           # @example
           #   require "google/cloud/language/v1beta2"
           #
-          #   Document = Google::Cloud::Language::V1beta2::Document
-          #   LanguageServiceClient = Google::Cloud::Language::V1beta2::LanguageServiceClient
-          #
-          #   language_service_client = LanguageServiceClient.new
-          #   document = Document.new
+          #   language_service_client = Google::Cloud::Language::V1beta2.new
+          #   document = {}
           #   response = language_service_client.analyze_sentiment(document)
 
           def analyze_sentiment \
               document,
               encoding_type: nil,
               options: nil
-            req = Google::Cloud::Language::V1beta2::AnalyzeSentimentRequest.new({
+            req = {
               document: document,
               encoding_type: encoding_type
-            }.delete_if { |_, v| v.nil? })
+            }.delete_if { |_, v| v.nil? }
+            req = Google::Gax::to_proto(req, Google::Cloud::Language::V1beta2::AnalyzeSentimentRequest)
             @analyze_sentiment.call(req, options)
           end
 
@@ -193,8 +224,10 @@ module Google
           # along with entity types, salience, mentions for each entity, and
           # other properties.
           #
-          # @param document [Google::Cloud::Language::V1beta2::Document]
+          # @param document [Google::Cloud::Language::V1beta2::Document | Hash]
           #   Input document.
+          #   A hash of the same form as `Google::Cloud::Language::V1beta2::Document`
+          #   can also be provided.
           # @param encoding_type [Google::Cloud::Language::V1beta2::EncodingType]
           #   The encoding type used by the API to calculate offsets.
           # @param options [Google::Gax::CallOptions]
@@ -205,31 +238,29 @@ module Google
           # @example
           #   require "google/cloud/language/v1beta2"
           #
-          #   Document = Google::Cloud::Language::V1beta2::Document
-          #   EncodingType = Google::Cloud::Language::V1beta2::EncodingType
-          #   LanguageServiceClient = Google::Cloud::Language::V1beta2::LanguageServiceClient
-          #
-          #   language_service_client = LanguageServiceClient.new
-          #   document = Document.new
-          #   encoding_type = EncodingType::NONE
-          #   response = language_service_client.analyze_entities(document, encoding_type)
+          #   language_service_client = Google::Cloud::Language::V1beta2.new
+          #   document = {}
+          #   response = language_service_client.analyze_entities(document)
 
           def analyze_entities \
               document,
-              encoding_type,
+              encoding_type: nil,
               options: nil
-            req = Google::Cloud::Language::V1beta2::AnalyzeEntitiesRequest.new({
+            req = {
               document: document,
               encoding_type: encoding_type
-            }.delete_if { |_, v| v.nil? })
+            }.delete_if { |_, v| v.nil? }
+            req = Google::Gax::to_proto(req, Google::Cloud::Language::V1beta2::AnalyzeEntitiesRequest)
             @analyze_entities.call(req, options)
           end
 
-          # Finds entities, similar to AnalyzeEntities in the text and analyzes
+          # Finds entities, similar to {Google::Cloud::Language::V1beta2::LanguageService::AnalyzeEntities AnalyzeEntities} in the text and analyzes
           # sentiment associated with each entity and its mentions.
           #
-          # @param document [Google::Cloud::Language::V1beta2::Document]
+          # @param document [Google::Cloud::Language::V1beta2::Document | Hash]
           #   Input document.
+          #   A hash of the same form as `Google::Cloud::Language::V1beta2::Document`
+          #   can also be provided.
           # @param encoding_type [Google::Cloud::Language::V1beta2::EncodingType]
           #   The encoding type used by the API to calculate offsets.
           # @param options [Google::Gax::CallOptions]
@@ -240,23 +271,19 @@ module Google
           # @example
           #   require "google/cloud/language/v1beta2"
           #
-          #   Document = Google::Cloud::Language::V1beta2::Document
-          #   EncodingType = Google::Cloud::Language::V1beta2::EncodingType
-          #   LanguageServiceClient = Google::Cloud::Language::V1beta2::LanguageServiceClient
-          #
-          #   language_service_client = LanguageServiceClient.new
-          #   document = Document.new
-          #   encoding_type = EncodingType::NONE
-          #   response = language_service_client.analyze_entity_sentiment(document, encoding_type)
+          #   language_service_client = Google::Cloud::Language::V1beta2.new
+          #   document = {}
+          #   response = language_service_client.analyze_entity_sentiment(document)
 
           def analyze_entity_sentiment \
               document,
-              encoding_type,
+              encoding_type: nil,
               options: nil
-            req = Google::Cloud::Language::V1beta2::AnalyzeEntitySentimentRequest.new({
+            req = {
               document: document,
               encoding_type: encoding_type
-            }.delete_if { |_, v| v.nil? })
+            }.delete_if { |_, v| v.nil? }
+            req = Google::Gax::to_proto(req, Google::Cloud::Language::V1beta2::AnalyzeEntitySentimentRequest)
             @analyze_entity_sentiment.call(req, options)
           end
 
@@ -264,8 +291,10 @@ module Google
           # tokenization along with part of speech tags, dependency trees, and other
           # properties.
           #
-          # @param document [Google::Cloud::Language::V1beta2::Document]
+          # @param document [Google::Cloud::Language::V1beta2::Document | Hash]
           #   Input document.
+          #   A hash of the same form as `Google::Cloud::Language::V1beta2::Document`
+          #   can also be provided.
           # @param encoding_type [Google::Cloud::Language::V1beta2::EncodingType]
           #   The encoding type used by the API to calculate offsets.
           # @param options [Google::Gax::CallOptions]
@@ -276,33 +305,61 @@ module Google
           # @example
           #   require "google/cloud/language/v1beta2"
           #
-          #   Document = Google::Cloud::Language::V1beta2::Document
-          #   EncodingType = Google::Cloud::Language::V1beta2::EncodingType
-          #   LanguageServiceClient = Google::Cloud::Language::V1beta2::LanguageServiceClient
-          #
-          #   language_service_client = LanguageServiceClient.new
-          #   document = Document.new
-          #   encoding_type = EncodingType::NONE
-          #   response = language_service_client.analyze_syntax(document, encoding_type)
+          #   language_service_client = Google::Cloud::Language::V1beta2.new
+          #   document = {}
+          #   response = language_service_client.analyze_syntax(document)
 
           def analyze_syntax \
               document,
-              encoding_type,
+              encoding_type: nil,
               options: nil
-            req = Google::Cloud::Language::V1beta2::AnalyzeSyntaxRequest.new({
+            req = {
               document: document,
               encoding_type: encoding_type
-            }.delete_if { |_, v| v.nil? })
+            }.delete_if { |_, v| v.nil? }
+            req = Google::Gax::to_proto(req, Google::Cloud::Language::V1beta2::AnalyzeSyntaxRequest)
             @analyze_syntax.call(req, options)
           end
 
-          # A convenience method that provides all syntax, sentiment, and entity
-          # features in one call.
+          # Classifies a document into categories.
           #
-          # @param document [Google::Cloud::Language::V1beta2::Document]
+          # @param document [Google::Cloud::Language::V1beta2::Document | Hash]
           #   Input document.
-          # @param features [Google::Cloud::Language::V1beta2::AnnotateTextRequest::Features]
+          #   A hash of the same form as `Google::Cloud::Language::V1beta2::Document`
+          #   can also be provided.
+          # @param options [Google::Gax::CallOptions]
+          #   Overrides the default settings for this call, e.g, timeout,
+          #   retries, etc.
+          # @return [Google::Cloud::Language::V1beta2::ClassifyTextResponse]
+          # @raise [Google::Gax::GaxError] if the RPC is aborted.
+          # @example
+          #   require "google/cloud/language/v1beta2"
+          #
+          #   language_service_client = Google::Cloud::Language::V1beta2.new
+          #   document = {}
+          #   response = language_service_client.classify_text(document)
+
+          def classify_text \
+              document,
+              options: nil
+            req = {
+              document: document
+            }.delete_if { |_, v| v.nil? }
+            req = Google::Gax::to_proto(req, Google::Cloud::Language::V1beta2::ClassifyTextRequest)
+            @classify_text.call(req, options)
+          end
+
+          # A convenience method that provides all syntax, sentiment, entity, and
+          # classification features in one call.
+          #
+          # @param document [Google::Cloud::Language::V1beta2::Document | Hash]
+          #   Input document.
+          #   A hash of the same form as `Google::Cloud::Language::V1beta2::Document`
+          #   can also be provided.
+          # @param features [Google::Cloud::Language::V1beta2::AnnotateTextRequest::Features | Hash]
           #   The enabled features.
+          #   A hash of the same form as `Google::Cloud::Language::V1beta2::AnnotateTextRequest::Features`
+          #   can also be provided.
           # @param encoding_type [Google::Cloud::Language::V1beta2::EncodingType]
           #   The encoding type used by the API to calculate offsets.
           # @param options [Google::Gax::CallOptions]
@@ -313,27 +370,22 @@ module Google
           # @example
           #   require "google/cloud/language/v1beta2"
           #
-          #   Document = Google::Cloud::Language::V1beta2::Document
-          #   EncodingType = Google::Cloud::Language::V1beta2::EncodingType
-          #   Features = Google::Cloud::Language::V1beta2::AnnotateTextRequest::Features
-          #   LanguageServiceClient = Google::Cloud::Language::V1beta2::LanguageServiceClient
-          #
-          #   language_service_client = LanguageServiceClient.new
-          #   document = Document.new
-          #   features = Features.new
-          #   encoding_type = EncodingType::NONE
-          #   response = language_service_client.annotate_text(document, features, encoding_type)
+          #   language_service_client = Google::Cloud::Language::V1beta2.new
+          #   document = {}
+          #   features = {}
+          #   response = language_service_client.annotate_text(document, features)
 
           def annotate_text \
               document,
               features,
-              encoding_type,
+              encoding_type: nil,
               options: nil
-            req = Google::Cloud::Language::V1beta2::AnnotateTextRequest.new({
+            req = {
               document: document,
               features: features,
               encoding_type: encoding_type
-            }.delete_if { |_, v| v.nil? })
+            }.delete_if { |_, v| v.nil? }
+            req = Google::Gax::to_proto(req, Google::Cloud::Language::V1beta2::AnnotateTextRequest)
             @annotate_text.call(req, options)
           end
         end

data/lib/google/cloud/language/v1beta2/language_service_client_config.json

@@ -40,6 +40,11 @@
           "retry_codes_name": "idempotent",
           "retry_params_name": "default"
         },
+        "ClassifyText": {
+          "timeout_millis": 30000,
+          "retry_codes_name": "idempotent",
+          "retry_params_name": "default"
+        },
         "AnnotateText": {
           "timeout_millis": 30000,
           "retry_codes_name": "idempotent",

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

@@ -270,6 +270,10 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :content, :string, 1
     optional :begin_offset, :int32, 2
   end
+  add_message "google.cloud.language.v1beta2.ClassificationCategory" do
+    optional :name, :string, 1
+    optional :confidence, :float, 2
+  end
   add_message "google.cloud.language.v1beta2.AnalyzeSentimentRequest" do
     optional :document, :message, 1, "google.cloud.language.v1beta2.Document"
     optional :encoding_type, :enum, 2, "google.cloud.language.v1beta2.EncodingType"
@@ -304,6 +308,12 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     repeated :tokens, :message, 2, "google.cloud.language.v1beta2.Token"
     optional :language, :string, 3
   end
+  add_message "google.cloud.language.v1beta2.ClassifyTextRequest" do
+    optional :document, :message, 1, "google.cloud.language.v1beta2.Document"
+  end
+  add_message "google.cloud.language.v1beta2.ClassifyTextResponse" do
+    repeated :categories, :message, 1, "google.cloud.language.v1beta2.ClassificationCategory"
+  end
   add_message "google.cloud.language.v1beta2.AnnotateTextRequest" do
     optional :document, :message, 1, "google.cloud.language.v1beta2.Document"
     optional :features, :message, 2, "google.cloud.language.v1beta2.AnnotateTextRequest.Features"
@@ -314,6 +324,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :extract_entities, :bool, 2
     optional :extract_document_sentiment, :bool, 3
     optional :extract_entity_sentiment, :bool, 4
+    optional :classify_text, :bool, 6
   end
   add_message "google.cloud.language.v1beta2.AnnotateTextResponse" do
     repeated :sentences, :message, 1, "google.cloud.language.v1beta2.Sentence"
@@ -321,6 +332,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     repeated :entities, :message, 3, "google.cloud.language.v1beta2.Entity"
     optional :document_sentiment, :message, 4, "google.cloud.language.v1beta2.Sentiment"
     optional :language, :string, 5
+    repeated :categories, :message, 6, "google.cloud.language.v1beta2.ClassificationCategory"
   end
   add_enum "google.cloud.language.v1beta2.EncodingType" do
     value :NONE, 0
@@ -359,6 +371,7 @@ module Google
         EntityMention = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.language.v1beta2.EntityMention").msgclass
         EntityMention::Type = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.language.v1beta2.EntityMention.Type").enummodule
         TextSpan = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.language.v1beta2.TextSpan").msgclass
+        ClassificationCategory = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.language.v1beta2.ClassificationCategory").msgclass
         AnalyzeSentimentRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.language.v1beta2.AnalyzeSentimentRequest").msgclass
         AnalyzeSentimentResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.language.v1beta2.AnalyzeSentimentResponse").msgclass
         AnalyzeEntitySentimentRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest").msgclass
@@ -367,6 +380,8 @@ module Google
         AnalyzeEntitiesResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.language.v1beta2.AnalyzeEntitiesResponse").msgclass
         AnalyzeSyntaxRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.language.v1beta2.AnalyzeSyntaxRequest").msgclass
         AnalyzeSyntaxResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.language.v1beta2.AnalyzeSyntaxResponse").msgclass
+        ClassifyTextRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.language.v1beta2.ClassifyTextRequest").msgclass
+        ClassifyTextResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.language.v1beta2.ClassifyTextResponse").msgclass
         AnnotateTextRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.language.v1beta2.AnnotateTextRequest").msgclass
         AnnotateTextRequest::Features = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.language.v1beta2.AnnotateTextRequest.Features").msgclass
         AnnotateTextResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.cloud.language.v1beta2.AnnotateTextResponse").msgclass

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

@@ -47,8 +47,10 @@ module Google
             # tokenization along with part of speech tags, dependency trees, and other
             # properties.
             rpc :AnalyzeSyntax, AnalyzeSyntaxRequest, AnalyzeSyntaxResponse
-            # A convenience method that provides all syntax, sentiment, and entity
-            # features in one call.
+            # Classifies a document into categories.
+            rpc :ClassifyText, ClassifyTextRequest, ClassifyTextResponse
+            # A convenience method that provides all syntax, sentiment, entity, and
+            # classification features in one call.
             rpc :AnnotateText, AnnotateTextRequest, AnnotateTextResponse
           end
 

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Language
-      VERSION = "0.27.0"
+      VERSION = "0.27.1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-language
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.27.1
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: API Client library for Google Cloud Natural Language API