lolita-i18n 0.4.3 → 0.5.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bbe2673c732802ba0079e01909b9cd61c242ba22
+  data.tar.gz: be7ccaad2c86382b09c42cb81e645461a04cd3df
+SHA512:
+  metadata.gz: cdc8d31fdab9fa41d3eb412cbfcb1a12f95661ea03dd858ae30b77d00464dbceb5c81601d9ac6c39bf8b36de6bbaa89fad6ca8c3b606be6a629f0619b4fb762d
+  data.tar.gz: 0b5cc46476c14cf6b169f78adc59f07a5bbbda74eb94a05a668f94e7881886e3260faa1d2495f143a4bc2ad24314ef6283989ef8d0652a18d41b356445efbd39

data/Gemfile

@@ -1,15 +1,16 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gemspec
 
 group :test do
-  gem "debugger"
-  gem "rails", "~>3.2.2"
-  gem "cover_me", "~>1.2.0"
-  gem "bson_ext", "~>1.6.2"
-  gem "mongoid", "~>2.4.8"
-  gem "rspec-rails", "~>2.11.0"
-  gem "capybara", "~> 1.1.3"
-  gem "sass", "~>3.2.3"
-  gem "coffee-script", "~>2.2.0"
-end
+  gem 'byebug'
+  gem 'rails', '~> 3.2.0'
+  gem 'simplecov', '~> 0.7.1'
+  gem 'bson_ext', '~> 1.9.0'
+  gem 'mongoid', '~> 2.7.1'
+  gem 'rspec-rails', '~> 2.14'
+  gem 'capybara', '~> 2.1'
+  gem 'selenium-webdriver', '~> 2.33.0'
+  gem 'sass', '~> 3.2.3'
+  gem 'coffee-script', '~>2.2.0'
+end

data/README.md

@@ -1,10 +1,10 @@
 # About
 
-Lolita I18n is Lolita[https://github.com/ithouse/lolita] plugin, that enables .yml file translation from WEB interface.
+Lolita I18n is [Lolita](https://github.com/ithouse/lolita) plugin, that enables .yml file translation from WEB interface.
 
 ## Usage
 
-* setup rails >3.1 project with ["Lolita"](https://github.com/ithouse/lolita)
+* setup rails 3.2+ 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/lib/lolita-i18n/configuration.rb

@@ -8,7 +8,7 @@ module Lolita
         if Lolita.rails3?
           require 'lolita-i18n/rails'
         end
-      end 
+      end
       # Rerturn existing store or create new Redis connection without any arguments.
       def store
         unless @store
@@ -42,7 +42,7 @@ module Lolita
       def initialize_chain
         ::I18n::Backend::Chain.new(self.backend, self.yaml_backend)
       end
-      
+
       def init
         unless @initialized
           include_modules
@@ -64,17 +64,17 @@ module Lolita
         else
           disconnect
           @connected = begin
-            connection = Redis.new
-            connection.ping
+            store.client.reconnect
+            store.ping
             ::I18n.backend = initialize_chain
             true
           rescue Errno::ECONNREFUSED => e
             warn "Warning: Lolita was unable to connect to Redis DB: #{e}"
             false
-          end       
+          end
         end
       end
-      
+
       def disconnect
         if @connected
           store.client.disconnect
@@ -90,7 +90,6 @@ module Lolita
       def include_modules
         ::I18n::Backend::Simple.send(:include, ::I18n::Backend::Flatten)
         ::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

data/lib/lolita-i18n/request.rb

@@ -22,7 +22,7 @@ module Lolita
         def validate_array(key,values)
           translation = Translation.new(key,values)
           if translation.original.class != values.class || translation.original.size != values.size
-            raise Exceptions::TranslationDoesNotMatch.new(values,translation.original) 
+            raise Exceptions::TranslationDoesNotMatch.new(values,translation.original)
           end
           values.each_with_index do |value,index|
             validate_value(key,value,:index => index)
@@ -32,7 +32,7 @@ module Lolita
         def validate_hash(key,hash)
           translation = Translation.new(key,hash)
           if translation.original.class != hash.class || (hash.keys.map(&:to_sym) - translation.original.keys).any?
-            raise Exceptions::TranslationDoesNotMatch.new(hash,translation.original) 
+            raise Exceptions::TranslationDoesNotMatch.new(hash,translation.original)
           end
           hash.each do |hash_key,value|
             validate_value(key,value, :key => hash_key)
@@ -40,7 +40,7 @@ module Lolita
         end
 
         def validate_value(key,value, options = {})
-          value = value.to_s 
+          value = value.to_s
           original_value = current_value_for_original(key,value,options)
           unless interpolations(value) == interpolations(original_value)
             raise Exceptions::MissingInterpolationArgument.new(interpolations(original_value))
@@ -101,6 +101,7 @@ module Lolita
 
       class Translations
         def initialize(translations_hash)
+          translations_hash.delete(:'i18n')
           @translations = translations_hash
         end
 
@@ -126,8 +127,8 @@ module Lolita
         end
 
         def final_value?(value)
-          !value.is_a?(Hash) || 
-          (value.is_a?(Hash) && value.keys.map(&:to_sym).include?(:other) && value.keys.size > 1 && !value.values.detect{|value| value.is_a?(Array) || value.is_a?(Hash)}) 
+          !value.is_a?(Hash) ||
+          (value.is_a?(Hash) && value.keys.map(&:to_sym).include?(:other) && value.keys.size > 1 && !value.values.detect{|value| value.is_a?(Array) || value.is_a?(Hash)})
         end
 
         def translation_value key, value, locale
@@ -166,7 +167,7 @@ module Lolita
 
       def translations locale
         Lolita.i18n.load_translations
-        translations = Translations.new(Lolita.i18n.yaml_backend.send(:translations)[::I18n.default_locale]) 
+        translations = Translations.new(Lolita.i18n.yaml_backend.send(:translations)[::I18n.default_locale])
         translations.normalized(locale)
       end
 
@@ -194,11 +195,7 @@ module Lolita
         @validator ||= Validator.new()
       end
 
-      def del key
-        Lolita.i18n.store.del key
-      end
-
-      private 
+      private
 
       def both_values_complex?(value_a, value_b)
         (value_a.is_a?(Hash) || value_a.is_a?(Array)) && [Array,Hash].include?(value_b.class)
@@ -207,7 +204,7 @@ module Lolita
       def complex_value?(value_a, value_b)
         (value_a.is_a?(Hash) || value_a.is_a?(Array)) && ![Array,Hash].include?(value_b.class)
       end
-      
+
       def set(key,value)
         translation = Translation.new(key,value)
         validator.validate(key,translation.value)
@@ -216,4 +213,4 @@ module Lolita
 
     end
   end
-end
+end

data/lib/lolita-i18n/version.rb

@@ -1,7 +1,7 @@
 module Lolita
   module I18n
     class Version
-      VERSION = "0.4.3"
+      VERSION = "0.5.1"
 
       def self.to_s
         VERSION

data/lolita-i18n.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |s|
   ]
   s.licenses = ["MIT"]
 
-  s.add_runtime_dependency(%q<lolita>, ["~> 3.2.0.rc.9"])
-  s.add_runtime_dependency(%q<hiredis>, ["~> 0.3.1"])
-  s.add_runtime_dependency(%q<redis>, ["~> 2.2.2"])
-  s.add_runtime_dependency(%q<yajl-ruby>,["~> 1.0.0"])
-  s.add_runtime_dependency(%q<unicode_utils>,["~> 1.3.0"])
-
+  s.add_runtime_dependency(%q<lolita>, ["~> 3.2"])
+  s.add_runtime_dependency(%q<i18n>, ["= 0.6.4"])
+  #s.add_runtime_dependency(%q<hiredis>, ["~> 0.4.5"])
+  s.add_runtime_dependency(%q<redis>, ["~> 3.0.3"])
+  s.add_runtime_dependency(%q<yajl-ruby>,["~> 1.1.0"])
+  s.add_runtime_dependency(%q<unicode_utils>,["~> 1.4.0"])
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]

data/spec/controllers/lolita/i18n_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Lolita::I18nController, :rails => true do 
+describe Lolita::I18nController do 
   
   describe "GET index" do 
     it "should authorize resource" do

data/spec/{requests → features}/translating_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Translating process", :rails => true do 
+describe "Translating process" do 
    def translate_key(key)
     page.should have_selector("textarea[name='#{key}']")
     fill_in(key, :with => "translation for #{key}")

data/spec/{requests → features}/translation_list_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Viewing all translations", :rails => true, :redis => true, :js => true do 
+describe "Viewing all translations", :redis => true, :js => true do 
   before(:each) do 
     visit "/lolita/i18n"
   end

data/spec/lolita-i18n/configuration_spec.rb

@@ -1,57 +1,57 @@
 require 'spec_helper'
 
-describe Lolita::I18n::Configuration do 
+describe Lolita::I18n::Configuration do
   subject { described_class.new }
-  let(:redis){ double("redis", :ping => true) }
+  let(:redis){ double("redis", :ping => true, client: double(disconnect: true, reconnect: true)) }
 
-  it "should load rails if Rails is defined" do 
+  it "should load rails if Rails is defined" do
     Lolita.stub(:rails3?).and_return(true)
     subject.should_receive(:require).with('lolita-i18n/rails')
     subject.load_rails!
   end
 
-  it "should allow to assign store with Hash as connection options" do 
+  it "should allow to assign store with Hash as connection options" do
     Redis.should_receive(:new).with({:key => "value"}).and_return(redis)
     subject.store = {:key => "value"}
   end
 
-  it "should allow to assign store as store itself" do 
-    subject.store = redis 
+  it "should allow to assign store as store itself" do
+    subject.store = redis
     subject.store.should eq(redis)
   end
 
-  it "should return assigned store" do 
+  it "should return assigned store" do
     subject.store = redis
     subject.store.should eq(redis)
   end
 
-  it "should return new Redis connection and warn when no store is assigned"  do 
+  it "should return new Redis connection and warn when no store is assigned"  do
     Redis.should_receive(:new).and_return(redis)
     subject.should_receive(:warn).with("Lolita::I18n No store specified. See Lolita::I18n")
     subject.store.should eq(redis)
   end
 
-  it "should lazy create and return backend" do 
+  it "should lazy create and return backend" do
     Redis.should_receive(:new).and_return(redis)
     ::I18n::Backend::KeyValue.should_receive(:new).with(redis)
     subject.backend
   end
 
-  it "should load translations" do 
+  it "should load translations" do
     yaml_backend = double("yaml_backend")
     subject.yaml_backend = yaml_backend
     yaml_backend.should_receive(:load_translations)
     subject.load_translations
   end
 
-  it "should initialize chain" do 
+  it "should initialize chain" do
     subject.yaml_backend = double("yaml backend")
     Redis.stub(:new).and_return(redis)
     ::I18n::Backend::Chain.should_receive(:new).with(subject.backend,subject.yaml_backend)
     subject.initialize_chain
     Redis.unstub(:new)
   end
-  
+
   describe "#connect" do
     before(:each){ Redis.stub(:new).and_return(redis) }
     after(:each){ Redis.unstub(:new) }
@@ -71,7 +71,7 @@ describe Lolita::I18n::Configuration do
       subject.connect.should_not be_true
     end
   end
-  
+
   describe "#reconnect" do
     it "should call init if not initialized jet" do
       subject.should_receive(:init).once
@@ -105,10 +105,10 @@ describe Lolita::I18n::Configuration do
       subject.reconnect
     end
   end
-  
+
   describe "#disconnect" do
     it "should disconnect if connected" do
-      subject.store.client.should_receive(:disconnect)
+      subject.store.client.should_receive(:disconnect).twice
       subject.connect
       subject.disconnect
     end
@@ -135,13 +135,12 @@ describe Lolita::I18n::Configuration do
       subject.init
     end
   end
-  
+
   describe "#include_modules" do
-    it "include module in ::I18n::Backend::Simple" do 
+    it "include module in ::I18n::Backend::Simple" do
       subject.include_modules
       ::I18n::Backend::Simple.ancestors.should include(::I18n::Backend::Flatten)
       ::I18n::Backend::Simple.ancestors.should include(::I18n::Backend::Pluralization)
-      ::I18n::Backend::Simple.ancestors.should include(::I18n::Backend::Metadata)
       ::I18n::Backend::Simple.ancestors.should include(::I18n::Backend::InterpolationCompiler)
     end
   end

data/spec/spec_helper.rb

@@ -1,16 +1,10 @@
 require 'rubygems'
 require 'bundler'
-require 'cover_me'
 
-CoverMe.config do |c|
-    # where is your project's root:
-    c.project.root = File.expand_path("../lolita-i18n") # => "Rails.root" (default)
-    
-    # what files are you interested in coverage for:
-    c.file_pattern =  [
-      /(#{CoverMe.config.project.root}\/app\/.+\.rb)/i,
-      /(#{CoverMe.config.project.root}\/lib\/.+\.rb)/i
-    ] 
+# run simplecov only wehen all tests are executed
+if ARGV.empty? || ARGV.include?("spec")
+  require 'simplecov'
+  SimpleCov.start 'rails'
 end
 
 REQUIRE_RAILS = true # turn of to run lolita-i18n tests fast
@@ -28,15 +22,11 @@ if REQUIRE_RAILS
   require 'rails_spec_helper'
 end
 require File.expand_path('lib/lolita-i18n')
-  
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.mock_with :rspec
-  config.before(:each,:redis) do
+  config.before(:each, :redis) do
     Lolita.i18n.store.flushdb
   end
-end
-
-at_exit do
-  CoverMe.complete! if 1==1
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita-i18n
 version: !ruby/object:Gem::Version
-  version: 0.4.3
-  prerelease: 
+  version: 0.5.1
 platform: ruby
 authors:
 - ITHouse (Latvia)
@@ -11,88 +10,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-21 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lolita
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0.rc.9
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0.rc.9
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: hiredis
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: unicode_utils
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 description: Lolita plugin, that enables .yml files management from administrative
   interface. Also faster access to translations, that DB store
 email: support@ithouse.lv
@@ -130,6 +119,8 @@ files:
 - lib/lolita-i18n/version.rb
 - lolita-i18n.gemspec
 - spec/controllers/lolita/i18n_controller_spec.rb
+- spec/features/translating_spec.rb
+- spec/features/translation_list_spec.rb
 - spec/helpers/lolita/i18n_helper_spec.rb
 - spec/lolita-i18n/configuration_spec.rb
 - spec/lolita-i18n/exceptions_spec.rb
@@ -137,8 +128,6 @@ files:
 - 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
@@ -157,26 +146,50 @@ files:
 homepage: http://github.com/ithouse/lolita-i18n
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Lolita plugin, that enables .yml management
-test_files: []
+test_files:
+- spec/controllers/lolita/i18n_controller_spec.rb
+- spec/features/translating_spec.rb
+- spec/features/translation_list_spec.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/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