lolita-i18n 0.3.2 → 0.4.0

data/.gitignore

@@ -0,0 +1,29 @@
+# rcov generated
+coverage
+coverage.data
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+Gemfile.lock
+
+spec/rails_app/log/*.log
+.idea
+
+.rvmrc
+tmp
+.sass-cache
+.rspec
+pkg
+spec/test_app/coverage.data
+spec/test_app/coverage
+spec/tst_app/log

data/Gemfile

@@ -1,30 +1,16 @@
 source "http://rubygems.org"
 
-gem "lolita", '~>3.2.0.rc.6'
-gem "hiredis", "~> 0.3.1"
-gem "redis", "~> 2.2.2", :require => ["redis/connection/hiredis", "redis"]
-gem "yajl-ruby", "~> 1.0.0"
-gem "easy_translate", "~> 0.2.1"
-
-group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
-end
+gemspec
 
 group :test do
-  gem "rspec","~>2.6.0"
-  gem "rspec-rails", "~>2.6.0"
-  gem "webmock", "~> 1.7.6"
-  # gem "mongo", "~> 1.3.0"
-  # gem "mongoid", "~> 2.0.0"
-  # gem "bson_ext", "~> 1.4.0"
-
-  # For ruby 1.9.3
-  # curl -OL http://rubyforge.org/frs/download.php/75414/linecache19-0.5.13.gem
-  # gem install linecache19-0.5.13.gem
-  # And then ruby-debug-base19x via
-  # gem install --pre ruby-debug-base19x
-  gem 'ruby-debug-base19x'
+  gem "rails", "~>3.2.2"
+  gem "cover_me", "~>1.2.0"
+  gem "bson_ext", "~>1.6.2"
+  gem "mongoid", "~>2.4.8"
+  gem "rspec","~>2.9.0"
+  gem "rspec-rails", "~>2.9.0"
+  gem "capybara", "~> 1.1.2"
+  gem 'capybara-webkit', "~>0.11.0"
+  gem "sass", "~>3.1.15"
+  
 end

data/History.rdoc

@@ -1,3 +1,10 @@
+=== Version 0.4.0
+* Changes
+  * Google translations removed.
+  * Updated translation backend to be more OO
+  * 100% test coverage
+  * Interface and usability updated
+  
 === Version 0.2.0
 * Enhancements
   * Redis configuration and access to attributes goes through Lolita.i18n

data/README.md

@@ -4,7 +4,7 @@ Lolita I18n is Lolita[https://github.com/ithouse/lolita] plugin, that enables .y
 
 ## Usage
 
-* setup rails 3.1 project with ["Lolita"](https://github.com/ithouse/lolita)
+* setup rails >3.1 project with ["Lolita"](https://github.com/ithouse/lolita)
 * setup [Redis DB](http://redis.io) on your server
 * add `gem 'lolita-i18n'` into Gemfile
 * in your lolita setup block add  `config.i18n.store = {:db => REDIS_DB}` or `config.i18n.store = Redis.new`

data/Rakefile

@@ -1,46 +1,4 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "lolita-i18n"
-  gem.homepage = "http://github.com/ithouse/lolita-i18n"
-  gem.license = "MIT"
-  gem.summary = %Q{Lolita plugin, that enables .yml management}
-  gem.description = %Q{Lolita plugin, that enables .yml files management from administrative interface. Also faster access to translations, that DB store}
-  gem.email = "support@ithouse.lv"
-  gem.authors = ["ITHouse (Latvia)","Arturs Meisters", "Gatis Tomsons"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-task :default => :test
-
-require 'rdoc/task'
-RDoc::Task.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "lolita-i18n #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'rubygems'
+require 'bundler'
+
+Bundler::GemHelper.install_tasks

data/app/assets/javascripts/lolita/i18n/application.js

@@ -1,2 +1,2 @@
 //= require jquery
-//= require_tree .
+//= require ./i18n

data/app/assets/javascripts/lolita/i18n/i18n.js

@@ -0,0 +1,87 @@
+$(function(){
+
+  $('#active_locale').change(function(){
+    params("active_locale",$(this).val())
+  })
+
+  $('#show_untranslated').change(function(){
+    params("show_untranslated", $(this).is(':checked') ? "1" : false)
+  })
+
+  var resize  = function($textarea) {
+    $textarea[0].style.height = 'auto';
+    $textarea[0].style.height = ($textarea[0].scrollHeight  + $textarea.data("offset") ) + 'px';  
+  }
+
+  var reset_size = function($textarea){
+    $textarea[0].style.height = 'auto';
+    $textarea[0].style.height = ($textarea.data("offset") ) + 'px'; 
+  }
+
+  $("textarea").each(function(){
+    var t = $(this)[0]
+    var offset= !window.opera ? (t.offsetHeight - t.clientHeight) : (t.offsetHeight + parseInt(window.getComputedStyle(t, null).getPropertyValue('border-top-width'))) ;
+    $(this).data("offset",offset)
+  })
+
+  $("textarea").keyup(function(){
+    resize($(this))
+  })
+
+  $("textarea").focus(function(){
+    resize($(this))
+    $(this).data("original-text",$(this).val())
+  })
+
+  $("textarea").blur(function(){
+    if($(this).data("original-text")!=$(this).val()){
+      $(this).data("original-text",false)
+      var $td = $(this).parents("td:eq(0)")
+      var key = $td.data("key")
+      var locale = $td.data("locale")
+      var $textareas = $("td[data-key='"+key+"'] textarea");
+      var result_str = ""
+      var result_arr = false
+      var result_json = false
+
+      if($textareas.length > 1){
+        $textareas.each(function(index){
+          var current_key = locale + "." + $(this).attr("name")
+          var m_data = current_key.match(/\[(\d+)\]$/)
+          if(m_data){
+            result_arr = result_arr || []
+            result_arr[parseInt(m_data[m_data.length-1])] = $(this).val()
+          }else{
+            result_json = result_json || {}
+            keys = current_key.split(".")
+            json_key = keys[keys.length-1]
+            result_json[json_key] = $(this).val()
+          }
+        })
+      }else{
+        result_str = $textareas.eq(0).val()
+      }
+      
+      new_id = Base64.encode(key)
+      save(result_arr || result_json || result_str, new_id)
+    }
+    reset_size($(this))
+  })
+
+  var save = function(post_data,id){
+    $.ajax({
+      type: 'PUT',
+      url: '/lolita/i18n/' + id,
+      data: {translation: post_data},
+      dataType: 'json',
+      success: function(data){
+        if(data.error){
+          show_error_msg( data.error)
+        }
+      },
+      error: function(request){
+        show_error_msg("Connection error! Translation is not saved!")
+      }
+    })
+  }
+})

data/app/assets/stylesheets/lolita/i18n/application.scss

@@ -3,10 +3,10 @@
 */
 .clear { clear: both; height: 0; }
 
-div.i18n-box div.list {
+/*div.i18n-box div.list {
   background-color: white;
   overflow: none;
-}
+}*/
 .i18n-language-switch{
   overflow: hidden;
   list-style: none;
@@ -29,9 +29,7 @@ span.hint {
   color: #666;
   display: block;
 }
-#i18n_edit textarea {
-  height: 100px;
-}
+
 div.list div.actions {
   padding: 10px;
   .filters {
@@ -68,7 +66,8 @@ div.list table {
     box-sizing: border-box;
     padding: 3px 10px;
     width: 100%;
-    min-height: 50px;
+    min-height: 25px;
+    height: 25px;
     color: #494949;    
   }
   td, th {
@@ -76,10 +75,12 @@ div.list table {
     padding: 5px 20px;
     line-height: 20px;
   }
+  td.grouped{
+    padding-left: 0px;
+  }
   thead th {
     line-height: 30px;
     select {
-      float: right;
       margin-top: 5px;
     }
   }

data/app/controllers/lolita/i18n_controller.rb

@@ -5,27 +5,38 @@ class Lolita::I18nController < ApplicationController
   layout "lolita/application"
 
   def index
-    @translation_keys=Lolita.i18n.flatten_keys
+    authorization_proxy.authorize!(:read, self.resource_class)
+    @translations = i18n_request.translations(@active_locale)
+
+    if params[:sort] && params[:sort].to_s == "1"
+      @translations = i18n_request.sort_translations(@translations)
+    end
   end
 
   def update
+    authorization_proxy.authorize!(:update, self.resource_class)
     respond_to do |format|
       format.json do
-        error = false
         begin
-          Lolita::I18n::Backend.set(params[:id],params[:translation])
-        rescue Lolita::I18n::Exceptions::MissingInterpolationArgument => e
-          error = e.to_s
+          if saved = i18n_request.update_key 
+            notice(::I18n.t("lolita-i18n.Successful update"))
+          else
+            error(::I18n.t("lolita-i18n.Error"))
+          end
+          render :nothing => true, :json => {error: !saved && ::I18n.t("lolita-i18n.Error") }
+        rescue Lolita::I18n::Exceptions::MissingInterpolationArgument => er
+          render :nothing => true, :json => {error: er.to_s}
+        rescue Exception => e
+          render :nothing => true, :json => {error: "Key is not saved. Some error accured." }
         end
-        render :nothing => true, :json => {error: error}
       end
     end
   end
 
   private
   
-  def is_lolita_resource?
-    true
+  def lolita_mapping
+    Lolita.mappings[:i18n]
   end
 
   def next_locale
@@ -33,7 +44,14 @@ class Lolita::I18nController < ApplicationController
   end
 
   def set_current_locale
-    @active_locale = (params[:active_locale] || next_locale).to_sym
+    @active_locale = ::I18n.available_locales.include?(params[:active_locale].to_s.to_sym) ? params[:active_locale] : nil
+    @active_locale ||= next_locale
+    @active_locale = @active_locale.to_sym
+    @active_locale = nil if @active_locale == ::I18n.default_locale
+  end
+
+  def i18n_request
+    @i18n_request ||= Lolita::I18n::Request.new(params)
   end
 
 end

data/app/helpers/lolita/i18n_helper.rb

@@ -1,17 +1,50 @@
 module Lolita
   module I18nHelper
     def locale_options
-      (::I18n::available_locales).collect{|locale| 
-        [::I18n.t(locale, :default => locale), locale] unless [::I18n.default_locale,@active_locale].include?(locale)
-      }.compact.insert(0,[::I18n.t("lolita-i18n.choose-other-language", :default => ::I18n.t("lolita-i18n.choose-other-language", :locale => "en")),""])
+      [[::I18n.t("lolita-i18n.choose-other-language"),nil]] + 
+      (::I18n.available_locales - [::I18n.default_locale]).sort.map{|locale|
+        [::I18n.t("#{locale}", :default => locale.to_s.upcase), locale]
+      }
     end
 
-    def show_translation key
-      ::I18n.t(key, :locale => @active_locale, :default => '')
+    def translation active_locale, key, original_key, translation, original 
+      %Q{
+        <td style="width:450px", data-key="#{active_locale}.#{original_key}" data-locale="#{active_locale}">
+          <p>
+            #{text_area_tag "#{active_locale}.#{key}", translation}
+          </p>
+        </td>
+        <td style="width:90%" data-key="#{::I18n.default_locale}.#{original_key}" data-locale="#{::I18n.default_locale}">
+          <p>
+            #{text_area_tag "#{::I18n.default_locale}.#{key}", original}
+          </p>
+          #{!key.blank? && "<span class='hint'>#{key}</span>"} 
+        </td>
+      }
     end
 
-    def is_untranslated key
-      ::I18n.t(key, :locale => @active_locale, :default => "").blank?
+    def translation_visible? value
+      !!(!params[:show_untranslated] || value.is_a?(Array) || value.is_a?(Hash) || (params[:show_untranslated] && value.blank?))
+    end
+
+    def any_translation_visible? values
+      if values.is_a?(Array)
+        values.empty? || values.detect{|value| translation_visible?(value)}
+      elsif values.is_a?(Hash)
+        values.empty? || values.detect{|key,value| translation_visible?(value)}
+      else
+        translation_visible?(values)
+      end
+    end
+
+    def sort_link
+      sort_params = unless params[:sort]
+        params.merge({:sort => 1})
+      else
+        params.reject{|k,v| k == "sort" || k == :sort}
+      end
+      url_for_sort = url_for(sort_params)
+      link_to(raw("#{::I18n.t(::I18n.default_locale)} #{params[:sort] && "&uArr;"}"), url_for_sort, :id => "translation_sort_link")
     end
   end
 end

data/app/views/lolita/i18n/index.html.haml

@@ -2,30 +2,39 @@
   = stylesheet_link_tag "lolita/i18n/application", :media => "screen,projection"
 - content_for :script do
   = javascript_include_tag "lolita/i18n/application"
-.box.i18n-bo
+.box.i18n-box
   .boxtitle
-    %h1.black= ::I18n.t('lolita-i18n.title', :default => ::I18n.t('lolita-i18n.title', :locale => 'en'))
+    %h1.black= ::I18n.t('lolita-i18n.title', :default => ::I18n.t('lolita-i18n.title'))
     .arrow
   .list
     %div.actions
       .filters
         = check_box_tag "show_untranslated", nil, params[:show_untranslated]
-        = label_tag "show_untranslated", ::I18n.t('lolita-i18n.show-untranslated', :default => ::I18n.t('lolita-i18n.show-untranslated', :locale => 'en'))
+        = label_tag "show_untranslated", ::I18n.t('lolita-i18n.show-untranslated', :default => ::I18n.t('lolita-i18n.show-untranslated'))
     %table
       %thead
         %tr
           %th{:style => "width:450px"}
-            = label_tag :active_locale, I18n.t(@active_locale, :default => @active_locale)
             - if locale_options.size > 1
-              = select_tag :active_locale, options_for_select(locale_options), :id => "active_locale"
-          %th{:style => "width:90%"}= ::I18n.t(::I18n.default_locale)
+              = select_tag :active_locale, options_for_select(locale_options,@active_locale.to_sym), :id => "active_locale"
+          %th{:style => "width:90%"}= raw(sort_link)
       %tbody
-        - @translation_keys.each do |key|
-          - if !params[:show_untranslated] or is_untranslated(key)
+        - active_locale = @active_locale
+        - @translations.each do |key,value|
+          - if @active_locale && any_translation_visible?(value[:translation])
             %tr
-              %td{:style => "width:450px", :'data-key' => key, :'data-locale' => @active_locale}
-                %p= show_translation key
-              %td{:style => "width:90%", :'data-key' => key, :'data-locale' => ::I18n.default_locale}
-                %p= ::I18n.t(key, :locale => ::I18n.default_locale, :default => "")
-                %span.hint
-                  = key
+              - if value[:original_translation].is_a?(Hash) || value[:original_translation].is_a?(Array)
+                %td.grouped{:colspan => "2"}
+                  %table
+                    - if value[:original_translation].is_a?(Hash)
+                      - value[:original_translation].each do |c_key,c_value|
+                        - if translation_visible?(value[:translation][c_key])
+                          %tr
+                            = raw(translation(@active_locale,"#{key}.#{c_key}",key,value[:translation][c_key],c_value))
+                    - else
+                      - value[:original_translation].each_with_index do |c_value,index|
+                        - if translation_visible?(value[:translation][index])
+                          %tr
+                            = raw(translation(@active_locale, "#{key}[#{index}]", key, value[:translation][index], c_value))
+              - else
+                = raw(translation(@active_locale, key, key, value[:translation], value[:original_translation]))