lit 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a051d3c6a1e4a1db24c3818aae84d51f42df73a907c23b787f6f5b3c40f798aa
-  data.tar.gz: e080032aebf0428fdfd9ca2bc3a0c75964774b774c1caed2329cbb337d70cd9e
+  metadata.gz: 4d3b3569eb99f453aea4b65451511bdeb76680774b664ab108f445359b9e10f0
+  data.tar.gz: cbf55f8eefb23231f5201087e612a58172e2ce4537fc0c8211a597ebba8e5f88
 SHA512:
-  metadata.gz: 679930cd3c4ee3d0c506dce93b471b8df4edbaac0772ef05d0a9caac3878d284d467599234bed06f77876af6dff2a25bded7f8a1f223bfbabfde2ddfe8ab7ed1
-  data.tar.gz: 5c6908710836b9f2c11a5da6933e616883e8fdb8ff497908c5cd2ad37c4279ab2b558fb46b1b87f07ae35adceb11143e093ac82393244cf9b6cf440ad4d79a84
+  metadata.gz: be93a781bdea6ff7a095bd86a60fc671c5f325f6d6f37a45bfea883b549f3655c4d9d5e768b125181501b944303dccc89d3032180952f4f870a8878bc7d6816d
+  data.tar.gz: 8655233c8aba69f06bf775bd28df3bc7e17f81f4378dab0f8818c6fac05e22e521ef966c5ae3706dfc3f2552d747687d22c241422f51aeab1f34764bc30bd698

data/README.md

@@ -37,10 +37,10 @@ gem 'lit'
 
 2. run `bundle install`
 
-3. run installation generator `bundle exec rails g lit:install`
-  (for production/staging environment `redis` is suggested as key value engine. `hash` will not work in multi process environment)
+3. Add `config.i18n.available_locales = [...]` to `application.rb` - it's required to precompile appropriate language flags in lit backend.
 
-4. Add `config.i18n.available_locales = [...]` to `application.rb` - it's required to precompile appropriate language flags in lit backend.
+4. run installation generator `bundle exec rails g lit:install`
+  (for production/staging environment `redis` is suggested as key value engine. `hash` will not work in multi process environment)
 
 5. After doing above and restarting app, point your browser to `http://app/lit`
 
@@ -145,10 +145,10 @@ These credentials can be given in three ways:
       ... # see Google docs link above for reference
     }
   end
-  
+
   # For example, for Rails 6, from encrypted credentials file (HashWithIndifferentAccess is used, because the keys in
    the credentials.config could be strings or, as well, symbols):
-  
+
   Lit::CloudTranslation.configure do |config|
     config.keyfile_hash = HashWithIndifferentAccess.new(Rails.application.credentials.config[:google_translate_api])
   end

data/app/assets/javascripts/lit/backend/localizations.js.coffee

@@ -2,25 +2,32 @@
 $(document).ready ->
   $('td.localization_row[data-editing=0]').on 'click', ->
     $this = $(this)
-    if parseInt($this.data('editing'))==0
+    if parseInt($this.data('editing')) == 0
       edited_rows[$this.data('id')] = $this.html()
       unless parseInt($this.data('editing'))
         $this.data('editing', '1')
         $.get $this.data('edit')
-  $('td.localization_row').on 'click', 'form button.cancel', (e)->
+  $('td.localization_row').on 'click', 'form button.cancel', (e) ->
     $this = $(this)
-    if $this[0].localName=='button'
+    if $this[0].localName == 'button'
       $this = $this.parents('td.localization_row')
     $this.data('editing', 0)
     $this.html edited_rows[$this.data('id')]
     e.preventDefault()
     false
-  $('tr.localization_versions_row').on 'click', '.close_versions', (e)->
+  $('tr.localization_versions_row').on 'click', '.close_versions', (e) ->
     $this = $(this)
     $parent = $this.parents('tr.localization_versions_row')
     $parent.addClass('hidden')
     $parent.children('td').html('')
-  $('tr.localization_key_row').on 'click', 'input.wysiwyg_switch', (e)->
+  $('tr.localization_key_row').on 'click', 'input.wysiwyg_switch', (e) ->
     $(this).parents('form').find("textarea").jqte()
-  $('tr.localization_key_row').on 'click', '.request_info_link', (e)->
+  $('tr.localization_key_row').on 'click', '.request_info_link', (e) ->
     $(this).parents('tr.localization_key_row').find(".request_info_row").toggleClass('hidden')
+  $('tr.localization_key_row').on 'click', '.js-copy_to_clipboard', (e) ->
+    if(!navigator.clipboard)
+      alert('No browser support for clipboard')
+    else
+      navigator.clipboard.writeText($(this).data('key'))
+    e.preventDefault()
+    false

data/app/assets/stylesheets/lit/application.css

@@ -11,17 +11,17 @@
  *= require './backend/jquery-te-1.4.0.css'
  *= require_self
  */
-.detail_wrapper{
-  padding: 10px 0 0 50px;
+.detail_wrapper {
+  padding: 10px 0 0 10px;
 }
-.detail_wrapper table tr td.locale_row{
+.detail_wrapper table tr td.locale_row {
   width: 75px;
 }
-.localization_key_row .localization_keys_options{
+.localization_key_row .localization_keys_options {
   display: none;
   float: right;
 }
-.localization_key_row:hover .localization_keys_options{
+.localization_key_row:hover .localization_keys_options {
   display: block;
 }
 
@@ -29,29 +29,29 @@ li.key_prefix .fa-chevron-right {
   float: right;
   margin-top: 2px;
   margin-right: -6px;
-  opacity: .25;
+  opacity: 0.25;
 }
 
-.hidden{
+.hidden {
   display: none;
 }
-i.fa{
+i.fa {
   color: black;
 }
-.nav.nav-stacked>li>a {
-padding: 5px 7px;
+.nav.nav-stacked > li > a {
+  padding: 5px 7px;
 }
-.well{
+.well {
   background-color: white;
   border-radius: 0px;
 }
-.well label{
+.well label {
   font-weight: normal;
 }
 .well .form-search {
   margin-bottom: 15px;
 }
-.localization_row em{
+.localization_row em {
   color: #bbb;
 }
 .loading {
@@ -60,3 +60,6 @@ padding: 5px 7px;
 .loaded {
   display: none;
 }
+.copy_to_clipboard_btn {
+  cursor: pointer;
+}

data/app/controllers/lit/cloud_translations_controller.rb

@@ -18,7 +18,7 @@ module Lit
           from: params[:from],
           to: @target_localization.locale.locale
         }.compact
-      @translated_text = Lit::CloudTranslation.translate(opts)
+      @translated_text = Lit::CloudTranslation.translate(**opts)
     rescue Lit::CloudTranslation::TranslationError => e
       @error_message = "Translation failed. #{e.message}"
     end

data/app/controllers/lit/concerns/request_info_store.rb

@@ -1,17 +1,23 @@
 module Lit
-  module Concerns
-    module RequestInfoStore
-      extend ::ActiveSupport::Concern
-      included do
-        before_action :store_request_path
-      end
+  module RequestInfoStore
+    extend ::ActiveSupport::Concern
+    included do
+      before_action :store_request_path
+    end
 
-      private
+    private
 
-      def store_request_path
-        Thread.current[:lit_current_request_path] = request&.path
-      end
+    def store_request_path
+      Thread.current[:lit_current_request_path] = request&.path
     end
   end
 end
 
+module Lit::Concerns::RequestInfoStore
+  extend ActiveSupport::Concern
+
+  included do
+    Rails.logger.info 'DEPRECATED: Use include Lit::RequestInfoStore'
+    include Lit::RequestInfoStore
+  end
+end

data/app/controllers/lit/concerns/request_keys_store.rb

@@ -1,16 +1,23 @@
 module Lit
-  module Concerns
-    module RequestKeysStore
-      extend ::ActiveSupport::Concern
-      included do
-        before_action :init_request_keys
-      end
+  module RequestKeysStore
+    extend ::ActiveSupport::Concern
+    included do
+      before_action :init_request_keys
+    end
 
-      private
+    private
 
-      def init_request_keys
-        Thread.current[:lit_request_keys] = {}
-      end
+    def init_request_keys
+      Thread.current[:lit_request_keys] = {}
     end
   end
 end
+
+module Lit::Concerns::RequestKeysStore
+  extend ActiveSupport::Concern
+
+  included do
+    Rails.logger.info 'DEPRECATED: Use include Lit::RequestKeysStore'
+    include Lit::RequestKeysStore
+  end
+end

data/app/controllers/lit/localization_keys_controller.rb

@@ -1,9 +1,7 @@
 module Lit
   class LocalizationKeysController < ::Lit::ApplicationController
-    before_action :find_localization_scope,
-                  except: %i[destroy find_localization]
-    before_action :find_localization_key,
-                  only: %i[star destroy change_completed restore_deleted]
+    before_action :find_localization_scope, except: %i[destroy find_localization]
+    before_action :find_localization_key, only: %i[star destroy change_completed restore_deleted]
 
     def index
       get_localization_keys
@@ -20,27 +18,19 @@ module Lit
     end
 
     def find_localization
-      localization_key = Lit::LocalizationKey.find_by!(
-        localization_key: params[:key]
-      )
+      localization_key = Lit::LocalizationKey.find_by!(localization_key: params[:key])
       locale = Lit::Locale.find_by!(locale: params[:locale])
       localization = localization_key.localizations.find_by(locale_id: locale)
-      render json: {
-        path: localization_key_localization_path(localization_key, localization)
-      }
+      render json: { path: localization_key_localization_path(localization_key, localization) }
     end
 
     def starred
       @scope = @scope.where(is_starred: true)
 
-      if defined?(Kaminari) &&
-         @scope.respond_to?(Kaminari.config.page_method_name)
+      if defined?(Kaminari) && @scope.respond_to?(Kaminari.config.page_method_name)
         @scope = @scope.send(Kaminari.config.page_method_name, params[:page])
       end
-      if defined?(WillPaginate) &&
-         @scope.respond_to?(:paginate)
-        @scope = @scope.paginate(page: params[:page])
-      end
+      @scope = @scope.paginate(page: params[:page]) if defined?(WillPaginate) && @scope.respond_to?(:paginate)
       get_localization_keys
       render action: :index
     end
@@ -66,6 +56,16 @@ module Lit
       respond_to :js
     end
 
+    def batch_touch
+      get_localization_keys
+      localization_key_ids = @scope.distinct(false).pluck(:id)
+      if localization_key_ids.any?
+        @scope.distinct(false).update_all updated_at: Time.current
+        Localization.where(localization_key_id: localization_key_ids).update_all updated_at: Time.current
+      end
+      respond_to :js
+    end
+
     private
 
     def find_localization_key
@@ -73,19 +73,16 @@ module Lit
     end
 
     def find_localization_scope
-      @search_options = if params.respond_to?(:permit)
-                          params.permit(*valid_keys)
-                        else
-                          params.slice(*valid_keys)
-                        end
-      @scope = LocalizationKey.distinct.active
-                              .preload(localizations: :locale)
-                              .search(@search_options)
+      @search_options = params.respond_to?(:permit) ? params.permit(*valid_keys) : params.slice(*valid_keys)
+      @scope = LocalizationKey.distinct.active.preload(localizations: :locale).search(@search_options)
     end
 
     def get_localization_keys
       key_parts = @search_options[:key_prefix].to_s.split('.').length
-      @prefixes = @scope.reorder(nil).distinct.pluck(:localization_key).map { |lk| lk.split('.').shift(key_parts + 1).join('.') }.uniq.sort
+      @prefixes =
+        @scope.reorder(nil).distinct.pluck(:localization_key).map do |lk|
+          lk.split('.').shift(key_parts + 1).join('.')
+        end.uniq.sort
       if @search_options[:key_prefix].present?
         parts = @search_options[:key_prefix].split('.')
         @parent_prefix = parts[0, parts.length - 1].join('.')
@@ -104,16 +101,15 @@ module Lit
     end
 
     def grouped_localizations
-      @_grouped_localizations ||= begin
-        {}.tap do |hash|
-          @localization_keys.each do |lk|
-            hash[lk] = {}
-            lk.localizations.each do |l|
-              hash[lk][l.locale.locale.to_sym] = l
+      @_grouped_localizations ||=
+        begin
+          {}.tap do |hash|
+            @localization_keys.each do |lk|
+              hash[lk] = {}
+              lk.localizations.each { |l| hash[lk][l.locale.locale.to_sym] = l }
             end
           end
         end
-      end
     end
 
     def localization_for(locale, localization_key)
@@ -136,12 +132,16 @@ module Lit
     helper_method :localization_for
 
     def versions?(localization)
-      @_versions ||= begin
-        ids = grouped_localizations.values.map(&:values).flatten.map(&:id)
-        Lit::Localization.active.where(id: ids).joins(:versions).group(
-          "#{Lit::Localization.quoted_table_name}.id"
-        ).count
-      end
+      @_versions ||=
+        begin
+          ids = grouped_localizations.values.map(&:values).flatten.map(&:id)
+          Lit::Localization
+            .active
+            .where(id: ids)
+            .joins(:versions)
+            .group("#{Lit::Localization.quoted_table_name}.id")
+            .count
+        end
       @_versions[localization.id].to_i > 0
     end
     helper_method :versions?

data/app/helpers/lit/frontend_helper.rb

@@ -9,7 +9,7 @@ module Lit
         key = scope_key_by_partial(key)
         key = pluralized_key(key, count) if count
 
-        content = super(key, options.symbolize_keys)
+        content = super(key, **options.symbolize_keys)
         if !options[:skip_lit] && lit_authorized?
           content = get_translateable_span(key, content)
         end

data/app/models/lit/base.rb

@@ -21,7 +21,7 @@ class Lit::Base < ActiveRecord::Base
 
   private
 
-  def create_or_update(*args, &block)
+  def create_or_update(**kwargs, &block)
     @was_saved_with_insert = true if new_record?
     @was_saved_with_update = true if persisted?
 

data/app/views/lit/localization_keys/_localizations_list.html.erb

@@ -1,8 +1,12 @@
-<table class="table">
+<div class="col-12 text-right">
+  <%= link_to "batch touch", lit.batch_touch_localization_keys_path(key: params[:key], key_prefix: params[:key_prefix]), method: :post, remote: true, class: 'btn btn-sm btn-primary', data: { confirm: 'This will "touch" all search results making them subject of synchronization. Proceed?'} %>
+</div>
+<table class="table mt-1">
   <%- @localization_keys.each do |lk| %>
     <tr class="localization_key_row" data-id="<%= lk.id %>">
       <td>
         <strong><%= lk.localization_key %></strong>
+        <i class="fa fa-clipboard js-copy_to_clipboard copy_to_clipboard_btn " data-key="<%= lk.localization_key %>"></i>
         <span class="badge"><%= Lit.init.cache.get_global_hits_counter(lk.localization_key) %></span>
         <div class="localization_keys_options">
           <% if Lit.store_request_info %>
@@ -30,26 +34,30 @@
         <div class="detail_wrapper">
           <table class="table table-bordered table-striped">
             <tr>
-              <th class="col-md-8">Translation</th>
-              <th class="col-md-2 text-center">Locale</th>
+              <th class="col-md-1"></th>
+              <th class="col-md-9">Translation</th>
+              <th class="col-md-1 text-center">Locale</th>
               <% unless lk.is_deleted? %>
-                <th class="col-md-2 text-center">Completed</th>
+                <th class="col-md-1 text-center">Completed</th>
               <% end %>
             </tr>
             <%- available_locales.each do |locale| %>
               <%- localization = localization_for(locale, lk) %>
               <tr>
+                <td>
+                  <% if localization %>
+                    <%= draw_icon 'clock-o', title: "Last updated at #{localization.updated_at.to_s(:db)}" %>
+                    <%= link_to lit.previous_versions_localization_key_localization_path(lk, localization, format: :js), class: "js-show_prev_versions #{'hidden' unless versions?(localization)}", remote: true do %>
+                      <%= draw_icon 'random', title: I18n.t('lit.common.previous_versions', default: 'Previous versions') %>
+                    <% end %>
+                  <% end %>
+                </td>
                 <td class="localization_row" data-id="<%= localization.id%>" data-edit="<%= edit_localization_key_localization_path(lk, localization, format: :js) %>" data-editing=0 data-content="">
                   <%= render partial: 'localization_row', locals: {localization: Lit.init.cache["#{locale}.#{lk.localization_key}"]} %>
                 </td>
                 <td class="locale_row text-center">
                   <%= EmojiFlag.new(locale) %>
                   <%= locale %>
-                  <% if localization %>
-                    <%= link_to lit.previous_versions_localization_key_localization_path(lk, localization, format: :js), class: "show_prev_versions #{'hidden' unless versions?(localization)}", remote: true do %>
-                      <%= draw_icon 'random', title: I18n.t('lit.common.previous_versions', default: 'Previous versions') %>
-                    <% end %>
-                  <% end %>
                 </td>
                 <% unless lk.is_deleted? %>
                   <td class="text-center">
@@ -65,7 +73,7 @@
             <% end %>
             <% if Lit.store_request_info %>
               <tr class="hidden request_info_row">
-                <td colspan="2">
+                <td colspan="3">
                   <strong>Translation key recently displayed on following pages:</strong>
                   <ul>
                     <% Lit.init.cache.get_request_info(lk.localization_key).split(' ').reverse.each do |l| %>

data/app/views/lit/localization_keys/batch_touch.js.erb

@@ -0,0 +1 @@
+alert('All of search results have been marked as updated now, please retry synchronizing now');

data/app/views/lit/localizations/update.js.erb

@@ -1,6 +1,6 @@
 var $row = $('td.localization_row[data-id="<%= @localization.id %>"]');
 $row.data('editing', 0);
 $row.html("<%= ejs render(:partial=>"/lit/localization_keys/localization_row", formats: ['html'], :locals=>{:localization=>@localization.translated_value }) %>");
-$row.siblings().find('.show_prev_versions').removeClass('hidden');
+$row.siblings().find('.js-show_prev_versions').removeClass('hidden');
 $('a.change_completed_<%= @localization.id %> input[type=checkbox]').prop("checked", true);
 

data/config/routes.rb

@@ -25,6 +25,7 @@ Lit::Engine.routes.draw do
       get :find_localization
       get :not_translated
       get :visited_again
+      post :batch_touch
     end
     resources :localizations, only: [:edit, :update, :show] do
       member do

data/lib/lit/engine.rb

@@ -3,6 +3,7 @@ module Lit
     require 'jquery-rails'
 
     config.autoload_paths += %W[#{Lit::Engine.root}/app/controllers/lit/concerns]
+    paths.add 'lib', eager_load: true # Zeitwerk compatibility
 
     isolate_namespace Lit
 

data/lib/lit/import.rb

@@ -3,14 +3,14 @@ require 'csv'
 module Lit
   class Import
     class << self
-      def call(*args)
-        new(*args).perform
+      def call(**kwargs)
+        new(**kwargs).perform
       end
     end
 
     attr_reader :input, :locale_keys, :format, :skip_nil
 
-    def initialize(input:, locale_keys: [], format:, skip_nil: true, dry_run: false, raw: false)
+    def initialize(input:, format:, locale_keys: [], skip_nil: true, dry_run: false, raw: false)
       raise ArgumentError, 'format must be yaml or csv' if %i[yaml csv].exclude?(format.to_sym)
       @input = input
       @locale_keys = locale_keys.presence || I18n.available_locales
@@ -143,7 +143,7 @@ module Lit
                          .find_by('localization_key = ? and locale = ?', key, locale)
 
         return unless existing_translation
-        
+
         if @raw
           existing_translation.update(default_value: value)
         else

data/lib/lit/version.rb

@@ -1,3 +1,3 @@
 module Lit
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.1.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lit
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Maciej Litwiniuk
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -89,14 +89,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -272,6 +272,7 @@ files:
 - app/views/lit/localization_keys/_localization_row.html.erb
 - app/views/lit/localization_keys/_localizations_list.html.erb
 - app/views/lit/localization_keys/_sidebar.html.erb
+- app/views/lit/localization_keys/batch_touch.js.erb
 - app/views/lit/localization_keys/change_completed.js.erb
 - app/views/lit/localization_keys/destroy.js.erb
 - app/views/lit/localization_keys/index.html.erb
@@ -344,7 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Database powered i18n backend with web gui