lit 0.2.6 → 0.3.0

data/app/models/lit/localization.rb

@@ -6,7 +6,10 @@ module Lit
     ## SCOPES
     scope :changed, proc { where(is_changed: true) }
     # @HACK: dirty, find a way to round date to full second
-    scope :after, proc { |dt| where('updated_at >= ?', dt + 1.second) }
+    scope :after, proc { |dt|
+      where('updated_at >= ?', dt + 1.second)
+        .where('is_changed = true')
+    }
 
     ## ASSOCIATIONS
     belongs_to :locale
@@ -25,7 +28,7 @@ module Lit
 
     ## BEFORE & AFTER
     with_options if: :translated_value_changed? do |o|
-      o.before_update :update_is_changed_attribute
+      o.before_update :update_should_mark_localization_key_completed
       o.before_update :create_version
     end
     after_update :mark_localization_key_completed
@@ -39,7 +42,7 @@ module Lit
     end
 
     def get_value
-      (is_changed? && (!translated_value.nil?)) ? translated_value : default_value
+      is_changed? && !translated_value.nil? ? translated_value : default_value
     end
 
     def value
@@ -60,21 +63,25 @@ module Lit
 
     def update_default_value(value)
       return true if persisted? && default_value == value
-      self.default_value = value
-      self.save!
+      if persisted?
+        update_column(:default_value, value)
+      else
+        self.default_value = value
+        save!
+      end
     end
 
     private
 
-    def update_is_changed_attribute
-      return if attributes['is_changed'] == true
-
-      self[:is_changed] = true
+    def update_should_mark_localization_key_completed
+      return if translated_value == translated_value_was
       @should_mark_localization_key_completed = true
     end
 
     def mark_localization_key_completed
-      localization_key.mark_completed! if @should_mark_localization_key_completed
+      return if !instance_variable_defined?(:@should_mark_localization_key_completed) || \
+                @should_mark_localization_key_completed
+      localization_key.mark_completed!
     end
 
     def create_version

data/app/models/lit/localization_key.rb

@@ -7,7 +7,11 @@ module Lit
     scope :not_completed, proc { where(is_completed: false) }
     scope :starred, proc { where(is_starred: true) }
     scope :ordered, proc { order('localization_key asc') }
-    scope :after, proc { |dt| where('updated_at >= ?', dt) }
+    scope :after, proc { |dt|
+      joins(:localizations)
+        .where('lit_localization_keys.updated_at >= ?', dt)
+        .where('lit_localizations.is_changed = true')
+    }
 
     ## ASSOCIATIONS
     has_many :localizations, dependent: :destroy
@@ -62,7 +66,7 @@ module Lit
     end
 
     def self.search(options = {})
-      options = options.reverse_merge(default_search_options)
+      options = options.to_h.reverse_merge(default_search_options).with_indifferent_access
       s = self
       if options[:order] && order_options.include?(options[:order])
         column, order = options[:order].split(' ')

data/app/models/lit/source.rb

@@ -48,12 +48,13 @@ module Lit
             unless il.is_duplicate?(r['value'])
               il.save!
               IncommingLocalization.where(id: il.id).
-                update_all ['translated_value=?', r['value']]
+                update_all(translated_value: r['value'])
             end
           end
           last_change = get_last_change
           last_change = DateTime.parse(last_change) unless last_change.nil?
           touch_last_updated_at(last_change)
+          update_column(:sync_complete, true)
           save
         end
       end
@@ -89,8 +90,8 @@ module Lit
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = (uri.port == 443)
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        res = http.start do |http|
-          http.request(req)
+        res = http.start do |http_started|
+          http_started.request(req)
         end
         if res.is_a?(Net::HTTPSuccess)
           result = JSON.parse(res.body)

data/app/views/layouts/lit/application.html.erb

@@ -5,12 +5,12 @@
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
-    <%= stylesheet_link_tag    "//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css", :media => "all" %>
-    <%= stylesheet_link_tag    "//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css", :media => "all" %>
-    <%= stylesheet_link_tag    "//netdna.bootstrapcdn.com/bootswatch/3.0.3/yeti/bootstrap.min.css", :media => "all" %>
-    <%= stylesheet_link_tag    "lit/application", :media => "all" %>
-    <%= javascript_include_tag "lit/application" %>
-    <%= javascript_include_tag "//netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js" %>
+    <%= stylesheet_link_tag    '//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css', media: 'all' %>
+    <%= stylesheet_link_tag    '//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css', media: 'all' %>
+    <%= stylesheet_link_tag    '//netdna.bootstrapcdn.com/bootswatch/3.0.3/yeti/bootstrap.min.css', media: 'all' %>
+    <%= stylesheet_link_tag    'lit/application', media: 'all' %>
+    <%= javascript_include_tag 'lit/application' %>
+    <%= javascript_include_tag '//netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js' %>
     <%= csrf_meta_tags %>
   </head>
   <body class="<%= params[:controller] %>">

data/app/views/lit/incomming_localizations/index.html.erb

@@ -1,15 +1,20 @@
 <h1>Incomming localizations</h1>
-<div class="row">
-  <span class="pull-right">
-    <%= link_to accept_all_source_incomming_localizations_path(@source), :class=>"btn btn-success btn-sm", :data=>{:confirm=>t('lit.common.you_sure', :default=>"Are you sure?")} do %>
-      <%= t('lit.common.accept_all', :default=>"Accept all") %>
-    <% end %>
-    <%= link_to reject_all_source_incomming_localizations_path(@source), :class=>"btn btn-danger btn-sm", :method=>:post, :data=>{:confirm=>t('lit.common.you_sure', :default=>"Are you sure?")} do %>
-      <%= t('lit.common.reject_all', :default=>"Reject all") %>
-    <% end %>
-  </span>
+<input type="hidden" id="source_id" value="<%= @source.id %>">
+<div class="container">
+  <div class="row inline-headers">
+    <h4 class="<%= source_loading_class(@source) %>">Synchronization in progress, please wait. The page will refresh automatically when done.</h2>
+    <span class="pull-right">
+      <%= link_to accept_all_source_incomming_localizations_path(@source), :class=>"btn btn-success btn-sm", :data=>{:confirm=>t('lit.common.you_sure', :default=>"Are you sure?")} do %>
+        <%= t('lit.common.accept_all', :default=>"Accept all") %>
+      <% end %>
+      <%= link_to reject_all_source_incomming_localizations_path(@source), :class=>"btn btn-danger btn-sm", :method=>:post, :data=>{:confirm=>t('lit.common.you_sure', :default=>"Are you sure?")} do %>
+        <%= t('lit.common.reject_all', :default=>"Reject all") %>
+      <% end %>
+    </span>
+  </div>
 </div>
 
+
 <table class="table table-bordered table-striped incomming-localizations-table">
   <tr>
     <th>Current value</th>
@@ -26,20 +31,20 @@
     <tr data-id="<%= il.id %>">
       <td>
         <% if il.localization %>
-          <%= render :partial=>"/lit/localization_keys/localization_row", :locals=>{:localization=>il.localization.get_value} %>
+          <%= render partial: '/lit/localization_keys/localization_row', locals: {localization: il.localization.get_value} %>
         <% end %>
       </td>
       <Td>
-        <%= render :partial=>"/lit/localization_keys/localization_row", :locals=>{:localization=>il.get_value} %>
+        <%= render partial: '/lit/localization_keys/localization_row', locals: {localization: il.get_value} %>
       </td>
       <td>
-        <%= link_to accept_source_incomming_localization_path(@source, il), :class=>"btn btn-success btn-sm", :remote=>true do %>
-          <%= draw_icon "check", :class=>"icon-white" %>
-          <%= t('lit.common.accept', :default=>"Accept") %>
+        <%= link_to accept_source_incomming_localization_path(@source, il, format: :js), class: 'btn btn-success btn-sm', remote: true do %>
+          <%= draw_icon 'check', class: 'icon-white' %>
+          <%= t('lit.common.accept', default: 'Accept') %>
         <% end %>
-        <%= link_to source_incomming_localization_path(@source, il), :class=>"btn btn-danger btn-sm", :remote=>true, :method=>:delete, :data=>{:confirm=>t('lit.common.you_sure', :default=>"Are you sure?")} do %>
-          <%= draw_icon "times", :class=>"icon-white" %>
-          <%= t('lit.common.reject', :default=>"Reject") %>
+        <%= link_to source_incomming_localization_path(@source, il, format: :js), class: 'btn btn-danger btn-sm', remote: true, method: delete, data: {confirm: I18n.t('lit.common.you_sure', default: 'Are you sure?')} do %>
+          <%= draw_icon 'times', class: "icon-white" %>
+          <%= I18n.t('lit.common.reject', :default=>"Reject") %>
         <% end %>
       </td>
     </tr>

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

@@ -6,7 +6,7 @@
   </ul>
 <% else %>
   <% if localization.nil? %>
-    <em title="<%= t('.value_not_yet_translated', default: 'Value not yet translated') %>">null</em>
+    <em title="<%= I18n.t('.value_not_yet_translated', default: 'Value not yet translated') %>">null</em>
   <% else %>
     <%= localization %>
   <% end %>

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

@@ -1,4 +1,4 @@
-<h3><%= t('.header', :default=>"Localization keys") %></h3>
+<h3><%= I18n.t('.header', default: 'Localization keys') %></h3>
 <% available_locales = I18n.backend.available_locales %>
 
 <table class="table">
@@ -8,10 +8,15 @@
         <strong><%= lk.localization_key %></strong>
         <span class="badge"><%= Lit.init.cache.get_global_hits_counter(lk.localization_key) %></span>
         <div class="localization_keys_options">
-          <%= link_to lit.star_localization_key_path(lk), :remote=>true, :class=>"star_icon" do %>
+          <% if Lit.store_request_info %>
+            <%= link_to '#', class: 'request_info_link title',  title: 'Show / hide request' do %>
+              <%= draw_icon 'link' %>
+            <% end %>
+          <% end %>
+          <%= link_to lit.star_localization_key_path(lk), remote: true, class: 'star_icon title', title: 'Star / unstar translation key' do %>
             <%= draw_icon lk.is_starred? ? 'star' : 'star-o' %>
           <% end %>
-          <%= link_to lit.localization_key_path(lk), :method=>:delete, :data=>{:confirm=>t('lit.common.you_sure', :default=>"Are you sure?")}, :remote=>true do %>
+          <%= link_to lit.localization_key_path(lk), method: :delete, data: {confirm: t('lit.common.you_sure', default: "Are you sure?")}, remote: true, title: 'Delete translation key', class: 'title' do %>
             <%= draw_icon 'trash-o' %>
           <% end %>
         </div>
@@ -20,15 +25,15 @@
             <%- available_locales.each do |locale| %>
               <%- localization = localization_for(locale, lk) %>
               <tr>
-                <td class="localization_row" data-id="<%= localization.id%>" data-edit="<%= edit_localization_key_localization_path(lk, localization) %>" data-editing=0 data-content="">
-                  <%= render :partial=>"localization_row", :locals=>{:localization=>Lit.init.cache["#{locale}.#{lk.localization_key}"]} %>
+                <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">
                   <%= image_tag "lit/famfamfam_flags/#{locale[0,2]}.png" %>
                   <%= locale %>
                   <% if localization %>
-                    <%= link_to lit.previous_versions_localization_key_localization_path(lk, localization), :class=>"show_prev_versions #{'hidden' unless has_versions?(localization)}", :remote=>true do %>
-                      <%= draw_icon 'random', :title=>t('lit.common.previous_versions', :default=>"Previous versions") %>
+                    <%= link_to lit.previous_versions_localization_key_localization_path(lk, localization, format: :js), class: "show_prev_versions #{'hidden' unless has_versions?(localization)}", remote: true do %>
+                      <%= draw_icon 'random', title: I18n.t('lit.common.previous_versions', default: 'Previous versions') %>
                     <% end %>
                   <% end %>
                 </td>
@@ -37,6 +42,19 @@
                 <td colspan="2" class="localization_versions"></td>
               </tr>
             <% end %>
+            <% if Lit.store_request_info %>
+              <tr class="hidden request_info_row">
+                <td colspan="2">
+                  <strong>Translation key recently displayed on following pages:</strong>
+                  <ul>
+                    <% Lit.init.cache.get_request_info(lk.localization_key).split(' ').reverse.each do |l| %>
+                      <li><%= link_to l, l %></li>
+                   <% end %>
+                  </ul>
+                  <em>Note: you might not have access to those pages!</em>
+                </td>
+              </tr>
+            <% end %>
           </table>
         </div>
       </td>
@@ -47,6 +65,8 @@
 <% if defined?(Kaminari)  %>
   <%= paginate @localization_keys, :theme=>"lit" %>
 <% end %>
+
+
 <% content_for(:sidebar) do %>
   <div class="well">
     <%= form_tag '', :class=>"form-search", :method=>:get do |f| %>
@@ -105,4 +125,3 @@
     </ul>
   </div>
 <% end %>
-

data/app/views/lit/localizations/_form.html.erb

@@ -1,13 +1,13 @@
-<%= form_for [@localization_key, @localization], :html=>{:remote=>true} do |f| %>
+<%= form_for @localization, url: lit.localization_key_localization_path(@localization_key, @localization, format: :js), html: {remote: true} do |f| %>
   <%- f.label :translated_value %>
   <% if @localization.translated_value.is_a?(Array) %>
     <ul style="list-style: none;">
       <% @localization.translated_value.each do |l| %>
-        <li><%= text_field_tag 'localization[translated_value][]', l, :class=>"form-control input-xlarge" %></li>
+        <li><%= text_field_tag 'localization[translated_value][]', l, class: 'form-control input-xlarge' %></li>
       <% end %>
     </ul>
   <% else %>
-    <%= f.text_area :translated_value, :size=>"40x2", :class=>"form-control input-xxlarge" %>
+    <%= f.text_area :translated_value, size: '40x2', class: 'form-control input-xxlarge' %>
     <% if allow_wysiwyg_editor?(@localization_key.localization_key) %>
       <br />
       <label>
@@ -17,7 +17,7 @@
     <% end %>
   <% end %>
 
-  <button class="btn btn-primary btn-sm" type="submit"><%= t('lit.common.update', :default=>"Update") %></button>
-  <button class="btn btn-default btn-sm cancel" type="reset"><%= t('lit.common.cancel', :default=>'Cancel') %></button>
+  <button class="btn btn-primary btn-sm" type="submit"><%= I18n.t('lit.common.update', default: "Update") %></button>
+  <button class="btn btn-default btn-sm cancel" type="reset"><%= I18n.t('lit.common.cancel', default: 'Cancel') %></button>
 <% end %>
 

data/app/views/lit/localizations/_previous_versions_rows.html.erb

@@ -7,7 +7,7 @@
   <% @versions.each do |v| %>
     <tr>
       <td>
-        <%= render :partial=>"/lit/localization_keys/localization_row", :locals=>{:localization=>v.translated_value} %>
+        <%= render :partial=>"/lit/localization_keys/localization_row", formats: ['html'], :locals=>{:localization=>v.translated_value} %>
       </td>
       <td><%= I18n.l v.created_at, format: :long %></td>
     </tr>

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

@@ -1,7 +1,7 @@
 var $row = $('td.localization_row[data-id="<%= @localization.id %>"]');
 $row.data('editing', 1);
-$row.html("<%= ejs render(:partial=>'form') %>");
+$row.html("<%= ejs render(partial: 'form', formats: ['html']) %>");
 $row.find('textarea').focus();
 <% if @localization.full_key.ends_with?('_html') -%>
   $row.find('.wysiwyg_switch').click();
-<% end %>
+<% end %>

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

@@ -1,3 +1,3 @@
 var row = $('.localization_versions_row[data-id="<%= @localization.id %>"]');
 row.removeClass('hidden');
-row.children('td').html("<%= j render(:partial=>'previous_versions_rows', :locals=>{:localization=>@localization, :versions=>@versions}) %>");
+row.children('td').html("<%= j render(:partial=>'previous_versions_rows', formats: ['html'], :locals=>{:localization=>@localization, :versions=>@versions}) %>");

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

@@ -1,4 +1,4 @@
 var $row = $('td.localization_row[data-id="<%= @localization.id %>"]');
 $row.data('editing', 0);
-$row.html("<%= ejs render(:partial=>"/lit/localization_keys/localization_row", :locals=>{:localization=>@localization.translated_value }) %>");
-$row.siblings().find('.show_prev_versions').removeClass('hidden');
+$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');

data/config/routes.rb

@@ -1,29 +1,28 @@
 Lit::Engine.routes.draw do
-
-
   if Lit.api_enabled
     namespace :api do
       namespace :v1 do
         get '/last_change' => 'localizations#last_change'
-        resources :locales, :only=>[:index]
-        resources :localization_keys, :only=>[:index]
-        resources :localizations, :only=>[:index] do
-          get 'last_change', :on=>:collection
+        resources :locales, only: [:index]
+        resources :localization_keys, only: [:index]
+        resources :localizations, only: [:index] do
+          get 'last_change', on: :collection
         end
       end
     end
   end
-  resources :locales, :only=>[:index, :destroy] do
-    put :hide, :on=>:member
+  resources :locales, only: [:index, :destroy] do
+    put :hide, on: :member
   end
-  resources :localization_keys, :only=>[:index, :destroy] do
+  resources :localization_keys, only: [:index, :destroy] do
     member do
       get :star
     end
     collection do
       get :starred
+      get :find_localization
     end
-    resources :localizations, :only=>[:edit, :update] do
+    resources :localizations, only: [:edit, :update, :show] do
       member do
         get :previous_versions
       end
@@ -32,9 +31,10 @@ Lit::Engine.routes.draw do
   resources :sources do
     member do
       get :synchronize
+      get :sync_complete
       put :touch
     end
-    resources :incomming_localizations, :only=>[:index, :destroy] do
+    resources :incomming_localizations, only: [:index, :destroy] do
       member do
         get :accept
       end
@@ -45,5 +45,5 @@ Lit::Engine.routes.draw do
     end
   end
 
-  root :to=>"dashboard#index"
+  root to: 'dashboard#index'
 end

data/db/migrate/20180101010101_lit_create_lit_locales.rb

@@ -0,0 +1,16 @@
+class LitCreateLitLocales < Rails::VERSION::MAJOR >= 5   ?
+                            ActiveRecord::Migration[4.2] :
+                            ActiveRecord::Migration
+  def up
+    return if table_exists?(:lit_locales)
+    create_table :lit_locales do |t|
+      t.string :locale
+
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :lit_locales
+  end
+end

data/db/migrate/20180101010102_lit_create_lit_localization_keys.rb

@@ -0,0 +1,18 @@
+class LitCreateLitLocalizationKeys < Rails::VERSION::MAJOR >= 5   ?
+                                     ActiveRecord::Migration[4.2] :
+                                     ActiveRecord::Migration
+  def up
+    return if table_exists?(:lit_localization_keys)
+    create_table :lit_localization_keys do |t|
+      t.string :localization_key
+
+      t.timestamps
+    end
+    add_index :lit_localization_keys, :localization_key, unique: true
+  end
+
+  def down
+    remove_index :lit_localization_keys, :localization_key
+    drop_table :lit_localization_keys
+  end
+end

data/db/migrate/20180101010103_lit_create_lit_localizations.rb

@@ -0,0 +1,24 @@
+class LitCreateLitLocalizations < Rails::VERSION::MAJOR >= 5   ?
+                                  ActiveRecord::Migration[4.2] :
+                                  ActiveRecord::Migration
+  def up
+    return if table_exists?(:lit_localizations)
+    create_table :lit_localizations do |t|
+      t.integer :locale_id
+      t.integer :localization_key_id
+      t.text :default_value
+      t.text :translated_value
+      t.boolean :is_changed, default: false
+
+      t.timestamps
+    end
+
+    add_index :lit_localizations, :locale_id
+    add_index :lit_localizations, :localization_key_id
+  end
+
+  def down
+    remove_index :lit_localizations, :locale_id
+    remove_index :lit_localizations, :localization_key_id
+  end
+end