yatapp 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,4 @@
 ---
-SHA1:
-  metadata.gz: 2a249b5fc32c1f49f433436623f3c5d9d761966e
-  data.tar.gz: b529a6dc36bcf54a685c9e628e87c8f35736bc3d
 SHA512:
-  metadata.gz: 6967be826d40b266444ff88be39c63e480dd0fb43255a77e5712fef6a36443db9b617716da46b15fb95148aea94f81e200fca4e627c83ebc7577960cb29a2454
-  data.tar.gz: 2966200ebf6f48c1c77b5ca34b78e56cb701e0a25874f18ee56cdd454bf793fba87e07ba059fd3466ac1e3b494723d4db3e4a2b7038e7bfc54cdaa0b29aa6c31
+  metadata.gz: 3bacf21524a200dabb5f1fa4b45781770cb5ec31251151d61f5d8249e0cb0fd1b695df577306ec16e6824e2033234969b1dc45dcdac9c00ee8d462b7e548c7c3
+  data.tar.gz: cb3e5fb173d47fb0ac1e660772d395a15bb2314b312b8a3d620d349dbb525741d287eb6707650d17d7a030d47228264c4bfc5ecc25efc0dae87dfede2c19f99e

data/README.md

@@ -33,6 +33,7 @@ Gem can be used in two ways:
 * `save_to_path` - you can define where files should be saved. Default: `/config/locales/`
 * `root` - add locale as root to file with translations. Default: `false`
 * `strip_empty` - generates only keys that have text and skip empty ones. Default `false`
+* `download_on_start` - download all translations on start to i18n from Yata when Websocket is enabled. Default: `false`
 
 First two parameters are required and the rest is optional.
 
@@ -158,7 +159,13 @@ Yatapp.start_websocket
 
 ```
 
+### Download translations at the start of the application
 
+If you want to download translations at the start of the application add to `Procfile` line:
+```bash
+task: rake yata:fetch_translations
+```
+It will download all translations to files.
 
 ## Development
 

data/lib/yatapp.rb

@@ -14,7 +14,9 @@ module Yatapp
     end
 
     def download_translations
-      api_caller.download_translations
+      if download_on_start
+        api_caller.download_translations_and_store
+      end
     end
 
     def start_websocket

data/lib/yatapp/configuration.rb

@@ -8,7 +8,8 @@ module Yatapp
       :translation_format,
       :root,
       :save_to_path,
-      :strip_empty
+      :strip_empty,
+      :download_on_start
     ].freeze
 
     attr_accessor *CONFIGURATION_OPTIONS

data/lib/yatapp/socket.rb

@@ -1,14 +1,10 @@
 require 'faye/websocket'
 require 'eventmachine'
 require 'yatapp/inbox'
+require 'yatapp/store'
 require 'json'
 require 'cgi'
 require 'uri'
-begin
-  require 'rails-i18n'
-rescue
-  puts "WARNING: Failed to require rails-i18n gem, websocket integration may fail."
-end
 
 module Phoenix
   class Socket
@@ -107,25 +103,6 @@ module Phoenix
       @topic_joined = false # The initial join request has been acked by the remote server
     end
 
-    def add_new_key_to_i18n(key, values)
-      values.each do |value|
-        unless I18n.available_locales.include?(value['lang'].to_sym)
-          add_new_locale(value['lang'])
-        end
-
-        key_array = key.split(".")
-        translation_hash = key_array.reverse.inject(value['text']) {|acc, n| {n => acc}}
-        I18n.backend.store_translations(value['lang'].to_sym, translation_hash)
-        puts "new translation added: #{value['lang']} => #{key}: #{value['text']}"
-      end
-    end
-
-    def add_new_locale(lang)
-      existing_locales = I18n.config.available_locales
-      new_locales      = existing_locales << lang.to_sym
-      I18n.config.available_locales = new_locales.uniq
-    end
-
     def handle_message(event)
       data = JSON.parse(event.data)
       log event.data
@@ -135,12 +112,12 @@ module Phoenix
           handle_close(event)
         elsif data['event'] == 'new_translation'
           payload = data['payload']
-          add_new_key_to_i18n(payload['key'], payload['values'])
+          Store.add_new_key(payload['key'], payload['values'])
         elsif data['event'] == 'updated_translation'
           payload = data['payload']
-          add_new_key_to_i18n(payload['new_key'], payload['values'])
-        elsif data['event'] == 'deleted translation'
-          puts 'deleted translation'
+          Store.add_new_key(payload['new_key'], payload['values'])
+        elsif data['event'] == 'deleted_translation'
+          puts "deleted translation: #{data['payload']['key']}"
         elsif data['ref'] == @join_ref && data['event'] == 'phx_error'
           # NOTE: For some reason, on errors phx will send the join ref instead of the message ref
           inbox_cond.broadcast
@@ -162,6 +139,7 @@ module Phoenix
         @dead     = false
         thread_ready.broadcast
       end
+
       Yatapp.download_translations
     end
 

data/lib/yatapp/store.rb

@@ -0,0 +1,43 @@
+begin
+  require 'rails-i18n'
+rescue
+  puts "WARNING: Failed to require rails-i18n gem, websocket integration may fail."
+end
+
+module Yatapp
+  class Store
+    def self.store_translations(lang, api_response)
+      unless I18n.available_locales.include?(lang.to_sym)
+        add_new_locale(lang)
+      end
+
+      translations = api_response[lang]
+
+      I18n.backend.store_translations(lang.to_sym, translations)
+      puts "Loaded all #{lang} translations."
+    end
+
+    def self.add_new_key(key, values)
+      values.each do |value|
+        unless I18n.available_locales.include?(value['lang'].to_sym)
+          add_new_locale(value['lang'])
+        end
+
+        key_array        = key.split(".")
+        translation_hash = key_array.reverse.inject(value['text']) {|acc, n| {n => acc}}
+
+        I18n.backend.store_translations(value['lang'].to_sym, translation_hash)
+        puts "new translation added: #{value['lang']} => #{key}: #{value['text']}"
+      end
+    end
+
+    private
+
+    def self.add_new_locale(lang)
+      existing_locales = I18n.config.available_locales
+      new_locales      = existing_locales << lang.to_sym
+
+      I18n.config.available_locales = new_locales.uniq
+    end
+  end
+end

data/lib/yatapp/version.rb

@@ -1,3 +1,3 @@
 module Yatapp
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/lib/yatapp/yata_api_caller.rb

@@ -27,14 +27,14 @@ module Yatapp
       end
     end
 
-    def download_translations
+    def download_translations_and_store
       languages.each do |lang|
         puts "Getting translation for #{lang}"
         api_url      = download_url_websocket(lang)
         puts api_url
         api_response = HTTParty.get(api_url)
         next if !should_save_the_translation?(api_response)
-        add_new_key_to_i18n(lang, JSON.parse(api_response.body))
+        Store.store_translations(lang, JSON.parse(api_response.body))
       end
     end
 
@@ -52,6 +52,9 @@ module Yatapp
         Configuration::CONFIGURATION_OPTIONS.each do |key|
           send("#{key}=", options[key])
         end
+
+        raise ArgumentError.new("Missing API_ACCESS_TOKEN") unless api_access_token
+        raise ArgumentError.new("Missing PROJECT_ID") unless project_id
       end
 
       def save_translation(lang, response)
@@ -85,21 +88,5 @@ module Yatapp
         url = url.sub(':lang', lang)
         url = url + "?apiToken=#{api_access_token}&root=true"
       end
-
-      def add_new_key_to_i18n(lang, api_response)
-        unless I18n.available_locales.include?(lang.to_sym)
-          add_new_locale(lang)
-        end
-
-        translations = api_response[lang]
-        I18n.backend.store_translations(lang.to_sym, translations)
-        puts "Loaded all #{lang} translations."
-      end
-
-      def add_new_locale(lang)
-        existing_locales = I18n.config.available_locales
-        new_locales      = existing_locales << lang.to_sym
-        I18n.config.available_locales = new_locales.uniq
-      end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yatapp
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - luki3k5
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-14 00:00:00.000000000 Z
+date: 2019-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -160,6 +160,7 @@ files:
 - lib/yatapp/inbox.rb
 - lib/yatapp/railtie.rb
 - lib/yatapp/socket.rb
+- lib/yatapp/store.rb
 - lib/yatapp/version.rb
 - lib/yatapp/yata_api_caller.rb
 - yatapp.gemspec
@@ -183,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: This gem allows for easy integration with Yata to fetch translation files