lolita-i18n 0.3.2 → 0.4.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita-i18n
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000 Z
+date: 2012-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lolita
-  requirement: &83808380 !ruby/object:Gem::Requirement
+  requirement: &11765480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0.rc.6
+        version: 3.2.0.rc.9
   type: :runtime
   prerelease: false
-  version_requirements: *83808380
+  version_requirements: *11765480
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &83807280 !ruby/object:Gem::Requirement
+  requirement: &11764960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *83807280
+  version_requirements: *11764960
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &83806730 !ruby/object:Gem::Requirement
+  requirement: &11764340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *83806730
+  version_requirements: *11764340
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &83805310 !ruby/object:Gem::Requirement
+  requirement: &11763640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,62 +56,18 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *83805310
+  version_requirements: *11763640
 - !ruby/object:Gem::Dependency
-  name: easy_translate
-  requirement: &83820270 !ruby/object:Gem::Requirement
+  name: unicode_utils
+  requirement: &11762900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *83820270
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &83816870 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *83816870
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &83828530 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *83828530
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &83824730 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: *83824730
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &83840380 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *83840380
+  version_requirements: *11762900
 description: Lolita plugin, that enables .yml files management from administrative
   interface. Also faster access to translations, that DB store
 email: support@ithouse.lv
@@ -122,16 +78,16 @@ extra_rdoc_files:
 - README.md
 files:
 - .document
+- .gitignore
 - .rspec
 - Gemfile
 - History.rdoc
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
 - app/assets/images/lolita/i18n/google_translate_icon.png
 - app/assets/javascripts/lolita/i18n/application.js
-- app/assets/javascripts/lolita/i18n/i18n.js.coffee
+- app/assets/javascripts/lolita/i18n/i18n.js
 - app/assets/javascripts/lolita/i18n/spin.min.js
 - app/assets/stylesheets/lolita/i18n/application.scss
 - app/controllers/lolita/i18n_controller.rb
@@ -141,21 +97,39 @@ files:
 - config/locales/lv.yml
 - config/routes.rb
 - lib/lolita-i18n.rb
-- lib/lolita-i18n/backend.rb
+- lib/lolita-i18n/configuration.rb
 - lib/lolita-i18n/exceptions.rb
 - lib/lolita-i18n/module.rb
 - lib/lolita-i18n/rails.rb
+- lib/lolita-i18n/request.rb
+- lib/lolita-i18n/version.rb
 - lolita-i18n.gemspec
 - spec/controllers/lolita/i18n_controller_spec.rb
-- spec/lolita-i18n/backend_spec.rb
-- spec/rails_app/app/controllers/application_controller.rb
-- spec/rails_app/config/application.rb
-- spec/rails_app/config/enviroment.rb
-- spec/rails_app/config/initializers/lolita_i18n.rb
-- spec/rails_app/config/locales/en.yml
-- spec/rails_app/config/locales/lv.yml
-- spec/rails_app/config/routes.rb
+- spec/helpers/lolita/i18n_helper_spec.rb
+- spec/lolita-i18n/configuration_spec.rb
+- spec/lolita-i18n/exceptions_spec.rb
+- spec/lolita-i18n/request_spec.rb
+- spec/lolita-i18n/version_spec.rb
+- spec/lolita_i18n_spec.rb
+- spec/rails_spec_helper.rb
+- spec/requests/translating_spec.rb
+- spec/requests/translation_list_spec.rb
+- spec/routing/routes_spec.rb
 - spec/spec_helper.rb
+- spec/test_app/app/controllers/application_controller.rb
+- spec/test_app/config/application.rb
+- spec/test_app/config/boot.rb
+- spec/test_app/config/enviroment.rb
+- spec/test_app/config/enviroments/test.rb
+- spec/test_app/config/initializers/lolita_i18n.rb
+- spec/test_app/config/initializers/token.rb
+- spec/test_app/config/locales/en.yml
+- spec/test_app/config/locales/lv.yml
+- spec/test_app/config/locales/ru.yml
+- spec/test_app/config/mongoid.yml
+- spec/test_app/config/routes.rb
+- spec/test_app/log/.gitkeep
+- spec/test_app/log/development.log
 homepage: http://github.com/ithouse/lolita-i18n
 licenses:
 - MIT
@@ -169,9 +143,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 763032781
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -180,16 +151,34 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Lolita plugin, that enables .yml management
 test_files:
 - spec/controllers/lolita/i18n_controller_spec.rb
-- spec/lolita-i18n/backend_spec.rb
-- spec/rails_app/app/controllers/application_controller.rb
-- spec/rails_app/config/application.rb
-- spec/rails_app/config/enviroment.rb
-- spec/rails_app/config/initializers/lolita_i18n.rb
-- spec/rails_app/config/routes.rb
+- spec/helpers/lolita/i18n_helper_spec.rb
+- spec/lolita-i18n/configuration_spec.rb
+- spec/lolita-i18n/exceptions_spec.rb
+- spec/lolita-i18n/request_spec.rb
+- spec/lolita-i18n/version_spec.rb
+- spec/lolita_i18n_spec.rb
+- spec/rails_spec_helper.rb
+- spec/requests/translating_spec.rb
+- spec/requests/translation_list_spec.rb
+- spec/routing/routes_spec.rb
 - spec/spec_helper.rb
+- spec/test_app/app/controllers/application_controller.rb
+- spec/test_app/config/application.rb
+- spec/test_app/config/boot.rb
+- spec/test_app/config/enviroment.rb
+- spec/test_app/config/enviroments/test.rb
+- spec/test_app/config/initializers/lolita_i18n.rb
+- spec/test_app/config/initializers/token.rb
+- spec/test_app/config/locales/en.yml
+- spec/test_app/config/locales/lv.yml
+- spec/test_app/config/locales/ru.yml
+- spec/test_app/config/mongoid.yml
+- spec/test_app/config/routes.rb
+- spec/test_app/log/.gitkeep
+- spec/test_app/log/development.log

data/VERSION

@@ -1 +0,0 @@
-0.3.2

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

@@ -1,135 +0,0 @@
-class LolitaI18nCell
-
-  constructor: (@td) ->
-    @p = @td.find('p:first')
-   
-  edit: ->
-    if @td.find('input').size() == 0
-      @key     = @td.attr('data-key')
-      @locale  = @td.attr('data-locale')
-      input    = $('<textarea name="'+@key+'" />').html(@fix_quotes(@p.text().trim()))
-      input.css('width',@p.width()+'px').css('height', @p.height()+'px')
-      @p.html("")
-      @p.hide()
-      @td.append(input)
-      input.focus()
-      that = this
-
-      input.blur ->
-        that.value = input.val().trim()
-        input.remove()
-        that.add_spinner()
-        that.save()
-
-      input.keyup (e) ->
-        if e.keyCode == 27
-          input.trigger('blur')
-  
-  save: ->
-    that = this
-    $.ajax 
-      type: 'PUT'
-      url: '/lolita/i18n/' + @locale + '.' + that.key
-      data: {translation: that.value}
-      dataType: 'json'
-      success: (data) ->
-        if data.error
-          alert "Error saving translation:\n\n" + data.error
-        that.remove_spinner()
-
-  add_spinner: ->
-    opts =
-      lines: 10
-      length: 3
-      width: 2
-      radius: 5,
-      color: '#000'
-      speed: 1
-      trail: 20
-      shadow: false
-
-    @spinner = Spinner(opts).spin()
-    @td.prepend(@spinner.el)
-    $(@spinner.el).css('top',($(@spinner.el).parent().height() / 2)+ 'px').css('left','5px').css('clear','both')
-
-  remove_spinner: ->
-    @spinner.stop()
-    @p.text(@value)
-    @p.show()
-
-  fix_quotes: (value) ->
-    value.replace(/\'/g, "&#39;").replace(/\"/g, "&#34;")
-
-class LolitaTranslate
-
-  constructor: (@button)->
-    @url = @button.attr('data-url')
-    @locale = @button.attr('data-locale')
-    @add_spinner()
-    @translate()
-
-  translate: ->
-    that = this
-
-    $.ajax 
-      type: 'PUT'
-      url: @url
-      data: {active_locale: @locale}
-      dataType: 'json'
-      success: (data) ->
-        if data.errors.length > 0
-          alert("Errors\n\n" + data.errors.join("\n"))
-          that.remove_spinner()
-        if data.translated > 0
-          window.location.reload()
-        else
-          that.remove_spinner()
-      error: (request,error) ->
-        alert "Error 500"
-        that.remove_spinner()        
-
-  add_spinner: ->
-    opts =
-      lines: 10
-      length: 3
-      width: 2
-      radius: 5
-      color: '#000'
-      speed: 1
-      trail: 5
-      shadow: false
-
-    @spinner = Spinner(opts).spin()
-    @button.append(@spinner.el)
-    @button.addClass('loading')
-    @button.attr('disabled',true)
-    $(@spinner.el).css('position', 'absolute').css('top','17px').css('left','16px')
-
-  remove_spinner: ->
-    @spinner.stop()
-    @button.removeClass('loading')
-    @button.attr('disabled',false)
-
-params = (name) ->
-  decodeURI((RegExp(name + '=' + '(.+?)(&|$)').exec(location.search)||[1,null])[1])
-
-$ ->
-  $('.list td p').click ->
-    cell = new LolitaI18nCell $(this).parent()
-    cell.edit()
-  $('.list td span.hint').click ->
-    cell = new LolitaI18nCell $(this).parent()
-    cell.edit()
-  $('#active_locale').change ->
-    show_untranslated = if params('show_untranslated') == "null" then "" else  "&show_untranslated=true"
-    window.location.href = "?active_locale=" + $(this).val() + show_untranslated
-  $('button.translate:first').click ->
-    if confirm('Are you shure?')
-      new LolitaTranslate $(this)
-  $('#show_untranslated').change ->
-    active_locale = if params('active_locale') == "null" then "" else  "active_locale=" + params('active_locale')
-    if $(this).is(':checked')
-      window.location.href = "?show_untranslated=true&" + active_locale
-    else
-      window.location.href = "?" + active_locale
-        

data/lib/lolita-i18n/backend.rb

@@ -1,87 +0,0 @@
-module Lolita
-  module I18n   
-    # Allow to operate with I18n keys and values.
-    class Backend
-
-      class << self
-        # Get translation and decode it. Set translate from and to translations.
-        # Return Hash with
-        # * <tt>:key</tt> - translation key
-        # * <tt>:value</tt> - translation
-        # * <tt>:translate_to</tt> - translation locale, like <i>en</i>
-        # * <tt>:translate_from</tt> - translation key for default language
-        def get(key)
-          result={:key=>key}
-          result[:value]=decoded_value(key)
-          result[:original_value]=decoded_value(translate_from(key))
-          result[:translate_to]=translate_to(key)
-          result[:translate_from]=translate_from(key)
-          result
-        end
-
-        # Store translation, decode and store.
-        # Accept:
-        # * <tt>key</tt> - translation key
-        # * <tt>translation</tt> - String with translation
-        def set(key,translation)
-          validate_translation(key,translation)
-          locale=translate_to(key)
-          translation_key=translation_key(key)
-          value=Yajl::Parser.parse(translation.to_json)
-          if value.blank?
-            del key
-          else
-            if Lolita.i18n.backend.store_translations(locale,{translation_key=>value},:escape=>false)
-              true
-            else
-              false
-            end
-          end
-        end
-
-        def del key
-          Lolita.i18n.store.del key
-        end
-
-        def locale(key)
-          translate_to(key) || ::I18n.default_locale
-        end
-
-        def translation_key(key)
-          (key.to_s.split('.')[1..-1]).join(".")
-        end
-        
-        private
-        
-        def validate_translation key,translation
-          validate_interpolation_arguments key,translation
-        end
-
-        def validate_interpolation_arguments key,translation
-          in_translation = translation.scan(/(%{\w+})/).map{|m| m.first}.sort
-          in_original = ::I18n.t(translation_key(key), :locale => ::I18n.default_locale).scan(/(%{\w+})/).map{|m| m.first}.sort
-          raise Exceptions::MissingInterpolationArgument.new(in_original) unless in_translation == in_original
-        end
-
-        def keys
-          @keys||=Lolita.i18n.flattened_translations.keys.sort
-        end
-
-        def decoded_value(key)
-          value=Lolita.i18n.backend.store[key]
-          value ? (Yajl::Parser.parse(value) rescue "") : ::I18n.t(key.split('.')[1..-1].join('.'), :default => "", :locale => translate_to(key))
-        end 
-
-        def translate_to(key)
-          key.to_s.split(".").first
-        end
-
-        def translate_from(key,locale=nil)
-          (key.to_s.split('.')[1..-1]).insert(0,locale || ::I18n.default_locale).join(".")
-        end
-
-      end
-
-    end
-  end
-end