active_translation 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5060f0fe015b2284bcb3099e6a9287a5dac0bbc8f0cb8f8172c0d068dcfb714
-  data.tar.gz: 25abebd6fff9da4101bf2aca097085b9314c0b217b3de1547b597f2f641e95c9
+  metadata.gz: d7c30d8d827617a8cc52aae8809f5e6a12e703bc06452309fe4ecacefcfecfd7
+  data.tar.gz: e69abc9036b9ba190fc7663f5f41bd7d748a8c3d5cd861c184617c7ba6272d6f
 SHA512:
-  metadata.gz: be37b5420e08aa497dc213784b4101eb09de9fd645fe14c974dbd0659453251242a55e90ffba89afd6194067edfdf3c3a344294b20a63be7fda7a0deb1ad18b4
-  data.tar.gz: e9afd718cec5a0a67035c8e6656579e57993caf67ff6e8b39254e6f9b3301c31c894ffeb41e16375b8dd30554cd30063f8d74f37ad200747feecdb3308ba8618
+  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
 

data/lib/active_translation/version.rb

@@ -1,3 +1,3 @@
 module ActiveTranslation
-  VERSION = "0.7.7"
+  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.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Talentronic