world-flags 0.3.6 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.4.0

data/lib/world-flags.rb

@@ -37,7 +37,7 @@ module WorldFlags
 
 		# see core_ext
 		def flag_locale_map
-			locale_flag_map.hash_revert
+			@flag_locale_map ||= keys_to_sym(locale_flag_map.hash_revert)
 		end
 
 		protected

data/lib/world_flags/helper/view/util.rb

@@ -25,17 +25,19 @@ module WorldFlags
 				end
 
 				def self.flag_options code, title, name, options = {}
-					locale = WorldFlags.locale(code)
+					locale = I18n.locale
 					extra_options = title ? {:title => title } : {}			
 					selected = flag_selected?(code, options) ? ' selected' : ''
 
-					language_name = WorldFlags.language(locale, code)
-					country_name = WorldFlags.country(locale, code)
+					language_name = WorldFlags.language(code, locale)
+					country_name = WorldFlags.country(code, locale)
 
 					# add semi class if not selected
 					semi = (selected.blank? ? ' semi' : '') if options[:with_semi]
 
-					{:class => "flag #{code}#{selected}#{semi}", :'data-country_name' => country_name, :'data-language_name' => language_name, :'data-cc' => code, :'data-locale' => locale}.merge(options[:html] || {}).merge(extra_options)
+					flag_locale = WorldFlags.locale(code)
+
+					{:class => "flag #{code}#{selected}#{semi}", :'data-country_name' => country_name, :'data-language_name' => language_name, :'data-cc' => code, :'data-locale' => flag_locale}.merge(options[:html] || {}).merge(extra_options)
 				end
 
 				def self.flag_selected? code, options = {}

data/lib/world_flags/util/country.rb

@@ -13,6 +13,7 @@ module WorldFlags
 
       def country code = :us, locale = :en
         locale ||= default_locale_used
+        locale = WorldFlags.locale(locale).to_sym
 
         locale_countries_map = countries_map[locale] || countries_map[default_locale_used]
         locale_countries_map = countries_map[:en] if locale_countries_map.blank?

data/lib/world_flags/util/language.rb

@@ -4,11 +4,12 @@ module WorldFlags
       attr_writer :languages_map
 
       def language_label code, locale
-        WorldFlags.language code, locale
+        language code, locale
       end
 
       def language code = :us, locale = :en 
         locale ||= default_locale_used      
+        locale = WorldFlags.locale(locale).to_sym
 
         locale_languages_map = languages_map[locale] || languages_map[default_locale_used]
         locale_languages_map = languages_map[:en] if locale_languages_map.blank?
@@ -16,7 +17,7 @@ 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] 
+        locale_languages_map[code] ? locale_languages_map[code] : locale_languages_map[default_code_used]         
       rescue Exception => e
         raise e if WorldFlags.raise_error?
         "Undefined"

data/spec/world_flags/view_helper_spec.rb

@@ -12,6 +12,10 @@ describe WorldFlags::Helper::View do
     WorldFlags.raise_error!
   end
 
+  it 'should translate flag code to locale' do
+    WorldFlags.locale('dk').to_s.should == 'da'
+  end
+
   it "should be empty, with an empty block" do
     output = flags_list do
     end
@@ -71,7 +75,7 @@ describe WorldFlags::Helper::View do
         output = flags_list 32 do
           flags :dk, :se, :no, :with_semi => true, :country => :da
         end
-        output.should == "<ul class=\"f32\"><li class=\"flag dk selected\" data-cc=\"dk\" data-country_name=\"Danmark\" data-language_name=\"Dansk\" data-locale=\"dk\">&nbsp;</li><li class=\"flag se semi\" data-cc=\"se\" data-country_name=\"Sverige\" data-language_name=\"Svensk\" data-locale=\"se\">&nbsp;</li><li class=\"flag no semi\" data-cc=\"no\" data-country_name=\"Norge\" data-language_name=\"Norsk\" data-locale=\"no\">&nbsp;</li></ul>"
+        output.should == "<ul class=\"f32\"><li class=\"flag dk selected\" data-cc=\"dk\" data-country_name=\"Danmark\" data-language_name=\"Dansk\" data-locale=\"da\">&nbsp;</li><li class=\"flag se semi\" data-cc=\"se\" data-country_name=\"Sverige\" data-language_name=\"Svensk\" data-locale=\"sv\">&nbsp;</li><li class=\"flag no semi\" data-cc=\"no\" data-country_name=\"Norge\" data-language_name=\"Norsk\" data-locale=\"nb\">&nbsp;</li></ul>"
       end
     end
 
@@ -84,7 +88,7 @@ describe WorldFlags::Helper::View do
         output = flags_list 32 do
           flags :dk, :se, :no, :with_semi => true, :country => :da
         end
-        output.should == "<ul class=\"f32\"><li class=\"flag dk semi\" data-cc=\"dk\" data-country_name=\"Danmark\" data-language_name=\"Dansk\" data-locale=\"dk\">&nbsp;</li><li class=\"flag se selected\" data-cc=\"se\" data-country_name=\"Sverige\" data-language_name=\"Svenska\" data-locale=\"se\">&nbsp;</li><li class=\"flag no semi\" data-cc=\"no\" data-country_name=\"Norge\" data-language_name=\"Norsk\" data-locale=\"no\">&nbsp;</li></ul>"
+        output.should == "<ul class=\"f32\"><li class=\"flag dk semi\" data-cc=\"dk\" data-country_name=\"Danmark\" data-language_name=\"Dansk\" data-locale=\"da\">&nbsp;</li><li class=\"flag se selected\" data-cc=\"se\" data-country_name=\"Sverige\" data-language_name=\"Svenska\" data-locale=\"sv\">&nbsp;</li><li class=\"flag no semi\" data-cc=\"no\" data-country_name=\"Norge\" data-language_name=\"Norsk\" data-locale=\"nb\">&nbsp;</li></ul>"
       end
     end
 
@@ -97,7 +101,7 @@ describe WorldFlags::Helper::View do
         output = flags_list 32 do
           flags :dk, :se, :no, :with_semi => true, :country => :da
         end
-        output.should == "<ul class=\"f32\"><li class=\"flag dk semi\" data-cc=\"dk\" data-country_name=\"Danmark\" data-language_name=\"Dansk\" data-locale=\"dk\">&nbsp;</li><li class=\"flag se semi\" data-cc=\"se\" data-country_name=\"Sverige\" data-language_name=\"Svensk\" data-locale=\"se\">&nbsp;</li><li class=\"flag no selected\" data-cc=\"no\" data-country_name=\"Norge\" data-language_name=\"Norsk\" data-locale=\"no\">&nbsp;</li></ul>"
+        output.should == "<ul class=\"f32\"><li class=\"flag dk semi\" data-cc=\"dk\" data-country_name=\"Danmark\" data-language_name=\"Dansk\" data-locale=\"da\">&nbsp;</li><li class=\"flag se semi\" data-cc=\"se\" data-country_name=\"Sverige\" data-language_name=\"Svensk\" data-locale=\"sv\">&nbsp;</li><li class=\"flag no selected\" data-cc=\"no\" data-country_name=\"Norge\" data-language_name=\"Norsk\" data-locale=\"nb\">&nbsp;</li></ul>"
       end
     end
   end  

data/world-flags.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "world-flags"
-  s.version = "0.3.6"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2012-05-13"
+  s.date = "2012-05-14"
   s.description = "Use world flag icons in your Rails app"
   s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: world-flags
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-13 00:00:00.000000000 Z
+date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -194,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -558446436876807119
+      hash: -1443906191312410055
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: