google-cloud-translate 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f57095104f31f5d2599e3e8581240c69e0ed606fd726cb382d2fda74f0547f85
-  data.tar.gz: 834d192ac8e50111bebbf6c020301abcc6ed5f9f0b707adda84de0661ad79426
+  metadata.gz: 41ec37f5e02cac79d4901ad0538400bacbf4b6614042b9150165e6cbd415dae5
+  data.tar.gz: 7b337bce70d91e3d57ef0b7728a948b311322248776ca3517d45f3f8b0a942a1
 SHA512:
-  metadata.gz: 3dacdd67988fc96e3560c492f3865af64ba0b9b47808031e50c94096619c55d5f0e4eff475ef95df7169ab99231b79e7be0bb7dd7af8ba2a8981ec029f01a194
-  data.tar.gz: 60dcdf8e53fef429e271048fd7e07d8c3e0bfba4a2e95f74621f665d067e774436bfa6f57099eee50a0798abbf3ed9be9c9cd05263353a0dfdb36318a5a25db8
+  metadata.gz: 79da43c9637bc93f00de089075d484aa93971d6936d51d35605a409f3cf3d9ce43034fbd830770c34e6af13a3d409d980e193ab2982eb429d4dbd1f8063d3aab
+  data.tar.gz: 152b161306540e6cb2619b4d171de05376f2c43039f15dbdf52afa79930b88e482a131bffe3c2abe6f834675fb6d2c00038637deebaf949c858afaf8687e8d57

data/LICENSE

@@ -1,6 +1,6 @@
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -192,7 +192,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       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,

data/lib/google-cloud-translate.rb

@@ -1,10 +1,10 @@
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2016 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
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     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,
@@ -20,6 +20,8 @@
 
 gem "google-cloud-core"
 require "google/cloud"
+require "google/cloud/config"
+require "googleauth"
 
 module Google
   module Cloud
@@ -140,3 +142,30 @@ module Google
     end
   end
 end
+
+# Set the default translate configuration
+Google::Cloud.configure.add_config! :translate do |config|
+  default_project = Google::Cloud::Config.deferred do
+    ENV["TRANSLATE_PROJECT"]
+  end
+  default_creds = Google::Cloud::Config.deferred do
+    Google::Cloud::Config.credentials_from_env(
+      "TRANSLATE_CREDENTIALS", "TRANSLATE_CREDENTIALS_JSON",
+      "TRANSLATE_KEYFILE", "TRANSLATE_KEYFILE_JSON"
+    )
+  end
+  default_key = Google::Cloud::Config.deferred do
+    ENV["TRANSLATE_KEY"] || ENV["GOOGLE_CLOUD_KEY"]
+  end
+
+  config.add_field! :project_id, default_project, match: String, allow_nil: true
+  config.add_alias! :project, :project_id
+  config.add_field! :credentials, default_creds,
+                    match: [String, Hash, Google::Auth::Credentials],
+                    allow_nil: true
+  config.add_alias! :keyfile, :credentials
+  config.add_field! :key, default_key, match: String, allow_nil: true
+  config.add_field! :scope, nil, match: [String, Array]
+  config.add_field! :retries, nil, match: Integer
+  config.add_field! :timeout, nil, match: Integer
+end

data/lib/google/cloud/translate.rb

@@ -1,10 +1,10 @@
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2016 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
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     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,
@@ -15,6 +15,8 @@
 
 require "google-cloud-translate"
 require "google/cloud/translate/api"
+require "google/cloud/config"
+require "google/cloud/env"
 
 module Google
   module Cloud
@@ -275,28 +277,75 @@ module Google
       #
       def self.new project_id: nil, credentials: nil, key: nil, scope: nil,
                    retries: nil, timeout: nil, project: nil, keyfile: nil
-        project_id ||= (project || Translate::Api.default_project_id)
+        project_id ||= (project || default_project_id)
         project_id = project_id.to_s # Always cast to a string
 
-        key ||= ENV["TRANSLATE_KEY"]
-        key ||= ENV["GOOGLE_CLOUD_KEY"]
+        key ||= configure.key
         if key
           return Google::Cloud::Translate::Api.new(
             Google::Cloud::Translate::Service.new(
-              project_id, nil, retries: retries, timeout: timeout, key: key))
+              project_id, nil, retries: retries, timeout: timeout, key: key
+            )
+          )
         end
 
-        fail ArgumentError, "project_id is missing" if project_id.empty?
+        raise ArgumentError, "project_id is missing" if project_id.empty?
 
-        credentials ||= keyfile
-        credentials ||= Translate::Credentials.default(scope: scope)
+        scope ||= configure.scope
+        retries ||= configure.retries
+        timeout ||= configure.timeout
+        credentials ||= keyfile || default_credentials(scope: scope)
         unless credentials.is_a? Google::Auth::Credentials
           credentials = Translate::Credentials.new credentials, scope: scope
         end
 
         Translate::Api.new(
           Translate::Service.new(
-            project_id, credentials, retries: retries, timeout: timeout))
+            project_id, credentials, retries: retries, timeout: timeout
+          )
+        )
+      end
+
+      ##
+      # Configure the Google Cloud Translate library.
+      #
+      # The following Translate configuration parameters are supported:
+      #
+      # * `project_id` - (String) Identifier for a Translate project. (The
+      #   parameter `project` is considered deprecated, but may also be used.)
+      # * `credentials` - (String, Hash, Google::Auth::Credentials) The path to
+      #   the keyfile as a String, the contents of the keyfile as a Hash, or a
+      #   Google::Auth::Credentials object. (See {Translate::Credentials}) (The
+      #   parameter `keyfile` is considered deprecated, but may also be used.)
+      # * `scope` - (String, Array<String>) The OAuth 2.0 scopes controlling
+      #   the set of resources and operations that the connection can access.
+      # * `retries` - (Integer) Number of times to retry requests on server
+      #   error.
+      # * `timeout` - (Integer) Default timeout to use in requests.
+      #
+      # @return [Google::Cloud::Config] The configuration object the
+      #   Google::Cloud::Translate library uses.
+      #
+      def self.configure
+        yield Google::Cloud.configure.translate if block_given?
+
+        Google::Cloud.configure.translate
+      end
+
+      ##
+      # @private Default project.
+      def self.default_project_id
+        Google::Cloud.configure.translate.project_id ||
+          Google::Cloud.configure.project_id ||
+          Google::Cloud.env.project_id
+      end
+
+      ##
+      # @private Default credentials.
+      def self.default_credentials scope: nil
+        Google::Cloud.configure.translate.credentials ||
+          Google::Cloud.configure.credentials ||
+          Translate::Credentials.default(scope: scope)
       end
     end
   end

data/lib/google/cloud/translate/api.rb

@@ -1,10 +1,10 @@
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2016 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
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     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,
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 
-require "google/cloud/env"
 require "google/cloud/translate/service"
 require "google/cloud/translate/translation"
 require "google/cloud/translate/detection"
@@ -78,16 +77,7 @@ module Google
         def project_id
           service.project
         end
-        alias_method :project, :project_id
-
-        ##
-        # @private Default project.
-        def self.default_project_id
-          ENV["TRANSLATE_PROJECT"] ||
-            ENV["GOOGLE_CLOUD_PROJECT"] ||
-            ENV["GCLOUD_PROJECT"] ||
-            Google::Cloud.env.project_id
-        end
+        alias project project_id
 
         ##
         # Returns text translations from one language to another.
@@ -184,7 +174,7 @@ module Google
         def translate *text, to: nil, from: nil, format: nil, model: nil,
                       cid: nil
           return nil if text.empty?
-          fail ArgumentError, "to is required" if to.nil?
+          raise ArgumentError, "to is required" if to.nil?
           to = to.to_s
           from = from.to_s if from
           format = format.to_s if format

data/lib/google/cloud/translate/credentials.rb

@@ -1,10 +1,10 @@
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2016 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
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     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,
@@ -38,19 +38,19 @@ module Google
       #   translate.project_id #=> "my-todo-project"
       #
       class Credentials < Google::Auth::Credentials
-        SCOPE = ["https://www.googleapis.com/auth/cloud-platform"]
-        PATH_ENV_VARS = %w(TRANSLATE_CREDENTIALS
+        SCOPE = ["https://www.googleapis.com/auth/cloud-platform"].freeze
+        PATH_ENV_VARS = %w[TRANSLATE_CREDENTIALS
                            TRANSLATE_KEYFILE
                            GOOGLE_CLOUD_CREDENTIALS
                            GOOGLE_CLOUD_KEYFILE
-                           GCLOUD_KEYFILE)
-        JSON_ENV_VARS = %w(TRANSLATE_CREDENTIALS_JSON
+                           GCLOUD_KEYFILE].freeze
+        JSON_ENV_VARS = %w[TRANSLATE_CREDENTIALS_JSON
                            TRANSLATE_KEYFILE_JSON
                            GOOGLE_CLOUD_CREDENTIALS_JSON
                            GOOGLE_CLOUD_KEYFILE_JSON
-                           GCLOUD_KEYFILE_JSON)
+                           GCLOUD_KEYFILE_JSON].freeze
         DEFAULT_PATHS = \
-          ["~/.config/gcloud/application_default_credentials.json"]
+          ["~/.config/gcloud/application_default_credentials.json"].freeze
       end
     end
   end

data/lib/google/cloud/translate/detection.rb

@@ -1,10 +1,10 @@
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2016 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
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     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,

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

@@ -1,10 +1,10 @@
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2016 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
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     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,

data/lib/google/cloud/translate/service.rb

@@ -1,10 +1,10 @@
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2016 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
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     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,
@@ -25,8 +25,8 @@ module Google
       # @private
       # Represents the Translation API REST service, exposing the API calls.
       class Service #:nodoc:
-        API_VERSION = "v2"
-        API_URL = "https://translation.googleapis.com"
+        API_VERSION = "v2".freeze
+        API_URL = "https://translation.googleapis.com".freeze
 
         # @private
         attr_accessor :project, :credentials, :retries, :timeout, :key
@@ -71,7 +71,7 @@ module Google
         end
 
         def inspect
-          "#{self.class}"
+          self.class.to_s
         end
 
         protected
@@ -92,7 +92,7 @@ module Google
 
           return JSON.parse(response.body)["data"] if response.success?
 
-          fail Google::Cloud::Error.gapi_error_class_for(response.status)
+          raise Google::Cloud::Error.gapi_error_class_for(response.status)
         rescue Faraday::ConnectionFailed
           raise Google::Cloud::ResourceExhaustedError
         end
@@ -153,7 +153,7 @@ module Google
           # Set the default values
           self.retries = 3
           self.http_codes = [500, 503]
-          self.reasons = %w(rateLimitExceeded userRateLimitExceeded)
+          self.reasons = %w[rateLimitExceeded userRateLimitExceeded]
           self.backoff = ->(retries) { sleep retries.to_i }
 
           def initialize options = {} #:nodoc:

data/lib/google/cloud/translate/translation.rb

@@ -1,10 +1,10 @@
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2016 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
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     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,
@@ -45,8 +45,8 @@ module Google
         #
         # @return [String]
         attr_reader :text
-        alias_method :to_s, :text
-        alias_method :to_str, :text
+        alias to_s text
+        alias to_str text
 
         ##
         # The original query text that was translated.
@@ -59,15 +59,15 @@ module Google
         #
         # @return [String]
         attr_reader :to
-        alias_method :language, :to
-        alias_method :target, :to
+        alias language to
+        alias target to
 
         ##
         # The source language from which the text was translated.
         #
         # @return [String]
         attr_reader :from
-        alias_method :source, :from
+        alias source from
 
         ##
         # The translation model. Can be either `base` for the Phrase-Based

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

@@ -1,10 +1,10 @@
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2016 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
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     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,
@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Translate
-      VERSION = "1.1.0"
+      VERSION = "1.2.0".freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-translate
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -127,16 +127,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.50.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.50.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -220,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: API Client library for Google Cloud Translation API