lit 0.0.4.3 → 0.1.0

data/app/models/lit/localization.rb

@@ -1,28 +1,35 @@
 module Lit
   class Localization < ActiveRecord::Base
+    serialize :translated_value
+    serialize :default_value
 
     ## 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) }
 
     ## ASSOCIATIONS
     belongs_to :locale
     belongs_to :localization_key
+    has_many :localization_versions, dependent: :destroy
+    has_many :versions, class_name: '::Lit::LocalizationVersion'
 
     ## VALIDATIONS
     validates :locale_id,
               :presence=>true
 
-    if ::Rails::VERSION::MAJOR<4
+    unless defined?(::ActionController::StrongParameters)
       ## ACCESSIBLE
       attr_accessible :translated_value, :locale_id
     end
 
     ## BEFORE & AFTER
     before_update :update_is_changed
+    before_update :create_version
     after_update :mark_localization_key_completed
 
     def to_s
-      self.value
+      self.get_value
     end
 
     def full_key
@@ -30,7 +37,23 @@ module Lit
     end
 
     def get_value
-      is_changed? ? self.translated_value : self.default_value
+      (is_changed? && (not self.translated_value.nil?)) ? self.translated_value : self.default_value
+    end
+
+    def value
+      get_value
+    end
+
+    def localization_key_str
+      self.localization_key.localization_key
+    end
+
+    def locale_str
+      self.locale.locale
+    end
+
+    def last_change
+      self.updated_at.to_s(:db)
     end
 
     private
@@ -41,5 +64,12 @@ module Lit
       def mark_localization_key_completed
         self.localization_key.mark_completed!
       end
+
+      def create_version
+        if self.translated_value.present? and (not self.translated_value.nil?)
+          l = self.localization_versions.new
+          l.translated_value = self.translated_value_was || self.default_value
+        end
+      end
   end
 end

data/app/models/lit/localization_key.rb

@@ -7,6 +7,7 @@ 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) }
 
     ## ASSOCIATIONS
     has_many :localizations, :dependent=>:destroy
@@ -16,7 +17,7 @@ module Lit
               :presence=>true,
               :uniqueness=>true
 
-    if ::Rails::VERSION::MAJOR<4
+    unless defined?(::ActionController::StrongParameters)
       ## ACCESSIBLE
       attr_accessible :localization_key
     end

data/app/models/lit/localization_version.rb

@@ -0,0 +1,12 @@
+module Lit
+  class LocalizationVersion < ActiveRecord::Base
+    serialize :translated_value
+
+    ## ASSOCIATIONS
+    belongs_to :localization
+
+    def to_s
+      self.translated_value
+    end
+  end
+end

data/app/models/lit/source.rb

@@ -0,0 +1,87 @@
+require 'net/http'
+module Lit
+  class Source < ActiveRecord::Base
+    LOCALES_PATH = "/api/v1/locales.json"
+    LOCALIZATION_KEYS_PATH = "/api/v1/localization_keys.json"
+    LOCALIZATIONS_PATH = "/api/v1/localizations.json"
+    LAST_CHANGE_PATH = "/api/v1/last_change.json"
+
+    ## ASSOCIATIONS
+    has_many :incomming_localizations
+
+    ## VALIDATIONS
+    validates :api_key, :identifier, :url,
+              :presence=>true
+    validates :url,
+              :format=>{:with=>/\Ahttps?:\/\/.*\/.*[^\/]\Z/i}
+
+    unless defined?(::ActionController::StrongParameters)
+      attr_accessible :api_key, :identifier, :url
+    end
+
+    ## BEFORE & AFTER
+    after_validation :check_if_url_is_valid
+
+
+    def get_last_change
+      result = get_from_remote(LAST_CHANGE_PATH)
+      result["last_change"] unless result.nil?
+    end
+
+    def synchronize
+      after = self.last_updated_at.nil? ? nil : self.last_updated_at.to_s(:db)
+      result = get_from_remote(LOCALIZATIONS_PATH, {:after=>after})
+      unless result.nil?
+        if result.is_a?(Array)
+          result.each do |r|
+            il = IncommingLocalization.new
+            if ::Rails::VERSION::MAJOR<4
+              il = IncommingLocalization.where(:incomming_id=>r["id"]).first_or_initialize
+            else
+              il = IncommingLocalization.find_or_initialize_by(:incomming_id=>r["id"])
+            end
+            il.source = self
+            il.locale_str = r["locale_str"]
+            il.locale = Locale.where(:locale=>il.locale_str).first
+            il.localization_key_str = r["localization_key_str"]
+            il.localization_key = LocalizationKey.where(:localization_key=>il.localization_key_str).first
+            il.save!
+            IncommingLocalization.where(:id=>il.id).update_all ['translated_value=?', r["value"]]
+          end
+          lc = get_last_change
+          lc = DateTime.parse(lc) unless lc.nil?
+          self.last_updated_at = lc || Time.now
+          self.save
+        end
+      end
+    end
+
+    private
+      def check_if_url_is_valid
+        if self.errors.empty? && (self.new_record? || self.url_changed?)
+            self.errors.add(:url, "is not accessible") if get_last_change.nil?
+        end
+      end
+
+      def get_from_remote(path, query_values={})
+        result = nil
+        #begin
+          uri = URI(self.url+path)
+          query_values.each do |k,v|
+            params = URI.decode_www_form(uri.query || []) << [k, v]
+            uri.query = URI.encode_www_form(params)
+          end
+          req = Net::HTTP::Get.new(uri.request_uri)
+          req.add_field("Authorization", %(Token token="#{self.api_key}"))
+          res = Net::HTTP.new(uri.host, uri.port).start do |http|
+            http.request(req)
+          end
+          if res.is_a?(Net::HTTPSuccess)
+            result = JSON.parse(res.body)
+          end
+        #rescue
+        #end
+        result
+      end
+  end
+end

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

@@ -1,11 +1,14 @@
 <%= link_to "Lost in translation", root_path, :class=>'brand' %>
 <ul class="nav">
   <li><%= link_to "Translate!", lit.localization_keys_path %></li>
+  <li><%= link_to "Synchronize", lit.sources_path %></li>
   <li class="dropdown">
     <a href="#" class="dropdown-toggle" data-toggle="dropdown">
       Settings
       <b class="caret"></b>
     </a>
+    <ul class="dropdown-menu">
+    </ul>
     <ul class="dropdown-menu">
       <li><%= link_to "Locales", lit.locales_path %></li>
     </ul>

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

@@ -0,0 +1,47 @@
+<h1>Incomming localizations</h1>
+<div class="row">
+  <span class="pull-right">
+    <%= link_to accept_all_source_incomming_localizations_path(@source), :class=>"btn btn-success", :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", :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>
+
+<table class="table table-bordered table-striped">
+  <tr>
+    <th>Current value</th>
+    <th>Imported value</th>
+    <th width="200px"></th>
+  </tr>
+  <% @incomming_localizations.each do |il| %>
+    <tr>
+      <td colspan="3">
+        <%= image_tag "lit/famfamfam_flags/#{il.locale_str[0,2]}.png" %>
+        <strong><%= il.full_key %></strong>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <% if il.localization %>
+          <%= 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} %>
+      </td>
+      <td>
+        <%= link_to accept_source_incomming_localization_path(@source, il), :class=>"btn btn-success" do %>
+          <%= draw_icon "ok", :class=>"icon-white" %>
+          <%= t('lit.common.accept', :default=>"Accept") %>
+        <% end %>
+        <%= link_to source_incomming_localization_path(@source, il), :class=>"btn btn-danger", :method=>:delete, :data=>{:confirm=>t('lit.common.you_sure', :default=>"Are you sure?")} do %>
+          <%= draw_icon "remove", :class=>"icon-white" %>
+          <%= t('lit.common.reject', :default=>"Reject") %>
+        <% end %>
+      </td>
+    </tr>
+  <% end %>
+</table>

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

@@ -0,0 +1,11 @@
+<%- la = localization -%>
+<% if la.is_a?(Array) %>
+  <ul>
+    <% la.each do |l| %>
+      <li><%= l %></li>
+    <% end %>
+  </ul>
+<% else %>
+  <%= la %>
+<% end %>
+

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

@@ -17,20 +17,28 @@
         <div class="detail_wrapper">
           <table class="table table-bordered table-striped">
             <%- I18n.backend.available_locales.each do |locale| %>
+              <%- localization = lk.localizations.where(:locale_id=>Lit.init.cache.find_locale(locale).id).first %>
               <tr>
-                <%- localization = lk.localizations.where(:locale_id=>Lit.init.cache.find_locale(locale).id).first %>
                 <% unless localization %>
                   <% Lit.init.cache.refresh_key("#{locale}.#{lk.localization_key}") %>
                   <%- localization = lk.localizations.where(:locale_id=>Lit.init.cache.find_locale(locale).id).first %>
                 <% end %>
-                <td class="localization_row" data-id="<%= localization.id%>" data-edit="<%= edit_localization_key_localization_path(lk, localization) %>" data-editing=0 data-content="<%= ejs(Lit.init.cache["#{locale}.#{lk.localization_key}"])%>">
-                  <%= Lit.init.cache["#{locale}.#{lk.localization_key}"] %>
+                <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>
                 <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' if localization.versions.empty?}", :remote=>true do %>
+                      <%= draw_icon 'random', :title=>t('lit.common.previous_versions', :default=>"Previous versions") %>
+                    <% end %>
+                  <% end %>
                 </td>
               </tr>
+              <tr class="hidden localization_versions_row" data-id="<%= localization.id %>">
+                <td colspan="2" class="localization_versions"></td>
+              </tr>
             <% end %>
           </table>
         </div>
@@ -39,9 +47,8 @@
   <% end %>
 
 </table>
-<% begin  %>
+<% if defined?(Kaminari)  %>
   <%= paginate @localization_keys, :theme=>"lit" %>
-<% rescue %>
 <% end %>
 <% content_for(:sidebar) do %>
   <div class="well">

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

@@ -1,6 +1,14 @@
 <%= form_for [@localization_key, @localization], :html=>{:remote=>true} do |f| %>
   <%= f.label :translated_value %>
-  <%= f.text_area :translated_value, :size=>"40x2", :class=>"input-xxlarge" %>
+  <% 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=>"input-xlarge" %></li>
+      <% end %>
+    </ul>
+  <% else %>
+    <%= f.text_area :translated_value, :size=>"40x2", :class=>"input-xxlarge" %>
+  <% end %>
   <button class="btn" type="submit"><%= t('lit.common.update', :default=>"Update") %></button>
   <button class="btn cancel"><%= t('lit.common.cancel', :default=>'Cancel') %></button>
 <% end %>

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

@@ -0,0 +1,15 @@
+<span class="pull-right"><%= draw_icon 'remove', :class=>"close_versions" %></span>
+<table class="table table-condensed">
+  <tr>
+    <th><%= t('lit.common.previous_versions') %></th>
+    <th width="25%"><%= t('lit.common.created_at') %></th>
+  </tr>
+  <% @versions.each do |v| %>
+    <tr>
+      <td>
+        <%= render :partial=>"/lit/localization_keys/localization_row", :locals=>{:localization=>v.translated_value} %>
+      </td>
+      <td><%= v.created_at %></td>
+    </tr>
+  <% end %>
+</table>

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

@@ -0,0 +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}) %>");

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.data('content', "<%= ejs @localization.get_value %>");
-$row.html("<%= @localization.get_value %>");
+$row.html("<%= ejs render(:partial=>"/lit/localization_keys/localization_row", :locals=>{:localization=>@localization.translated_value }) %>");
+$row.siblings().find('.show_prev_versions').removeClass('hidden');

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

@@ -0,0 +1,35 @@
+<%= form_for(@source, :class=>"form-horizontal") do |f| %>
+  <% if @source.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@source.errors.count, "error") %> prohibited this source from being saved:</h2>
+
+      <ul>
+      <% @source.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+  <div class="control-group">
+    <%= f.label :identifier, :class=>"control-label" %>
+    <div class="controls">
+      <%= f.text_field :identifier %>
+    </div>
+  </div>
+  <div class="control-group">
+    <%= f.label :url, :class=>"control-label" %>
+    <div class="controls">
+      <%= f.text_field :url, :placeholder=>"http://your_other_env.host/lit" %>
+    </div>
+  </div>
+  <div class="control-group">
+    <%= f.label :api_key, :class=>"control-label" %>
+    <div class="controls">
+      <%= f.text_field :api_key %>
+    </div>
+  </div>
+
+  <div class="actions">
+    <%= f.submit t('lit.common.save'), :class=>"btn" %>
+  </div>
+<% end %>

data/app/views/lit/sources/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing source</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @source %> |
+<%= link_to 'Back', sources_path %>

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

@@ -0,0 +1,36 @@
+<h1>Synchronization sources</h1>
+
+<table class="table">
+  <tr>
+    <th>Identifier</th>
+    <th>Last synchronization</th>
+    <th>Last change (remote)</th>
+    <th width="80px"></th>
+  </tr>
+
+<% @sources.each do |source| %>
+  <tr>
+    <td><%= link_to source.identifier, lit.source_path(source) %></td>
+    <td><%= source.last_updated_at.to_s(:db) unless source.last_updated_at.nil? %></td>
+    <td><%= source.get_last_change %></td>
+    <td>
+      <%= link_to lit.synchronize_source_path(source), :title=>t('lit.common.synchronize', :default=>"Synchronize") do %>
+        <%= draw_icon 'refresh' %>
+      <% end %>
+      <%= link_to lit.source_path(source), :title=>t('lit.common.show', :default=>"Show") do %>
+        <%= draw_icon 'zoom-in' %>
+      <% end %>
+      <%= link_to lit.edit_source_path(source), :title=>t('lit.common.edit', :default=>"Edit") do %>
+        <%= draw_icon 'pencil' %>
+      <% end %>
+      <%= link_to lit.source_path(source), :method => :delete, :data => { :confirm => 'Are you sure?' }, :title=>t('lit.common.delete', :default=>"Delete") do %>
+        <%= draw_icon 'trash' %>
+      <% end %>
+    </td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New Source', new_source_path %>

data/app/views/lit/sources/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New source</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', sources_path %>