lolita-i18n 0.2.0 → 0.3.0

data/.document

@@ -1,4 +1,4 @@
-lib/**/*.rb
-- 
-features/**/*.feature
-LICENSE.txt
+lib/**/*.rb
+- 
+features/**/*.feature
+LICENSE.txt

data/.rspec

@@ -1 +1 @@
---color
+--color

data/Gemfile

@@ -20,5 +20,11 @@ group :test do
   # gem "mongo", "~> 1.3.0"
   # gem "mongoid", "~> 2.0.0"
   # gem "bson_ext", "~> 1.4.0"
-  gem 'ruby-debug19', :require => 'ruby-debug'
+
+  # 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'
 end

data/LICENSE.txt

@@ -1,20 +1,20 @@
-Copyright (c) 2011 ITHouse (Latvia) and Arturs Meisters
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2011 ITHouse (Latvia) and Arturs Meisters
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,46 +1,46 @@
-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'
+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

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

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

@@ -128,7 +128,7 @@ $ ->
       new LolitaTranslate $(this)
   $('#show_untranslated').change ->
     active_locale = if params('active_locale') == "null" then "" else  "active_locale=" + params('active_locale')
-    if $(this).attr('checked')
+    if $(this).is(':checked')
       window.location.href = "?show_untranslated=true&" + active_locale
     else
       window.location.href = "?" + active_locale

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

@@ -48,22 +48,6 @@ div.list div.actions {
       padding-left: 20px;
     }
   }
-  button.translate {
-    position: relative;
-    padding-left: 30px;
-    height: 34px;
-    background-image: url(image-path('lolita/i18n/google_translate_icon.png'));
-    background-position: 5px 5px;
-    background-repeat: no-repeat;
-    box-shadow: inset 0 0 1px 1px #eaeaea;
-    text-shadow: 0 1px 0 white;
-    border: 1px solid #bbb;
-    float: right;
-  }
-  button.loading {
-    background-image: none;
-    color: #999;
-  }
 }
 div.list table {
   table-layout: fixed;

data/app/controllers/lolita/i18n_controller.rb

@@ -16,16 +16,6 @@ class Lolita::I18nController < ApplicationController
     end
   end
 
-  def translate_untranslated
-    respond_to do |format|
-      format.json do
-        google_translate = Lolita::I18n::GoogleTranslate.new @active_locale
-        google_translate.run
-        render :nothing => true, :status => 200, :json => {errors: google_translate.errors, :translated => google_translate.untranslated}
-      end
-    end    
-  end
-
   private
   
   def is_lolita_resource?

data/app/helpers/lolita/i18n_helper.rb

@@ -3,23 +3,15 @@ module Lolita
     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 => "Choose other language"),""])
+      }.compact.insert(0,[::I18n.t("lolita-i18n.choose-other-language", :default => ::I18n.t("lolita-i18n.choose-other-language", :locale => "en")),""])
     end
 
     def show_translation key
-      value = ::I18n.t(key, :locale => @active_locale, :default => '')
-      unless value.blank?
-        value
-      else
-        value = Lolita::I18n::GoogleTranslate.get_translation(@active_locale,key)
-        unless value.blank?
-          content_tag(:span, value, :class => "unapproved")
-        end
-      end
+      ::I18n.t(key, :locale => @active_locale, :default => '')
     end
 
     def is_untranslated key
-      Lolita::I18n::GoogleTranslate.get_translation(@active_locale,key)
+      ::I18n.t(key, :locale => @active_locale, :default => "").blank?
     end
   end
 end

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

@@ -4,16 +4,13 @@
   = javascript_include_tag "lolita/i18n/application"
 .box.i18n-bo
   .boxtitle
-    %h1.black= ::I18n.t('lolita-i18n.title', :default => "Static content translation")
+    %h1.black= ::I18n.t('lolita-i18n.title', :default => ::I18n.t('lolita-i18n.title', :locale => 'en'))
     .arrow
   .list
-    / %div.actions
-    /   .filters
-    /     = check_box_tag "show_untranslated", nil, params[:show_untranslated]
-    /     = label_tag "show_untranslated", "Show translations that need approval"
-
-    /   %button.translate{:'data-url' => translate_untranslated_lolita_i18n_index_path, :'data-locale' => @active_locale} Translate empty translations with Google
-    /   .clear
+    %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'))
     %table
       %thead
         %tr

data/config/locales/en.yml

@@ -7,4 +7,6 @@ en:
   lolita-i18n:
     title: "Static content translation"
     choose-other-language: "Choose other language"
+    show-untranslated: "Show only untranslated translations"
+    remove-old: "Remove old translations"
   

data/config/locales/lv.yml

@@ -6,4 +6,6 @@ lv:
   sv: Zviedru
   lolita-i18n:
     title: "Statiskā satura tulkošana"
-    choose-other-language: "Izvēlies citu valodu"
+    choose-other-language: "Izvēlies citu valodu"
+    show-untranslated: "Rādīt tikai neiztulkotos tulkojumus"
+    remove-old: "Noņemt vecos tulkojumus"

data/config/routes.rb

@@ -1,11 +1,11 @@
-Rails.application.routes.draw do
-
-  namespace "lolita" do
-    resources :i18n, :only=>[:update],:constraints=>{:id=>/.*/} do
-      collection do
-        put 'translate_untranslated'
-        get 'index'
-      end
-    end
-  end
+Rails.application.routes.draw do
+
+  namespace "lolita" do
+    resources :i18n, :only=>[:update],:constraints=>{:id=>/.*/} do
+      collection do
+        put 'translate_untranslated'
+        get 'index'
+      end
+    end
+  end
 end

data/lib/lolita-i18n.rb

@@ -18,9 +18,7 @@ module Lolita
   #   config.i18n.store = Redis.new()
   module I18n
     autoload :Backend, 'lolita-i18n/backend'
-    autoload :GoogleTranslate, 'lolita-i18n/google_translate'
 
-  
     class Configuration
 
       attr_accessor :yaml_backend
@@ -28,19 +26,17 @@ module Lolita
       def store
         unless @store
           warn "Lolita::I18n No store specified. See Lolita::I18n"
-          # warn "No Lolita::I18n store specfied."
           @store = Redis.new
-          # initialize_chain
         end
         @store
       end
 
       def store=(possible_store)
         @store = if possible_store.is_a?(Hash)
-          Redis.new(possible_store)
-        else
-          possible_store
-        end
+                   Redis.new(possible_store)
+                 else
+                   possible_store
+                 end
         @store
       end
 
@@ -66,7 +62,9 @@ module Lolita
 
       def include_modules
         ::I18n::Backend::Simple.send(:include, ::I18n::Backend::Flatten)
-        ::I18n::Backend::Simple.send(:include, ::I18n::Backend::Memoize)
+        ::I18n::Backend::Simple.send(:include, ::I18n::Backend::Pluralization)
+        ::I18n::Backend::Simple.send(:include, ::I18n::Backend::Metadata)
+        ::I18n::Backend::Simple.send(:include, ::I18n::Backend::InterpolationCompiler)
       end
 
     end
@@ -84,7 +82,14 @@ Lolita.scope.extend(LolitaI18nConfiguration)
 Lolita.after_setup do
   Lolita.i18n.yaml_backend = ::I18n.backend
   Lolita.i18n.include_modules
-  ::I18n.backend = Lolita.i18n.initialize_chain
+  begin
+    r = Redis.new
+    r.ping
+    ::I18n.backend = Lolita.i18n.initialize_chain
+  rescue Errno::ECONNREFUSED => e
+    warn "Warning: Lolita was unable to connect to Redis DB: #{e}"
+  end
+
 end
 
 require 'lolita-i18n/module'
@@ -95,16 +100,14 @@ end
 
 Lolita.after_routes_loaded do
   if tree=Lolita::Navigation::Tree[:"left_side_navigation"]
-    unless tree.branches.detect{|b| b.title=="System"}
-      branch=tree.append(nil,:title=>"System")
-      #mapping=Lolita::Mapping.new(:i18n_index,:singular=>:i18n,:class_name=>Object,:controller=>"lolita/i18n")
-      branch.append(Object,:title=>"I18n",:url=>Proc.new{|view,branch|
+    unless tree.branches.detect { |b| b.title=="System" }
+      branch=tree.append(nil, :title=>"System")
+      branch.append(Object, :title=>"I18n", :url=>Proc.new { |view, branch|
         view.send(:lolita_i18n_index_path)
-      }, :active=>Proc.new{|view,parent_branch,branch|
+      }, :active=>Proc.new { |view, parent_branch, branch|
         params=view.send(:params)
         params[:controller].to_s.match(/lolita\/i18n/)
       })
     end
   end
 end
-

data/lib/lolita-i18n/backend.rb

@@ -30,8 +30,7 @@ module Lolita
           if value.blank?
             del key
           else
-            if Lolita::I18n.backend.store_translations(locale,{translation_key=>value},:escape=>false)
-              Lolita::I18n::GoogleTranslate.del_translation locale, translation_key
+            if Lolita.i18n.backend.store_translations(locale,{translation_key=>value},:escape=>false)
               true
             else
               false
@@ -40,7 +39,7 @@ module Lolita
         end
 
         def del key
-          Lolita::I18n.store.del key
+          Lolita.i18n.store.del key
         end
 
         def locale(key)

data/lolita-i18n.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "lolita-i18n"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ITHouse (Latvia)", "Arturs Meisters", "Gatis Tomsons"]
-  s.date = "2011-11-11"
+  s.date = "2012-02-22"
   s.description = "Lolita plugin, that enables .yml files management from administrative interface. Also faster access to translations, that DB store"
   s.email = "support@ithouse.lv"
   s.extra_rdoc_files = [
@@ -38,13 +38,11 @@ Gem::Specification.new do |s|
     "config/routes.rb",
     "lib/lolita-i18n.rb",
     "lib/lolita-i18n/backend.rb",
-    "lib/lolita-i18n/google_translate.rb",
     "lib/lolita-i18n/module.rb",
     "lib/lolita-i18n/rails.rb",
     "lolita-i18n.gemspec",
     "spec/controllers/lolita/i18n_controller_spec.rb",
     "spec/lolita-i18n/backend_spec.rb",
-    "spec/lolita-i18n/google_translate_spec.rb",
     "spec/rails_app/app/controllers/application_controller.rb",
     "spec/rails_app/config/application.rb",
     "spec/rails_app/config/enviroment.rb",
@@ -57,12 +55,11 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/ithouse/lolita-i18n"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.15"
   s.summary = "Lolita plugin, that enables .yml management"
   s.test_files = [
     "spec/controllers/lolita/i18n_controller_spec.rb",
     "spec/lolita-i18n/backend_spec.rb",
-    "spec/lolita-i18n/google_translate_spec.rb",
     "spec/rails_app/app/controllers/application_controller.rb",
     "spec/rails_app/config/application.rb",
     "spec/rails_app/config/enviroment.rb",

data/spec/controllers/lolita/i18n_controller_spec.rb

@@ -1,39 +1,30 @@
-# coding: utf-8
-
-USE_RAILS=true unless defined?(USE_RAILS)
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-
-include Lolita::Test::Matchers
-
-describe Lolita::I18nController do
-  render_views
-
-  it "should have i18n routes" do
-    {:get=>"/lolita/i18n"}.should be_routable
-    {:put=>"/lolita/i18n/1"}.should be_routable
-    {:put=>"/lolita/i18n/translate_untranslated"}.should be_routable
-    {:get=>"/lolita/i18n"}.should be_routable
-  end
-
-  it "should show all translations" do
-    get :index
-    response.should render_template("index")
-    response.body.should match(/#{::I18n.t('lolita-i18n.title')}/)
-  end
-
-  it "should save translation" do
-    put :update, :id=>"en.Page title",:translation=>"New title", :format => :json
-    response.body.should == {error: false}.to_json
-    ::I18n.t("Page title", :locale => :en).should == "New title"
-  end
-
-  it "should translate to google" do
-    stub_request(:post, "http://ajax.googleapis.com/ajax/services/language/translate").
-    with(:body => "v=2.0&format=text&q=true&langpair=%7Clv&q=true&langpair=%7Clv&q=Posts&langpair=%7Clv&q=Posts%20description&langpair=%7Clv&q=Comments&langpair=%7Clv&q=Comment%20description&langpair=%7Clv&q=Footer%20text&langpair=%7Clv",
-    :headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
-    to_return(:status => 200, :body => '{"responseData": [{"responseData":{"translatedText":"patiess","detectedSourceLanguage":"en"},"responseDetails":null,"responseStatus":200},{"responseData":{"translatedText":"patiess","detectedSourceLanguage":"en"},"responseDetails":null,"responseStatus":200},{"responseData":{"translatedText":"Atbildes","detectedSourceLanguage":"en"},"responseDetails":null,"responseStatus":200},{"responseData":{"translatedText":"Atbildes apraksts","detectedSourceLanguage":"en"},"responseDetails":null,"responseStatus":200},{"responseData":{"translatedText":"Komentāri","detectedSourceLanguage":"en"},"responseDetails":null,"responseStatus":200},{"responseData":{"translatedText":"Cik apraksts","detectedSourceLanguage":"fr"},"responseDetails":null,"responseStatus":200},{"responseData":{"translatedText":"Kājenes tekstu","detectedSourceLanguage":"en"},"responseDetails":null,"responseStatus":200}], "responseDetails": null, "responseStatus": 200}', :headers => {})
-
-    put :translate_untranslated, :active_locale => :lv, :format => :json
-    response.body.should == {errors: [], translated: 7}.to_json
-  end
+# coding: utf-8
+
+USE_RAILS=true unless defined?(USE_RAILS)
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+include Lolita::Test::Matchers
+
+describe Lolita::I18nController do
+  render_views
+
+  it "should have i18n routes" do
+    {:get=>"/lolita/i18n"}.should be_routable
+    {:put=>"/lolita/i18n/1"}.should be_routable
+    {:put=>"/lolita/i18n/translate_untranslated"}.should be_routable
+    {:get=>"/lolita/i18n"}.should be_routable
+  end
+
+  it "should show all translations" do
+    get :index
+    response.should render_template("index")
+    response.body.should match(/#{::I18n.t('lolita-i18n.title')}/)
+  end
+
+  it "should save translation" do
+    put :update, :id=>"en.Page title",:translation=>"New title", :format => :json
+    response.body.should == {error: false}.to_json
+    ::I18n.t("Page title", :locale => :en).should == "New title"
+  end
+
 end

data/spec/lolita-i18n/backend_spec.rb

@@ -17,7 +17,7 @@ describe Lolita::I18n::Backend do
     Lolita::I18n::Backend.set("en.test-key","Hello")
     Lolita::I18n::Backend.get("en.test-key")[:value].should == "Hello"
     Lolita::I18n::Backend.set("en.test-key","")
-    Lolita::I18n.store.get("en.test-key").should be_nil
+    Lolita.i18n.store.get("en.test-key").should be_nil
   end
 
   it "should get translation into DB" do

data/spec/rails_app/app/controllers/application_controller.rb

@@ -1,3 +1,3 @@
-class ApplicationController < ActionController::Base
-
+class ApplicationController < ActionController::Base
+
 end

data/spec/rails_app/config/enviroment.rb

@@ -1,5 +1,5 @@
-# Load the rails application
-require File.expand_path('../application', __FILE__)
-
-# Initialize the rails application
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
 Test::Application.initialize!

data/spec/rails_app/config/locales/en.yml

@@ -1,9 +1,9 @@
-en:
-  "Page title": "Page title"
-  posts:
-    "Title": Posts
-    "Description": "Posts description"
-  comments:
-    "Title": Comments
-    "Description": "Comment description"
+en:
+  "Page title": "Page title"
+  posts:
+    "Title": Posts
+    "Description": "Posts description"
+  comments:
+    "Title": Comments
+    "Description": "Comment description"
   "Footer": "Footer text"

data/spec/rails_app/config/routes.rb

@@ -1,3 +1,3 @@
-Test::Application.routes.draw do 
- 
+Test::Application.routes.draw do 
+ 
 end

data/spec/spec_helper.rb

@@ -12,7 +12,6 @@ require 'rails'
 require 'lolita'
 require File.expand_path('lib/lolita-i18n')
 require 'webmock/rspec'
-require 'ruby-debug'
 
 if defined?(USE_RAILS)
   # require 'mongoid'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita-i18n
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-11 00:00:00.000000000Z
+date: 2012-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lolita
-  requirement: &82640050 !ruby/object:Gem::Requirement
+  requirement: &77328960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.2.0.rc.6
   type: :runtime
   prerelease: false
-  version_requirements: *82640050
+  version_requirements: *77328960
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &82639690 !ruby/object:Gem::Requirement
+  requirement: &77338860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *82639690
+  version_requirements: *77338860
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &82639370 !ruby/object:Gem::Requirement
+  requirement: &77338530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *82639370
+  version_requirements: *77338530
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &82639100 !ruby/object:Gem::Requirement
+  requirement: &77338040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *82639100
+  version_requirements: *77338040
 - !ruby/object:Gem::Dependency
   name: easy_translate
-  requirement: &82638790 !ruby/object:Gem::Requirement
+  requirement: &77337330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *82638790
+  version_requirements: *77337330
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &82638490 !ruby/object:Gem::Requirement
+  requirement: &77336670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82638490
+  version_requirements: *77336670
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &82638220 !ruby/object:Gem::Requirement
+  requirement: &77335820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *82638220
+  version_requirements: *77335820
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &82637680 !ruby/object:Gem::Requirement
+  requirement: &77335230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *82637680
+  version_requirements: *77335230
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &82637180 !ruby/object:Gem::Requirement
+  requirement: &77351840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,7 +111,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82637180
+  version_requirements: *77351840
 description: Lolita plugin, that enables .yml files management from administrative
   interface. Also faster access to translations, that DB store
 email: support@ithouse.lv
@@ -142,13 +142,11 @@ files:
 - config/routes.rb
 - lib/lolita-i18n.rb
 - lib/lolita-i18n/backend.rb
-- lib/lolita-i18n/google_translate.rb
 - lib/lolita-i18n/module.rb
 - lib/lolita-i18n/rails.rb
 - lolita-i18n.gemspec
 - spec/controllers/lolita/i18n_controller_spec.rb
 - spec/lolita-i18n/backend_spec.rb
-- spec/lolita-i18n/google_translate_spec.rb
 - spec/rails_app/app/controllers/application_controller.rb
 - spec/rails_app/config/application.rb
 - spec/rails_app/config/enviroment.rb
@@ -172,7 +170,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -153498191
+      hash: -798289933
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -181,14 +179,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 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/lolita-i18n/google_translate_spec.rb
 - spec/rails_app/app/controllers/application_controller.rb
 - spec/rails_app/config/application.rb
 - spec/rails_app/config/enviroment.rb

data/lib/lolita-i18n/google_translate.rb

@@ -1,76 +0,0 @@
-require 'easy_translate'
-
-module Lolita
-  module I18n
-    # Translates untranslated strings using google translate API
-    class GoogleTranslate
-      attr_reader :untranslated, :errors
-      def initialize locale
-        @locale = locale
-        @untranslated = 0
-        @errors = []
-      end
-
-      def run
-        unless untranslated_translations.empty?
-          @untranslated = untranslated_translations.count
-          untranslated_translations.each_slice(10).to_a.each do |batch|
-            begin
-              EasyTranslate.translate(batch.map(&:last), :to => @locale).each_with_index do |result,index|
-                unless result.blank?
-                  key = batch[index].first
-                  add_translation key, result
-                  add_to_unapproved key
-                end
-              end
-            rescue EasyTranslate::EasyTranslateException => e
-              @errors << e.to_s
-            rescue Exception => e
-              puts "#{e.to_s}\n\n#{$@.join("\n")}"
-              @errors << e.to_s
-              break
-            end
-          end
-        end
-      end
-
-      def untranslated_translations
-        unless @untranslated_translations
-          @untranslated_translations = []
-          Lolita.i18n.flatten_keys.each do |key|
-            unless unapproved_keys.include?(key)
-              if !::I18n.t(key, :locale => ::I18n.default_locale, :default => '').blank? && ::I18n.t(key, :locale => @locale, :default => '').blank? && Lolita::I18n::GoogleTranslate.get_translation(@locale,key).blank?
-                value = ::I18n.t(key, :locale => ::I18n.default_locale, :default => '').to_s
-                @untranslated_translations << [key,value] unless value.blank?
-              end
-            end
-          end
-        end
-        @untranslated_translations
-      end
-      
-      def self.get_translation locale, key
-        Lolita.i18n.store.get :"#{locale}.g.#{key}"
-      end
-
-      def self.del_translation locale, key
-        Lolita.i18n.store.del :"#{locale}.g.#{key}"
-      end
-
-      private
-
-      def unapproved_keys
-        @@unapproved_keys ||= Lolita.i18n.store.smembers(:"unapproved_keys_#{@locale}").map(&:to_sym)
-      end
-
-      def add_translation key, value
-        Lolita.i18n.store.set :"#{@locale}.g.#{key}", value
-      end
-
-      def add_to_unapproved key
-        Lolita.i18n.store.sadd(:"unapproved_keys_#{@locale}",key)
-      end
-
-    end
-  end
-end

data/spec/lolita-i18n/google_translate_spec.rb

@@ -1,31 +0,0 @@
-# coding: utf-8
-
-USE_RAILS=true unless defined?(USE_RAILS)
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe Lolita::I18n::GoogleTranslate do
-  let(:google_translate){
-    stub_request(:post, "http://ajax.googleapis.com/ajax/services/language/translate").
-    with(:body => "v=2.0&format=text&q=true&langpair=%7Clv&q=true&langpair=%7Clv&q=Posts&langpair=%7Clv&q=Posts%20description&langpair=%7Clv&q=Comments&langpair=%7Clv&q=Comment%20description&langpair=%7Clv&q=Footer%20text&langpair=%7Clv",
-    :headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
-    to_return(:status => 200, :body => '{"responseData": [{"responseData":{"translatedText":"patiess","detectedSourceLanguage":"en"},"responseDetails":null,"responseStatus":200},{"responseData":{"translatedText":"patiess","detectedSourceLanguage":"en"},"responseDetails":null,"responseStatus":200},{"responseData":{"translatedText":"Atbildes","detectedSourceLanguage":"en"},"responseDetails":null,"responseStatus":200},{"responseData":{"translatedText":"Atbildes apraksts","detectedSourceLanguage":"en"},"responseDetails":null,"responseStatus":200},{"responseData":{"translatedText":"Komentāri","detectedSourceLanguage":"en"},"responseDetails":null,"responseStatus":200},{"responseData":{"translatedText":"Cik apraksts","detectedSourceLanguage":"fr"},"responseDetails":null,"responseStatus":200},{"responseData":{"translatedText":"Kājenes tekstu","detectedSourceLanguage":"en"},"responseDetails":null,"responseStatus":200}], "responseDetails": null, "responseStatus": 200}', :headers => {})
-
-    gt = Lolita::I18n::GoogleTranslate.new(:lv)
-    gt.run
-    gt
-  }
-
-  it "should store google translation" do
-    google_translate.untranslated_translations.size.should == 7
-    google_translate.untranslated.should == 7
-    google_translate.errors.should be_empty
-    Lolita::I18n::GoogleTranslate.get_translation(:lv, :'posts.Description').should == "Atbildes apraksts"
-  end
-
-  it "should delete google translation" do
-    google_translate
-    Lolita::I18n::GoogleTranslate.get_translation(:lv, :'posts.Description').should == "Atbildes apraksts"
-    Lolita::I18n::GoogleTranslate.del_translation(:lv, :'posts.Description')
-    Lolita::I18n::GoogleTranslate.get_translation(:lv, :'posts.Description').should be_nil
-  end
-end