lit 0.2.6 → 0.3.0

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

@@ -8,7 +8,7 @@
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
  *
- *= require './jquery-te-1.4.0.css'
+ *= require './backend/jquery-te-1.4.0.css'
  *= require_self
  */
 .detail_wrapper{
@@ -51,3 +51,9 @@ padding: 5px 7px;
 .localization_row em{
   color: #bbb;
 }
+.loading {
+  display: inline;
+}
+.loaded {
+  display: none;
+}

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

@@ -0,0 +1,86 @@
+.lit-key-generic {
+}
+.lit-key-highlight{
+  text-decoration: underline wavy red !important;
+}
+#lit_button_wrapper{
+  position: fixed;
+  bottom: 20px;
+  right: 20px;
+  z-index: 100;
+  background-color: red;
+  border-radius: 4px;
+  display: block;
+  padding: 5px;
+  cursor: pointer;
+  color: white;
+}
+#lit_button_wrapper.lit-highlight-enabled{
+  background-color: lightgreen;
+}
+#lit_textarea{
+  position: absolute;
+  padding: 0 0 1px 0;
+  margin: 0 0 0 0;
+  border: 0;
+  border-bottom: 1px solid red;
+
+}
+.lit-translations-info.collapsed {
+  position: fixed;
+  bottom: 60px;
+  right: 20px;
+  z-index: 100;
+  background-color: green;
+  border-radius: 4px;
+  display: block;
+  padding: 5px;
+  cursor: pointer;
+  color: white;
+}
+.lit-translations-info.expanded{
+  position: absolute;
+  display: block;
+  width: 80%;
+  overflow: auto;
+  height: 80%;
+  right: 10%;
+  left: 10%;
+  top: 10%;
+  background-color: rgba(240, 240, 240, 0.9);
+  border: 1px solid black;
+  z-index: 90;
+}
+
+.lit-translations-info.collapsed span.lit-open-button{
+  display: block;
+}
+.lit-translations-info.expanded span.lit-open-button{
+  display: none;
+}
+.lit-translations-info.collapsed span.lit-close-button{
+  display: none;
+}
+.lit-translations-info.expanded span.lit-close-button{
+  display: block;
+  position: fixed;
+  right: 10%;
+  border: 2px solid black;
+  font-size: 12pt;
+  font-weight: bold;
+  background-color: white;
+  padding: 10px 10px 5px;
+}
+.lit-translations-info.collapsed ul.lit-translations-list{
+  display: none;
+}
+.lit-translations-info.expanded ul.lit-translations-list{
+}
+
+.lit-translations-info.expanded ul.lit-translations-list li{
+  margin: 5px;
+}
+
+.lit-translations-info.expanded #lit_textarea{
+  padding: 2px;
+}

data/app/controllers/lit/api/v1/base_controller.rb

@@ -4,7 +4,7 @@ module Lit
       class BaseController < ActionController::Base
         layout nil
         respond_to :json
-        before_filter :authenticate_requests!
+        before_action :authenticate_requests!
 
         private
 

data/app/controllers/lit/application_controller.rb

@@ -1,8 +1,12 @@
 module Lit
   class ApplicationController < ActionController::Base
-    before_filter :authenticate
-    before_filter :stop_hits_counter
-    after_filter :restore_hits_counter
+    unless respond_to?(:before_action)
+      alias_method :before_action, :before_filter
+      alias_method :after_action, :after_filter
+    end
+    before_action :authenticate
+    before_action :stop_hits_counter
+    after_action :restore_hits_counter
 
     private
 

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

@@ -0,0 +1,16 @@
+module Lit
+  module Concerns
+    module RequestInfoStore
+      extend ::ActiveSupport::Concern
+      included do
+        before_action :store_request_path
+      end
+
+      private
+
+      def store_request_path
+        Thread.current[:lit_current_request_path] = request&.path
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Lit
+  module Concerns
+    module RequestKeysStore
+      extend ::ActiveSupport::Concern
+      included do
+        before_action :init_request_keys
+      end
+
+      private
+
+      def init_request_keys
+        Thread.current[:lit_request_keys] = {}
+      end
+    end
+  end
+end

data/app/controllers/lit/incomming_localizations_controller.rb

@@ -2,10 +2,10 @@ require_dependency 'lit/application_controller'
 
 module Lit
   class IncommingLocalizationsController < ApplicationController
-    before_filter :find_source
+    before_action :find_source
 
     def index
-      @incomming_localizations = @source.incomming_localizations.all
+      @incomming_localizations = @source.incomming_localizations
     end
 
     def accept

data/app/controllers/lit/locales_controller.rb

@@ -3,7 +3,7 @@ require_dependency 'lit/application_controller'
 module Lit
   class LocalesController < ApplicationController
     def index
-      @locales = Locale.ordered.all
+      @locales = Locale.ordered
 
       respond_to do |format|
         format.html # index.html.erb

data/app/controllers/lit/localization_keys_controller.rb

@@ -1,15 +1,26 @@
 module Lit
   class LocalizationKeysController < ::Lit::ApplicationController
-    before_filter :get_localization_scope, except: [:destroy]
+    before_action :get_localization_scope, except: [:destroy, :find_localization]
 
     def index
       get_localization_keys
     end
 
+    def find_localization
+      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)
+      }
+    end
+
     def starred
       @scope = @scope.where(is_starred: true)
 
-      if defined?(Kaminari) and @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
       get_localization_keys
@@ -18,7 +29,7 @@ module Lit
 
     def star
       @localization_key = LocalizationKey.find params[:id].to_i
-      @localization_key.is_starred = ! @localization_key.is_starred?
+      @localization_key.is_starred = !@localization_key.is_starred?
       @localization_key.save
       respond_to :js
     end
@@ -35,14 +46,18 @@ module Lit
     private
 
     def get_localization_scope
-      @search_options = params.slice(*valid_keys)
+      @search_options = if params.respond_to?(:permit)
+                          params.permit(*valid_keys)
+                        else
+                          params.slice(*valid_keys)
+                        end
       @search_options[:include_completed] = '1' if @search_options.empty?
-      @scope = LocalizationKey.uniq.preload(localizations: :locale).search(@search_options)
+      @scope = LocalizationKey.distinct.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).uniq.pluck(:localization_key).map { |lk| lk.split('.').shift(key_parts + 1).join('.') }.uniq.sort
+      @prefixes = @scope.reorder(nil).distinct.pluck(:localization_key).map { |lk| lk.split('.').shift(key_parts + 1).join('.') }.uniq.sort
       if @search_options[:key_prefix].present?
         parts = @search_options[:key_prefix].split('.')
         @parent_prefix = parts[0, parts.length - 1].join('.')
@@ -50,7 +65,7 @@ module Lit
       if defined?(Kaminari) and @scope.respond_to?(Kaminari.config.page_method_name)
         @localization_keys = @scope.send(Kaminari.config.page_method_name, params[:page])
       else
-        @localization_keys = @scope.all
+        @localization_keys = @scope
       end
     end
 
@@ -88,7 +103,6 @@ module Lit
         ret
       end
     end
-
     helper_method :localization_for
 
     def has_versions?(localization)
@@ -98,7 +112,6 @@ module Lit
       end
       @_versions[localization.id].to_i > 0
     end
-
     helper_method :has_versions?
   end
 end

data/app/controllers/lit/localizations_controller.rb

@@ -1,19 +1,31 @@
 module Lit
   class LocalizationsController < ::Lit::ApplicationController
-    before_filter :find_localization_key
-    before_filter :find_localization
+    before_action :find_localization_key
+    before_action :find_localization
+
+    def show
+      render json: { value: @localization.get_value }
+    end
 
     def edit
       @localization.translated_value = @localization.get_value
-      respond_to :js
+      respond_to do |format|
+        format.js
+      end
     end
 
     def update
       if @localization.update_attributes(clear_params)
+        @localization.update_column :is_changed, true
         Lit.init.cache.update_cache @localization.full_key, @localization.get_value
       end
       @localization.reload
-      respond_to :js
+      respond_to do |f|
+        f.js
+        f.json do
+          render json: { value: @localization.get_value }
+        end
+      end
     end
 
     def previous_versions
@@ -24,7 +36,8 @@ module Lit
     private
 
     def find_localization_key
-      @localization_key = Lit::LocalizationKey.find(params[:localization_key_id])
+      @localization_key = Lit::LocalizationKey. \
+                          find(params[:localization_key_id])
     end
 
     def find_localization
@@ -32,7 +45,7 @@ module Lit
     end
 
     def clear_params
-      if defined?(::ActionController::StrongParameters)
+      if params.respond_to?(:permit)
         # allow translated_value to be an array
         if @localization.value.is_a?(Array)
           params.require(:localization).permit(:locale_id, translated_value: [])

data/app/controllers/lit/sources_controller.rb

@@ -20,7 +20,12 @@ module Lit
 
     def synchronize
       @source = Source.find(params[:id])
-      @source.synchronize
+      @source.update_column(:sync_complete, false)
+      if defined?(ActiveJob)
+        SynchronizeSourceJob.perform_later(@source)
+      else
+        @source.synchronize
+      end
       redirect_to lit.source_incomming_localizations_path(@source)
     end
 
@@ -54,6 +59,11 @@ module Lit
       redirect_to sources_url
     end
 
+    def sync_complete
+      @source = Source.find(params[:id])
+      render json: { sync_complete: @source.sync_complete }
+    end
+
     private
 
     def clear_params

data/app/helpers/lit/frontend_helper.rb

@@ -0,0 +1,71 @@
+module Lit
+  module FrontendHelper
+    include ActionView::Helpers::TranslationHelper
+    module TranslationKeyWrapper
+      def translate(key, options = {})
+        options = options.with_indifferent_access
+        key = scope_key_by_partial(key)
+        ret = super(key, options)
+        if !options[:skip_lit] && lit_authorized?
+          ret = get_translateable_span(key, ret)
+        end
+        ret
+      end
+
+      def t(key, options = {})
+        translate(key, options)
+      end
+    end
+    prepend Lit::FrontendHelper::TranslationKeyWrapper
+
+    def javascript_lit_tag
+      javascript_include_tag 'lit/lit_frontend'
+    end
+
+    def stylesheet_lit_tag
+      stylesheet_link_tag 'lit/lit_frontend'
+    end
+
+    def lit_frontend_assets
+      return unless lit_authorized?
+      meta = content_tag :meta,
+                         '',
+                         value: lit.find_localization_localization_keys_path,
+                         name: 'lit-url-base'
+      safe_join([javascript_lit_tag, stylesheet_lit_tag, meta])
+    end
+
+    def lit_translations_info
+      return if Thread.current[:lit_request_keys].nil?
+      return unless lit_authorized?
+      content_tag :div, class: 'lit-translations-info collapsed' do
+        concat content_tag :span, 'Show translations', class: 'lit-open-button'
+        concat content_tag :span, 'X', class: 'lit-close-button'
+        concat(content_tag(:ul, class: 'lit-translations-list') do
+          Lit.init.cache.request_keys.each do |k, v|
+            concat(content_tag(:li) do
+              concat content_tag :code, "#{k}:"
+              concat get_translateable_span(k, v, alternative_text: '[empty]')
+            end)
+          end
+        end)
+      end
+    end
+
+    def lit_authorized?
+      if Lit.authentication_verification.present?
+        send(Lit.authentication_verification)
+      else
+        true
+      end
+    end
+
+    def get_translateable_span(key, localization, alternative_text: nil)
+      content_tag :span,
+                  class: 'lit-key-generic',
+                  data: { key: key, locale: I18n.locale } do
+        localization.blank? ? alternative_text : localization
+      end
+    end
+  end
+end

data/app/helpers/lit/localization_keys_helper.rb

@@ -0,0 +1,5 @@
+module Lit
+  module LocalizationKeysHelper
+    include LocalizationsHelper
+  end
+end

data/app/helpers/lit/sources_helper.rb

@@ -1,4 +1,7 @@
 module Lit
   module SourcesHelper
+    def source_loading_class(source)
+      source.sync_complete ? 'loaded' : 'loading'
+    end
   end
 end

data/app/jobs/lit/synchronize_source_job.rb

@@ -0,0 +1,11 @@
+module Lit
+  if defined?(::ActiveJob)
+    class SynchronizeSourceJob < ::ActiveJob::Base
+      queue_as :default
+
+      def perform(source)
+        source.synchronize
+      end
+    end
+  end
+end