world-flags 0.1.2 → 0.1.3

data/Gemfile

@@ -1,5 +1,7 @@
 source :rubygems
 
+gem 'httparty'
+
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do

data/Gemfile.lock

@@ -3,6 +3,9 @@ GEM
   specs:
     diff-lcs (1.1.3)
     git (1.2.5)
+    httparty (0.8.1)
+      multi_json
+      multi_xml
     jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -10,6 +13,7 @@ GEM
       rdoc
     json (1.6.5)
     multi_json (1.1.0)
+    multi_xml (0.4.2)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -31,6 +35,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.0.0)
+  httparty
   jeweler (>= 1.8.3)
   rdoc (>= 3.12)
   rspec (>= 2.8.0)

data/README.textile

@@ -10,8 +10,25 @@ In you asset application.css manifest file:
  *= require_self
  *= require_tree .
  *= require flags/flags32
+ *= require flags/flags32_semi
 */
 
+There is also support for semi-transparent flags. This can be used to fade certain flags while having the selected flag (or hovered over flag) in full brightness.
+
+Simply add or remove the "semi" class for the flag to adjust the brightness level (fx for selection/mouse over).
+
+$("li.flag['data-cc'=dk).addClass('semi');
+
+$("li.flag['data-cc'=dk).removeClass('semi');
+
+*/
+ *= require_self
+ *= require_tree .
+ *= require flags/flags32
+ *= require flags/flags32
+*/
+
+
 h2. Alternative config
 
 Note that the ruby examples uses HAML syntax
@@ -34,9 +51,8 @@ Flags will be rendered in HTML as:
 
 <pre>
 <ul class="f32">
-  <li class="flag ar">Argentina</li>
-  <li class="flag au">Australia</li>
-  <li class="flag at">Austria</li>
+  <li class="flag ar" data-cc="ar" data-country="Argentina">Argentina</li>
+  <li class="flag gb" data-cc="gb" data-country="England">England</li>
 ...
 </ul>
 </pre>
@@ -45,27 +61,58 @@ The countries corresponding to the codes can be found at "http://en.wikipedia.or
 
 h2. Use
 
+WorldFlags supports flag sizes in 16, 32 and 64 pixels (size).
+
 You can also use built in helper methods:
 
 = flag_list 16 do
-	= flags :ar => 'Argentina', :en => 'England'
+	= flags :ar => 'Argentina', :gb => 'England'
 
 Alternatively
 
 = flags_list 32 do
-	= flag(:ar, 'Argentina') + flag(:en, 'England')
+	= flag(:ar, 'Argentina') + flag(:gb, 'England')
 
 For use with tooltips (see example below):
 
 = flags_list 32 do
-	= flags_title(:ar => 'Argentina', :br => 'Brazil') + flag_title(:en, 'England')
+	= flags_title(:ar => 'Argentina', :br => 'Brazil') + flag_title(:gb, 'England')
 
 The flag_title will render the following list item:
 
-<li class="flag ar" title="Argentina">&nbsp;</li>
+<li class="flag ar" lang="ar" title="Argentina">&nbsp;</li>
 
 The &nbsp; is needed in order for the background (flag icon) to have something to be displayed against.
 
+h2. Get client country code (browser and geo)
+
+A small helper module is provided that can be inserted into a Controller or wherever you see fit
+
+* ip_country_code
+* browser_locale
+
+class MainController < ApplicationController
+  def home
+  	@json = Property.all.to_gmaps4rails
+    @country_code = WorldFlags::Geo.ip_country_code
+  end
+end
+
+Alternatively you can include the modules directly into the controller:
+
+class MainController < ApplicationController
+	include WorldFlags::Geo
+	include WorldFlags::Browser
+
+  def home
+  	@json = Property.all.to_gmaps4rails
+    @country_code = ip_country_code
+    @locale = browser_locale
+  end
+end
+
+For convenience you can also include WorldFlags::All to include all these modules
+
 h2. Nice effects
 
 CSS config:
@@ -77,9 +124,10 @@ ul.f32 {
 
 	li.flag {
 		float:left;
-		padding-bottom: 10px;
-		padding-right: 32px;
-		cursor: pointer;
+		padding-bottom: 6px;
+		padding-right: 26px;
+		margin-right: 8px;
+		background-position: center; 
 	}
 }
 
@@ -114,15 +162,12 @@ Layout file:
 
 %body
 	.main
-		= link_to "Sign un", new_user_session_path
+		= link_to "Sign in", new_user_session_path
 		= link_to "Sign up", new_user_registration_path
 
 		#languages
-			%ul.f32
-				%li.flag.ar{:title => 'Argentina'}
-					&nbsp;
-				%li.flag.en{:title => 'England'}
-					&nbsp;
+			= flags_list 64 do
+				= flags_title :ar => 'Argentina', :gb => 'England'
 		%p.clear
 		= yield
 

data/VERSION

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

data/lib/world-flags.rb

@@ -1,4 +1,5 @@
 require "world_flags/world_flags_helper"
+require "world_flags/locale_helper"
 require "rails"
 require 'world_flags/rails_plugin/engine'
 

data/lib/world_flags/locale_helper.rb

@@ -0,0 +1,43 @@
+require "httparty"
+
+module WorldFlags
+	module Geo
+    def self.ip_json
+      HTTParty.get('http://freegeoip.net/json/')
+    end
+
+		def self.ip_country_code
+    	@ip_country_code ||= ip_json.parsed_response['country_code']
+    end
+
+		def ip_country_code
+    	WorldFlags::Geo.ip_country_code
+    end
+  end
+
+  module Browser
+		def self.browser_locale
+			return @browser_locale if @browser_locale
+      if lang = request.env["HTTP_ACCEPT_LANGUAGE"]
+        lang = lang.split(",").map { |l|
+          l += ';q=1.0' unless l =~ /;q=\d+\.\d+$/
+          l.split(';q=')
+        }.first
+        @browser_locale = lang.first.split("-").first
+      else
+        @browser_locale = I18n.default_locale
+      end
+   	end
+
+   	def browser_locale
+   		WorldFlags::Browser.browser_locale
+   	end
+  end
+
+  module All
+  	def self.included(base)
+  		base.send :include, Geo
+  		base.send :include, Browser
+  	end
+  end
+end

data/lib/world_flags/world_flags_helper.rb

@@ -1,6 +1,6 @@
 module WorldFlagsHelper
 	def self.flag_sizes
-		[16, 32]
+		[16, 32, 64]
 	end
 
 	def flags_list size = 16, &block
@@ -11,9 +11,9 @@ module WorldFlagsHelper
 	end
 	alias_method :flag_list, :flags_list
 
-	def flags flags_hash
+	def flags flags_hash, display = false
 		flags_hash.inject("") do |res, element|
-			res << flag(element.first, element.last)
+			res << flag(element.first, element.last, display)
 		end.html_safe
 	end
 
@@ -23,12 +23,14 @@ module WorldFlagsHelper
 		end.html_safe
 	end
 
-	def flag code, name
-		content_tag :li,  name.html_safe, :class => "flag #{code}"
+	def flag code, name, display = false
+		label = display ? name : '&nbsp;'
+		content_tag :li,  label.html_safe, :class => "flag #{code}", :'data-country' => name, :'data-cc' => code
 	end
 
-	def flag_title code, name
-		content_tag :li,  '&nbsp;'.html_safe, :class => "flag #{code}", :title => name
+	def flag_title code, name, display = false
+		label = display ? name : '&nbsp;'
+		content_tag :li,  label.html_safe, :class => "flag #{code}", :title => name, :'data-cc' => code
 	end
 
 	def use_flags size = 16

data/spec/world-flags_spec.rb

@@ -29,28 +29,28 @@ describe WorldFlagsHelper do
 
   it "should list flags" do
     output = flags_list 32 do
-    	flags :ar => 'Argentina', :en => 'England'
+    	flags :ar => 'Argentina', :gb => 'England'
     end
-    output.should == "<ul class=\"f32\"><li class=\"flag ar\">Argentina</li><li class=\"flag en\">England</li></ul>"
+    output.should == "<ul class=\"f32\"><li class=\"flag ar\" data-cc=\"ar\" data-country=\"Argentina\">Argentina</li><li class=\"flag gb\" data-cc=\"gb\" data-country=\"England\">England</li></ul>"
   end
 
   it "should list flags" do
     output = flag_title :ar, 'Argentina'
-    output.should == "<li class=\"flag ar\" title=\"Argentina\">&nbsp;</li>"
+    output.should == "<li class=\"flag ar\" data-cc=\"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\" title=\"Argentina\">&nbsp;</li></ul>"
+    output.should == "<ul class=\"f32\"><li class=\"flag ar\" data-cc=\"ar\" title=\"Argentina\">&nbsp;</li></ul>"
   end
 
   it "should list flags combined" do
     output = flags_list 32 do
-    	[flags(:ar => 'Argentina', :en => 'England'), flag(:br, 'Brazil')].join.html_safe 
+    	[flags(:ar => 'Argentina', :gb => 'England'), flag(:br, 'Brazil')].join.html_safe 
     end
-    output.should == "<ul class=\"f32\"><li class=\"flag ar\">Argentina</li><li class=\"flag en\">England</li><li class=\"flag br\">Brazil</li></ul>"
+    output.should == "<ul class=\"f32\"><li class=\"flag ar\" data-cc=\"ar\" data-country=\"Argentina\">Argentina</li><li class=\"flag gb\" data-cc=\"gb\" data-country=\"England\">England</li><li class=\"flag br\" data-cc=\"br\" data-country=\"Brazil\">Brazil</li></ul>"
   end
 end
 

data/vendor/assets/stylesheets/flags/flags16-semi.css.erb

@@ -0,0 +1,247 @@
+.f16 .flag.semi {
+	background:url(<%= asset_path 'flags/flags16_semi.png' %>) no-repeat;	
+}
+.f16 ._African_Union{background-position:0 -0px;}
+.f16 ._Arab_League{background-position:0 -16px;}
+.f16 ._ASEAN{background-position:0 -32px;}
+.f16 ._CARICOM{background-position:0 -48px;}
+.f16 ._CIS{background-position:0 -64px;}
+.f16 ._Commonwealth{background-position:0 -80px;}
+.f16 ._England{background-position:0 -96px;}
+.f16 ._European_Union{background-position:0 -112px;}
+.f16 ._Islamic_Conference{background-position:0 -128px;}
+.f16 ._Kosovo{background-position:0 -144px;}
+.f16 ._NATO{background-position:0 -160px;}
+.f16 ._Northern_Cyprus{background-position:0 -176px;}
+.f16 ._Northern_Ireland{background-position:0 -192px;}
+.f16 ._Olympic_Movement{background-position:0 -208px;}
+.f16 ._OPEC{background-position:0 -224px;}
+.f16 ._Red_Cross{background-position:0 -240px;}
+.f16 ._Scotland{background-position:0 -256px;}
+.f16 ._Somaliland{background-position:0 -272px;}
+.f16 ._Tibet{background-position:0 -288px;}
+.f16 ._United_Nations{background-position:0 -304px;}
+.f16 ._Wales{background-position:0 -320px;}
+.f16 .ad{background-position:0 -336px;}
+.f16 .ae{background-position:0 -352px;}
+.f16 .af{background-position:0 -368px;}
+.f16 .ag{background-position:0 -384px;}
+.f16 .ai{background-position:0 -400px;}
+.f16 .al{background-position:0 -416px;}
+.f16 .am{background-position:0 -432px;}
+.f16 .an{background-position:0 -448px;}
+.f16 .ao{background-position:0 -464px;}
+.f16 .aq{background-position:0 -480px;}
+.f16 .ar{background-position:0 -496px;}
+.f16 .as{background-position:0 -512px;}
+.f16 .at{background-position:0 -528px;}
+.f16 .au{background-position:0 -544px;}
+.f16 .aw{background-position:0 -560px;}
+.f16 .az{background-position:0 -576px;}
+.f16 .ba{background-position:0 -592px;}
+.f16 .bb{background-position:0 -608px;}
+.f16 .bd{background-position:0 -624px;}
+.f16 .be{background-position:0 -640px;}
+.f16 .bf{background-position:0 -656px;}
+.f16 .bg{background-position:0 -672px;}
+.f16 .bh{background-position:0 -688px;}
+.f16 .bi{background-position:0 -704px;}
+.f16 .bj{background-position:0 -720px;}
+.f16 .bm{background-position:0 -736px;}
+.f16 .bn{background-position:0 -752px;}
+.f16 .bo{background-position:0 -768px;}
+.f16 .br{background-position:0 -784px;}
+.f16 .bs{background-position:0 -800px;}
+.f16 .bt{background-position:0 -816px;}
+.f16 .bw{background-position:0 -832px;}
+.f16 .by{background-position:0 -848px;}
+.f16 .bz{background-position:0 -864px;}
+.f16 .ca{background-position:0 -880px;}
+.f16 .cg{background-position:0 -896px;}
+.f16 .cf{background-position:0 -912px;}
+.f16 .cd{background-position:0 -928px;}
+.f16 .ch{background-position:0 -944px;}
+.f16 .ci{background-position:0 -960px;}
+.f16 .ck{background-position:0 -976px;}
+.f16 .cl{background-position:0 -992px;}
+.f16 .cm{background-position:0 -1008px;}
+.f16 .cn{background-position:0 -1024px;}
+.f16 .co{background-position:0 -1040px;}
+.f16 .cr{background-position:0 -1056px;}
+.f16 .cu{background-position:0 -1072px;}
+.f16 .cv{background-position:0 -1088px;}
+.f16 .cy{background-position:0 -1104px;}
+.f16 .cz{background-position:0 -1120px;}
+.f16 .de{background-position:0 -1136px;}
+.f16 .dj{background-position:0 -1152px;}
+.f16 .dk{background-position:0 -1168px;}
+.f16 .dm{background-position:0 -1184px;}
+.f16 .do{background-position:0 -1200px;}
+.f16 .dz{background-position:0 -1216px;}
+.f16 .ec{background-position:0 -1232px;}
+.f16 .ee{background-position:0 -1248px;}
+.f16 .eg{background-position:0 -1264px;}
+.f16 .eh{background-position:0 -1280px;}
+.f16 .er{background-position:0 -1296px;}
+.f16 .es{background-position:0 -1312px;}
+.f16 .et{background-position:0 -1328px;}
+.f16 .fi{background-position:0 -1344px;}
+.f16 .fj{background-position:0 -1360px;}
+.f16 .fm{background-position:0 -1376px;}
+.f16 .fo{background-position:0 -1392px;}
+.f16 .fr{background-position:0 -1408px;}
+.f16 .ga{background-position:0 -1424px;}
+.f16 .gb{background-position:0 -1440px;}
+.f16 .gd{background-position:0 -1456px;}
+.f16 .ge{background-position:0 -1472px;}
+.f16 .gg{background-position:0 -1488px;}
+.f16 .gh{background-position:0 -1504px;}
+.f16 .gi{background-position:0 -1520px;}
+.f16 .gl{background-position:0 -1536px;}
+.f16 .gm{background-position:0 -1552px;}
+.f16 .gn{background-position:0 -1568px;}
+.f16 .gp{background-position:0 -1584px;}
+.f16 .gq{background-position:0 -1600px;}
+.f16 .gr{background-position:0 -1616px;}
+.f16 .gt{background-position:0 -1632px;}
+.f16 .gu{background-position:0 -1648px;}
+.f16 .gw{background-position:0 -1664px;}
+.f16 .gy{background-position:0 -1680px;}
+.f16 .hk{background-position:0 -1696px;}
+.f16 .hn{background-position:0 -1712px;}
+.f16 .hr{background-position:0 -1728px;}
+.f16 .ht{background-position:0 -1744px;}
+.f16 .hu{background-position:0 -1760px;}
+.f16 .id{background-position:0 -1776px;}
+.f16 .mc{background-position:0 -1776px;}
+.f16 .ie{background-position:0 -1792px;}
+.f16 .il{background-position:0 -1808px;}
+.f16 .im{background-position:0 -1824px;}
+.f16 .in{background-position:0 -1840px;}
+.f16 .iq{background-position:0 -1856px;}
+.f16 .ir{background-position:0 -1872px;}
+.f16 .is{background-position:0 -1888px;}
+.f16 .it{background-position:0 -1904px;}
+.f16 .je{background-position:0 -1920px;}
+.f16 .jm{background-position:0 -1936px;}
+.f16 .jo{background-position:0 -1952px;}
+.f16 .jp{background-position:0 -1968px;}
+.f16 .ke{background-position:0 -1984px;}
+.f16 .kg{background-position:0 -2000px;}
+.f16 .kh{background-position:0 -2016px;}
+.f16 .ki{background-position:0 -2032px;}
+.f16 .km{background-position:0 -2048px;}
+.f16 .kn{background-position:0 -2064px;}
+.f16 .kp{background-position:0 -2080px;}
+.f16 .kr{background-position:0 -2096px;}
+.f16 .kw{background-position:0 -2112px;}
+.f16 .ky{background-position:0 -2128px;}
+.f16 .kz{background-position:0 -2144px;}
+.f16 .la{background-position:0 -2160px;}
+.f16 .lb{background-position:0 -2176px;}
+.f16 .lc{background-position:0 -2192px;}
+.f16 .li{background-position:0 -2208px;}
+.f16 .lk{background-position:0 -2224px;}
+.f16 .lr{background-position:0 -2240px;}
+.f16 .ls{background-position:0 -2256px;}
+.f16 .lt{background-position:0 -2272px;}
+.f16 .lu{background-position:0 -2288px;}
+.f16 .lv{background-position:0 -2304px;}
+.f16 .ly{background-position:0 -2320px;}
+.f16 .ma{background-position:0 -2336px;}
+.f16 .md{background-position:0 -2352px;}
+.f16 .me{background-position:0 -2368px;}
+.f16 .mg{background-position:0 -2384px;}
+.f16 .mh{background-position:0 -2400px;}
+.f16 .mk{background-position:0 -2416px;}
+.f16 .ml{background-position:0 -2432px;}
+.f16 .mm{background-position:0 -2448px;}
+.f16 .mn{background-position:0 -2464px;}
+.f16 .mo{background-position:0 -2480px;}
+.f16 .mq{background-position:0 -2496px;}
+.f16 .mr{background-position:0 -2512px;}
+.f16 .ms{background-position:0 -2528px;}
+.f16 .mt{background-position:0 -2544px;}
+.f16 .mu{background-position:0 -2560px;}
+.f16 .mv{background-position:0 -2576px;}
+.f16 .mw{background-position:0 -2592px;}
+.f16 .mx{background-position:0 -2608px;}
+.f16 .my{background-position:0 -2624px;}
+.f16 .mz{background-position:0 -2640px;}
+.f16 .na{background-position:0 -2656px;}
+.f16 .nc{background-position:0 -2672px;}
+.f16 .ne{background-position:0 -2688px;}
+.f16 .ng{background-position:0 -2704px;}
+.f16 .ni{background-position:0 -2720px;}
+.f16 .nl{background-position:0 -2736px;}
+.f16 .no{background-position:0 -2752px;}
+.f16 .np{background-position:0 -2768px;}
+.f16 .nr{background-position:0 -2784px;}
+.f16 .nz{background-position:0 -2800px;}
+.f16 .om{background-position:0 -2816px;}
+.f16 .pa{background-position:0 -2832px;}
+.f16 .pe{background-position:0 -2848px;}
+.f16 .pf{background-position:0 -2864px;}
+.f16 .pg{background-position:0 -2880px;}
+.f16 .ph{background-position:0 -2896px;}
+.f16 .pk{background-position:0 -2912px;}
+.f16 .pl{background-position:0 -2928px;}
+.f16 .pr{background-position:0 -2944px;}
+.f16 .ps{background-position:0 -2960px;}
+.f16 .pt{background-position:0 -2976px;}
+.f16 .pw{background-position:0 -2992px;}
+.f16 .py{background-position:0 -3008px;}
+.f16 .qa{background-position:0 -3024px;}
+.f16 .re{background-position:0 -3040px;}
+.f16 .ro{background-position:0 -3056px;}
+.f16 .rs{background-position:0 -3072px;}
+.f16 .ru{background-position:0 -3088px;}
+.f16 .rw{background-position:0 -3104px;}
+.f16 .sa{background-position:0 -3120px;}
+.f16 .sb{background-position:0 -3136px;}
+.f16 .sc{background-position:0 -3152px;}
+.f16 .sd{background-position:0 -3168px;}
+.f16 .se{background-position:0 -3184px;}
+.f16 .sg{background-position:0 -3200px;}
+.f16 .si{background-position:0 -3216px;}
+.f16 .sk{background-position:0 -3232px;}
+.f16 .sl{background-position:0 -3248px;}
+.f16 .sm{background-position:0 -3264px;}
+.f16 .sn{background-position:0 -3280px;}
+.f16 .so{background-position:0 -3296px;}
+.f16 .sr{background-position:0 -3312px;}
+.f16 .st{background-position:0 -3328px;}
+.f16 .sv{background-position:0 -3344px;}
+.f16 .sy{background-position:0 -3360px;}
+.f16 .sz{background-position:0 -3376px;}
+.f16 .tc{background-position:0 -3392px;}
+.f16 .td{background-position:0 -3408px;}
+.f16 .tg{background-position:0 -3424px;}
+.f16 .th{background-position:0 -3440px;}
+.f16 .tj{background-position:0 -3456px;}
+.f16 .tl{background-position:0 -3472px;}
+.f16 .tm{background-position:0 -3488px;}
+.f16 .tn{background-position:0 -3504px;}
+.f16 .to{background-position:0 -3520px;}
+.f16 .tr{background-position:0 -3536px;}
+.f16 .tt{background-position:0 -3552px;}
+.f16 .tv{background-position:0 -3568px;}
+.f16 .tw{background-position:0 -3584px;}
+.f16 .tz{background-position:0 -3600px;}
+.f16 .ua{background-position:0 -3616px;}
+.f16 .ug{background-position:0 -3632px;}
+.f16 .us{background-position:0 -3648px;}
+.f16 .uy{background-position:0 -3664px;}
+.f16 .uz{background-position:0 -3680px;}
+.f16 .va{background-position:0 -3696px;}
+.f16 .vc{background-position:0 -3712px;}
+.f16 .ve{background-position:0 -3728px;}
+.f16 .vg{background-position:0 -3744px;}
+.f16 .vi{background-position:0 -3760px;}
+.f16 .vn{background-position:0 -3776px;}
+.f16 .vu{background-position:0 -3792px;}
+.f16 .ws{background-position:0 -3808px;}
+.f16 .ye{background-position:0 -3824px;}
+.f16 .za{background-position:0 -3840px;}
+.f16 .zm{background-position:0 -3856px;}
+.f16 .zw{background-position:0 -3872px;}