multi_formal_i18n_tenancy 0.0.3 → 0.0.4

data/README.rdoc

@@ -6,7 +6,7 @@ This gem extend the standard i18n backend (I18n::Backend::Simple) to introduce {
 
 <b>1 ) *_formal.yml</b>
 
-Given you want to offer your users the option to be addressed formally or informally through a {session locale switch}[http://https://github.com/Applicat/multi_formal_i18n_tenancy#Backend Locale Switch]: 
+Given you want to offer your users the option to be addressed formally or informally through a {session locale switch}[https://github.com/Applicat/multi_formal_i18n_tenancy#backend-locale-switch]: 
 
 Then this is a {DRY}[http://en.wikipedia.org/wiki/Don%27t_repeat_yourself] solution for the workaround about having duplication of de locales in the de_formal namespace even though informal & formal translation are the same.
 
@@ -14,7 +14,7 @@ This locale file will own all translations from its base *.yml and lets you over
 
 <b>2 ) #{locales_path}/tenants/your_tenant_name/**/your_tenant_name.yml</b>
 
-Given you want to have tenant specific locales through a {session locale switch}[http://https://github.com/Applicat/multi_formal_i18n_tenancy#Backend Locale Switch]:
+Given you want to have tenant specific locales through a {session locale switch}[https://github.com/Applicat/multi_formal_i18n_tenancy#backend-locale-switch]:
 
 <b>Precondition:</b> Assure that you recursively add locale files to i18n's locale path e.g. through your Rails 3 application.rb:
 
@@ -75,7 +75,7 @@ Dependency: https://github.com/iain/http_accept_language
         locale ||= I18n.default_locale
         
         unless Settings.tenant.name == 'global'
-          locale = ("#{Settings.tenant.name}_#{locale}").to_sym
+          locale = ("#{Settings.tenant.name.parameterize.gsub('-', '_')}_#{locale}").to_sym
         end
       end
       
@@ -91,7 +91,6 @@ Tested on MacOS with: Rails 3.1 & Ruby 1.9.2, Rails 3.2.6 & Ruby 1.9.3.
 
 = Future
 
-* automatically add an before filter to rails controller which includes the tenant scope in the locale
 * Support of more backends than only standard simple one
 
 == Contribution

data/lib/multi_formal_i18n_tenancy.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/hash/deep_merge'
 
 module MultiFormalI18nTenancy
 end

data/lib/multi_formal_i18n_tenancy/backend.rb

@@ -56,8 +56,9 @@ class MultiFormalI18nTenancy::Backend < I18n::Backend::Simple
         
         # de_formal > your_enterprise_name_de
         base_locale = locale.to_s.gsub(FORMAL_LOCALE_PATTERN, '') 
-        base_translations = (translations[base_locale.to_sym] || {}).clone.deep_symbolize_keys # deep_symbolize_keys?
-        translations[locale].deep_merge!(base_translations)
+        base_translations = (translations[base_locale.to_sym] || {}).clone.deep_symbolize_keys
+        
+        translations[locale] = base_translations.deep_merge(translations[locale])
       elsif tenant
         base_locale.gsub!(/^#{tenant}_/, '')
       else
@@ -116,7 +117,7 @@ class MultiFormalI18nTenancy::Backend < I18n::Backend::Simple
     deepest_available_locale || I18n.default_locale
   end
   
-  private
+  #private
   
   def tenant_from_locale?(locale)
     tenant = locale.to_s.gsub(FORMAL_LOCALE_PATTERN, '').split('_')
@@ -130,4 +131,16 @@ class MultiFormalI18nTenancy::Backend < I18n::Backend::Simple
     
     tenant && @filenames.select{|f| f.match("/tenants/#{tenant}/")}.any? ? tenant : nil
   end
+  
+  def delete_right_key_if_left_has_key(left_hash, right_hash)
+    right_hash.each do |key,value|
+      next unless left_hash.has_key?(key)
+
+      if value.is_a?(Hash)
+        delete_right_key_if_left_has_key(left_hash[key], value)
+      else
+        right_hash.delete(key) if left_hash.has_key?(key)
+      end
+    end
+  end
 end

data/lib/multi_formal_i18n_tenancy/version.rb

@@ -1,3 +1,3 @@
 module MultiFormalI18nTenancy
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/fixtures/de.yml

@@ -1,3 +1,4 @@
 de:
   formal_available: 'Du'
   formal_unavailable: 'Du'
+  de_formal_formal_available: 'Du'

data/spec/fixtures/de_formal.yml

@@ -1,2 +1,3 @@
 de_formal:
-  formal_available: 'Sie'
+  formal_available: 'Sie'
+  de_formal_formal_available: 'Sie'

data/spec/lib/multi_formal_i18n_tenancy/backend_spec.rb

@@ -23,8 +23,10 @@ describe MultiFormalI18nTenancy::Backend do
         it 'returns the formal translation' do
           I18n.locale = :de
           I18n.t('formal_available').should == 'Du'
+          I18n.t('de_formal_formal_available').should == 'Du'
           I18n.locale = :de_formal
           I18n.t('formal_available').should == 'Sie'
+          I18n.t('de_formal_formal_available').should == 'Sie'
         end
       end
       
@@ -41,8 +43,10 @@ describe MultiFormalI18nTenancy::Backend do
         it 'returns the formal translation' do
           I18n.locale = :your_tenant_name_de
           I18n.t('formal_available').should == 'Du auch'
+          I18n.t('de_formal_formal_available').should == 'Du'
           I18n.locale = :your_tenant_name_de_formal
           I18n.t('formal_available').should == 'Sie auch'
+          I18n.t('de_formal_formal_available').should == 'Sie'
         end
       end
       
@@ -189,4 +193,25 @@ describe MultiFormalI18nTenancy::Backend do
       end
     end
   end
+=begin  
+  describe '#delete_right_key_if_left_key' do
+    include_context :all_locale_file_constellations
+    
+    it 'principally works' do
+      I18n.backend = MultiFormalI18nTenancy::Backend.new
+      
+      left_hash = { key_1: 'value 1', key_2: { key_2_1: 'value 2.1' }}
+      right_hash = { key_1: 'value 2', key_2: { key_2_1: 'value 2.1 a', key_2_2: 'value 2.2' } }
+      
+      #I18n.backend.delete_right_key_if_left_key(left_hash, right_hash)
+      
+      #left_hash.deep_merge!(right_hash)
+      left_hash = right_hash.deep_merge(left_hash)
+      
+      left_hash[:key_1].should == 'value 1'
+      left_hash[:key_2][:key_2_1].should == 'value 2.1'
+      left_hash[:key_2][:key_2_2].should == 'value 2.2'
+    end
+  end
+=end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_formal_i18n_tenancy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70220249428440 !ruby/object:Gem::Requirement
+  requirement: &70348032887440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70220249428440
+  version_requirements: *70348032887440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70220249426980 !ruby/object:Gem::Requirement
+  requirement: &70348032885840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70220249426980
+  version_requirements: *70348032885840
 description: Your formal locales will inherit translations from their base locale
   and locales stored in an enterprise folder can override base + formal translations
 email:
@@ -76,7 +76,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2083026653359506385
+      hash: -2510370042609232382
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2083026653359506385
+      hash: -2510370042609232382
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17