lit 0.0.4.2 → 0.0.4.3

data/README.md

@@ -60,7 +60,7 @@ mount Lit::Engine => "/lit"
 * Better cache
 * Support for other key value providers (ie. Redis does not support Array types in easy way)
 * Integration with ActiveAdmin
-
+* Add versioning 
 
 ### License
 

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

@@ -12,7 +12,7 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require jquery-ui
+// require jquery-ui
 //= require bootstrap
 //= require_tree .
 

data/app/controllers/lit/application_controller.rb

@@ -1,6 +1,8 @@
 module Lit
   class ApplicationController < ActionController::Base
     before_filter :authenticate
+    before_filter :stop_hits_counter
+    after_filter :restore_hits_counter
 
     private
       def authenticate
@@ -8,5 +10,13 @@ module Lit
           send(Lit.authentication_function)
         end
       end
+
+      def stop_hits_counter
+        Lit.init.cache.stop_hits_counter
+      end
+
+      def restore_hits_counter
+        Lit.init.cache.restore_hits_counter
+      end
   end
 end

data/app/controllers/lit/dashboard_controller.rb

@@ -1,7 +1,7 @@
 require_dependency "lit/application_controller"
 
 module Lit
-  class DashboardController < ApplicationController
+  class DashboardController < ::Lit::ApplicationController
     def index
       @locales = Lit::Locale.ordered
     end

data/app/controllers/lit/locales_controller.rb

@@ -0,0 +1,31 @@
+require_dependency "lit/application_controller"
+
+module Lit
+  class LocalesController < ApplicationController
+    def index
+      @locales = Locale.ordered.all
+  
+      respond_to do |format|
+        format.html # index.html.erb
+        format.json { render json: @locales }
+      end
+    end
+    
+    def hide
+      @locale = Locale.find(params[:id])
+      @locale.is_hidden = !@locale.is_hidden?
+      @locale.save
+      respond_to :js
+    end
+  
+    def destroy
+      @locale = Locale.find(params[:id])
+      @locale.destroy
+  
+      respond_to do |format|
+        format.html { redirect_to locales_url }
+        format.json { head :no_content }
+      end
+    end
+  end
+end

data/app/controllers/lit/localization_keys_controller.rb

@@ -1,5 +1,5 @@
 module Lit
-  class LocalizationKeysController < ApplicationController
+  class LocalizationKeysController < ::Lit::ApplicationController
     before_filter :get_localization_scope, :except=>[:destroy]
 
     def index

data/app/controllers/lit/localizations_controller.rb

@@ -1,5 +1,5 @@
 module Lit
-  class LocalizationsController < ApplicationController
+  class LocalizationsController < ::Lit::ApplicationController
     before_filter :find_localization_key
     before_filter :find_localization
 

data/app/models/lit/locale.rb

@@ -3,6 +3,7 @@ module Lit
 
     ## SCOPES
     scope :ordered, proc{ order('locale ASC') }
+    scope :visible, proc{ where(:is_hidden=>false) }
 
     ## ASSOCIATIONS
     has_many :localizations, :dependent=>:destroy

data/app/models/lit/localization_key.rb

@@ -1,5 +1,6 @@
 module Lit
   class LocalizationKey < ActiveRecord::Base
+    attr_accessor :interpolated_key
 
     ## SCOPES
     scope :completed, proc{ where(:is_completed=>true) }
@@ -25,11 +26,10 @@ module Lit
     end
 
     def clone_localizations
-      first_localization = self.localizations.first
       new_created = false
       Lit::Locale.find_each do |locale|
         self.localizations.where(:locale_id=>locale.id).first_or_create do |l|
-          l.default_value = first_localization.get_value
+          l.default_value = interpolated_key
           new_created = true
         end
       end

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

@@ -1,4 +1,13 @@
 <%= link_to "Lost in translation", root_path, :class=>'brand' %>
 <ul class="nav">
   <li><%= link_to "Translate!", lit.localization_keys_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/lit/locales/_hide_link.html.erb

@@ -0,0 +1 @@
+<%= link_to locale.is_hidden? ? 'Show' : 'Hide', hide_locale_path(locale), :method=>:put, :remote=>true %>

data/app/views/lit/locales/hide.js.erb

@@ -0,0 +1 @@
+$('#hide_link_<%= @locale.id %>').html("<%= j render(:partial=>"hide_link", :locals=>{:locale=>@locale}) %>");

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

@@ -0,0 +1,20 @@
+<h1>Listing locales</h1>
+
+<table class="table table-stripped">
+  <tr>
+    <th>Locale</th>
+    <th width="100">Options</th>
+  </tr>
+
+<% @locales.each do |locale| %>
+  <tr>
+    <td><%= locale %></td>
+    <td>
+      <span id="hide_link_<%= locale.id %>"><%= render :partial=>"hide_link", :locals=>{:locale=>locale} %></span>
+      <%= link_to 'Destroy', locale, method: :delete, data: { confirm: 'Are you sure?' } %>
+    </td>
+  </tr>
+<% end %>
+</table>
+
+

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

@@ -5,6 +5,7 @@
     <tr class="localization_key_row" data-id="<%= lk.id %>">
       <td>
         <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 %>
             <%= draw_icon lk.is_starred? ? 'star' : 'star-empty' %>
@@ -19,11 +20,11 @@
               <tr>
                 <%- localization = lk.localizations.where(:locale_id=>Lit.init.cache.find_locale(locale).id).first %>
                 <% unless localization %>
-                  <%- lk.clone_localizations %>
+                  <% 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}"] || localization.get_value %>
+                  <%= Lit.init.cache["#{locale}.#{lk.localization_key}"] %>
                 </td>
                 <td class="locale_row">
                   <%= image_tag "lit/famfamfam_flags/#{locale[0,2]}.png" %>

data/config/routes.rb

@@ -1,5 +1,8 @@
 Lit::Engine.routes.draw do
 
+  resources :locales, :only=>[:index, :destroy] do
+    put :hide, :on=>:member
+  end
   resources :localization_keys, :only=>[:index, :destroy] do
     member do
       get :star

data/db/migrate/20130511111904_add_is_hidden_to_locales.rb

@@ -0,0 +1,5 @@
+class AddIsHiddenToLocales < ActiveRecord::Migration
+  def change
+    add_column :lit_locales, :is_hidden, :boolean, :default=>false
+  end
+end

data/lib/lit.rb

@@ -5,12 +5,16 @@ module Lit
   mattr_accessor :authentication_function
   mattr_accessor :key_value_engine
   mattr_accessor :storage_options
+  mattr_accessor :humanize_key
+  mattr_accessor :fallback
   class << self
     attr_accessor :loader
   end
   def self.init
-    if self.loader.nil?
+    @@table_exists ||= Lit::Locale.table_exists?
+    if self.loader.nil? && @@table_exists
       self.loader ||= Loader.new
+      Lit.humanize_key = true if Lit.humanize_key.nil?
       #if loading all translations on start, migrations have to be performed
       #already, fails on first deploy
       #self.loader.cache.load_all_translations

data/lib/lit/adapters/hash_storage.rb

@@ -1,4 +1,8 @@
 module Lit
   class HashStorage < Hash
+    def incr(key)
+      self.[key] ||= 0
+      self.[key] += 1
+    end
   end
 end

data/lib/lit/adapters/redis_storage.rb

@@ -2,9 +2,8 @@ require 'redis'
 module Lit
   extend self
   def redis
-    return @redis if @redis
-    @redis = Redis.connect(:thread_safe => true)
-    @redis
+    $redis = Redis.connect unless $redis
+    $redis
   end
   class RedisStorage
     def initialize
@@ -19,9 +18,12 @@ module Lit
       Lit.redis.set(_prefixed_key(k).to_s, v.to_s)
     end
 
+    def delete(k)
+      Lit.redis.del k
+    end
+
     def clear
-      Lit.redis.del self.keys
-      save
+      Lit.redis.del(self.keys) if self.keys.length > 0
     end
 
     def keys
@@ -32,6 +34,16 @@ module Lit
       Lit.redis.exists(_prefixed_key(key))
     end
 
+    def incr(key)
+      Lit.redis.incr(_prefixed_key(key))
+    end
+
+    def sort
+      Lit.redis.keys.sort.map do |k|
+        [k, self.[](k)]
+      end
+    end
+
     private
       def _prefixed_key(key="")
         prefix = "lit:"

data/lib/lit/cache.rb

@@ -3,10 +3,13 @@ module Lit
 
     def initialize
       @localizations = Lit.get_key_value_engine
+      @hits_counter = Lit.get_key_value_engine
+      @hits_counter_working = true
     end
 
     def [](key)
-      @localizations[key]
+      update_hits_count(key)
+      @localizations[key] 
     end
 
     def []=(key, value)
@@ -22,34 +25,44 @@ module Lit
     end
 
     def update_locale(key, value)
+      key = key.to_s
       locale_key, key_without_locale = split_key(key)
-      #Lit.init.logger.info "key: #{key}"
-      #Lit.init.logger.info "key_without_locale: #{key_without_locale}"
-      #Lit.init.logger.info "value: #{value}"
       locale = find_locale(locale_key)
       localization = find_localization(locale, key_without_locale, value)
-      @localizations[key] = localization.get_value
+      @localizations[key] = localization.get_value if localization
     end
 
-    def load_all_translations
+    def load_all_translations(oninit=false)
       Lit.init.logger.info "loading all translations"
-      Localization.includes([:locale, :localization_key]).find_each do |l|
-        @localizations[l.full_key] = l.get_value
+      doinit = false
+      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
       end
     end
 
     def refresh_key(key)
+      key = key.to_s
       Lit.init.logger.info "refreshing key: #{key}"
       locale_key, key_without_locale = split_key(key)
       locale = find_locale(locale_key)
       localization = find_localization(locale, key_without_locale)
-      @localizations[key] = localization.get_value
+      @localizations[key] = localization.get_value if localization
     end
 
     def delete_key(key)
+      key = key.to_s
       Lit.init.logger.info "deleting key: #{key}"
       @localizations.delete(key)
-      locale_key, key_without_locale = split_key(key)
+      key_without_locale = split_key(key).last
       @localization_keys.delete(key_without_locale)
       I18n.backend.reload!
     end
@@ -57,11 +70,14 @@ module Lit
     def reset
       @locale_cache = {}
       @localizations = Lit.get_key_value_engine
+      @localizations.clear
       @localization_keys = Lit.get_key_value_engine
+      @localization_keys.clear
       load_all_translations
     end
 
     def find_locale(locale_key)
+      locale_key = locale_key.to_s
       @locale_cache ||= {}
       unless @locale_cache.has_key?(locale_key)
         #Lit.init.logger.info "looking for locale: #{locale_key}"
@@ -76,7 +92,11 @@ module Lit
     def export
       keys = {}
       reset
-      @localizations.sort.each do |(l_key, value)|
+      db_localizations = {}
+      Lit::Localization.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('.')
 
@@ -93,61 +113,93 @@ module Lit
       keys.to_yaml
     end
 
+    def get_global_hits_counter(key)
+      @hits_counter['global_hits_counter.'+key]
+    end
+
+    def get_hits_counter(key)
+      @hits_counter['hits_counter.'+key]
+    end
+
+    def stop_hits_counter
+      @hits_counter_working = false
+    end
+
+    def restore_hits_counter
+      @hits_counter_working = true
+    end
+
     private
 
       def find_localization(locale, key_without_locale, value=nil)
         unless value.is_a?(Hash)
           localization_key = find_localization_key(key_without_locale)
-          create = false
           localization = Lit::Localization.where(:locale_id=>locale.id).
                             where(:localization_key_id=>localization_key.id).first_or_create do |l|
             if value.is_a?(Array)
-              if value.length > 1
-                new_value = nil
-                value_clone = value.dup
-                while v = value_clone.pop
-                  lk = Lit::LocalizationKey.where(:localization_key=>v).first
-                  if lk
-                    loca = Lit::Localization.where(:locale_id=>locale.id).
-                                where(:localization_key_id=>lk.id).first
-                    new_value = loca.get_value if loca and loca.get_value.present?
-
+              new_value = nil
+              value_clone = value.dup
+              while (v = value_clone.shift) && v.present?
+                pv = parse_value(v, locale)
+                new_value = pv unless pv.nil?
+              end
+              value = new_value
+            else
+              value = parse_value(value, locale) unless value.nil?
+            end
+            if value.nil?
+              if Lit.fallback
+                @locale_cache.keys.each do |lc|
+                  if lc != locale.locale
+                    nk = "#{lc}.#{key_without_locale}"
+                    v = @localizations[nk]
+                    value = v if v.present? and value.nil?
                   end
                 end
-                value = new_value.nil? ? value.last : new_value
-              else
-                value = value.first
               end
+              value = key_without_locale.split('.').last.humanize if value.nil? && 
+                                                                    Lit.humanize_key
             end
-            l.default_value = value.to_s
-            #Lit.init.logger.info "creating new localization: #{key_without_locale}"
-            #Lit.init.logger.info "creating new localization with value: #{value}"
-            #Lit.init.logger.info "creating new localization with value: #{value.class}"
-            create = true
+            l.default_value = value
           end
-          localization_key.clone_localizations if create and localization_key.localizations.count(:id)==1
           localization
         else
           Lit.init.logger.info "returning value for hash: #{key_without_locale}: #{value.to_s}"
-          l = Localization.new
-          l.default_value = value
-          l
+          nil
         end
       end
 
+      ## checks parameter type and returns value basing on it
+      ## symbols are beeing looked up in db
+      ## string are returned directly
+      ## procs are beeing called (once)
+      ## hashes are converted do string (for now)
+      def parse_value(v, locale)
+        new_value = nil
+        case v
+          when Symbol then
+            lk = Lit::LocalizationKey.where(:localization_key=>v.to_s).first
+            if lk
+              loca = Lit::Localization.where(:locale_id=>locale.id).
+                          where(:localization_key_id=>lk.id).first
+              new_value = loca.get_value if loca and loca.get_value.present?
+            end
+          when String then
+            new_value = v
+          when Proc then
+            new_value = v.call
+          else
+            new_value = v.to_s
+        end
+        new_value
+      end
+
       def find_localization_key(key_without_locale)
         @localization_keys ||= Lit.get_key_value_engine
         unless @localization_keys.has_key?(key_without_locale)
-          localization_key = Lit::LocalizationKey.where(:localization_key=>key_without_locale).first_or_create!
-          @localization_keys[key_without_locale] = localization_key.id
-          #Lit.init.logger.info "creating key: #{key_without_locale} with id #{localization_key.id}"
-          localization_key
+          find_or_create_localization_key(key_without_locale)
         else
-          #Lit.init.logger.info "current keys: #{@localization_keys.keys}"
-          #Lit.init.logger.info "And I was looking for key: #{key_without_locale}"
-          #Lit.init.logger.info "And store has currently #{@localization_keys[key_without_locale]}"
-          #Lit.init.logger.info Lit::LocalizationKey.all
-          Lit::LocalizationKey.find(@localization_keys[key_without_locale])
+          Lit::LocalizationKey.find_by_id(@localization_keys[key_without_locale]) || find_or_create_localization_key(key_without_locale)
         end
       end
 
@@ -158,5 +210,20 @@ module Lit
         [locale_key, key_without_locale]
       end
 
+      def find_or_create_localization_key(key_without_locale)
+        #Lit.init.logger.info "creating key: #{key_without_locale} with id #{localization_key.id}"
+        localization_key = Lit::LocalizationKey.where(:localization_key=>key_without_locale).first_or_create! 
+        @localization_keys[key_without_locale] = localization_key.id
+        localization_key
+      end
+
+      def update_hits_count(key)
+        if @hits_counter_working 
+          key_without_locale = split_key(key).last
+          @hits_counter.incr('hits_counter.'+key)
+          @hits_counter.incr('global_hits_counter.'+key_without_locale)
+        end
+      end
+
   end
 end

data/lib/lit/i18n_backend.rb

@@ -18,14 +18,13 @@ module Lit
     end
 
     def available_locales
-      Lit::Locale.ordered.all.map{|l| l.locale.to_sym }
+      Lit::Locale.ordered.visible.all.map{|l| l.locale.to_sym }
     end
 
     # Stores the given translations.
     #
     # @param [String] locale the locale (ie "en") to store translations for
     # @param [Hash] data nested key-value pairs to be added as blurbs
-    # @param [Hash] options unused part of the I18n API
     def store_translations(locale, data, options = {})
       super
       #Lit.init.logger.info "store translation: #{locale}, data: #{data}, options: #{options}"
@@ -36,13 +35,18 @@ module Lit
     private
 
     def lookup(locale, key, scope = [], options = {})
-      #Lit.init.logger.info "lookup translation: #{key}, scope: #{scope}, options: #{options}"
       parts = I18n.normalize_keys(locale, key, scope, options[:separator])
       key_with_locale = parts.join('.')
+      
+      ## check in cache or in simple backend
       content = @cache[key_with_locale] || super
-      #Lit.init.logger.info "options[:default]: #{options[:default].class}"
-      #Lit.init.logger.info "options[:default]: #{options[:default]}"
-      @cache[key_with_locale] = (options[:default] || "") if content.nil?
+      
+      ## store value if not found
+      if content.nil?
+        @cache[key_with_locale] = options[:default] 
+        content = @cache[key_with_locale] 
+      end
+      ## return translated content
       content
     end
 

data/lib/lit/version.rb

@@ -1,3 +1,3 @@
 module Lit
-  VERSION = "0.0.4.2"
+  VERSION = "0.0.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lit
 version: !ruby/object:Gem::Version
-  version: 0.0.4.2
+  version: 0.0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -374,6 +374,7 @@ files:
 - app/assets/stylesheets/lit/dashboard.css
 - app/controllers/lit/application_controller.rb
 - app/controllers/lit/dashboard_controller.rb
+- app/controllers/lit/locales_controller.rb
 - app/controllers/lit/localization_keys_controller.rb
 - app/controllers/lit/localizations_controller.rb
 - app/helpers/lit/application_helper.rb
@@ -393,6 +394,9 @@ files:
 - app/views/layouts/lit/_navigation.html.erb
 - app/views/layouts/lit/application.html.erb
 - app/views/lit/dashboard/index.html.erb
+- app/views/lit/locales/_hide_link.html.erb
+- app/views/lit/locales/hide.js.erb
+- app/views/lit/locales/index.html.erb
 - app/views/lit/localization_keys/destroy.js.erb
 - app/views/lit/localization_keys/index.html.erb
 - app/views/lit/localization_keys/star.js.erb
@@ -404,6 +408,7 @@ files:
 - db/migrate/20121103174049_create_lit_localization_keys.rb
 - db/migrate/20121103182106_create_lit_localizations.rb
 - db/migrate/20121225112100_add_is_completed_and_is_starred_to_localization_keys.rb
+- db/migrate/20130511111904_add_is_hidden_to_locales.rb
 - lib/lit/adapters/hash_storage.rb
 - lib/lit/adapters/redis_storage.rb
 - lib/lit/cache.rb
@@ -438,7 +443,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Database powered i18n backend with web gui