exvo_globalize 0.3.0 → 0.3.1

data/app/controllers/globalize_translations_controller.rb

@@ -14,7 +14,7 @@ class GlobalizeTranslationsController < ApplicationController
   end
 
   def update
-    if I18n.backend.store_flatten_translations(@globalize_app.fetch_translations)
+    if I18n.backend.store_nested_translations(@globalize_app.fetch_translations)
       flash.now[:notice] = 'Translations updated'
     else
       flash.now[:alert] = 'There was a problem while updating translations'

data/lib/exvo_globalize/backend/chain.rb

@@ -7,7 +7,7 @@ module I18n
         # returning a combined hash with translations from all chained backends
         def available_translations
           # reverse, so that the translations from the first backend (GlobalizeStore) overwrite/overshadow others
-          backends.map { |backend| backend.available_translations }.reverse.inject(&:merge)
+          @available_translations ||= backends.map { |backend| backend.available_translations }.reverse.inject(&:merge)
         end
 
         # Return a hash only with Application translations
@@ -30,11 +30,22 @@ module I18n
           translations
         end
 
-        # stores a whole Hash of flattened translations
+        # stores a whole Hash of nested translations (like those: { :en => { :session => { :title => 'Title' } } })
+        def store_nested_translations(translations_hash)
+          return false if translations_hash.blank?
+
+          translations_hash.reject { |locale, translations| locale.to_sym == :default_locale }.each do |locale, translations|
+            next if translations.blank?
+
+            store_translations(locale, translations)
+          end
+        end
+
+        # stores a whole Hash of flattened translations (like those: { :en => { 'session.title' => 'Title' } })
         def store_flatten_translations(translations_hash)
           return false if translations_hash.blank?
 
-          translations_hash.reject { |key, value| key.to_sym == :default_locale }.each do |locale, translations|
+          translations_hash.reject { |locale, translations| locale.to_sym == :default_locale }.each do |locale, translations|
             next if translations.blank?
 
             translations.each do |key, value|

data/lib/exvo_globalize/version.rb

@@ -1,3 +1,3 @@
 module ExvoGlobalize
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/controllers/globalize_translations_controller_spec.rb

@@ -56,7 +56,7 @@ describe GlobalizeTranslationsController do
 
     describe "PUT :update" do
       let(:intro) { "Introduction" }
-      let(:translations) { { :en => { :intro => intro } } }
+      let(:translations) { { :en => { :intro => { :title => intro } } } }
 
       before do
         controller.stub!(:require_admin).and_return(true)
@@ -65,7 +65,7 @@ describe GlobalizeTranslationsController do
       end
 
       it "updates the translations" do
-        I18n.t(:intro).should eq(intro)
+        I18n.t(:title, :scope => :intro).should eq(intro)
       end
 
       it "sets a flash notice" do

data/spec/exvo_globalize/globalize_store_spec.rb

@@ -21,6 +21,7 @@ describe ExvoGlobalize do
   context "translation storage" do
     let(:hello_world) { 'Hello world' }
     let(:hello_earth) { 'Hello Earth' }
+    let(:hello_mars) { 'Hello Mars' }
 
     it "stores a flatten translations hash" do
       I18n.backend.store_flatten_translations({ :en => { 'hello.world' => hello_world, 'hello.earth' => hello_earth } })
@@ -29,8 +30,13 @@ describe ExvoGlobalize do
     end
 
     it "stores a flatten translation" do
-      I18n.backend.store_flatten_translation(I18n.locale, 'hello.earth', hello_earth)
-      I18n.translate(:earth, :scope => [:hello]).should eql(hello_earth)
+      I18n.backend.store_flatten_translation(I18n.locale, 'hello.mars', hello_mars)
+      I18n.translate(:mars, :scope => [:hello]).should eql(hello_mars)
+    end
+
+    it "stores a nested translations hash" do
+      I18n.backend.store_nested_translations({ :en => { :nested => { :hello => hello_world } } })
+      I18n.translate(:hello, :scope => :nested).should eql(hello_world)
     end
 
     it "stores a nested translation" do
@@ -40,7 +46,7 @@ describe ExvoGlobalize do
   end
 
   it "falls back to the YAML file if the translation is missing in the GlobalizeStore backend (db)" do
-    I18n.translate('yaml.title').should eq('YAML Title')
+    I18n.translate('yaml.title').should eq('YAML Nested Title')
   end
 
   it "prioritizes the translations from GlobalizeStore backend (db) over others" do
@@ -48,7 +54,11 @@ describe ExvoGlobalize do
   end
 
   it "lists available_translations from the Simple backend (YAML files)" do
-    I18n.backend.simple.available_translations[:en][:title].should eq('YAML Title')
+    I18n.backend.simple.available_translations[:en][:yaml][:title].should eq('YAML Nested Title')
+  end
+
+  it "lists available app translations" do
+    I18n.backend.available_app_translations[:en][:helpers][:select].has_key?(:prompt).should be_true
   end
 
   it "excludes fixtures from app_translations and does so without breaking the I18n.load_path" do

data/spec/fixtures/locales/en.yml

@@ -3,7 +3,7 @@ en:
   title: YAML Title
 
   yaml:
-    title: YAML Title
+    title: YAML Nested Title
 
   mail:
     one: "You have 1 message"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exvo_globalize
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - "Pawe\xC5\x82 Go\xC5\x9Bcicki"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-19 00:00:00 +02:00
+date: 2011-08-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency