lit 0.2.1 → 0.2.2

data/README.md

@@ -47,7 +47,7 @@ You may want to take a look at generated initializer in `config/initializers/lit
 * ~~API~~
 * ~~Synchronization between environments~~
 * Rewrite initializer
-* Rewrite exporter (which is now code from copycopter)
+* ~~Rewrite exporter (which is now code from copycopter)~~
 * ~~Support for array types (ie. `date.abbr_day_names`)~~
 * ~~Generator~~
 * ~~Support for wysiwyg~~

data/app/assets/javascripts/lit/application.js

@@ -12,8 +12,6 @@
 //
 //= require jquery
 //= require jquery_ujs
-// require jquery-ui
-//= require bootstrap
 //= require_tree .
 
 $(document).ready(function(){

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

@@ -8,7 +8,6 @@
  * 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 './bootstrap_and_overrides.css'
  *= require './jquery-te-1.4.0.css'
  *= require_self
  */
@@ -16,7 +15,7 @@
   padding: 10px 0 0 50px;
 }
 .detail_wrapper table tr td.locale_row{
-  width: 65px;
+  width: 75px;
 }
 .localization_key_row .localization_keys_options{
   display: none;
@@ -26,7 +25,7 @@
   display: block;
 }
 
-li.key_prefix .icon-chevron-right {
+li.key_prefix .fa-chevron-right {
   float: right;
   margin-top: 2px;
   margin-right: -6px;
@@ -36,3 +35,16 @@ li.key_prefix .icon-chevron-right {
 .hidden{
   display: none;
 }
+i.fa{
+  color: black;
+}
+.nav.nav-stacked>li>a {
+padding: 5px 7px;
+}
+.well{
+  background-color: white;
+  border-radius: 0px;
+}
+.well label{
+  font-weight: normal;
+}

data/app/controllers/lit/localizations_controller.rb

@@ -10,7 +10,7 @@ module Lit
 
     def update
       if @localization.update_attributes(clear_params)
-        Lit.init.cache.refresh_key @localization.full_key
+        Lit.init.cache.update_cache @localization.full_key, @localization.get_value
       end
       @localization.reload
       respond_to :js

data/app/controllers/lit/sources_controller.rb

@@ -24,6 +24,12 @@ module Lit
       redirect_to lit.source_incomming_localizations_path(@source)
     end
 
+    def touch
+      @source = Source.find(params[:id])
+      @source.touch_last_updated_at!
+      redirect_to request.env["HTTP_REFERER"].present? ? :back : @source
+    end
+
     def create
       @source = Source.new(clear_params)
       if @source.save

data/app/helpers/lit/localizations_helper.rb

@@ -1,11 +1,15 @@
 module Lit
   module LocalizationsHelper
     def draw_icon(icon, opts={})
-      raw("<i class=\"icon-#{icon} #{opts[:class]}\" title=\"#{opts[:title]}\" ></i>")
+      raw("<i class=\"fa fa-#{icon} #{opts[:class]}\" title=\"#{opts[:title]}\" ></i>")
     end
 
     def ejs(val)
       escape_javascript val.to_s
     end
+
+    def allow_wysiwyg_editor?(key)
+      Lit.all_translations_are_html_safe || key.to_s =~ /(\b|_|\.)html$/
+    end
   end
-end
+end

data/app/models/lit/incomming_localization.rb

@@ -32,19 +32,19 @@ module Lit
         unless self.locale.present?
           self.locale = Lit::Locale.new
           self.locale.locale = self.locale_str
-          self.locale.save
+          self.locale.save!
         end
         unless self.localization_key.present?
           self.localization_key = Lit::LocalizationKey.new
           self.localization_key.localization_key = self.localization_key_str
-          self.localization_key.save
+          self.localization_key.save!
         end
         unless self.localization.present?
           self.localization = Lit::Localization.new
           self.localization.locale = self.locale
           self.localization.localization_key = self.localization_key
           self.localization.default_value = self.translated_value
-          self.localization.save
+          self.localization.save!
         end
       end
       self.destroy

data/app/models/lit/localization.rb

@@ -24,8 +24,10 @@ module Lit
     end
 
     ## BEFORE & AFTER
-    before_update :update_is_changed
-    before_update :create_version
+    with_options :if=>:translated_value_changed? do |o|
+      o.before_update :update_is_changed
+      o.before_update :create_version
+    end
     after_update :mark_localization_key_completed
 
     def to_s
@@ -33,7 +35,7 @@ module Lit
     end
 
     def full_key
-      "#{self.locale.locale}.#{self.localization_key.localization_key}"
+      [self.locale.locale, self.localization_key.localization_key].join('.')
     end
 
     def get_value
@@ -56,17 +58,26 @@ module Lit
       self.updated_at.to_s(:db)
     end
 
+    def update_default_value(value)
+      return true if persisted? && default_value == value
+      self.default_value = value
+      self.save!
+    end
+
     private
       def update_is_changed
-        self.is_changed = true unless is_changed?
+        unless is_changed?
+          self.is_changed = true
+          @should_mark_localization_key_completed = true
+        end
       end
 
       def mark_localization_key_completed
-        self.localization_key.mark_completed!
+        self.localization_key.mark_completed! if @should_mark_localization_key_completed
       end
 
       def create_version
-        if self.translated_value.present? and (not self.translated_value.nil?)
+        if self.translated_value.present?
           l = self.localization_versions.new
           l.translated_value = self.translated_value_was || self.default_value
         end

data/app/models/lit/localization_key.rb

@@ -15,7 +15,7 @@ module Lit
     ## VALIDATIONS
     validates :localization_key,
               :presence=>true,
-              :uniqueness=>true
+              :uniqueness=>{:if=>:localization_key_changed?}
 
     unless defined?(::ActionController::StrongParameters)
       ## ACCESSIBLE

data/app/models/lit/source.rb

@@ -20,6 +20,7 @@ module Lit
     end
 
     ## BEFORE & AFTER
+    before_create :set_last_updated_at_upon_creation
     after_validation :check_if_url_is_valid
 
 
@@ -50,13 +51,22 @@ module Lit
           end
           lc = get_last_change
           lc = DateTime.parse(lc) unless lc.nil?
-          self.last_updated_at = lc || Time.now
+          touch_last_updated_at(lc)
           self.save
         end
       end
     end
 
+    def touch_last_updated_at!
+      touch_last_updated_at
+      self.save
+    end
+
     private
+      def touch_last_updated_at(time=nil)
+        self.last_updated_at = time || Time.now
+      end
+
       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?
@@ -65,10 +75,10 @@ module Lit
 
       def get_from_remote(path, query_values={})
         result = nil
-        #begin
+        begin
           uri = URI(self.url+path)
           query_values.each do |k,v|
-            params = URI.decode_www_form(uri.query || []) << [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)
@@ -79,9 +89,15 @@ module Lit
           if res.is_a?(Net::HTTPSuccess)
             result = JSON.parse(res.body)
           end
-        #rescue
-        #end
+        rescue
+        end
         result
       end
+
+      def set_last_updated_at_upon_creation
+        if self.last_updated_at.blank?
+          touch_last_updated_at if Lit.set_last_updated_at_upon_creation
+        end
+      end
   end
 end

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

@@ -1,16 +1,23 @@
-<%= 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>
-  </li>
-</ul>
+<div class="navbar-header">
+  <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+    <span class="sr-only">Toggle navigation</span>
+    <span class="icon-bar"></span>
+    <span class="icon-bar"></span>
+    <span class="icon-bar"></span>
+  </button>
+  <%= link_to "Lost in translation", root_path, :class=>'navbar-brand' %>
+</div>
+<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+  <ul class="nav navbar-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">
+        <li><%= link_to "Locales", lit.locales_path %></li>
+      </ul>
+    </li>
+  </ul>

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

@@ -5,30 +5,30 @@
     <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" %>
     <%= csrf_meta_tags %>
   </head>
   <body class="<%= params[:controller] %>">
-    <div class="navbar navbar-fixed-top navbar-inverse">
-      <nav class="navbar-inner">
-        <div class="container">
-          <%= render 'layouts/lit/navigation' %>
-        </div>
-      </nav>
-    </div>
+    <nav class="navbar navbar-default" role="navigation">
+      <%= render 'layouts/lit/navigation' %>
+    </nav>
     <div id="main" class="container <%= params[:action] %>" role="main">
       <div class="row">
         <% if content_for?(:sidebar) %>
-          <div class="span3">
+          <div class="col-lg-3 col-xs-12 col-sm-3 col-md-3">
             <%= yield(:sidebar) %>
           </div>
-          <div class="span9">
+          <div class="col-lg-9 col-xs-12 col-sm-9 col-md-9">
             <%= render 'layouts/lit/messages' %>
             <%= yield %>
           </div>
         <% else %>
-          <div class="span12">
+          <div class="col-lg-12 col-xs-12 col-sm-12 col-md-12">
             <%= render 'layouts/lit/messages' %>
             <%= yield %>
           </div>

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

@@ -1,4 +1,3 @@
-<h1>Dashboard</h1>
 <strong>All localization keys</strong> <%= Lit::LocalizationKey.count(:id) %><br/>
 <% @locales.each do |l| %>
   <strong><%= image_tag "lit/famfamfam_flags/#{l.locale[0,2]}.png" %> <%= t("lit.locale_to_languages.#{l.locale}", :default=>l.locale) %>:</strong> <span title="<%= "#{l.get_changed_localizations_count}/#{l.get_all_localizations_count}" %>"><%= l.get_translated_percentage %>%</span><br/>

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

@@ -1,10 +1,10 @@
 <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 %>
+    <%= 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", :method=>:post, :data=>{:confirm=>t('lit.common.you_sure', :default=>"Are you sure?")} do %>
+    <%= 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>
@@ -33,12 +33,12 @@
         <%= 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" %>
+        <%= link_to accept_source_incomming_localization_path(@source, il), :class=>"btn btn-success btn-sm" 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", :method=>:delete, :data=>{:confirm=>t('lit.common.you_sure', :default=>"Are you sure?")} do %>
-          <%= draw_icon "remove", :class=>"icon-white" %>
+        <%= link_to source_incomming_localization_path(@source, il), :class=>"btn btn-danger btn-sm", :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") %>
         <% end %>
       </td>

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

@@ -3,7 +3,7 @@
 <table class="table table-stripped">
   <tr>
     <th>Locale</th>
-    <th width="100">Options</th>
+    <th width="130">Options</th>
   </tr>
 
 <% @locales.each do |locale| %>

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

@@ -9,10 +9,10 @@
         <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 %>
-            <%= draw_icon lk.is_starred? ? 'star' : 'star-empty' %>
+            <%= 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 %>
-            <%= draw_icon 'trash' %>
+            <%= draw_icon 'trash-o' %>
           <% end %>
         </div>
         <div class="detail_wrapper">
@@ -53,16 +53,18 @@
       <% if @search_options.has_key?(:key_prefix) %>
         <%= hidden_field_tag :key_prefix, @search_options[:key_prefix] %>
       <% end %>
-      <div class="input-append">
-        <%= text_field_tag :key, @search_options[:key], :class=>"input-medium search-query" %>
-        <button type="submit" class="btn"><%= t('.search', :default=>"Search") %></button>
+      <div class="input-group">
+        <%= text_field_tag :key, @search_options[:key], :class=>"form-control search-query" %>
+        <div class="input-group-btn">
+          <button type="submit" class="btn btn-default"><%= draw_icon 'search' %></button>
+        </div>
       </div>
       <label class="checkbox">
         <%= check_box_tag :include_completed, '1', @search_options[:include_completed].to_i==1 %>
         <%= t('.is_completed', :default=>"Include completed") %>
       </label>
     <% end %>
-    <ul class="nav nav-list ">
+    <ul class="nav nav-pills nav-stacked">
       <li class="<%= "active" if params[:action]=='index' %>">
         <%= link_to lit.localization_keys_path do -%>
           <%= draw_icon 'list' %>

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

@@ -1 +1 @@
-$('tr.localization_key_row[data-id="<%= @localization_key.id %>"] a.star_icon').html("<%= ejs(draw_icon(@localization_key.is_starred? ? 'star' : 'star-empty')) %>");
+$('tr.localization_key_row[data-id="<%= @localization_key.id %>"] a.star_icon').html("<%= ejs(draw_icon(@localization_key.is_starred? ? 'star' : 'star-o')) %>");

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

@@ -1,20 +1,23 @@
 <%= form_for [@localization_key, @localization], :html=>{:remote=>true} do |f| %>
-  <%= f.label :translated_value %>
+  <%- 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=>"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=>"input-xxlarge" %>
-    <br />
-    <label>
-      <input type="checkbox" class="wysiwyg_switch" /> use wysiwyg editor
-    </label>
+    <%= f.text_area :translated_value, :size=>"40x2", :class=>"form-control input-xxlarge" %>
+    <% if allow_wysiwyg_editor?(@localization_key.localization_key) %>
+      <br />
+      <label>
+        <input type="checkbox" class="wysiwyg_switch" /> use wysiwyg editor
+      </label>
+      <br />
+    <% end %>
   <% end %>
 
-  <button class="btn" type="submit"><%= t('lit.common.update', :default=>"Update") %></button>
-  <button class="btn cancel"><%= t('lit.common.cancel', :default=>'Cancel') %></button>
+  <button class="btn btn-primary btn-sm" type="submit"><%= t('lit.common.update', :default=>"Update") %></button>
+  <button class="btn btn-default btn-sm"><%= t('lit.common.cancel', :default=>'Cancel') %></button>
 <% end %>
 

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

@@ -1,4 +1,4 @@
-<span class="pull-right"><%= draw_icon 'remove', :class=>"close_versions" %></span>
+<span class="pull-right"><%= draw_icon 'times', :class=>"close_versions" %></span>
 <table class="table table-condensed">
   <tr>
     <th><%= t('lit.common.previous_versions') %></th>

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

@@ -13,23 +13,23 @@
   <div class="control-group">
     <%= f.label :identifier, :class=>"control-label" %>
     <div class="controls">
-      <%= f.text_field :identifier %>
+      <%= f.text_field :identifier, :class=>"form-control" %>
     </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" %>
+      <%= f.text_field :url, :placeholder=>"http://your_other_env.host/lit", :class=>"form-control" %>
     </div>
   </div>
   <div class="control-group">
     <%= f.label :api_key, :class=>"control-label" %>
     <div class="controls">
-      <%= f.text_field :api_key %>
+      <%= f.text_field :api_key, :class=>"form-control" %>
     </div>
   </div>
 
   <div class="actions">
-    <%= f.submit t('lit.common.save', :default => "Save"), :class=>"btn" %>
+    <%= f.submit t('lit.common.save', :default => "Save"), :class=>"btn btn-primary btn-sm" %>
   </div>
 <% end %>

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

@@ -23,8 +23,11 @@
       <%= link_to lit.edit_source_path(source), :title=>t('lit.common.edit', :default=>"Edit") do %>
         <%= draw_icon 'pencil' %>
       <% end %>
+      <%= link_to lit.touch_source_path(source), :title=>t('lit.common.touch', :default=>"Touch (update) last_updated_at"), :method => :put, :data => { :confirm => 'Are you sure?' } do %>
+        <%= draw_icon 'clock-o' %>
+      <% 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' %>
+        <%= draw_icon 'trash-o' %>
       <% end %>
     </td>
   </tr>

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

@@ -11,6 +11,7 @@
 <br/>
 <strong>Last updated at:</strong>
 <%= @source.last_updated_at.to_s(:db) unless @source.last_updated_at.nil? %>
+<%= link_to '(touch!)', touch_source_path(@source), :method => :put, :data => { :confirm => 'Are you sure?' } %>
 <br/>
 
 

data/config/routes.rb

@@ -32,6 +32,7 @@ Lit::Engine.routes.draw do
   resources :sources do
     member do
       get :synchronize
+      put :touch
     end
     resources :incomming_localizations, :only=>[:index, :destroy] do
       member do

data/lib/generators/lit/install/templates/initializer.rb

@@ -11,6 +11,9 @@ Lit.key_value_engine = "<%= @key_value_engine %>"
 # supported at the moment)
 # Lit.storage_options = { :prefix=>"my_project" }
 
+# If true all translations are returned as html_safe strings
+Lit.all_translations_are_html_safe = false
+
 # Translations without default will be humanized (default string will be added)
 # ie. scope.page_header will become "Page header"
 # If `false` then will serve nil instead (but translation will be wrapped in
@@ -28,6 +31,10 @@ Lit.api_enabled = false
 # API key is required to authorize third party, if API is enabled
 Lit.api_key = "<%= @api_key %>"
 
+# If true, last_updated_at column of synchronizaton source will be set to now
+# upon record creation
+Lit.set_last_updated_at_upon_creation = true
+
 # Initialize lit
 Lit.init
 

data/lib/lit.rb

@@ -9,6 +9,9 @@ module Lit
   mattr_accessor :fallback
   mattr_accessor :api_enabled
   mattr_accessor :api_key
+  mattr_accessor :all_translations_are_html_safe
+  mattr_accessor :set_last_updated_at_upon_creation
+
   class << self
     attr_accessor :loader
   end

data/lib/lit/adapters/redis_storage.rb

@@ -13,26 +13,32 @@ module Lit
     def [](key)
       if Lit.redis.exists(_prefixed_key_for_array(key))
         Lit.redis.lrange(_prefixed_key(key), 0, -1)
+      elsif Lit.redis.exists(_prefixed_key_for_nil(key))
+        nil
       else
         Lit.redis.get(_prefixed_key(key))
       end
     end
 
     def []=(k, v)
+
+      delete(k)
       if v.is_a?(Array)
-        delete(k)
         Lit.redis.set(_prefixed_key_for_array(k), "1")
         v.each do |ve|
           Lit.redis.rpush(_prefixed_key(k), ve.to_s)
         end
+      elsif v.nil?
+        Lit.redis.set(_prefixed_key_for_nil(k), "1")
+        Lit.redis.set(_prefixed_key(k), "")
       else
-        Lit.redis.del(_prefixed_key_for_array(k))
-        Lit.redis.set(_prefixed_key(k), v) unless v.nil?
+        Lit.redis.set(_prefixed_key(k), v)
       end
     end
 
     def delete(k)
       Lit.redis.del(_prefixed_key_for_array(k))
+      Lit.redis.del(_prefixed_key_for_nil(k))
       Lit.redis.del(_prefixed_key(k))
     end
 
@@ -72,5 +78,8 @@ module Lit
       def _prefixed_key_for_array(key="")
         _prefix+"array_flags:"+key.to_s
       end
+      def _prefixed_key_for_nil(key="")
+        _prefix+"nil_flags:"+key.to_s
+      end
   end
 end

data/lib/lit/cache.rb

@@ -40,7 +40,6 @@ module Lit
     end
 
     def has_key?(key)
-      # @TODO: change into correct has_key? call
       @localizations.has_key?(key)
     end
 
@@ -60,6 +59,11 @@ module Lit
       @localizations[key] = localization.get_value if localization
     end
 
+    def update_cache(key, value)
+      key = key.to_s
+      @localizations[key] = value
+    end
+
     def delete_locale(key)
       key = key.to_s
       locale_key, key_without_locale = split_key(key)
@@ -67,16 +71,12 @@ module Lit
       delete_localization(locale, key_without_locale)
     end
 
-    def load_all_translations(oninit=false)
-      doinit = false
+    def load_all_translations
       first = Localization.order('id ASC').first
       last = Localization.order('id DESC').first
       if not first or not last or (not @localizations.has_key?(first.full_key) or
         not @localizations.has_key?(last.full_key))
-        doinit = true
-      end
 
-      if oninit==false || doinit==true
         Localization.includes([:locale, :localization_key]).find_each do |l|
           @localizations[l.full_key] = l.get_value
         end
@@ -123,27 +123,36 @@ module Lit
 
     # this comes directly from copycopter.
     def export
-      keys = {}
       reset
+      localizations_scope = Lit::Localization
+      unless ENV['LOCALES'].blank?
+        locale_keys = ENV['LOCALES'].to_s.split(',') || []
+        locale_ids = Lit::Locale.where(locale: locale_keys).pluck(:id)
+        localizations_scope = localizations_scope.where(locale_id: locale_ids) unless locale_ids.empty?
+      end
       db_localizations = {}
-      Lit::Localization.find_each do |l|
+      localizations_scope.find_each do |l|
         db_localizations[l.full_key] = l.get_value
       end
-      db_localizations.sort.each do |(l_key, value)|
-        current = keys
-        yaml_keys = l_key.split('.')
-
-        0.upto(yaml_keys.size - 2) do |i|
-          key = yaml_keys[i]
-          # Overwrite en.key with en.sub.key
-          unless current[key].class == Hash
-            current[key] = {}
-          end
-          current = current[key]
+      keys = nested_string_keys_to_hash(db_localizations)
+      keys.to_yaml
+    end
+
+    def nested_string_keys_to_hash(db_localizations)
+      # http://subtech.g.hatena.ne.jp/cho45/20061122
+      deep_proc = Proc.new { |k, s, o|
+        if s.kind_of?(Hash) && o.kind_of?(Hash)
+          next s.merge(o, &deep_proc)
         end
-        current[yaml_keys.last] = value
+        next o
+      }
+      keys = {}
+      db_localizations.sort.each do |k,v|
+        key_parts = k.to_s.split('.')
+        converted = key_parts.reverse.inject(v) { |a, n| { n => a } }
+        keys.merge!(converted, &deep_proc)
       end
-      keys.to_yaml
+      keys
     end
 
     def get_global_hits_counter(key)
@@ -196,8 +205,7 @@ module Lit
               value = key_without_locale.split('.').last.humanize if value.nil? &&
                                                                     Lit.humanize_key
             end
-            localization.default_value = value
-            localization.save!
+            localization.update_default_value(value)
           end
           return localization
         else
@@ -205,9 +213,16 @@ module Lit
         end
       end
 
+      def find_localization_for_delete(locale, key_without_locale)
+        localization_key = find_localization_key_for_delete(key_without_locale)
+        return nil unless localization_key
+        Lit::Localization.where(:locale_id=>locale.id).
+            where(:localization_key_id=>localization_key.id).first
+      end
+
       def delete_localization(locale, key_without_locale)
-        localization = find_localization(locale, key_without_locale)
-        if localization.persisted?
+        localization = find_localization_for_delete(locale, key_without_locale)
+        if localization
           @localizations.delete("#{locale.locale}.#{key_without_locale}")
           @localization_keys.delete(key_without_locale)
           localization.destroy # or localization.default_value = nil; localization.save!
@@ -231,6 +246,8 @@ module Lit
             end
           when String then
             new_value = v
+          when Hash then
+            new_value = nil
           when Proc then
             new_value = nil # was v.call - requires more love
           else
@@ -248,6 +265,12 @@ module Lit
         end
       end
 
+      def find_localization_key_for_delete(key_without_locale)
+        @localization_keys ||= Lit.get_key_value_engine
+        lk = Lit::LocalizationKey.find_by_id(@localization_keys[key_without_locale]) if @localization_keys.has_key?(key_without_locale)
+        lk || Lit::LocalizationKey.where(:localization_key=>key_without_locale).first
+      end
+
       def split_key(key)
         key.split('.', 2)
       end

data/lib/lit/engine.rb

@@ -1,4 +1,3 @@
-require 'bootstrap-sass'
 module Lit
   class Engine < ::Rails::Engine
     isolate_namespace Lit

data/lib/lit/i18n_backend.rb

@@ -12,7 +12,7 @@ module Lit
 
     def translate(locale, key, options = {})
       content = super(locale, key, options.merge(:fallback => true))
-      if content.respond_to?(:html_safe)
+      if Lit.all_translations_are_html_safe && content.respond_to?(:html_safe)
         content.html_safe
       else
         content
@@ -43,14 +43,26 @@ module Lit
       content = @cache[key_with_locale] || super
       return content if parts.size <= 1
 
-      newly_created = false
       unless @cache.has_key?(key_with_locale)
-        @cache.init_key_with_value(key_with_locale, content)
-        newly_created = true
-      end
-      if content.nil? || (newly_created && options[:default].present?)
-        @cache[key_with_locale] = options[:default]
-        content = @cache[key_with_locale]
+        new_content = @cache.init_key_with_value(key_with_locale, content)
+        content = new_content if content.nil? # Content can change when Lit.humanize is true for example
+
+        if content.nil? && options[:default].present?
+          if options[:default].is_a?(Array)
+            default = options[:default].map do |key|
+              if key.is_a?(Symbol)
+                I18n.normalize_keys(nil, key.to_s, options[:scope], options[:separator]).join('.').to_sym
+              else
+                key
+              end
+            end
+          else
+            default = options[:default]
+          end
+
+          @cache[key_with_locale] = default
+          content = @cache[key_with_locale]
+        end
       end
       ## return translated content
       content
@@ -75,17 +87,5 @@ module Lit
       super
     end
 
-    def default(locale, object, subject, options = {})
-      content = super(locale, object, subject, options)
-      if content.respond_to?(:to_str)
-        parts = I18n.normalize_keys(locale, object, options[:scope], options[:separator])
-        if parts.size > 1
-          key = parts.join('.')
-          @cache[key] = content
-        end
-      end
-      content
-    end
-
   end
 end

data/lib/lit/version.rb

@@ -1,3 +1,3 @@
 module Lit
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/tasks/lit_tasks.rake

@@ -1,8 +1,5 @@
-# desc "Explaining what the task does"
-# task :lit do
-#   # Task goes here
-# end
 namespace :lit do
+  desc "Exports translated strings from lit to config/locales/lit.yml file."
   task :export => :environment do
     if yml = Lit.init.cache.export
       PATH = "config/locales/lit.yml"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lit
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,22 +59,6 @@ dependencies:
     - - ! '>'
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: bootstrap-sass
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -388,7 +372,6 @@ files:
 - app/assets/javascripts/lit/jquery-te-1.4.0.min.js
 - app/assets/javascripts/lit/localizations.js.coffee
 - app/assets/stylesheets/lit/application.css
-- app/assets/stylesheets/lit/bootstrap_and_overrides.css.scss
 - app/assets/stylesheets/lit/dashboard.css
 - app/assets/stylesheets/lit/jquery-te-1.4.0.css.scss
 - app/controllers/lit/api/v1/base_controller.rb
@@ -487,7 +470,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: Database powered i18n backend with web gui

data/app/assets/stylesheets/lit/bootstrap_and_overrides.css.scss

@@ -1,43 +0,0 @@
-// Set the correct sprite paths
-$iconSpritePath: asset-path('glyphicons-halflings.png', image);
-$iconWhiteSpritePath: asset-path('glyphicons-halflings-white.png', image);
-$baseFontSize: 13px;
-$baseLineHeight: 18px;
-@import "bootstrap";
-body { padding-top: 60px; }
-@import "bootstrap-responsive";
-
-.btn-invite {
-  &:active, &.active {
-    background-color: #99cc99; } }
-
-.btn-save {
-  &:active, &.active {
-    background-color: #cccc66; } }
-
-.btn-discard {
-  &:active, &.active {
-    background-color: #cc9999; } }
-h1 { font-size: 30px; line-height: 36px; }
-h2 { font-size: 24px; line-height: 36px; }
-h3 { font-size: 18px; line-height: 27px; }
-h4 { font-size: 14px; line-height: 18px; }
-h5 { font-size: 12px; line-height: 18px; }
-h6 { font-size: 11px; line-height: 18px; }
-
-h1 small { font-size: 18px; }
-h2 small { font-size: 18px; }
-h3 small { font-size: 14px; }
-h4 small { font-size: 12px; }
-h1, h2, h3, h4, h5, h6 {
-    color: inherit;
-    font-family: inherit;
-    font-weight: bold;
-    margin: 0;
-    text-rendering: optimizelegibility;
-}
-h6 {
-    color: #999999;
-    font-size: 11px;
-    text-transform: uppercase;
-}