From 4b4468cae574be7eb1f1fb3719d6d601bc6b050a Mon Sep 17 00:00:00 2001 From: Thorsten Eggert Date: Wed, 19 Feb 2020 14:22:43 +0100 Subject: [PATCH 01/16] new format --- lib/lit/export.rb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/lit/export.rb b/lib/lit/export.rb index 25a28541..3e77240b 100644 --- a/lib/lit/export.rb +++ b/lib/lit/export.rb @@ -3,7 +3,7 @@ module Lit class Export def self.call(locale_keys:, format:, include_hits_count: false) - raise ArgumentError, "format must be yaml or csv" if %i[yaml csv].exclude?(format) + raise ArgumentError, "format must be yaml or csv" if %i[yaml_js yaml csv].exclude?(format) Lit.loader.cache.load_all_translations localizations_scope = Lit::Localization.active if locale_keys.present? @@ -19,7 +19,10 @@ def self.call(locale_keys:, format:, include_hits_count: false) when :yaml exported_keys = nested_string_keys_to_hash(db_localizations) exported_keys.to_yaml - when :csv + when :yaml_js + exported_keys = nested_string_keys_to_hash(db_localizations, "javascript") + exported_keys.to_yaml + when :csv relevant_locales = locale_keys.presence || I18n.available_locales.map(&:to_s) CSV.generate do |csv| csv << ['key', *relevant_locales, ('hits' if include_hits_count)].compact @@ -55,7 +58,7 @@ def self.call(locale_keys:, format:, include_hits_count: false) end end - private_class_method def self.nested_string_keys_to_hash(db_localizations) + private_class_method def self.nested_string_keys_to_hash(db_localizations, key_selector=nil) # http://subtech.g.hatena.ne.jp/cho45/20061122 deep_proc = proc do |_k, s, o| if s.is_a?(Hash) && o.is_a?(Hash) @@ -66,8 +69,10 @@ def self.call(locale_keys:, format:, include_hits_count: false) nested_keys = {} db_localizations.sort.each do |k, v| key_parts = k.to_s.split('.') - converted = key_parts.reverse.reduce(v) { |a, n| { n => a } } - nested_keys.merge!(converted, &deep_proc) + if (key_selector.present? && key_parts[0] == key_selector) || key_selector.nil? + converted = key_parts.reverse.reduce(v) { |a, n| { n => a } } + nested_keys.merge!(converted, &deep_proc) + end end nested_keys end From e9cb9850b5fbf0990801887b4e700b48ba358730 Mon Sep 17 00:00:00 2001 From: Thorsten Eggert Date: Wed, 19 Feb 2020 14:30:31 +0100 Subject: [PATCH 02/16] new format --- lib/lit/export.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/lit/export.rb b/lib/lit/export.rb index 3e77240b..a8899930 100644 --- a/lib/lit/export.rb +++ b/lib/lit/export.rb @@ -3,7 +3,7 @@ module Lit class Export def self.call(locale_keys:, format:, include_hits_count: false) - raise ArgumentError, "format must be yaml or csv" if %i[yaml_js yaml csv].exclude?(format) + raise ArgumentError, "format must be yaml, yaml_js or csv" if %i[yaml_js yaml csv].exclude?(format) Lit.loader.cache.load_all_translations localizations_scope = Lit::Localization.active if locale_keys.present? @@ -21,7 +21,7 @@ def self.call(locale_keys:, format:, include_hits_count: false) exported_keys.to_yaml when :yaml_js exported_keys = nested_string_keys_to_hash(db_localizations, "javascript") - exported_keys.to_yaml + exported_keys.to_json when :csv relevant_locales = locale_keys.presence || I18n.available_locales.map(&:to_s) CSV.generate do |csv| @@ -69,7 +69,8 @@ def self.call(locale_keys:, format:, include_hits_count: false) nested_keys = {} db_localizations.sort.each do |k, v| key_parts = k.to_s.split('.') - if (key_selector.present? && key_parts[0] == key_selector) || key_selector.nil? + puts "-------------_> #{key_parts.inspect}" + if (key_selector.present? && key_parts[1] == key_selector) || key_selector.nil? converted = key_parts.reverse.reduce(v) { |a, n| { n => a } } nested_keys.merge!(converted, &deep_proc) end From aad3a6d78ec4148f1d15ecc25c30070309e81e88 Mon Sep 17 00:00:00 2001 From: Thorsten Eggert Date: Wed, 19 Feb 2020 14:34:07 +0100 Subject: [PATCH 03/16] remove debug code --- lib/lit/export.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/lit/export.rb b/lib/lit/export.rb index a8899930..9e2b0663 100644 --- a/lib/lit/export.rb +++ b/lib/lit/export.rb @@ -69,7 +69,6 @@ def self.call(locale_keys:, format:, include_hits_count: false) nested_keys = {} db_localizations.sort.each do |k, v| key_parts = k.to_s.split('.') - puts "-------------_> #{key_parts.inspect}" if (key_selector.present? && key_parts[1] == key_selector) || key_selector.nil? converted = key_parts.reverse.reduce(v) { |a, n| { n => a } } nested_keys.merge!(converted, &deep_proc) From c47427aea501fee7c8f59d812394ed9dd4a9eed8 Mon Sep 17 00:00:00 2001 From: Thorsten Eggert Date: Wed, 19 Feb 2020 14:38:22 +0100 Subject: [PATCH 04/16] change format name --- lib/lit/export.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/lit/export.rb b/lib/lit/export.rb index 9e2b0663..80c9ddc7 100644 --- a/lib/lit/export.rb +++ b/lib/lit/export.rb @@ -3,7 +3,7 @@ module Lit class Export def self.call(locale_keys:, format:, include_hits_count: false) - raise ArgumentError, "format must be yaml, yaml_js or csv" if %i[yaml_js yaml csv].exclude?(format) + raise ArgumentError, "format must be yaml, json_js or csv" if %i[json_js yaml csv].exclude?(format) Lit.loader.cache.load_all_translations localizations_scope = Lit::Localization.active if locale_keys.present? @@ -19,7 +19,7 @@ def self.call(locale_keys:, format:, include_hits_count: false) when :yaml exported_keys = nested_string_keys_to_hash(db_localizations) exported_keys.to_yaml - when :yaml_js + when :json_js exported_keys = nested_string_keys_to_hash(db_localizations, "javascript") exported_keys.to_json when :csv From eaae4d5a11ca4d7a46e5c61b5a25558c8aa18616 Mon Sep 17 00:00:00 2001 From: Thorsten Eggert Date: Wed, 19 Feb 2020 14:49:54 +0100 Subject: [PATCH 05/16] add js prefix --- lib/lit/export.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/lit/export.rb b/lib/lit/export.rb index 80c9ddc7..100ccc5a 100644 --- a/lib/lit/export.rb +++ b/lib/lit/export.rb @@ -70,11 +70,16 @@ def self.call(locale_keys:, format:, include_hits_count: false) db_localizations.sort.each do |k, v| key_parts = k.to_s.split('.') if (key_selector.present? && key_parts[1] == key_selector) || key_selector.nil? + key_parts.drop(2) if key_selector.present? converted = key_parts.reverse.reduce(v) { |a, n| { n => a } } nested_keys.merge!(converted, &deep_proc) end end - nested_keys + if (key_selector.present? && key_parts[1] == key_selector) + "var js_locale= #{nested_keys}" + else + nested_keys + end end # This is like Array#transpose but ignores size differences between inner arrays. From 3aaed71ca7f5c53d33616b953e06a7ddcae0ed23 Mon Sep 17 00:00:00 2001 From: Thorsten Eggert Date: Wed, 19 Feb 2020 14:54:26 +0100 Subject: [PATCH 06/16] add js prefix --- lib/lit/export.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/lit/export.rb b/lib/lit/export.rb index 100ccc5a..1c55719b 100644 --- a/lib/lit/export.rb +++ b/lib/lit/export.rb @@ -75,7 +75,7 @@ def self.call(locale_keys:, format:, include_hits_count: false) nested_keys.merge!(converted, &deep_proc) end end - if (key_selector.present? && key_parts[1] == key_selector) + if key_selector.present? "var js_locale= #{nested_keys}" else nested_keys From c7d87ef99eeddc8576455eddcbf0beb5bba856e8 Mon Sep 17 00:00:00 2001 From: Thorsten Eggert Date: Wed, 19 Feb 2020 15:16:22 +0100 Subject: [PATCH 07/16] add js prefix --- lib/lit/export.rb | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/lit/export.rb b/lib/lit/export.rb index 1c55719b..c2a6d0a9 100644 --- a/lib/lit/export.rb +++ b/lib/lit/export.rb @@ -21,7 +21,7 @@ def self.call(locale_keys:, format:, include_hits_count: false) exported_keys.to_yaml when :json_js exported_keys = nested_string_keys_to_hash(db_localizations, "javascript") - exported_keys.to_json + "var js_locale= " + exported_keys.to_json when :csv relevant_locales = locale_keys.presence || I18n.available_locales.map(&:to_s) CSV.generate do |csv| @@ -70,16 +70,12 @@ def self.call(locale_keys:, format:, include_hits_count: false) db_localizations.sort.each do |k, v| key_parts = k.to_s.split('.') if (key_selector.present? && key_parts[1] == key_selector) || key_selector.nil? - key_parts.drop(2) if key_selector.present? + key_parts = key_parts.drop(2) if key_selector.present? converted = key_parts.reverse.reduce(v) { |a, n| { n => a } } nested_keys.merge!(converted, &deep_proc) end end - if key_selector.present? - "var js_locale= #{nested_keys}" - else - nested_keys - end + nested_keys end # This is like Array#transpose but ignores size differences between inner arrays. From 6bf7b880287bd16eaff41332a81193c0951c6bf6 Mon Sep 17 00:00:00 2001 From: Thorsten Eggert Date: Thu, 27 Feb 2020 10:09:30 +0100 Subject: [PATCH 08/16] add possibility to disable lit --- lib/generators/lit/install/templates/initializer.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/generators/lit/install/templates/initializer.rb b/lib/generators/lit/install/templates/initializer.rb index edf471b6..ec181aac 100644 --- a/lib/generators/lit/install/templates/initializer.rb +++ b/lib/generators/lit/install/templates/initializer.rb @@ -50,7 +50,7 @@ # For more information please check the README.md Lit.store_request_info = false -# Initialize lit -Lit.init +# Initialize lit unless it ist disabled by setting the SKIP_LIT enviroment variable. Disabling is usefull to speed up the startup, for example to execute migrations +Lit.init unless ENV["SKIP_LIT"] == "1" From a9db5d62aaf428d9b30008cc00d100d2762be5f2 Mon Sep 17 00:00:00 2001 From: Thorsten Eggert Date: Thu, 27 Feb 2020 10:10:29 +0100 Subject: [PATCH 09/16] log key usage to db --- .../lit/localization_keys_controller.rb | 10 ++++++++++ app/models/lit/localization_key.rb | 2 ++ app/views/lit/dashboard/index.html.erb | 1 + app/views/lit/localization_keys/_sidebar.html.erb | 14 +++++++++++++- app/views/lit/localization_keys/not_used.html.erb | 11 +++++++++++ app/views/lit/localization_keys/used.html.erb | 11 +++++++++++ config/routes.rb | 2 ++ ...nt_and_used_last_at_to_lit_localization_keys.rb | 8 ++++++++ .../lit/install/templates/initializer.rb | 3 +++ lib/lit.rb | 1 + lib/lit/cache.rb | 12 ++++++++++++ 11 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 app/views/lit/localization_keys/not_used.html.erb create mode 100644 app/views/lit/localization_keys/used.html.erb create mode 100644 db/migrate/20200227082719_lit_add_usage_count_and_used_last_at_to_lit_localization_keys.rb diff --git a/app/controllers/lit/localization_keys_controller.rb b/app/controllers/lit/localization_keys_controller.rb index a55f9644..bf80d0ef 100644 --- a/app/controllers/lit/localization_keys_controller.rb +++ b/app/controllers/lit/localization_keys_controller.rb @@ -9,6 +9,16 @@ def index get_localization_keys end + def not_used + @scope = @scope.not_used + get_localization_keys + end + + def used + @scope = @scope.used + get_localization_keys + end + def not_translated @scope = @scope.not_completed get_localization_keys diff --git a/app/models/lit/localization_key.rb b/app/models/lit/localization_key.rb index b3d3bf3e..41836354 100644 --- a/app/models/lit/localization_key.rb +++ b/app/models/lit/localization_key.rb @@ -3,6 +3,8 @@ class LocalizationKey < Lit::Base attr_accessor :interpolated_key ## SCOPES + scope :used, -> { where.not(used_last_at: nil) } + scope :not_used, -> { where(used_last_at: nil) } scope :completed, -> { where(is_completed: true) } scope :not_completed, -> { where(is_completed: false) } scope :starred, -> { where(is_starred: true) } diff --git a/app/views/lit/dashboard/index.html.erb b/app/views/lit/dashboard/index.html.erb index f9dcd4d4..c04d8feb 100644 --- a/app/views/lit/dashboard/index.html.erb +++ b/app/views/lit/dashboard/index.html.erb @@ -1,4 +1,5 @@ All localization keys <%= Lit::LocalizationKey.active.count(:id) %>
+Used localization keys <%= Lit::LocalizationKey.where.not(used_last_at: nil).count(:id) %>
<% @locales.each do |l| %> <%= EmojiFlag.new(l.locale) %> <%= I18n.t("lit.locale_to_languages.#{l.locale}", :default=>l.locale) %>: "><%= l.translated_percentage %>%
<% end %> diff --git a/app/views/lit/localization_keys/_sidebar.html.erb b/app/views/lit/localization_keys/_sidebar.html.erb index 7de3365e..26a8ee2b 100644 --- a/app/views/lit/localization_keys/_sidebar.html.erb +++ b/app/views/lit/localization_keys/_sidebar.html.erb @@ -12,7 +12,19 @@ <% end %>
    -
  • "> +
  • "> + <%= link_to lit.not_used_localization_keys_path do -%> + <%= draw_icon 'pencil' %> + not used + <% end %> +
    • +
  • "> + <%= link_to lit.used_localization_keys_path do -%> + <%= draw_icon 'pencil' %> + used + <% end %> +
    • +
  • "> <%= link_to lit.not_translated_localization_keys_path do -%> <%= draw_icon 'pencil' %> not translated diff --git a/app/views/lit/localization_keys/not_used.html.erb b/app/views/lit/localization_keys/not_used.html.erb new file mode 100644 index 00000000..454643d1 --- /dev/null +++ b/app/views/lit/localization_keys/not_used.html.erb @@ -0,0 +1,11 @@ +

    <%= I18n.t('lit.not_used_header', default: 'Not used localization keys') %>

    + +<%= render 'localizations_list', available_locales: I18n.backend.available_locales %> + +<% if defined?(Kaminari) %> + <%= paginate @localization_keys, :theme=>"lit" %> +<% elsif defined?(WillPaginate) %> + <%= will_paginate @localization_keys %> +<% end %> + +<%= render 'sidebar' %> diff --git a/app/views/lit/localization_keys/used.html.erb b/app/views/lit/localization_keys/used.html.erb new file mode 100644 index 00000000..b8e835b1 --- /dev/null +++ b/app/views/lit/localization_keys/used.html.erb @@ -0,0 +1,11 @@ +

    <%= I18n.t('lit.used_header', default: 'Used localization keys') %>

    + +<%= render 'localizations_list', available_locales: I18n.backend.available_locales %> + +<% if defined?(Kaminari) %> + <%= paginate @localization_keys, :theme=>"lit" %> +<% elsif defined?(WillPaginate) %> + <%= will_paginate @localization_keys %> +<% end %> + +<%= render 'sidebar' %> diff --git a/config/routes.rb b/config/routes.rb index ac6b5d7c..97e61ce0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -24,6 +24,8 @@ get :starred get :find_localization get :not_translated + get :not_used + get :used get :visited_again end resources :localizations, only: [:edit, :update, :show] do diff --git a/db/migrate/20200227082719_lit_add_usage_count_and_used_last_at_to_lit_localization_keys.rb b/db/migrate/20200227082719_lit_add_usage_count_and_used_last_at_to_lit_localization_keys.rb new file mode 100644 index 00000000..1dc50041 --- /dev/null +++ b/db/migrate/20200227082719_lit_add_usage_count_and_used_last_at_to_lit_localization_keys.rb @@ -0,0 +1,8 @@ +class LitAddUsageCountAndUsedLastAtToLitLocalizationKeys < Rails::VERSION::MAJOR >= 5 ? + ActiveRecord::Migration[4.2] : + ActiveRecord::Migration + def change + add_column :lit_localization_keys, :usage_count, :integer, index: true + add_column :lit_localization_keys, :used_last_at, :datetime, index: true + end +end diff --git a/lib/generators/lit/install/templates/initializer.rb b/lib/generators/lit/install/templates/initializer.rb index ec181aac..40eeee01 100644 --- a/lib/generators/lit/install/templates/initializer.rb +++ b/lib/generators/lit/install/templates/initializer.rb @@ -50,6 +50,9 @@ # For more information please check the README.md Lit.store_request_info = false +# Persist global_hits_counter every 1000 lookups, set to nil or comment out to disable +Lit.persit_global_hits_count = 1000 + # Initialize lit unless it ist disabled by setting the SKIP_LIT enviroment variable. Disabling is usefull to speed up the startup, for example to execute migrations Lit.init unless ENV["SKIP_LIT"] == "1" diff --git a/lib/lit.rb b/lib/lit.rb index 06dbedf1..0bb68f7d 100644 --- a/lib/lit.rb +++ b/lib/lit.rb @@ -17,6 +17,7 @@ module Lit mattr_accessor :all_translations_are_html_safe mattr_accessor :set_last_updated_at_upon_creation mattr_accessor :store_request_info + mattr_accessor :persit_global_hits_count class << self attr_accessor :loader diff --git a/lib/lit/cache.rb b/lib/lit/cache.rb index 52c92ac6..9d341401 100644 --- a/lib/lit/cache.rb +++ b/lib/lit/cache.rb @@ -20,6 +20,7 @@ module Lit class Cache def initialize @hits_counter = Lit.get_key_value_engine + @hits = 0 @request_info_store = Lit.get_key_value_engine @hits_counter_working = true @keys = nil @@ -143,6 +144,15 @@ def get_global_hits_counter(key) @hits_counter['global_hits_counter.' + key] end + def persit_global_hits_counters + @hits_counter.each do |k,v| + if k.match?(/^global_hits_counter/) + localization_key = find_localization_key(k.gsub("global_hits_counter.", "")) + localization_key.update_columns(usage_count: @hits_counter[k] + localization_key.usage_count.to_i, used_last_at: Time.now) + end + end + end + def get_hits_counter(key) @hits_counter['hits_counter.' + key] end @@ -310,6 +320,8 @@ def find_or_create_localization_key(key_without_locale) def update_hits_count(key) return unless @hits_counter_working key_without_locale = split_key(key).last + @hits += 1 + persit_global_hits_counters if Lit.persit_global_hits_count.present? && (@hits%Lit.persit_global_hits_count) == 0 @hits_counter.incr('hits_counter.' + key) @hits_counter.incr('global_hits_counter.' + key_without_locale) end From 756c80104d3da2cb8b563fada96708f580941c2a Mon Sep 17 00:00:00 2001 From: Thorsten Eggert Date: Thu, 27 Feb 2020 11:37:47 +0100 Subject: [PATCH 10/16] changed travis-ci url --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b5e6e281..daa6128d 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ translating app by non-technicals. Highly inspired by Copycopter by thoughtbot. -[![travis status](https://travis-ci.org/prograils/lit.svg)](https://travis-ci.org/prograils/lit) +[![travis status](https://api.travis-ci.org/3eggert/lit.svg?branch=js_translations)](https://api.travis-ci.org/3eggert/lit.svg?branch=js_translations) ### Features From 3efd01fd963fee30585ee4a597531677dd690592 Mon Sep 17 00:00:00 2001 From: Thorsten Eggert Date: Mon, 2 Mar 2020 12:36:58 +0100 Subject: [PATCH 11/16] added icons --- app/views/lit/localization_keys/_sidebar.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/lit/localization_keys/_sidebar.html.erb b/app/views/lit/localization_keys/_sidebar.html.erb index 26a8ee2b..a836f856 100644 --- a/app/views/lit/localization_keys/_sidebar.html.erb +++ b/app/views/lit/localization_keys/_sidebar.html.erb @@ -14,13 +14,13 @@
    • "> <%= link_to lit.not_used_localization_keys_path do -%> - <%= draw_icon 'pencil' %> + <%= draw_icon 'times-circle' %> not used <% end %>
    • "> <%= link_to lit.used_localization_keys_path do -%> - <%= draw_icon 'pencil' %> + <%= draw_icon 'check-circle' %> used <% end %>
      • From 5cf83342ddce6e0327e6741e9a4aa03953c1e2ca Mon Sep 17 00:00:00 2001 From: Thorsten Eggert Date: Mon, 2 Mar 2020 12:37:15 +0100 Subject: [PATCH 12/16] added usage info --- .../lit/localization_keys/_localizations_list.html.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/lit/localization_keys/_localizations_list.html.erb b/app/views/lit/localization_keys/_localizations_list.html.erb index 7e99693b..58da5c86 100644 --- a/app/views/lit/localization_keys/_localizations_list.html.erb +++ b/app/views/lit/localization_keys/_localizations_list.html.erb @@ -3,7 +3,11 @@ <%= lk.localization_key %> - <%= Lit.init.cache.get_global_hits_counter(lk.localization_key) %> + <% if lk.used_last_at.present? %> + <%= "#{I18n.t('lit.used', default: 'used')} #{lk.usage_count} #{I18n.t('lit.times_since', default: 'times since')} #{l(Lit::LocalizationKey.maximum(:used_last_at), :format => :short4rb)}, #{I18n.t('lit.times_since', default: 'last use')} #{l(lk.used_last_at, :format => :short4rb)}" %> + <% else %> + <%= "#{I18n.t('lit.not_used', default: 'not used since')} #{l(Lit::LocalizationKey.maximum(:used_last_at), :format => :short4rb)}" %> + <% end %>
      <% if Lit.store_request_info %> <%= link_to '#', class: 'request_info_link title', title: 'Show / hide request' do %> From 4e2615e3133a832001a147dfcd8576f0f7a3743a Mon Sep 17 00:00:00 2001 From: Thorsten Eggert Date: Mon, 2 Mar 2020 14:42:51 +0100 Subject: [PATCH 13/16] fix null exception --- app/views/lit/localization_keys/_localizations_list.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/lit/localization_keys/_localizations_list.html.erb b/app/views/lit/localization_keys/_localizations_list.html.erb index 58da5c86..0889831d 100644 --- a/app/views/lit/localization_keys/_localizations_list.html.erb +++ b/app/views/lit/localization_keys/_localizations_list.html.erb @@ -5,8 +5,10 @@ <%= lk.localization_key %> <% if lk.used_last_at.present? %> <%= "#{I18n.t('lit.used', default: 'used')} #{lk.usage_count} #{I18n.t('lit.times_since', default: 'times since')} #{l(Lit::LocalizationKey.maximum(:used_last_at), :format => :short4rb)}, #{I18n.t('lit.times_since', default: 'last use')} #{l(lk.used_last_at, :format => :short4rb)}" %> - <% else %> + <% elsif Lit::LocalizationKey.maximum(:used_last_at).present? %> <%= "#{I18n.t('lit.not_used', default: 'not used since')} #{l(Lit::LocalizationKey.maximum(:used_last_at), :format => :short4rb)}" %> + <% else %> + <%= "#{I18n.t('lit.not_used', default: 'not used since')}" %> <% end %>
      <% if Lit.store_request_info %> From 87c5b1cdeed9918f2b184e0f265a8fd5cb67b346 Mon Sep 17 00:00:00 2001 From: Thorsten Eggert Date: Mon, 2 Mar 2020 20:19:37 +0100 Subject: [PATCH 14/16] add clear usage button --- app/views/lit/dashboard/index.html.erb | 1 + config/routes.rb | 2 ++ 2 files changed, 3 insertions(+) diff --git a/app/views/lit/dashboard/index.html.erb b/app/views/lit/dashboard/index.html.erb index c04d8feb..f63dd54b 100644 --- a/app/views/lit/dashboard/index.html.erb +++ b/app/views/lit/dashboard/index.html.erb @@ -1,5 +1,6 @@ All localization keys <%= Lit::LocalizationKey.active.count(:id) %>
      Used localization keys <%= Lit::LocalizationKey.where.not(used_last_at: nil).count(:id) %>
      +<%= button_to("clear usage data", {action: "clear_usage_data"}, data: {confirm: "Are you sure you want to clear the usage data?" }) %> <% @locales.each do |l| %> <%= EmojiFlag.new(l.locale) %> <%= I18n.t("lit.locale_to_languages.#{l.locale}", :default=>l.locale) %>: "><%= l.translated_percentage %>%
      <% end %> diff --git a/config/routes.rb b/config/routes.rb index 97e61ce0..fead5f72 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -52,6 +52,8 @@ end end + post 'dashboard/clear_usage_data', to: 'dashboard#clear_usage_data', as: "dashboard_clear_usage_data" + resource :cloud_translation, only: :show root to: 'dashboard#index' From e2582a9eca3d467b34dabe1f98a4c7b0288474ad Mon Sep 17 00:00:00 2001 From: Thorsten Eggert Date: Mon, 2 Mar 2020 20:20:14 +0100 Subject: [PATCH 15/16] move persit_global_hits_counters to background job --- app/controllers/lit/dashboard_controller.rb | 5 +++++ app/jobs/lit/persit_global_hits_counters_job.rb | 11 +++++++++++ app/services/persit_global_hits_counters_service.rb | 12 ++++++++++++ gemfiles/rails_4.2.gemfile.lock | 2 +- gemfiles/rails_5.0.gemfile.lock | 2 +- gemfiles/rails_5.1.gemfile.lock | 2 +- gemfiles/rails_5.2.gemfile.lock | 2 +- lib/lit/cache.rb | 5 ++++- test/dummy/db/schema.rb | 4 +++- 9 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 app/jobs/lit/persit_global_hits_counters_job.rb create mode 100644 app/services/persit_global_hits_counters_service.rb diff --git a/app/controllers/lit/dashboard_controller.rb b/app/controllers/lit/dashboard_controller.rb index e4e32936..8f949187 100644 --- a/app/controllers/lit/dashboard_controller.rb +++ b/app/controllers/lit/dashboard_controller.rb @@ -5,5 +5,10 @@ class DashboardController < ::Lit::ApplicationController def index @locales = Lit::Locale.ordered.visible end + + def clear_usage_data + Lit::LocalizationKey.where.not(used_last_at: nil).update_all(usage_count: 0, used_last_at: nil) + redirect_to root_path + end end end diff --git a/app/jobs/lit/persit_global_hits_counters_job.rb b/app/jobs/lit/persit_global_hits_counters_job.rb new file mode 100644 index 00000000..40d50744 --- /dev/null +++ b/app/jobs/lit/persit_global_hits_counters_job.rb @@ -0,0 +1,11 @@ +module Lit + if defined?(::ActiveJob) + class PersitGlobalHitsCountersJob < ::ActiveJob::Base + queue_as :default + + def perform(update_array) + PersitGlobalHitsCountersService.new(update_array).execute + end + end + end +end diff --git a/app/services/persit_global_hits_counters_service.rb b/app/services/persit_global_hits_counters_service.rb new file mode 100644 index 00000000..73ba9a6f --- /dev/null +++ b/app/services/persit_global_hits_counters_service.rb @@ -0,0 +1,12 @@ +class PersitGlobalHitsCountersService + def initialize(update_array) + @update_array = update_array + end + + def execute + @update_array.each do |a| + Lit::LocalizationKey.find(a[0]).update_columns(usage_count: a[1], used_last_at: Time.now) + end + end + +end diff --git a/gemfiles/rails_4.2.gemfile.lock b/gemfiles/rails_4.2.gemfile.lock index 63ae6d45..5bc4def1 100644 --- a/gemfiles/rails_4.2.gemfile.lock +++ b/gemfiles/rails_4.2.gemfile.lock @@ -253,4 +253,4 @@ DEPENDENCIES webmock BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/gemfiles/rails_5.0.gemfile.lock b/gemfiles/rails_5.0.gemfile.lock index e81b10e6..0df9ac9b 100644 --- a/gemfiles/rails_5.0.gemfile.lock +++ b/gemfiles/rails_5.0.gemfile.lock @@ -261,4 +261,4 @@ DEPENDENCIES webmock BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/gemfiles/rails_5.1.gemfile.lock b/gemfiles/rails_5.1.gemfile.lock index 68bffef5..04744712 100644 --- a/gemfiles/rails_5.1.gemfile.lock +++ b/gemfiles/rails_5.1.gemfile.lock @@ -261,4 +261,4 @@ DEPENDENCIES webmock BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock index cd484696..9a030a8e 100644 --- a/gemfiles/rails_5.2.gemfile.lock +++ b/gemfiles/rails_5.2.gemfile.lock @@ -269,4 +269,4 @@ DEPENDENCIES webmock BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/lib/lit/cache.rb b/lib/lit/cache.rb index 9d341401..89230246 100644 --- a/lib/lit/cache.rb +++ b/lib/lit/cache.rb @@ -145,12 +145,15 @@ def get_global_hits_counter(key) end def persit_global_hits_counters + update_array = [] @hits_counter.each do |k,v| if k.match?(/^global_hits_counter/) localization_key = find_localization_key(k.gsub("global_hits_counter.", "")) - localization_key.update_columns(usage_count: @hits_counter[k] + localization_key.usage_count.to_i, used_last_at: Time.now) + update_array << [localization_key.id, @hits_counter[k] + localization_key.usage_count.to_i] + #localization_key.update_columns(usage_count: @hits_counter[k] + localization_key.usage_count.to_i, used_last_at: Time.now) end end + PersitGlobalHitsCountersJob.perform_later(update_array) end def get_hits_counter(key) diff --git a/test/dummy/db/schema.rb b/test/dummy/db/schema.rb index 57a61cd6..4509e0a9 100644 --- a/test/dummy/db/schema.rb +++ b/test/dummy/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_11_29_103819) do +ActiveRecord::Schema.define(version: 2020_02_27_082719) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -66,6 +66,8 @@ t.boolean "is_starred", default: false t.boolean "is_deleted", default: false, null: false t.boolean "is_visited_again", default: false, null: false + t.integer "usage_count" + t.datetime "used_last_at" t.index ["localization_key"], name: "index_lit_localization_keys_on_localization_key", unique: true end From 14968cb4643682ebe0ff8ff4bb3c76eeb9bdc8c0 Mon Sep 17 00:00:00 2001 From: Thorsten Eggert Date: Mon, 2 Mar 2020 20:33:15 +0100 Subject: [PATCH 16/16] revert do older version --- gemfiles/rails_4.2.gemfile.lock | 2 +- gemfiles/rails_5.0.gemfile.lock | 2 +- gemfiles/rails_5.1.gemfile.lock | 2 +- gemfiles/rails_5.2.gemfile.lock | 2 +- test/dummy/db/schema.rb | 4 +--- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gemfiles/rails_4.2.gemfile.lock b/gemfiles/rails_4.2.gemfile.lock index 5bc4def1..63ae6d45 100644 --- a/gemfiles/rails_4.2.gemfile.lock +++ b/gemfiles/rails_4.2.gemfile.lock @@ -253,4 +253,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.1.4 + 1.17.3 diff --git a/gemfiles/rails_5.0.gemfile.lock b/gemfiles/rails_5.0.gemfile.lock index 0df9ac9b..e81b10e6 100644 --- a/gemfiles/rails_5.0.gemfile.lock +++ b/gemfiles/rails_5.0.gemfile.lock @@ -261,4 +261,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.1.4 + 1.17.3 diff --git a/gemfiles/rails_5.1.gemfile.lock b/gemfiles/rails_5.1.gemfile.lock index 04744712..68bffef5 100644 --- a/gemfiles/rails_5.1.gemfile.lock +++ b/gemfiles/rails_5.1.gemfile.lock @@ -261,4 +261,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.1.4 + 1.17.3 diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock index 9a030a8e..cd484696 100644 --- a/gemfiles/rails_5.2.gemfile.lock +++ b/gemfiles/rails_5.2.gemfile.lock @@ -269,4 +269,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.1.4 + 1.17.3 diff --git a/test/dummy/db/schema.rb b/test/dummy/db/schema.rb index 4509e0a9..57a61cd6 100644 --- a/test/dummy/db/schema.rb +++ b/test/dummy/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2020_02_27_082719) do +ActiveRecord::Schema.define(version: 2018_11_29_103819) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -66,8 +66,6 @@ t.boolean "is_starred", default: false t.boolean "is_deleted", default: false, null: false t.boolean "is_visited_again", default: false, null: false - t.integer "usage_count" - t.datetime "used_last_at" t.index ["localization_key"], name: "index_lit_localization_keys_on_localization_key", unique: true end