mack-localization 0.8.0.101 → 0.8.1

data/lib/mack-localization.rb

@@ -68,3 +68,11 @@ dir_globs = Dir.glob(File.join(File.dirname(__FILE__), "mack-localization", "**/
 dir_globs.each do |d|
   require d
 end
+
+
+configatron.mack.localization.set_default(:base_language, 'en')
+configatron.mack.localization.set_default(:supported_languages, %w{bp en fr it de es})
+configatron.mack.localization.set_default(:char_encoding, 'us-ascii')
+configatron.mack.localization.set_default(:dynamic_translation, false)
+configatron.mack.localization.set_default(:base_directory, [Mack::Paths.app('lang')])
+configatron.mack.localization.set_default(:content_expiry, 3600)

data/lib/mack-localization/configuration.rb

@@ -5,22 +5,49 @@
 # {config_dir}/localization/ inside the application directory.
 # If the file doesn't exist then it will just load default configuration.
 #
-module Mack
-  module Localization # :nodoc:
-    module Configuration
 
-      configatron.mack.localization.base_language = 'en'
-      configatron.mack.localization.supported_languages = %w{bp en fr it de es}
-      configatron.mack.localization.char_encoding = 'us-ascii'
-      configatron.mack.localization.dynamic_translation = false
-      configatron.mack.localization.base_directory = Mack::Paths.app('lang')
-      configatron.mack.localization.content_expiry = 3600
+module Mack
+  module Localization
+    
+    class Configuration
+      include Singleton
+      def initialize
+        @storage = Mack::Localization::Storage.new
+      end
+      
+      def setup
+        yield @storage
+      end
+      
+      def method_missing(sym, *args)
+        @storage.send(sym, *args)
+      end
+    end
+    
+    class Storage
+      
+      def base_directory= (path)
+        arr = configatron.mack.localization.base_directory
+        arr = [] if arr.is_a?(Configatron::Store) and !arr.is_a?(Array)
+        arr << path
+        arr.uniq!
+        configatron.mack.localization.base_directory = arr
+      end
       
-      path = Mack::Paths.config("localization", "localization.rb")
-      if File.exists?(path)
-        require path
+      def base_directory
+        arr = configatron.mack.localization.base_directory
+        arr = [Mack::Paths.app('lang')] if arr.is_a?(Configatron::Store) and !arr.is_a?(Array)
+        return (arr.size == 1) ? arr[0] : arr
       end
-    end 
+      
+      def method_missing(sym, *args)
+        supported_settings = [:base_language, :supported_languages, :char_encoding, :dynamic_translation, :content_expiry,
+                              :base_language=, :supported_languages=, :char_encoding=, :dynamic_translation=, :content_expiry=]
+        if supported_settings.include?(sym)
+          configatron.mack.localization.send(sym, *args)
+        end
+      end
+    end
   end
 end
 
@@ -30,6 +57,6 @@ class Object
   # Give access to the mack l10n config object from anywhere inside the application
   #
   def l10n_config
-    configatron.mack.localization
+    Mack::Localization::Configuration.instance
   end
-end
+end

data/lib/mack-localization/translator.rb

@@ -31,7 +31,7 @@ module Mack
         raise Mack::Localization::Errors::UnsupportedLanguage.new(base_lang) if !l10n_config.supported_languages.include?(base_lang)
         
         cache_key = "#{view_sym}_#{base_lang}_content"
-        path      = File.join(l10n_config.base_directory, "views", "#{view_name}", "content_#{base_lang}.yml")
+        path      = File.join("views", "#{view_name}", "content_#{base_lang}.yml")
         content_hash = load_content_hash(cache_key, base_lang, path)
       
         raise Mack::Localization::Errors::UnknownStringKey.new(key) if content_hash[key] == nil
@@ -60,7 +60,7 @@ module Mack
         raise Mack::Localization::Errors::UnsupportedLanguage.new(base_lang) if !l10n_config.supported_languages.include?(base_lang)
         
         cache_key = "rules_content_#{base_lang}"
-        path      = File.join(l10n_config.base_directory, "rules", "inflection_#{base_lang}.yml")
+        path      = File.join("rules", "inflection_#{base_lang}.yml")
         content_hash = load_content_hash(cache_key, base_lang, path)
         
         hash = content_hash[type]
@@ -81,17 +81,27 @@ module Mack
             
       private 
       
-      def load_content_hash(cache_key, base_lang, path)
+      def load_content_hash(cache_key, base_lang, rsc_path)
         # content_hash = l10n_config.send("#{cache_key}")
         content_hash = l10n_cache.get("#{cache_key}")
         
         if content_hash.nil?
           raise Mack::Localization::Errors::InvalidConfiguration.new if base_lang.nil?
-          raise Mack::Localization::Errors::LanguageFileNotFound.new(path) if !File.exists?(path)
           
-          data = File.read(path)
-          content_hash = YAML.load(data)
-          l10n_cache.set("#{cache_key}", content_hash, l10n_config.content_expiry)
+          base_dir_arr = [l10n_config.base_directory].flatten
+          found_path = false
+          base_dir_arr.each do |base_dir|
+            path = File.join(base_dir, rsc_path)
+            found_path = File.exists?(path)
+            if found_path
+              data = File.read(path)
+              content_hash = YAML.load(data)
+              l10n_cache.set("#{cache_key}", content_hash, l10n_config.content_expiry)
+              break
+            end
+          end
+          
+          raise Mack::Localization::Errors::LanguageFileNotFound.new(rsc_path) if !found_path
         end
         
         return content_hash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack-localization
 version: !ruby/object:Gem::Version 
-  version: 0.8.0.101
+  version: 0.8.1
 platform: ruby
 authors: 
 - Darsono Sutedja
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-11 00:00:00 -04:00
+date: 2008-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.0.101
+        version: 0.8.1
     version: 
 description: Localization support for Mack Framework
 email: Darsono.Sutedja@gmail.com