active_translation 0.7.6 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80d790063e336ec762cf5374a7eb30e2858d04e04ff5c03e952358481262039a
-  data.tar.gz: 251987c1c7b1147547741567fc819f8680595e486e8d0e67997439305436941b
+  metadata.gz: d7c30d8d827617a8cc52aae8809f5e6a12e703bc06452309fe4ecacefcfecfd7
+  data.tar.gz: e69abc9036b9ba190fc7663f5f41bd7d748a8c3d5cd861c184617c7ba6272d6f
 SHA512:
-  metadata.gz: cd8bc53b2c7101fa908b90d8dc6076f63967452b6095f686c6a6590d2e9a40daae08897bb57ff4c1463b37f469344cfe18514b22fcdc42da335c00388e2ab5ab
-  data.tar.gz: 5fd085e8de592630f851874f68a8079f6de8213c1fc131005894abde22e3f9eb1972b375051f5665c0dbb9accea9bd3d5d6dd77c93471a0add7f4e746dcc587e
+  metadata.gz: 8dbdf785bcb4057b5e7f9498ade435c2b075a7da297d2df7ab50ca788b3a3879fdc2345cb6250410e8554692ed03f72b47b8eff2ca8518c4feeaf681202e9baf
+  data.tar.gz: 632bb0bce0180f3ee791875d56cbed286de15ebcd86c08dbf9853b8b34d498bd6079577ebaa40ff64a62c20e2cd629d90af4c13dff04cffc95144a71f0c49ae4

data/app/lib/active_translation/google_translate.rb

@@ -5,28 +5,46 @@
 module ActiveTranslation
   class GoogleTranslate
     class << self
+      def mock_api_responses?
+        !ActiveTranslation.configuration.non_mock_environments.map(&:to_s).include? Rails.env
+      rescue
+        !Rails.env.production?
+      end
+
       def translate(target_language_code:, text:, source: "en-US", obj: nil)
-        return "[#{target_language_code}] #{text}" if Rails.env.test?
+        translated_text = if mock_api_responses?
+          text
+        else
+          conn = Faraday.new(url: "https://translation.googleapis.com/") do |faraday|
+            faraday.request :json
+            faraday.response :json
+            faraday.request :authorization, "Bearer", -> { token }
+          end
 
-        conn = Faraday.new(url: "https://translation.googleapis.com/") do |faraday|
-          faraday.request :json
-          faraday.response :json
-          faraday.request :authorization, "Bearer", -> { token }
-        end
+          response =
+            conn.post(
+              "language/translate/v2",
+              {
+                q: text,
+                target: target_language_code,
+                source: source,
+              }
+            )
 
-        response =
-          conn.post(
-            "language/translate/v2",
-            {
-              q: text,
-              target: target_language_code,
-              source: source,
-            }
-          )
+          return nil unless response.success?
 
-        return nil unless response.success?
+          parse_response(response)
+        end
+
+        if text.match?(/\A[A-Z]/)
+          translated_text.sub!(/\A./, &:upcase)
+        end
 
-        parse_response(response)
+        if mock_api_responses?
+          "[#{target_language_code}] #{translated_text}"
+        else
+          translated_text
+        end
       end
 
       private
@@ -36,7 +54,7 @@ module ActiveTranslation
       end
 
       def token
-        return "fake_access_token" if Rails.env.test?
+        return "fake_access_token" if mock_api_responses?
 
         Rails.cache.fetch("google_access_token", expires_in: 55.minutes) do
           google_oauth_credentials = ActiveTranslation.configuration.to_json

data/lib/active_translation/configuration.rb

@@ -10,7 +10,8 @@ module ActiveTranslation
       :token_uri,
       :auth_provider_x509_cert_url,
       :client_x509_cert_url,
-      :universe_domain
+      :universe_domain,
+      :non_mock_environments
 
     def initialize
       @type = nil
@@ -24,6 +25,7 @@ module ActiveTranslation
       @auth_provider_x509_cert_url = "https://www.googleapis.com/oauth2/v1/certs"
       @client_x509_cert_url = nil
       @universe_domain = "googleapis.com"
+      @non_mock_environments = [ :production ]
     end
   end
 end

data/lib/active_translation/translatable.rb

@@ -31,7 +31,7 @@ module ActiveTranslation
           attribute = method_name.to_s.split("_").last
 
           # if something like "model.fr_title" is being called (no =)
-          if translation_config[:manual_attributes].include? attribute
+          if (translation_config[:attributes] + translation_config[:manual_attributes]).include? attribute
             translation = translations.find_by(locale: locale)
             return read_attribute(attribute) unless translation
 
@@ -168,22 +168,14 @@ module ActiveTranslation
 
       translated_text = cached_translation&.translated_text || ActiveTranslation::GoogleTranslate.translate(target_language_code: locale, text: send(attribute))
 
-      case translation_config[:cache]
-      when TrueClass
-        ActiveTranslation::Cache.find_or_create_by(
-          checksum: text_checksum(send(attribute)),
-          locale:,
-        ).update(translated_text:,)
-      when String, Symbol
-        return unless attribute.to_s == translation_config[:cache].to_s
-
-        ActiveTranslation::Cache.find_or_create_by(
-          checksum: text_checksum(send(attribute)),
-          locale:,
-        ).update(translated_text:,)
-      when Array
-        return unless translation_config[:cache].map(&:to_s).include? attribute.to_s
+      should_cache = case translation_config[:cache]
+      when TrueClass then true
+      when String, Symbol then attribute.to_s == translation_config[:cache].to_s
+      when Array then translation_config[:cache].map(&:to_s).include?(attribute.to_s)
+      else false
+      end
 
+      if should_cache
         ActiveTranslation::Cache.find_or_create_by(
           checksum: text_checksum(send(attribute)),
           locale:,

data/lib/active_translation/version.rb

@@ -1,3 +1,3 @@
 module ActiveTranslation
-  VERSION = "0.7.6"
+  VERSION = "0.7.8"
 end

data/lib/generators/active_translation/templates/README

@@ -21,6 +21,8 @@ Next steps:
      config.token_uri = ENV.fetch("GOOGLE_TRANSLATION_TOKEN_URI", "https://oauth2.googleapis.com/token")
      config.auth_provider_x509_cert_url = ENV.fetch("GOOGLE_TRANSLATION_AUTH_PROVIDER_CERT_URL", "https://www.googleapis.com/oauth2/v1/certs")
      config.universe_domain = ENV.fetch("GOOGLE_TRANSLATION_UNIVERSE_DOMAIN", "googleapis.com")
+
+     config.non_mock_environments = [ :production ]
    end
 
 3. Add to your models:

data/lib/generators/active_translation/templates/active_translation.rb

@@ -11,4 +11,6 @@ ActiveTranslation.configure do |config|
   config.token_uri = ENV.fetch("GOOGLE_TRANSLATION_TOKEN_URI", "https://oauth2.googleapis.com/token")
   config.auth_provider_x509_cert_url = ENV.fetch("GOOGLE_TRANSLATION_AUTH_PROVIDER_CERT_URL", "https://www.googleapis.com/oauth2/v1/certs")
   config.universe_domain = ENV.fetch("GOOGLE_TRANSLATION_UNIVERSE_DOMAIN", "googleapis.com")
+
+  config.non_mock_environments = [ :production ]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_translation
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.8
 platform: ruby
 authors:
 - Talentronic