lola 0.1.2 → 0.1.3

data/CHANGELOG.md

@@ -5,4 +5,7 @@
 * Fix problem with helpers
 
 ### 0.1.2
-* Fix problema with Norwegian ISO code
+* Fix problema with Norwegian ISO code
+
+### 0.1.3
+* Use English as default locale

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/lola.rb

@@ -14,11 +14,12 @@ module Lola
 
   # Raised when attemting to switch to a locale which does not exist
   class UnavailableLocale < RuntimeError; end
-
+  
   # Returns a list of all languages
   def self.languages(options={})
     # Use specified locale or fall back to default locale
-    locale = (options.delete(:locale) || @default_locale).to_s
+    locale = options.delete(:locale) || @default_locale
+    locale = available_locales.include?(locale) ? locale.to_s : @default_locale.to_s
 
     # Load the country list for the specified locale
     @languages ||= {}
@@ -65,6 +66,14 @@ module Lola
   end
 
   protected
+  def self.available_locales
+    locales = Array.new
+    Dir.glob("#{@data_path}/*.yml") do |filename|
+      locales << File.basename(filename, '.yml').to_sym
+    end
+    locales
+  end
+  
   def self.search_collection(collection, value, index_to_match, index_to_retrieve)
     return nil if collection.nil? || value.nil? || value.empty?
     collection.each do |m|

data/lola.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "lola"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Carlos Hernandez"]

data/test/test_lola.rb

@@ -38,7 +38,7 @@ class TestLola < Test::Unit::TestCase
     Lola.default_locale = :es
     assert_equal 'Griego', Lola.language_name('EL')
   end
-
+  
   def test_language_code
     assert_equal 'ES', Lola.language_code('Spanish')
     assert_equal 'ES', Lola.language_code('spanish')
@@ -84,9 +84,7 @@ class TestLola < Test::Unit::TestCase
   end
 
   def test_unsupported_locale
-    assert_raises Lola::UnavailableLocale do
-      Lola.languages(:locale => :latin)
-    end
+    assert_equal 'English', Lola.language_name('EN', :locale => :latin)
   end
 
   def test_special_characters_dont_rails_an_exception

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lola
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2359747171660169643
+      hash: -205451062462248237
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: