world-flags 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/world_flags/countries.rb

@@ -14,7 +14,8 @@ module WorldFlags
 				:dk => 'Denmark',
 				:se => 'Sweden',
 				:no => 'Norway',
-				:fi => 'Finland'
+				:fi => 'Finland',
+				:tw => 'Taiwan'
 			}
 		end
 

data/lib/world_flags/helper/locale.rb

@@ -15,7 +15,7 @@ module WorldFlags
 
       # ensure all country/language/domain types are mapped to their equivalent locale code
       def locales
-        locale_sources.downcase.map {|loc| WorldFlags.locale(loc) }
+        locale_sources.compact.downcase.map {|loc| WorldFlags.locale(loc) unless loc.blank? }
       end
 
       def locale_sources

data/lib/world_flags/util/language.rb

@@ -17,7 +17,16 @@ module WorldFlags
         raise "No language-locale map defined for locale: #{locale} or :en in #{languages.inspect}" if locale_languages_map.blank?
 
         # raise("No language map defined for language code: #{code} in #{locale_languages_map[code]}")      
-        locale_languages_map[code] ? locale_languages_map[code] : locale_languages_map[default_code_used]         
+        code_language = locale_languages_map[code] ? locale_languages_map[code] : locale_languages_map[default_code_used]         
+
+        case code_language
+        when Array
+          code_language.join(',')
+        when String
+          code_language
+        else
+          raise "The language in the language map must be either a String or Array, was #{code_language.inspect}"
+        end
       rescue Exception => e
         raise e if WorldFlags.raise_error?
         "Undefined"

data/spec/world_flags/json/json_languages_spec.rb

@@ -29,6 +29,6 @@ describe WorldFlags::Helper::View do
     output = flags_list 32 do
       flags [:tw]
     end
-    output.should == "<ul class=\"f32\"><li class=\"flag tw\" data-cc=\"tw\" data-country_name=\"United States\" data-language_name=\"zh:Chinese zh-tw:Taiwanese\" data-locale=\"tw\">&nbsp;</li></ul>"
+    output.should == "<ul class=\"f32\"><li class=\"flag tw\" data-cc=\"tw\" data-country_name=\"Taiwan\" data-language_name=\"zh:Chinese,zh-tw:Taiwanese\" data-locale=\"tw\">&nbsp;</li></ul>"
   end
 end

data/world-flags.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "world-flags"
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: world-flags
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -194,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3849876865143425182
+      hash: -3536745244245353850
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: