world-flags 0.2.2 → 0.2.3

data/README.textile

@@ -187,6 +187,22 @@ You must set up valid locales for use with WorldFlags in some initializer:
 # fx [:da, :en] or even ['da', 'en']
 WorldFlags::Locale.locales = my_valid_locales_list 
 
+h2. Post flag selection
+
+Here an example of setting up a flag click handler in order to call the server with the country/locale/language selection of the flag.
+
+$("li.flag").click(function() {
+	country = $(this).data('locale');
+
+	// full page reload
+	// window.location.href = "/locale/select/" + country;
+
+	// async post
+	$.post("/locale/select", { "country": country }, function(data) {
+		console.log(data);
+	});	
+});
+
 h2. Nice effects
 
 CSS config:

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/world-flags.rb

@@ -5,6 +5,14 @@ require 'world_flags/rails/engine' if defined?(::Rails::Engine)
 require "world_flags/languages"
 require "world_flags/countries"
 
+class Hash
+  def hash_revert
+    r = Hash.new
+    each {|k,v| r[v] = k}
+    r
+  end
+end
+
 module WorldFlags
 	class << self
 		attr_accessor :auto_select
@@ -30,16 +38,26 @@ module WorldFlags
 			locale_flag_map[code.to_sym] || code
 		end
 
+		def locale code
+			flag_locale_map[code.to_sym] || code
+		end
+
 		attr_accessor :locale_flag_map
 
 		# translate locales to flag code: ISO_3166-1_alpha-2
 		def locale_flag_map
 			@locale_map ||= {
-				:en => :gb,
-				:da => :dk
+				:en => :us,
+				:da => :dk,
+				:'en_UK' => :gb,
+				:'en_US' => :us
 			}
 		end
 
+		def flag_locale_map
+			locale_flag_map.hash_revert
+		end
+
 		# Language helper macros
 
 		def language locale = :en, code = :en

data/lib/world_flags/view_helper.rb

@@ -59,10 +59,10 @@ module WorldFlags
 			else
 				nil
 			end
-
+			locale = WorldFlags.locale(code)
 			extra_options = title ? {:title => title } : {}			
 			selected = flag_selected?(code, options) ? 'selected' : ''
-			content_tag :li,  label.html_safe, {:class => "flag #{code} #{selected}", :'data-country' => name, :'data-cc' => code}.merge(options[:html] || {}).merge(extra_options)
+			content_tag :li,  label.html_safe, {:class => "flag #{code} #{selected}", :'data-country' => name, :'data-cc' => code, :'data-locale' => locale}.merge(options[:html] || {}).merge(extra_options)
 		end
 
 		def flag_selected? code, options = {}

data/spec/world_flags/view_helper_spec.rb

@@ -29,35 +29,35 @@ describe WorldFlags::ViewHelper do
 
   it "should list flags using Hash arg" do
     output = flags_list 32 do
-    	flags :ar => 'Argentina', :gb => 'England'
+    	flags :ar => 'Argentina', :gb => 'England', :dk => 'Denmark'
     end
-    output.should == "<ul class=\"f32\"><li class=\"flag ar \" data-cc=\"ar\" data-country=\"Argentina\">&nbsp;</li><li class=\"flag gb \" data-cc=\"gb\" data-country=\"England\">&nbsp;</li></ul>"
+    output.should == "<ul class=\"f32\"><li class=\"flag ar \" data-cc=\"ar\" data-country=\"Argentina\" data-locale=\"ar\">&nbsp;</li><li class=\"flag gb \" data-cc=\"gb\" data-country=\"England\" data-locale=\"en_UK\">&nbsp;</li><li class=\"flag dk \" data-cc=\"dk\" data-country=\"Denmark\" data-locale=\"da\">&nbsp;</li></ul>"
   end
 
   it "should list flags using Array" do
     output = flags_list 32 do
       flags [:ar, :gb]
     end
-    output.should == "<ul class=\"f32\"><li class=\"flag ar \" data-cc=\"ar\" data-country=\"Argentinian Spanish\">&nbsp;</li><li class=\"flag gb \" data-cc=\"gb\" data-country=\"British English\">&nbsp;</li></ul>"
+    output.should == "<ul class=\"f32\"><li class=\"flag ar \" data-cc=\"ar\" data-country=\"Argentinian Spanish\" data-locale=\"ar\">&nbsp;</li><li class=\"flag gb \" data-cc=\"gb\" data-country=\"British English\" data-locale=\"en_UK\">&nbsp;</li></ul>"
   end
 
   it "should list flags" do
     output = flag_title :ar, 'Argentina'
-    output.should == "<li class=\"flag ar \" data-cc=\"ar\" data-country=\"Argentina\" title=\"Argentina\">&nbsp;</li>"
+    output.should == "<li class=\"flag ar \" data-cc=\"ar\" data-country=\"Argentina\" data-locale=\"ar\" title=\"Argentina\">&nbsp;</li>"
   end
 
   it "should list flags" do
     output = flags_list 32 do
     	flags_title :ar => 'Argentina'
     end
-    output.should == "<ul class=\"f32\"><li class=\"flag ar \" data-cc=\"ar\" data-country=\"Argentina\" title=\"Argentina\">&nbsp;</li></ul>"
+    output.should == "<ul class=\"f32\"><li class=\"flag ar \" data-cc=\"ar\" data-country=\"Argentina\" data-locale=\"ar\" title=\"Argentina\">&nbsp;</li></ul>"
   end
 
   it "should list flags combined" do
     output = flags_list 32 do
     	[flags(:ar => 'Argentina', :gb => 'England'), flag(:br, 'Brazil')].join.html_safe 
     end
-    output.should == "<ul class=\"f32\"><li class=\"flag ar \" data-cc=\"ar\" data-country=\"Argentina\">&nbsp;</li><li class=\"flag gb \" data-cc=\"gb\" data-country=\"England\">&nbsp;</li><li class=\"flag br \" data-cc=\"br\" data-country=\"Brazil\">&nbsp;</li></ul>"
+    output.should == "<ul class=\"f32\"><li class=\"flag ar \" data-cc=\"ar\" data-country=\"Argentina\" data-locale=\"ar\">&nbsp;</li><li class=\"flag gb \" data-cc=\"gb\" data-country=\"England\" data-locale=\"en_UK\">&nbsp;</li><li class=\"flag br \" data-cc=\"br\" data-country=\"Brazil\" data-locale=\"br\">&nbsp;</li></ul>"
   end
 end
 

data/world-flags.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "world-flags"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2012-04-17"
+  s.date = "2012-04-18"
   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.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -172,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1820002462427377461
+      hash: 4049711410867555584
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: