multi_formal_i18n_tenancy 0.0.4 → 0.0.5

data/lib/multi_formal_i18n_tenancy/backend.rb

@@ -6,7 +6,7 @@ class MultiFormalI18nTenancy::Backend < I18n::Backend::Simple
   TENANT_LOCALE_PATTERN = /tenants$/
 
   attr_accessor :filenames
- 
+  
   # Accepts a list of paths to translation files. Loads translations from
   # plain Ruby (*.rb) or YAML files (*.yml). See #load_rb and #load_yml
   # for details.
@@ -15,66 +15,7 @@ class MultiFormalI18nTenancy::Backend < I18n::Backend::Simple
     
     @filenames = filenames.flatten
     
-    [
-      # locale file groups order (ancestor chain)
-      #
-      # a) de > de_formal > your_enterprise_name_de > your_enterprise_name_de_formal
-      # b) de > your_enterprise_name_de
-      
-      # de
-      ->(f) { !f.match(FORMAL_FILENAME_PATTERN) && !f.match(TENANT_FILENAME_PATTERN) },
-      # de > your_enterprise_name_de
-      ->(f) { !f.match(FORMAL_FILENAME_PATTERN) && f.match(TENANT_FILENAME_PATTERN) },
-      # de > de_formal
-      ->(f) { f.match(FORMAL_FILENAME_PATTERN) && !f.match(TENANT_FILENAME_PATTERN) },
-      # de > de_formal > your_enterprise_name_de > your_enterprise_name_de_formal
-      ->(f) { f.match(FORMAL_FILENAME_PATTERN) && f.match(TENANT_FILENAME_PATTERN) }
-    ].each do |filename_filter|
-      filenames.flatten.select{|f| filename_filter.call(f) }.each { |filename| load_file(filename) }
-    end
-    
-    @filenames = [] # free memory
-  end
-      
-  # Stores translations for the given locale in memory.
-  # This uses a deep merge for the translations hash, so existing
-  # translations will be overwritten by new ones only at the deepest
-  # level of the hash.
-  def store_translations(locale, data, options = {})
-    locale = locale.to_sym
-    
-    # the has_key check assures that the inheritance will be performed for the first locale file
-    if (locale.to_s.match(FORMAL_LOCALE_PATTERN) || tenant_from_locale?(locale)) && !translations.has_key?(locale)
-      # inherit keys from base locale file
-      base_locale = locale.to_s
-      tenant = tenant_from_locale?(locale)
-      
-      if tenant && locale.to_s.match(FORMAL_LOCALE_PATTERN)
-        # de > de_formal
-        base_locale = locale.to_s.gsub(/^#{tenant}_/, '')
-        translations[locale] = (translations[base_locale.to_sym] || {}).clone
-        
-        # 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
-        
-        translations[locale] = base_translations.deep_merge(translations[locale])
-      elsif tenant
-        base_locale.gsub!(/^#{tenant}_/, '')
-      else
-        base_locale.gsub!(FORMAL_LOCALE_PATTERN, '') 
-      end
-       
-      unless tenant && locale.to_s.match(FORMAL_LOCALE_PATTERN)
-        translations[locale] = (translations[base_locale.to_sym] || {}).clone
-      end
-    else
-      translations[locale] ||= {}
-    end
-    
-    data = data.deep_symbolize_keys
-    
-    translations[locale].deep_merge!(data)
+    @filenames.each { |filename| load_file(filename) }
   end
   
   def available_locale(options = {})
@@ -117,7 +58,64 @@ class MultiFormalI18nTenancy::Backend < I18n::Backend::Simple
     deepest_available_locale || I18n.default_locale
   end
   
-  #private
+  protected
+  
+  # Looks up a translation from the translations hash. Returns nil if
+  # eiher key is nil, or locale, scope or key do not exist as a key in the
+  # nested translations hash. Splits keys or scopes containing dots
+  # into multiple keys, i.e. <tt>currency.format</tt> is regarded the same as
+  # <tt>%w(currency format)</tt>.
+  def lookup(locale, key, scope = [], options = {})
+    init_translations unless initialized?
+    
+    # only formal address: [:de, :de_formal]
+    # only multi tenancy: [:de, :tenant_name_de]
+    # formal address & multi tenancy: [:de, :tenant_name_de, :de_formal, :tenant_name_de_formal]
+    
+    locales = []
+    
+    base_locale = locale.to_s.gsub(FORMAL_LOCALE_PATTERN, '')
+    
+    tenant = tenant_from_locale?(locale)
+    base_locale.gsub!(/^#{tenant}_/, '') if tenant
+    
+    locales << base_locale.to_sym 
+    
+    if locale.to_s.match(FORMAL_LOCALE_PATTERN) && tenant && locale.to_s.match(/^#{tenant}_/)
+      locales << locale.to_s.gsub(FORMAL_LOCALE_PATTERN, '').to_sym
+      locales << locale.to_s.gsub(/^#{tenant}_/, '').to_sym
+    end
+    
+    locales << locale unless locales.include?(locale)
+    
+    entry, last_entry = nil, nil
+    
+    locales.each do |locale|
+      keys = I18n.normalize_keys(locale, key, scope, options[:separator])
+  
+      entry = keys.inject(translations) do |result, _key|
+        _key = _key.to_sym
+        
+        unless result.is_a?(Hash) && result.has_key?(_key)
+          nil
+        else
+          result = result[_key]
+          result = resolve(locale, _key, result, options.merge(:scope => nil)) if result.is_a?(Symbol)
+          result
+        end
+      end
+      
+      if entry.nil?
+        entry = last_entry
+      else
+        last_entry = entry
+      end
+    end
+    
+    entry
+  end
+  
+  private
   
   def tenant_from_locale?(locale)
     tenant = locale.to_s.gsub(FORMAL_LOCALE_PATTERN, '').split('_')
@@ -131,16 +129,4 @@ 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.4"
+  VERSION = "0.0.5"
 end

data/spec/lib/multi_formal_i18n_tenancy/backend_spec.rb

@@ -11,7 +11,7 @@ describe MultiFormalI18nTenancy::Backend do
     I18n.locale = I18n.default_locale
   end
   
-  describe '#load_translations' do
+  describe '#lookup' do
     include_context :all_locale_file_constellations
     
     before :all do
@@ -193,25 +193,4 @@ 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.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-15 00:00:00.000000000 Z
+date: 2012-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70348032887440 !ruby/object:Gem::Requirement
+  requirement: &70201387898160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70348032887440
+  version_requirements: *70201387898160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70348032885840 !ruby/object:Gem::Requirement
+  requirement: &70201387896560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,9 +32,10 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  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
+  version_requirements: *70201387896560
+description: ! 'Your locales about polite form of address will inherit translations
+  from their base locale and locales stored in a tenant directory can override base
+  + formal translations '
 email:
 - gawlista@googlemail.com
 executables: []
@@ -62,7 +63,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/deferred_garbage_collection.rb
 - spec/support/shared_contexts/all_locale_file_constellations.rb
-homepage: http://applicat.github.com/multi_formal_i18n_tenancy
+homepage: http://github.com/Applicat/multi_formal_i18n_tenancy
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -76,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2510370042609232382
+      hash: 3959917024077130504
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -85,14 +86,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2510370042609232382
+      hash: 3959917024077130504
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: Your formal locales will inherit translations from their base locale and
-  locales stored in an enterprise folder can override base + formal translations
+summary: Your locales about polite form of address will inherit translations from
+  their base locale and locales stored in a tenant directory can override base + formal
+  translations
 test_files:
 - spec/fixtures/de.yml
 - spec/fixtures/de_formal.yml