phrase-ota-i18n 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 348aeb752b1b54dd06a06363a1c81235dc799c8f59e1ad735cf85b43dd888f2a
-  data.tar.gz: de25387546ec36b726e660591cf421a7d994144a9d4e4032a6fa8f555a9e92d5
+  metadata.gz: 74730e59204a8113cb5da49b36771f19175d6aabb7cbea47559d20b9a053057f
+  data.tar.gz: f184f39f57cfc7c3aa0ee887002ebfb5f0c3fe11471335f8f0db08eb9d9271dd
 SHA512:
-  metadata.gz: 5bdcf6a5086b6dc0dba354960e451dd60fbcfdf2caac61370d13abab2ff4ccded7fa77a887ce030c0a6f566ac3cfbf20b093f27556a2e123fdb6fe037b400b56
-  data.tar.gz: 24ed5ce4b7c8e3dd619ebb47c10063754b66dc9f92986ea784e7c235f1bb0bbd55be7d4671e2fd5505a0f72288641bcf6b7ccf5f1d1c7b1689c5ac05c7f9a789
+  metadata.gz: aec2397a8b9f46f0b3442356d4ff8f38d069963d5d452fc7d127b6deee92060a2412864a15f493634e940715b46f632ce23bd497b6103a3bff2fb0f9780300ec
+  data.tar.gz: 7264e91c3e4e29f8977fa7fcaec188d08a27558bc630ec4c92c8743a83d51da5a586251f483feff64f9ed17ca3d25e65338e32f8c250d60226d4d193ea68cce7

data/.standard.yml

@@ -0,0 +1,3 @@
+fix: true
+parallel: true
+format: progress

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.0.2](https://github.com/phrase/phrase-ota-i18n/compare/v1.0.1...v1.0.2) (2023-09-07)
+
+
+### Bug Fixes
+
+* store current_version per locale ([3d23407](https://github.com/phrase/phrase-ota-i18n/commit/3d234072a8631577280fee280b93abb3e1cd2e2b))
+* use unique cache key per distribution and locale ([ea25cd5](https://github.com/phrase/phrase-ota-i18n/commit/ea25cd5172c41bdaccef57a0f0a66a3a39790b11))
+
 ## [1.0.1](https://github.com/phrase/phrase-ota-i18n/compare/v1.0.0...v1.0.1) (2023-09-04)
 
 

data/README.md

@@ -22,7 +22,7 @@ Or install it yourself as:
 
 Generate config:
 
-    bundle exec rails generate phrase_ota_rails:install --distribution-id <DISTRIBUTION_ID> --secret-token <SECRET>
+    bundle exec rails generate phrase_ota:install --distribution-id <DISTRIBUTION_ID> --secret-token <SECRET>
 
 
 ## Development

data/lib/phrase/ota/backend.rb

@@ -6,7 +6,7 @@ module Phrase
   module Ota
     class Backend < I18n::Backend::Simple
       def initialize
-        @current_version = nil
+        @current_locale_versions = {}
         @initialized = true # initializing immeditaly as we don't want to wait until all OTA translations have been fetched
         start_polling
       end
@@ -23,44 +23,52 @@ module Phrase
       def start_polling
         Thread.new do
           loop do
-            sleep(Phrase::Ota.config.poll_interval_seconds)
+            sleep(Phrase::Ota.config.poll_interval)
             update_translations
           end
         end
       end
 
       def update_translations
-        log("Phrase: Updating translations...")
+        log("Updating translations for locales: #{available_locales}")
 
         available_locales.each do |locale|
-          url = "#{Phrase::Ota.config.base_url}/#{Phrase::Ota.config.distribution_id}/#{Phrase::Ota.config.secret_token}/#{locale}/yml"
           params = {
             app_version: Phrase::Ota.config.app_version,
             client: "ruby",
             sdk_version: Phrase::Ota::VERSION
           }
-          params[:current_version] = @current_version unless @current_version.nil?
+          current_version = @current_locale_versions[locale_cache_key(locale)]
+          params[:current_version] = current_version unless current_version.nil?
 
           connection = Faraday.new do |faraday|
             faraday.use FaradayMiddleware::FollowRedirects
             faraday.adapter Faraday.default_adapter
           end
 
-          log("Phrase: Fetching URL: #{url}")
+          uri = URI("#{Phrase::Ota.config.base_url}/#{Phrase::Ota.config.distribution_id}/#{Phrase::Ota.config.secret_token}/#{locale}/yml")
+          uri.query = URI.encode_www_form(params)
+          url = uri.to_s
+          log("Request URL: #{url}")
 
-          response = connection.get(url, params, {"User-Agent" => "phrase-ota-i18n #{Phrase::Ota::VERSION}"})
+          response = connection.get(url, {}, {"User-Agent" => "phrase-ota-i18n #{Phrase::Ota::VERSION}"})
           next unless response.status == 200
 
-          @current_version = CGI.parse(URI(response.env.url).query)["version"].first.to_i
+          @current_locale_versions[locale_cache_key(locale)] = CGI.parse(URI(response.env.url).query)["version"].first.to_i
           yaml = YAML.safe_load(response.body)
           yaml.each do |yaml_locale, tree|
-            store_translations(yaml_locale, tree || {})
+            store_translations(locale, tree || {})
+            log("Updated locale: #{locale}")
           end
         end
       end
 
+      def locale_cache_key(locale)
+        "#{Phrase::Ota.config.distribution_id}/#{Phrase::Ota.config.secret_token}/#{locale}"
+      end
+
       def log(message)
-        Phrase::Ota.config.logger.info(message) if Phrase::Ota.config.debug
+        Phrase::Ota.config.logger.info("Phrase OTA: #{message}") if Phrase::Ota.config.debug
       end
     end
   end

data/lib/phrase/ota/configuration.rb

@@ -9,7 +9,7 @@ module Phrase
       attr_accessor :secret_token
       attr_accessor :logger
       attr_accessor :app_version
-      attr_accessor :poll_interval_seconds
+      attr_accessor :poll_interval
       attr_accessor :datacenter
       attr_accessor :available_locales
       attr_accessor :debug
@@ -20,7 +20,7 @@ module Phrase
         @secret_token = nil
         @logger = Logger.new($stdout)
         @app_version = nil
-        @poll_interval_seconds = 60
+        @poll_interval = 60
         @datacenter = "eu"
         @available_locales = []
         @base_url = nil

data/lib/phrase/ota/version.rb

@@ -1,5 +1,5 @@
 module Phrase
   module Ota
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phrase-ota-i18n
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Phrase
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-04 00:00:00.000000000 Z
+date: 2023-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -65,6 +65,7 @@ files:
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
+- ".standard.yml"
 - ".tool-versions"
 - CHANGELOG.md
 - Gemfile