genki-merb_babel 0.1.0.7 → 0.1.1.0

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb_babel"
-GEM_VERSION = "0.1.0.7"
+GEM_VERSION = "0.1.1.0"
 AUTHOR = "Matt Aimonetti"
 EMAIL = "mattaimonetti@gmail.com"
 HOMEPAGE = "http://github.com/mattetti/merb_babel/"
@@ -49,3 +49,10 @@ task :gemspec do
     file.puts spec.to_ruby
   end
 end
+
+desc "Run specs"
+task :spec do
+  sh "spec --color spec"
+end
+
+task :default => :spec

data/lib/merb_babel/m_i18n.rb

@@ -1,7 +1,7 @@
 module MI18n
   
   def self.lookup(options)
-    key = options[:key].to_s.intern
+    key = options[:key].to_s
     language = options[:language]
     country = options[:country]
     raise ArgumentError, "You need to pass a language reference" unless language
@@ -19,9 +19,9 @@ module MI18n
   end
   
   def self.lookup_with_full_locale(key, language, country)
-    country = country.to_s.intern
     if ML10n.localizations.has_key?(language)
-      ML10n.localizations[language].has_key?(country) ? ML10n.localizations[language][country][key.to_s] : nil 
+      ML10n.localizations[language].has_key?(country) ?
+        ML10n.localizations[language][country][key.to_s] : nil 
     else
       nil
     end

data/lib/merb_babel/m_l10n.rb

@@ -1,4 +1,6 @@
 module ML10n
+  LANGUAGE_CODE_KEY = 'mloc_language_code'.freeze
+  COUNTRY_CODE_KEY = 'mloc_country_code'.freeze
   
   class << self
   
@@ -45,7 +47,7 @@ module ML10n
       ML10n.reset_localization_files! 
       ML10n.find_localization_files.each do |l_file|
         begin
-          l_hash = YAML.load_file(l_file).symbolize_keys
+          l_hash = YAML.load_file(l_file)#.symbolize_keys
         rescue Exception => e
           # might raise a real error here in the future
           p e.inspect
@@ -85,6 +87,10 @@ module ML10n
       @@localization_files = nil
       ML10n.find_localization_files
     end
+
+    def reset_localizations!
+      @@localizations = {}
+    end
   
     def reload_localization_files!
       ML10n.reset_localization_files!
@@ -99,10 +105,10 @@ module ML10n
     protected
   
     def load_localization_hash(l_hash)
-      if l_hash.valid_localization_hash?
-        language = l_hash[:mloc_language_code]
-        if l_hash.localization_hash_with_locale?
-          country = l_hash[:mloc_country_code]
+      if l_hash.has_key?(LANGUAGE_CODE_KEY)
+        language = l_hash[LANGUAGE_CODE_KEY]
+        if l_hash.has_key?(COUNTRY_CODE_KEY)
+          country = l_hash[COUNTRY_CODE_KEY]
           # load localization under the full locale namespace
           ML10n.localizations[language] ||= {}
           (ML10n.localizations[language][country] ||= {}).merge!(l_hash)

data/lib/merb_babel/m_locale.rb

@@ -4,95 +4,93 @@ require 'locale'
 # The MLocale module helps you set up a locale, language, country
 # You don't have to use a locale, in some cases you might just want to use the language
 module MLocale
-
-    def locale_from_request
-      if hal = request.env["HTTP_ACCEPT_LANGUAGE"]
-        hal.gsub!(/\s/, "")
-        result = hal.split(/,/).map do |v|
-          v.split(";q=")
-        end.map do |j|
-          [j[0], j[1] ? j[1].to_f : 1.0]
-        end.sort do |a,b|
-          -(a[1] <=> b[1])
-        end.map do |v|
-          Locale::Tag.parse(v[0])
-        end.first
-        return nil if result.nil?
-        language = result.language
-        country = result.country ||
-          LocaleDetector.country_from_language(language)
-        request.env[:locale] = "#{language}-#{country}"
-      end
+  def locale_from_request
+    if hal = request.env["HTTP_ACCEPT_LANGUAGE"]
+      hal.gsub!(/\s/, "")
+      result = hal.split(/,/).map do |v|
+        v.split(";q=")
+      end.map do |j|
+        [j[0], j[1] ? j[1].to_f : 1.0]
+      end.sort do |a,b|
+        -(a[1] <=> b[1])
+      end.map do |v|
+        Locale::Tag.parse(v[0])
+      end.first
+      return nil if result.nil?
+      language = result.language
+      country = result.country ||
+        LocaleDetector.country_from_language(language)
+      request.env[:locale] = "#{language}-#{country}"
     end
+  end
 
-    # A locale is made of a language + country code, such as en-UK or en-US 
-    def locale 
-      request.env[:locale] || params[:locale] || (session ? session[:locale] : nil) || locale_from_request || default_locale
-    end
-    
-    # Many people don't care about locales, they might just want to use languages instead
-    def language
-      request.env[:language] || params[:language] || language_from_locale || (session ? session[:language] : nil) || default_language
+  # A locale is made of a language + country code, such as en-UK or en-US 
+  def locale 
+    request.env[:locale] || params[:locale] || (session ? session[:locale] : nil) || locale_from_request || default_locale
+  end
+  
+  # Many people don't care about locales, they might just want to use languages instead
+  def language
+    request.env[:language] || params[:language] || language_from_locale || (session ? session[:language] : nil) || default_language
+  end
+  
+  # The country is used when localizing currency or time
+  def country
+    request.env[:country] || params[:country] || country_from_locale || (session ? session[:country] : nil) || LocaleDetector.country_from_language(language) || default_country
+  end
+  
+  # Extract the language from the locale
+  def language_from_locale
+    if request.env[:locale] && request.env[:locale] =~ locale_regexp
+      language, country = request.env[:locale].match(locale_regexp).captures
+      return language
+    else 
+      return nil
     end
-    
-    # The country is used when localizing currency or time
-    def country
-      request.env[:country] || params[:country] || country_from_locale || (session ? session[:country] : nil) || LocaleDetector.country_from_language(language) || default_country
+  end
+  
+  # Extract the country from the locale
+  def country_from_locale
+    request.env[:locale] ? request.env[:locale][3..5].upcase : nil
+  end
+  
+  # Defaults set in the plugin settings
+  # You can change the default settings by overwriting 
+  # the Merb::Plugins.config[:merb_abel] hash in your settings
+  #
+    def default_locale
+      Merb::Plugins.config[:merb_babel] ? Merb::Plugins.config[:merb_babel][:default_locale] : nil
     end
-    
-    # Extract the language from the locale
-    def language_from_locale
-      if request.env[:locale] && request.env[:locale] =~ locale_regexp
-        language, country = request.env[:locale].match(locale_regexp).captures
-        return language
-      else 
-        return nil
-      end
+
+    def default_language
+      Merb::Plugins.config[:merb_babel] ? Merb::Plugins.config[:merb_babel][:default_language] : nil
     end
-    
-    # Extract the country from the locale
-    def country_from_locale
-      request.env[:locale] ? request.env[:locale][3..5].upcase : nil
+  
+    def default_country
+      Merb::Plugins.config[:merb_babel] ? Merb::Plugins.config[:merb_babel][:default_country] : nil
     end
-    
-    # Defaults set in the plugin settings
-    # You can change the default settings by overwriting 
-    # the Merb::Plugins.config[:merb_abel] hash in your settings
-    #
-      def default_locale
-        Merb::Plugins.config[:merb_babel] ? Merb::Plugins.config[:merb_babel][:default_locale] : nil
-      end
+  #
+  #### end of defaults
+  
+  protected
 
-      def default_language
-        Merb::Plugins.config[:merb_babel] ? Merb::Plugins.config[:merb_babel][:default_language] : nil
-      end
-    
-      def default_country
-        Merb::Plugins.config[:merb_babel] ? Merb::Plugins.config[:merb_babel][:default_country] : nil
-      end
-    #
-    #### end of defaults
+    def locale_regexp
+      /(.+)\-([a-z]{2})/i
+    end
     
-    protected
-  
-      def locale_regexp
-        /(.+)\-([a-z]{2})/i
+    # takes a locale as in fr-FR or en-US
+    def set_locale
+      if locale =~ locale_regexp
+        language, country = locale.match(locale_regexp).captures
+        # Set the locale, language and country
+        language = language.downcase
+        country = country.upcase
+        request.env[:locale] = "#{language}-#{country}"
       end
       
-      # takes a locale as in fr-FR or en-US
-      def set_locale
-        if locale =~ locale_regexp
-          language, country = locale.match(locale_regexp).captures
-          # Set the locale, language and country
-          language = language.downcase
-          country = country.upcase
-          request.env[:locale] = "#{language}-#{country}"
-        end
-        
-      end
-    
-      def set_language
-        request.env[:language] = language.downcase
-      end
+    end
   
+    def set_language
+      request.env[:language] = language.downcase
+    end
 end

data/lib/merb_babel.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__) / "merb_babel" / "core_ext")
+#require File.join(File.dirname(__FILE__) / "merb_babel" / "core_ext")
 
 # make sure we're running inside Merb
 if defined?(Merb::Plugins)
@@ -29,8 +29,8 @@ if defined?(Merb::Plugins)
             options.merge!(:language => language) unless options.has_key?(:language)
             options.merge!(:country => country) unless options.has_key?(:country)
             MI18n.lookup(options)
-          rescue
-            key.to_s
+          #rescue
+          #  key.to_s
           end
         end
         alias :translate :babelize

data/spec/m_i18n_spec.rb

@@ -10,6 +10,10 @@ describe '#babelize' do
     ML10n.load_localization!
   end
 
+  after(:each) do
+    ML10n.reset_localizations!
+  end
+
   it "should babelize a word in English " do
     @c.locale.should == 'en-US'
     @c.language.should == 'en'
@@ -46,4 +50,4 @@ describe '#babelize' do
     @c.t(:greetings, :language => 'fr').should == 'Salut'
   end
   
-end
+end

data/spec/m_l10n_spec.rb

@@ -7,6 +7,10 @@ describe "ML10n" do
     @lang_test_path_2 = File.expand_path(File.dirname(__FILE__) + "/other_lang_dir")
     ML10n.reset_localization_files_and_dirs!
   end
+
+  after(:each) do
+    ML10n.reset_localizations!
+  end
   
   it "should have a list of localization directories" do
     ML10n.localization_dirs.should == Merb::Plugins.config[:merb_babel][:localization_dirs]
@@ -27,24 +31,24 @@ describe "ML10n" do
   it "should load localization files and have them available" do
     ML10n.add_localization_dir(@lang_test_path)
     ML10n.load_localization!
-    ML10n.localizations['en'][:right].should == 'right'
-    ML10n.localizations['en'][:left].should == 'left'
-    ML10n.localizations['en']['US'][:greetings].should == 'Howdie'
+    ML10n.localizations['en']['right'].should == 'right'
+    ML10n.localizations['en']['left'].should == 'left'
+    ML10n.localizations['en']['US']['greetings'].should == 'Howdie'
   end
   
   it "should load more localization files and have them available" do
     ML10n.add_localization_dir(@lang_test_path)
     ML10n.load_localization!
-    ML10n.localizations['en'][:right].should == 'right'
+    ML10n.localizations['en']['right'].should == 'right'
     ML10n.localizations.has_key?('fr').should be_false
     
     ML10n.add_localization_dir(@lang_test_path_2)
     ML10n.load_localization!
-    ML10n.localizations['en'][:right].should == 'right'
+    ML10n.localizations['en']['right'].should == 'right'
     ML10n.localizations.has_key?('fr').should be_true
-    ML10n.localizations['fr'][:right].should == 'la droite'
-    ML10n.localizations['fr'][:left].should == 'la gauche'
-    ML10n.localizations['fr'][:greetings].should == 'Salut'
+    ML10n.localizations['fr']['right'].should == 'la droite'
+    ML10n.localizations['fr']['left'].should == 'la gauche'
+    ML10n.localizations['fr']['greetings'].should == 'Salut'
   end
   
-end
+end

data/spec/spec_helper.rb

@@ -47,4 +47,4 @@ class LanguageController < Merb::Controller
   
   before :set_language
   def index; end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: genki-merb_babel
 version: !ruby/object:Gem::Version 
-  version: 0.1.0.7
+  version: 0.1.1.0
 platform: ruby
 authors: 
 - Matt Aimonetti
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-12 00:00:00 -08:00
+date: 2009-01-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,6 @@ files:
 - Rakefile
 - TODO
 - lib/merb_babel
-- lib/merb_babel/core_ext.rb
 - lib/merb_babel/locale_detector.rb
 - lib/merb_babel/m_i18n.rb
 - lib/merb_babel/m_l10n.rb

data/lib/merb_babel/core_ext.rb

@@ -1,29 +0,0 @@
-module MerbBabel
-  
-  module HashExtension
-
-    def symbolize_keys
-      inject({}) do |options, (key, value)|
-        options[key.to_sym || key] = value
-        options
-      end
-    end
-    
-    def symbolize_keys!
-        self.replace(self.symbolize_keys)
-    end
-    
-    def valid_localization_hash?
-      self.has_key?(:mloc_language_code)
-    end
-    
-    def localization_hash_with_locale?
-      self.has_key?(:mloc_country_code)
-    end
-
-  end
-
-end
-
-
-Hash.send :include, MerbBabel::HashExtension