world-flags 0.4.3 → 0.4.4

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/generators/world_flags/templates/world_flags.erb

@@ -1,12 +1,13 @@
-WorldFlags.auto_select! # = false to disable
+WorldFlags.config do |c|
+  c.auto_select!
 
-# cc_en = 'app/config/country_codes/iso-3166-2.en.json'
-# cc_path = File.join(Rails.root, cc_en)
-# country_codes_en = JSON.parse File.read(cc_path)
+  # c.available_locales = [:en, :da]
+  # c.locale_source_priority = [:param, :domain, :browser, :ip]
 
-# WorldFlags.languages = some_language_hash # fx loaded from a yaml file
-# WorldFlags.countries = some_country_hash # fx loaded from a yaml file
+  # c.languages = languages_hash # fx loaded from a yaml file
+  # c.countries = countries_hash # fx loaded from a yaml file
+  # c.locale_flag_map = hash
+end
+  
 
-# WorldFlags.active_locales = [:en, :da]
 
-# WorldFlags.locale_flag_map = some hash

data/lib/world-flags.rb

@@ -15,6 +15,10 @@ module WorldFlags
 		attr_writer :active_locales
 		attr_writer :locale_flag_map		
 
+		def config &block
+  		(block_given? && block.arity == 1) ? yield(self) : instance_eval(&block)
+		end
+
 		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)

data/spec/world_flags/view_helper_spec.rb

@@ -5,11 +5,14 @@ describe WorldFlags::Helper::View do
           WorldFlags::Helper::View
 
   before do
-    WorldFlags.auto_select!
     I18n.locale = 'ar'
-    WorldFlags.available_locales = [:da, :sv, :nb, :en]
-    WorldFlags.reset!
-    WorldFlags.raise_error!
+
+    WorldFlags.config do |c|
+      c.auto_select!    
+      c.available_locales = [:da, :sv, :nb, :en]
+      c.reset!
+      c.raise_error!
+    end
   end
 
   it 'should translate flag code to locale' do

data/world-flags.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "world-flags"
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2012-05-14"
+  s.date = "2012-05-15"
   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.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000 Z
+date: 2012-05-15 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: 4215201966939774215
+      hash: -3562672022854432421
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: