world-flags 0.6.0 → 0.6.1

data/README.md

@@ -135,6 +135,15 @@ To get content rendered for the <li>
 
 Note: There is also a #flag_selected? helper, which is (and/or can be) used to determine if the flag to be drawn should have the "selected" class set)
 
+## Configuration
+
+To disable use of country- and language name data attributes in output:
+
+```ruby
+WorldFlags.country_name_disable!
+WorldFlags.language_name_disable!
+```
+
 ## Customizing output
 
 You can customize the output by the flag view helper methods:

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/lib/generators/world_flags/geoip_generator.rb

@@ -14,7 +14,6 @@ module WorldFlags
       source_root File.dirname(__FILE__)
 
       def main_flow
-        puts "local: #{local?}"
         local? ? copy_local : download_latest
       end
 
@@ -34,7 +33,7 @@ module WorldFlags
         # # resource.on_redirect { |req, resp| resp.header['Location'] =~ /example.com/ }
         # resp = resource.get  # Will only follow the redirect if the new location is example.com
 
-        puts "get: #{file_name} from #{zip_adr}"
+        # puts "get: #{file_name} from #{zip_adr}"
 
         agent = Mechanize.new  { |agent| agent.user_agent_alias = 'Mac Safari'}
         agent.robots = false
@@ -48,10 +47,10 @@ module WorldFlags
         #   zip_file.write(resp.body)
         # end
         #zf is an instance of class Tempfile
-        puts "zip path: #{zf.path}"
+        # puts "zip path: #{zf.path}"
 
         Zip::ZipFile.open(file_name) do |zipfile|
-          puts "zipfile: #{zipfile}"
+          # puts "zipfile: #{zipfile}"
           #zipfile.class is Zip::ZipFile
           zipfile.each do |e|
             #e is an instance of Zip::ZipEntry

data/lib/world-flags.rb

@@ -17,6 +17,31 @@ module WorldFlags
 
 		attr_writer :flag_tag, :flag_list_tag, :flag_text
 
+    def country_name_enabled?
+    	WorldFlags::Util::Country.name_enabled?
+    end
+
+    def language_name_enabled?
+    	WorldFlags::Util::Language.name_enabled?
+    end
+
+    def country_name_enable!
+    	WorldFlags::Util::Country.name_enable!
+    end
+
+    def language_name_enable!
+    	WorldFlags::Util::Language.name_enable!
+    end
+
+    def country_name_disable!
+    	WorldFlags::Util::Country.name_disable!
+    end
+
+    def language_name_disable!
+    	WorldFlags::Util::Language.name_disable!
+    end
+
+
 		def flag_text
  			@flag_text ||= '' #'  '
  		end

data/lib/world_flags/helper/geo.rb

@@ -7,7 +7,7 @@ module WorldFlags
         ip ||= request.remote_ip
         raise WorldFlags::GeoIPError, "IP address #{ip} is a localhost address" if local_ip?(ip)
         
-        puts "find country code for ip: #{ip}" if debug?
+        # puts "find country code for ip: #{ip}" if debug?
 
         @geoip ||= ::GeoIP.new WorldFlags.geo_ip_db_path
         country = @geoip.country(ip)

data/lib/world_flags/helper/view.rb

@@ -48,7 +48,7 @@ module WorldFlags
 				label = WorldFlags::Helper::View::Util.label_for options
 				title = WorldFlags::Helper::View::Util.title_for name, options
 
-				content_tag WorldFlags.flag_tag,  label.html_safe, WorldFlags::Helper::View::Util.flag_options(code, title, name, options)
+				content_tag WorldFlags.flag_tag, label.html_safe, WorldFlags::Helper::View::Util.flag_options(code, title, name, options)
 			end
 
 			def flag_title code, *args

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

@@ -29,16 +29,23 @@ module WorldFlags
 					extra_options = title ? {:title => title } : {}			
 					selected = flag_selected?(code, options) ? ' selected' : ''
 
-					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]
 					xclass = options[:class] ? " #{options[:class]}" : ''
 
+					if WorldFlags.country_name_enabled?
+						country_name = WorldFlags.country(code, locale)						
+					end
+					country_option = country_name ? {:'data-country_name' => country_name} : {}
+
+					if WorldFlags.language_name_enabled?
+						language_name = WorldFlags.language(code, locale)
+					end
+					language_option = language_name ? {:'data-language_name' => language_name} : {}
+
 					flag_locale = WorldFlags.locale(code)
 
-					{:class => "flag #{code}#{selected}#{semi}#{xclass}", :'data-country_name' => country_name, :'data-language_name' => language_name, :'data-cc' => code, :'data-locale' => flag_locale}.merge(options[:html] || {}).merge(extra_options)
+					{:class => "flag #{code}#{selected}#{semi}#{xclass}", :'data-cc' => code, :'data-locale' => flag_locale}.merge(options[:html] || {}).merge(extra_options).merge(country_option).merge(language_option)
 				end
 
 				def self.flag_selected? code, options = {}

data/lib/world_flags/util/country.rb

@@ -1,8 +1,12 @@
+require 'world_flags/util/name_enabler'
+
 module WorldFlags
   module Util
     module Country
       attr_writer :countries_map, :hashied_countries
       
+      extend WorldFlags::Util::NameEnabler
+
       def country_label code, locale
         WorldFlags.country code, locale
       end

data/lib/world_flags/util/language.rb

@@ -1,8 +1,12 @@
+require 'world_flags/util/name_enabler'
+
 module WorldFlags
   module Util
     module Language
       attr_writer :languages_map, :hashied_languages
 
+      extend WorldFlags::Util::NameEnabler
+
       def language_label code, locale
         language code, locale
       end

data/lib/world_flags/util/name_enabler.rb

@@ -0,0 +1,19 @@
+module WorldFlags
+  module Util
+    module NameEnabler
+      attr_writer :name_enabled
+
+      def name_enabled?
+        @name_enabled.nil? ? true : @name_enabled
+      end
+
+      def name_disable!
+        @name_enabled = false
+      end
+
+      def name_enable!
+        @name_enabled = true
+      end
+    end
+  end
+end

data/spec/world_flags/helper/util_spec.rb

@@ -33,4 +33,18 @@ describe WorldFlags::Helper::View do
       output.should == "<div class=\"f32 flags\"><span class=\"flag ar\" data-cc=\"ar\" data-country_name=\"Argentina\" data-language_name=\"Spanish\" data-locale=\"ar\"></span></div>"
     end
   end
+
+  describe 'disable country and language names' do
+    before :each do
+      WorldFlags.country_name_disable!
+      WorldFlags.language_name_disable!
+    end
+
+    it "should list flags using customized tags and text" do
+      output = flags_list 32 do
+        flags [:ar]
+      end
+      output.should == "<div class=\"f32 flags\"><span class=\"flag ar\" data-cc=\"ar\" data-locale=\"ar\"></span></div>"
+    end
+  end
 end

data/world-flags.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "world-flags"
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
@@ -53,6 +53,7 @@ Gem::Specification.new do |s|
     "lib/world_flags/util/config.rb",
     "lib/world_flags/util/country.rb",
     "lib/world_flags/util/language.rb",
+    "lib/world_flags/util/name_enabler.rb",
     "sandbox/country_codes_table.html",
     "sandbox/extract_codes.rb",
     "sandbox/languages_country_extract.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: world-flags
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -215,6 +215,7 @@ files:
 - lib/world_flags/util/config.rb
 - lib/world_flags/util/country.rb
 - lib/world_flags/util/language.rb
+- lib/world_flags/util/name_enabler.rb
 - sandbox/country_codes_table.html
 - sandbox/extract_codes.rb
 - sandbox/languages_country_extract.rb
@@ -279,7 +280,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3232488159583749
+      hash: 3654063232221514543
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: