world-flags 0.3.4 → 0.3.5

data/README.md

@@ -67,7 +67,7 @@ You can run the Rails generator `world_flags:init` in order to create a basic in
 You can setup WorldFlags to use a localization map for the labels of the flag icons
 
 ```ruby
-WorldFlags.languages = some_language_hash # fx loaded from a yaml file
+WorldFlags.language_map = some_language_hash # fx loaded from a yaml file
 WorldFlags.countries = some_country_hash # fx loaded from a yaml file
 ```
 
@@ -96,9 +96,11 @@ def countries locale = :en
   JSON.parse File.read(path)
 end
 
-WorldFlags.countries = countries(:en)
+WorldFlags.countries = Hashie::Mash.new countries
 ```
 
+PS: See the json specs for examples.
+
 ### Languages mappings
 
 A country code to languages mappping file (also in json), can be found in `app/config/languages`.
@@ -109,20 +111,22 @@ def languages locale = :en
   JSON.parse File.read(path)
 end
 
-WorldFlags.languages = languages(:en)
+WorldFlags.languages = Hashie::Mash.new languages
 ```
 
-Another approach more suited to adding single files is the following. Note that both `countrieds` and `languages` are instances of classes that inherit from the `Hashie::Mash` class (hash access via method missing).
+PS: See the json specs for examples.
+
+Another approach more suited to adding single files is the following. Note that both `countries` and `languages` are instances of classes that inherit from the `Hashie::Mash` class (hash access via method missing).
 
 ```
 WorldFlags.countries.en = countries_en
 WorldFlags.languages.en = languages_en
 ```
 
-You can set the active locales using:
+You can set the available locales. By default they are the same as `I18n.available_locales`.
 
 ```ruby
-WorldFlags.active_locales = [:en, :da]
+WorldFlags.available_locales = [:en, :da]
 ```
 
 ## Locale to country code
@@ -248,7 +252,6 @@ A small helper module is provided that can be inserted into a Controller or wher
 ```ruby
 class MainController < ApplicationController
   def home
-  	@json = Property.all.to_gmaps4rails
     @country_code = WorldFlags::Helper::Geo.ip_country_code
   end
 end
@@ -262,7 +265,6 @@ class MainController < ApplicationController
 	include WorldFlags::Helper::Browser
 
   def home
-  	@json = Property.all.to_gmaps4rails
     @country_code = ip_country_code
     @locale = browser_locale
   end
@@ -305,16 +307,7 @@ class MainController < ApplicationController
 end
 ```
 
-You can configure valid locales for use with WorldFlags in an initializer, fx `initializers/locales.rb` :
-
-```ruby
-# fx [:da, :en] or even ['da', 'en']
-WorldFlags.valid_locales = my_valid_locales_list 
-```
-
-Note that if not set, this list is preconfigured to: `['en', 'de', 'es', 'ru']`
-
-Alternatively configure in your `application.rb` file:
+You can define the available locales for your app in your `application.rb` file:
 
 ```ruby
 class Application < Rails::Application
@@ -322,6 +315,8 @@ class Application < Rails::Application
   config.i18n.available_locales = [:da, :sv, :no]
 ``
 
+The perhaps sync i18n `I18n.available_locales = MyCool::Application.i18n.available_locales`
+
 Note: This approach in turn works well with the `i18n-docs` gem ;)
 
 ## Post flag selection

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/config/countries/locale_countries.en.json

@@ -75,10 +75,10 @@
 	  "fm": "Federated States of Micronesia",
 	  "fo": "Faroe Islands",
 	  "fr": "France",
-	  "ga": "Clipperton Island",
-	  "gb": "Gabon",
-	  "gd": "United Kingdom",
-	  "ge": "Grenada",
+	  "ga": "Gabon",
+	  "gb": "United Kingdom",
+	  "gd": "Grenada",
+	  "ge": "Georgia",
 	  "gf": "French Guiana",
 	  "gg": "Guernsey",
 	  "gh": "Ghana",

data/config/languages/locale_languages.en.json

@@ -54,7 +54,7 @@
     "cv": "Portuguese",
     "cw": ["Papiamentu", "Dutch"],
     "cx": "English",
-    "cy": ["Greek", "Turkish"]
+    "cy": ["Greek", "Turkish"],
     "cz": "Czech",
     "de": "German",
     "dj": ["French", "Arabic"],
@@ -75,8 +75,8 @@
     "fm": "English",
     "fo": ["Faroese", "Danish"],
     "fr": "French",
-    "ga": "English",
-    "gb": "French",
+    "ga": "French",
+    "gb": "English",
     "gd": "English",
     "ge": "English",
     "gf": "French",

data/lib/world-flags.rb

@@ -1,69 +1,25 @@
 require 'hashie'
-require "world_flags/core_ext"
-require "world_flags/helpers"
+require 'world_flags/core_ext'
+require 'world_flags/helpers'
 
 require 'world_flags/rails/engine' if defined?(::Rails::Engine)
 
-require "world_flags/languages"
-require "world_flags/countries"
-
-require "world_flags/lang_util"
-require "world_flags/country_util"
-
+require 'world_flags/languages'
+require 'world_flags/countries'
+require 'world_flags/util'
 
 module WorldFlags
 	class << self
-		attr_accessor :auto_select, :raise_error, :default_code, :default_locale
+		include Util
 
-		# TODO: Why both active and valid locales? Does this even make sense!?
 		attr_writer :active_locales
-
-		def active_locales
-			@active_locales ||= I18n.available_locales unless I18n.available_locales.blank?
-			@active_locales ||= [:en]
-		end
-
-		# for WorldFlags::Helper::Locale
-    def valid_locales
-      @valid_locales ||= ['en', 'de', 'es', 'ru']
-    end
-
-		def valid_locales= *list
-			raise ArgumentError, "Must be a list of locales, was #{list}" if list.empty?
-			@valid_locales ||= list.flatten
-		end
-
-		def raise_error?
-			@raise_error
-		end
-
-		def raise_error!
-			@raise_error = true
-		end
-
-		def raise_error_off!
-			@raise_error = false
-		end
-
-		def auto_select?
-			auto_select
-		end
-
-		def auto_select!
-			@auto_select = true
-		end
+		attr_writer :locale_flag_map		
 
 		def label code = :us, options = {:language => :en}
 			locale = extract_locale!(options) || default_locale_used || :en
 			options[:country] ? country_label(code, locale) : language_label(code, locale)
 		end
 
-		def extract_locale! options
-			options[:country] ? options.delete(:country) : options.delete(:language)
-		end
-
-		# Locale translation helper macros
-
 		def flag_code code = :us
 			# ensure that 'en_US' becomes simply 'us'
 			code = code.to_s.sub(/^\w+_/, '').downcase
@@ -73,14 +29,19 @@ module WorldFlags
 		def locale code = :us
 			flag_locale_map[code.to_sym] || code
 		end
-
-		attr_writer :locale_flag_map
-
+		
 		# override using fx 'locale_to_country_code.json' file
 		def locale_flag_map
 			@locale_flag_map ||= keys_to_sym(locale_flag_hash) 
 		end
 
+		# see core_ext
+		def flag_locale_map
+			locale_flag_map.hash_revert
+		end
+
+		protected
+
 		def keys_to_sym hash
 			hash.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
 		end
@@ -95,21 +56,10 @@ module WorldFlags
   			:ja => "jp",
   			:uk => "ua"
   		}
-  	end		
+  	end
 
-		def flag_locale_map
-			locale_flag_map.hash_revert
-		end
-
-		def default_code_used
-			WorldFlags.default_code || :us
-		end
-
-		def default_locale_used
-			WorldFlags.default_locale || I18n.locale
-		end
-
-		include WorldFlags::LangUtil
-		include WorldFlags::CountryUtil
+		def extract_locale! options
+			options[:country] ? options.delete(:country) : options.delete(:language)
+		end		
 	end
 end

data/lib/world_flags/countries.rb

@@ -1,10 +1,10 @@
 module WorldFlags
 	class Countries < Hashie::Mash
 		def en
-			@en ||= {
+			{
 				:ar => 'Argentina',
 				:br => 'Brazil',
-				:gb => 'Great Britain',
+				:gb => 'United Kingdom',
 				:us => 'United States',				
 				:es => 'Spain',
 				:gr => 'Greece',
@@ -12,39 +12,37 @@ module WorldFlags
 				:nl => 'Netherlands',
 				:de => 'Germany',
 				:dk => 'Denmark',
-				:sv => 'Sweden',
+				:se => 'Sweden',
 				:no => 'Norway',
 				:fi => 'Finland'
 			}
 		end
 
 		def da
-			@da ||= {
+			{
 				:gb => 'England',
 				:us => 'USA',				
 				:es => 'Spanien',
 				:de => 'Tyskland',
 				:dk => 'Danmark',
-				:sv => 'Sverige',
+				:se => 'Sverige',
 				:no => 'Norge',
 			}
 		end
-		alias_method :dk, :da			
 
-		def se
+		def sv
 			{
 				:gb => 'England',
 				:us => 'USA',				
 				:es => 'Spanien',
 				:de => 'Tyskland',
 				:dk => 'Danmark',
-				:sv => 'Sverige',
+				:se => 'Sverige',
 				:no => 'Norge',
 			}
 		end
-		alias_method :sv, :se
 
-		def no
+		def nb
 			{
 				:gb => 'England',
 				:us => 'USA',				
@@ -55,6 +53,5 @@ module WorldFlags
 				:no => 'Norge'
 			}
 		end
-		alias_method :nb, :no
 	end
 end

data/lib/world_flags/languages.rb

@@ -1,9 +1,9 @@
 module WorldFlags
 	class Languages < Hashie::Mash
 		def en
-			@en ||= {
-				:ar => 'Argentinian Spanish',
-				:br => 'Brazilian Portuguese',
+			{
+				:ar => 'Spanish',
+				:br => 'Portuguese',
 				:po => 'Portuguese',
 				:gr => 'Greek',
 				:gb => 'British English',
@@ -14,43 +14,37 @@ module WorldFlags
 				:de => 'German',
 				:dk => 'Danish',
 				:se => 'Swedish',
-				:sv => 'Swedish',
 				:no => 'Norwegian',
-				:nb => 'Norwegian',
 				:fi => 'Finnish'
 			}
 		end
 
 		def da
-			@da ||= {
+			{
 				:gb => 'Engelsk',
 				:us => 'Engelsk',				
 				:es => 'Spansk',
 				:de => 'Tysk',
 				:dk => 'Dansk',
 				:se => 'Svensk',
-				:sv => 'Svensk',
 				:no => 'Norsk'
 			}
 		end
-		alias_method :dk, :da
 
-		def se
-			@se ||= {
+		def sv
+			{
 				:gb => 'Engelska',
 				:us => 'Engelska',				
 				:es => 'Spansk',
 				:de => 'Tysk',
 				:dk => 'Dansk',
 				:se => 'Svenska',
-				:sv => 'Svenska',
 				:no => 'Norsk'
 			}
 		end
-		alias_method :sv, :se
 
-		def no
-			@no ||= {
+		def nb
+			{
 				:gb => 'Engelsk',
 				:us => 'Engelsk',				
 				:es => 'Spansk',
@@ -61,6 +55,5 @@ module WorldFlags
 				:no => 'Norsk'
 			}
 		end
-		alias_method :nb, :no
 	end
 end

data/lib/world_flags/util.rb

@@ -0,0 +1,13 @@
+require "world_flags/util/language"
+require "world_flags/util/country"
+require "world_flags/util/config"
+
+module WorldFlags
+  module Util
+    def self.included base
+      base.send :include, Language
+      base.send :include, Country
+      base.send :include, Config
+    end
+  end
+end

data/lib/world_flags/util/config.rb

@@ -0,0 +1,65 @@
+module WorldFlags
+  module Util
+    module Config
+      attr_accessor :auto_select, :raise_error
+      attr_accessor :default_code, :default_locale
+
+      def reset!
+        raise_error_off!
+        auto_select_off!
+
+        self.countries = nil
+        self.countries_map = nil
+
+        self.languages_map = nil
+        self.languages = nil
+      end
+
+      def default_code_used
+        WorldFlags.default_code || :us
+      end
+
+      def default_locale_used
+        WorldFlags.default_locale || I18n.locale
+      end
+
+      def available_locales
+        @available_locales ||= I18n.available_locales unless I18n.available_locales.blank?
+        @available_locales ||= default_locales
+      end
+
+      def available_locales= *list
+        raise ArgumentError, "Must be a list of locales, was #{list}" if list.empty?
+        @available_locales = list.flatten
+      end
+
+      def default_locales
+        ['en', 'fr', 'es', 'ru']
+      end
+
+      def auto_select?
+        auto_select
+      end
+
+      def auto_select!
+        @auto_select = true
+      end
+
+      def auto_select_off!
+        @auto_select = true
+      end
+
+      def raise_error?
+        @raise_error
+      end
+
+      def raise_error!
+        @raise_error = true
+      end
+
+      def raise_error_off!
+        @raise_error = false
+      end      
+    end
+  end
+end

data/lib/world_flags/util/country.rb

@@ -0,0 +1,50 @@
+module WorldFlags
+  module Util
+    module Country
+      attr_writer :countries_map
+      
+      def country_label code, locale
+        WorldFlags.country code, locale
+      end
+
+      def countries
+        @countries ||= Countries.new
+      end
+
+      def country code = :us, locale = :en
+        locale ||= default_locale_used
+
+        locale_countries_map = countries_map[locale] || countries_map[default_locale_used]
+        locale_countries_map = countries_map[:en] if locale_countries_map.blank?
+
+        raise "No country-locale map defined for locale: #{locale} or :en in #{countries.inspect}" if locale_countries_map.blank?
+
+        # raise("No country map defined for country code: #{code} in #{locale_countries_map[code]}")
+        locale_countries_map[code] ? locale_countries_map[code] : locale_countries_map[default_code_used] 
+      rescue Exception => e
+        raise e if WorldFlags.raise_error?
+        "Undefined"
+      end
+
+      def countries= countries
+        raise ArgumentError, "Must be a hash, was: #{countries}" unless !countries || countries.kind_of?(Hash)
+        @countries = countries
+      end
+
+      def countries_map
+        @countries_map ||= begin 
+          available_locales.inject({}) do |res, loc|
+            res[loc] = find_country_map(loc)
+            res
+          end
+        end
+      end   
+
+      def find_country_map loc
+        countries.respond_to?(loc) ? countries.send(loc) : languages.send(locale(loc))
+      rescue
+        countries.send(default_locale_used)
+      end
+    end
+  end
+end

data/lib/world_flags/util/language.rb

@@ -0,0 +1,50 @@
+module WorldFlags
+  module Util
+    module Language
+      attr_writer :languages_map
+
+      def language_label code, locale
+        WorldFlags.language code, locale
+      end
+
+      def language code = :us, locale = :en 
+        locale ||= default_locale_used      
+
+        locale_languages_map = languages_map[locale] || languages_map[default_locale_used]
+        locale_languages_map = languages_map[:en] if locale_languages_map.blank?
+
+        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] 
+      rescue Exception => e
+        raise e if WorldFlags.raise_error?
+        "Undefined"
+      end
+
+      def languages
+        @languages ||= Languages.new
+      end
+
+      def languages= languages
+        raise ArgumentError, "Must be a hash, was: #{languages}" unless !languages || languages.kind_of?(Hash)
+        @languages = languages
+      end
+
+      def languages_map
+        @languages_map ||= begin 
+          available_locales.inject({}) do |res, loc|
+            res[loc] = find_language_map(loc)
+            res
+          end
+        end
+      end
+
+      def find_language_map loc
+        languages.respond_to?(loc) ? languages.send(loc) : languages.send(locale(loc))
+      rescue
+        languages.send(default_locale_used)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -13,6 +13,8 @@ require 'world-flags'
 
 # WorldFlags::Rails::Engine.add_view_ext
 
+SPEC_DIR = File.dirname(__FILE__)
+
 module ControllerTestHelpers
 
   def self.included(base)

data/spec/world_flags/json/json_countries_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe WorldFlags::Helper::View do
+  include ControllerTestHelpers,
+          WorldFlags::Helper::View
+
+  def countries locale = :en
+    path = File.join(SPEC_DIR, "../config/countries/locale_countries.#{locale}.json")
+    JSON.parse File.read(path)
+  end
+
+  before do
+    WorldFlags.auto_select!
+    I18n.locale = :en
+    WorldFlags.available_locales = [:da, :sv, :nb, :en]
+    WorldFlags.reset!
+    WorldFlags.countries = Hashie::Mash.new countries
+    WorldFlags.raise_error!
+  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_name=\"Argentina\" data-language_name=\"Spanish\" data-locale=\"ar\">&nbsp;</li><li class=\"flag gb\" data-cc=\"gb\" data-country_name=\"United Kingdom\" data-language_name=\"British English\" data-locale=\"gb\">&nbsp;</li></ul>"
+  end
+end

data/spec/world_flags/json/json_languages_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe WorldFlags::Helper::View do
+  include ControllerTestHelpers,
+          WorldFlags::Helper::View
+
+  def languages locale = :en
+    path = File.join(SPEC_DIR, "../config/languages/locale_languages.#{locale}.json")
+    JSON.parse(File.read(path))
+  end
+
+  before do
+    WorldFlags.auto_select!
+    I18n.locale = :en
+    WorldFlags.available_locales = [:da, :sv, :nb, :en]
+    WorldFlags.reset!
+    WorldFlags.languages = Hashie::Mash.new languages
+    WorldFlags.raise_error!
+  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_name=\"Argentina\" data-language_name=\"Spanish\" data-locale=\"ar\">&nbsp;</li><li class=\"flag gb\" data-cc=\"gb\" data-country_name=\"United Kingdom\" data-language_name=\"English\" data-locale=\"gb\">&nbsp;</li></ul>"
+  end
+end

data/spec/world_flags/json/locale_flag_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe WorldFlags::Helper::View do
+  include ControllerTestHelpers,
+          WorldFlags::Helper::View
+
+  def locale_flag_map
+    path = File.join(SPEC_DIR, "../config/locale_map/locale_to_country_code.json")
+    JSON.parse(File.read(path))
+  end
+
+  before do
+    WorldFlags.auto_select!
+    I18n.locale = :en
+    WorldFlags.available_locales = [:da, :sv, :nb, :en]
+    WorldFlags.reset!
+    WorldFlags.locale_flag_map = Hashie::Mash.new locale_flag_map
+
+    WorldFlags.raise_error!
+  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_name=\"Argentina\" data-language_name=\"Spanish\" data-locale=\"ar\">&nbsp;</li><li class=\"flag gb\" data-cc=\"gb\" data-country_name=\"United Kingdom\" data-language_name=\"British English\" data-locale=\"gb\">&nbsp;</li></ul>"
+  end
+end

data/spec/world_flags/view_helper_spec.rb

@@ -7,8 +7,8 @@ describe WorldFlags::Helper::View do
   before do
     WorldFlags.auto_select!
     I18n.locale = 'ar'
-    WorldFlags.active_locales = [:da, :sv, :nb, :en, :ar]
-
+    WorldFlags.available_locales = [:da, :sv, :nb, :en]
+    WorldFlags.reset!
     WorldFlags.raise_error!
   end
 
@@ -39,26 +39,26 @@ describe WorldFlags::Helper::View do
     output = flags_list 32 do
       flags [:ar, :gb]
     end
-    output.should == "<ul class=\"f32\"><li class=\"flag ar selected\" data-cc=\"ar\" data-country_name=\"Argentina\" data-language_name=\"Argentinian Spanish\" data-locale=\"ar\">&nbsp;</li><li class=\"flag gb\" data-cc=\"gb\" data-country_name=\"Great Britain\" data-language_name=\"British English\" data-locale=\"gb\">&nbsp;</li></ul>"
+    output.should == "<ul class=\"f32\"><li class=\"flag ar selected\" data-cc=\"ar\" data-country_name=\"Argentina\" data-language_name=\"Spanish\" data-locale=\"ar\">&nbsp;</li><li class=\"flag gb\" data-cc=\"gb\" data-country_name=\"United Kingdom\" data-language_name=\"British English\" data-locale=\"gb\">&nbsp;</li></ul>"
   end
 
   it "should list flags using args" do
     output = flags_list 32 do
       flags :ar, :gb
     end
-    output.should == "<ul class=\"f32\"><li class=\"flag ar selected\" data-cc=\"ar\" data-country_name=\"Argentina\" data-language_name=\"Argentinian Spanish\" data-locale=\"ar\">&nbsp;</li><li class=\"flag gb\" data-cc=\"gb\" data-country_name=\"Great Britain\" data-language_name=\"British English\" data-locale=\"gb\">&nbsp;</li></ul>"
+    output.should == "<ul class=\"f32\"><li class=\"flag ar selected\" data-cc=\"ar\" data-country_name=\"Argentina\" data-language_name=\"Spanish\" data-locale=\"ar\">&nbsp;</li><li class=\"flag gb\" data-cc=\"gb\" data-country_name=\"United Kingdom\" data-language_name=\"British English\" data-locale=\"gb\">&nbsp;</li></ul>"
   end
 
   it "should list flags using args and :with_semi" do
     output = flags_list 32 do
       flags :ar, :gb, :with_semi => true
     end
-    output.should == "<ul class=\"f32\"><li class=\"flag ar selected\" data-cc=\"ar\" data-country_name=\"Argentina\" data-language_name=\"Argentinian Spanish\" data-locale=\"ar\">&nbsp;</li><li class=\"flag gb semi\" data-cc=\"gb\" data-country_name=\"Great Britain\" data-language_name=\"British English\" data-locale=\"gb\">&nbsp;</li></ul>"
+    output.should == "<ul class=\"f32\"><li class=\"flag ar selected\" data-cc=\"ar\" data-country_name=\"Argentina\" data-language_name=\"Spanish\" data-locale=\"ar\">&nbsp;</li><li class=\"flag gb semi\" data-cc=\"gb\" data-country_name=\"United Kingdom\" data-language_name=\"British English\" data-locale=\"gb\">&nbsp;</li></ul>"
   end
 
   it "should list flags" do
     output = flag_title :ar, 'Argentina'
-    output.should == "<li class=\"flag ar selected\" data-cc=\"ar\" data-country_name=\"Argentina\" data-language_name=\"Argentinian Spanish\" data-locale=\"ar\" title=\"Argentina\">&nbsp;</li>"
+    output.should == "<li class=\"flag ar selected\" data-cc=\"ar\" data-country_name=\"Argentina\" data-language_name=\"Spanish\" data-locale=\"ar\" title=\"Argentina\">&nbsp;</li>"
   end
 
   describe 'Countries' do
@@ -71,7 +71,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=\"USA\" 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=\"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>"
       end
     end
 
@@ -84,7 +84,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=\"USA\" 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=\"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>"
       end
     end
 

data/world-flags.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "world-flags"
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
@@ -34,7 +34,6 @@ Gem::Specification.new do |s|
     "lib/world-flags.rb",
     "lib/world_flags/core_ext.rb",
     "lib/world_flags/countries.rb",
-    "lib/world_flags/country_util.rb",
     "lib/world_flags/helper/all.rb",
     "lib/world_flags/helper/browser.rb",
     "lib/world_flags/helper/geo.rb",
@@ -42,9 +41,12 @@ Gem::Specification.new do |s|
     "lib/world_flags/helper/view.rb",
     "lib/world_flags/helper/view/util.rb",
     "lib/world_flags/helpers.rb",
-    "lib/world_flags/lang_util.rb",
     "lib/world_flags/languages.rb",
     "lib/world_flags/rails/engine.rb",
+    "lib/world_flags/util.rb",
+    "lib/world_flags/util/config.rb",
+    "lib/world_flags/util/country.rb",
+    "lib/world_flags/util/language.rb",
     "sandbox/country_codes_table.html",
     "sandbox/extract_codes.rb",
     "sandbox/languages_country_extract.rb",
@@ -53,8 +55,11 @@ Gem::Specification.new do |s|
     "sandbox/official_languages.txt",
     "spec/spec_helper.rb",
     "spec/world_flags/country_spec.rb",
+    "spec/world_flags/helper/locale_helper_spec.rb",
+    "spec/world_flags/json/json_countries_spec.rb",
+    "spec/world_flags/json/json_languages_spec.rb",
+    "spec/world_flags/json/locale_flag_spec.rb",
     "spec/world_flags/language_spec.rb",
-    "spec/world_flags/locale_helper_spec.rb",
     "spec/world_flags/view_helper_spec.rb",
     "vendor/assets/images/flags/flags16.png",
     "vendor/assets/images/flags/flags16_semi.png",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: world-flags
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -132,7 +132,6 @@ files:
 - lib/world-flags.rb
 - lib/world_flags/core_ext.rb
 - lib/world_flags/countries.rb
-- lib/world_flags/country_util.rb
 - lib/world_flags/helper/all.rb
 - lib/world_flags/helper/browser.rb
 - lib/world_flags/helper/geo.rb
@@ -140,9 +139,12 @@ files:
 - lib/world_flags/helper/view.rb
 - lib/world_flags/helper/view/util.rb
 - lib/world_flags/helpers.rb
-- lib/world_flags/lang_util.rb
 - lib/world_flags/languages.rb
 - lib/world_flags/rails/engine.rb
+- lib/world_flags/util.rb
+- lib/world_flags/util/config.rb
+- lib/world_flags/util/country.rb
+- lib/world_flags/util/language.rb
 - sandbox/country_codes_table.html
 - sandbox/extract_codes.rb
 - sandbox/languages_country_extract.rb
@@ -151,8 +153,11 @@ files:
 - sandbox/official_languages.txt
 - spec/spec_helper.rb
 - spec/world_flags/country_spec.rb
+- spec/world_flags/helper/locale_helper_spec.rb
+- spec/world_flags/json/json_countries_spec.rb
+- spec/world_flags/json/json_languages_spec.rb
+- spec/world_flags/json/locale_flag_spec.rb
 - spec/world_flags/language_spec.rb
-- spec/world_flags/locale_helper_spec.rb
 - spec/world_flags/view_helper_spec.rb
 - vendor/assets/images/flags/flags16.png
 - vendor/assets/images/flags/flags16_semi.png
@@ -189,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1213500271519335978
+      hash: 240785203955185004
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/world_flags/country_util.rb

@@ -1,46 +0,0 @@
-module WorldFlags
-  module CountryUtil
-    def country_label code, locale
-      WorldFlags.country code, locale
-    end
-
-    def countries
-      @countries ||= Countries.new
-    end
-
-    def country code = :us, locale = :en
-      locale ||= default_locale_used
-
-      locale_countries_map = countries_map[locale] || countries_map[default_locale_used]
-      locale_countries_map = countries_map[:en] if locale_countries_map.blank?
-
-      raise "No country-locale map defined for locale: #{locale} or :en in #{countries.inspect}" if locale_countries_map.blank?
-
-      # raise("No country map defined for country code: #{code} in #{locale_countries_map[code]}")
-      locale_countries_map[code] ? locale_countries_map[code] : locale_countries_map[default_code_used] 
-    rescue Exception => e
-      raise e if WorldFlags.raise_error?
-      "Undefined"
-    end
-
-    def countries= countries
-      raise ArgumentError, "Must be a hash, was: #{countries}" unless countries.kind_of?(Hash)
-      @countries = countries
-    end
-
-    def countries_map
-      @countries_map ||= begin 
-        active_locales.inject({}) do |res, loc|
-          res[loc] = find_country_map(loc)
-          res
-        end
-      end
-    end   
-
-    def find_country_map loc
-      countries.respond_to?(loc) ? countries.send(loc) : languages.send(locale(loc))
-    rescue
-      countries.send(default_locale_used)
-    end
-  end
-end

data/lib/world_flags/lang_util.rb

@@ -1,46 +0,0 @@
-module WorldFlags
-  module LangUtil
-    def language_label code, locale
-      WorldFlags.language code, locale
-    end
-
-    def language code = :us, locale = :en 
-      locale ||= default_locale_used      
-
-      locale_languages_map = languages_map[locale] || languages_map[default_locale_used]
-      locale_languages_map = languages_map[:en] if locale_languages_map.blank?
-
-      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] 
-    rescue Exception => e
-      raise e if WorldFlags.raise_error?
-      "Undefined"
-    end
-
-    def languages
-      @languages ||= Languages.new
-    end
-
-    def languages= languages
-      raise ArgumentError, "Must be a hash, was: #{languages}" unless languages.kind_of?(Hash)
-      @languages = languages
-    end
-
-    def languages_map
-      @languages_map ||= begin 
-        active_locales.inject({}) do |res, loc|
-          res[loc] = find_language_map(loc)
-          res
-        end
-      end
-    end
-
-    def find_language_map loc
-      languages.respond_to?(loc) ? languages.send(loc) : languages.send(locale(loc))
-    rescue
-      languages.send(default_locale_used)
-    end
-  end
-end