world-flags 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d566b8b78cf0abbbd6e81d8826293ed067d34e58
-  data.tar.gz: cd25cb469671466cd666bc7fdee92d48bbaec307
+SHA256:
+  metadata.gz: 1c120c3fcd6bec0765bc067a10e1ac44e11f92c3ed5217de495bea96007af60f
+  data.tar.gz: aedfbcc870297d795b869e92472c906aafc8deef9d787717c307211698975d33
 SHA512:
-  metadata.gz: 123f419627b41747058d789765d914cbca2dc8122e3dfbb7584cc91d42efef4a82eeb1c2b44f4b361914160e13206da9ce276eb3f11ecdacc5834a85c93f6c7f
-  data.tar.gz: 196e920a05d3808838fe195309c876a8931570bd3063a44720a0b9f48105262d5025fb4ef1f51b83d8e6f3bb73e4f2b6bcae663a00edba37bd2f313389c10241
+  metadata.gz: d4012cde71a0814e95b7087577460121888b673d48f57158297fe61196fea62f82900b97f6591987f91bed1dab06251904292f3eaaa08ca55e7abd8ef6ffcef1
+  data.tar.gz: edfe9a5ff3cb1ad325875c2b2be378a47343268486a89753e83ad3f738915982b8e5f02c0cc6322af004040445e4e9ca3e54a78a47930aa58434ace9be8634dc

data/Gemfile

@@ -12,9 +12,9 @@ gem 'i18n',         '>= 0.6'
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rspec", 		">= 2.8.0"
-  gem "rdoc", 		">= 3.12"
-  gem "bundler", 	">= 1.1.0"
-  gem "jeweler", 	">= 1.8.3"
+  gem "rdoc", 		">= 6.0"
+  gem "bundler", 	">= 1.7.0"
+  gem "jeweler", 	">= 2.3.0"
   gem "simplecov",">= 0.5"
 end
 

data/Gemfile.lock

@@ -25,57 +25,62 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    addressable (2.3.5)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     arel (4.0.0)
     atomic (1.1.10)
     builder (3.1.4)
+    descendants_tracker (0.0.3)
     diff-lcs (1.2.4)
     erubis (2.7.0)
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
     geoip (1.2.1)
-    git (1.2.5)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
+    git (1.5.0)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
       hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
       oauth2
     hashie (2.0.5)
-    highline (1.6.19)
+    highline (2.0.3)
     hike (1.2.3)
-    httpauth (0.2.0)
     i18n (0.6.4)
-    jeweler (1.8.6)
+    jeweler (2.3.5)
       builder
-      bundler (~> 1.0)
+      bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api (~> 0.11.0)
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       rake
       rdoc
-    json (1.8.0)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
+      semver2
+    jwt (2.2.1)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.23)
+    mini_portile2 (2.1.0)
     minitest (4.7.5)
     multi_json (1.7.7)
-    multi_xml (0.5.4)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    oauth2 (1.4.2)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
+      rack (>= 1.2, < 3)
     polyglot (0.3.3)
+    psych (2.2.4)
+    public_suffix (4.0.3)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -93,8 +98,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.0)
-    rdoc (4.0.1)
-      json (~> 1.4)
+    rdoc (6.2.1)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -103,6 +107,7 @@ GEM
     rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.1)
+    semver2 (3.4.2)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -129,12 +134,15 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.1.0)
+  bundler (>= 1.7.0)
   geoip
   hashie (>= 1.2)
   i18n (>= 0.6)
-  jeweler (>= 1.8.3)
+  jeweler (>= 2.3.0)
   rails (>= 3.1)
-  rdoc (>= 3.12)
+  rdoc (>= 6.0)
   rspec (>= 2.8.0)
   simplecov (>= 0.5)
+
+BUNDLED WITH
+   1.17.2

data/VERSION

@@ -1 +1 @@
-0.6.5
+0.6.6

data/lib/world_flags/rails/engine.rb

@@ -3,7 +3,10 @@ module WorldFlags
     class Engine < ::Rails::Engine        
     	initializer "setup for rails" do |app|
     		ActionView::Base.send :include, WorldFlags::Helper::View
-        app.config.assets.precompile << %r(flags/flag\d\d(?:_semi)?\.png$)
+        Helper::View.flag_sizes.each do |size|
+          app.config.assets.precompile << "flags/flags#{size}.png"
+          app.config.assets.precompile << "flags/flags#{size}_semi.png"
+        end
       end
     end
   end

data/lib/world_flags/util/config.rb

@@ -48,6 +48,13 @@ module WorldFlags
         self.languages_map = nil
         self.hashied_languages = nil
         self.languages = nil
+
+        self.flag_text = ''
+        self.flag_tag = :li
+        self.flag_list_tag = :ul
+
+        self.country_name_enable!
+        self.language_name_enable!
       end
 
       def default_code_used
@@ -97,4 +104,4 @@ module WorldFlags
       end      
     end
   end
-end
+end

data/spec/world_flags/helper/util_spec.rb

@@ -44,7 +44,7 @@ describe WorldFlags::Helper::View 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>"
+      output.should == "<ul class=\"f32 flags\"><li class=\"flag ar\" data-cc=\"ar\" data-locale=\"ar\"></li></ul>"
     end
   end
-end
+end

data/spec/world_flags/json/json_countries_spec.rb

@@ -22,6 +22,6 @@ describe WorldFlags::Helper::View 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>"
+    output.should == "<ul class=\"f32 flags\"><li class=\"flag ar\" data-cc=\"ar\" data-country_name=\"Argentina\" data-language_name=\"Spanish\" data-locale=\"ar\"></li><li class=\"flag gb\" data-cc=\"gb\" data-country_name=\"United Kingdom\" data-language_name=\"British English\" data-locale=\"gb\"></li></ul>"
   end
 end

data/spec/world_flags/json/json_languages_spec.rb

@@ -22,13 +22,13 @@ describe WorldFlags::Helper::View 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=\"es-ar:Spanish\" data-locale=\"ar\">&nbsp;</li><li class=\"flag gb\" data-cc=\"gb\" data-country_name=\"United Kingdom\" data-language_name=\"en-gb:English\" data-locale=\"gb\">&nbsp;</li></ul>"
+    output.should == "<ul class=\"f32 flags\"><li class=\"flag ar\" data-cc=\"ar\" data-country_name=\"Argentina\" data-language_name=\"es-ar:Spanish\" data-locale=\"ar\"></li><li class=\"flag gb\" data-cc=\"gb\" data-country_name=\"United Kingdom\" data-language_name=\"en-gb:English\" data-locale=\"gb\"></li></ul>"
   end
 
   it "should list flags for Zaire with multiple language combis" do
     output = flags_list 32 do
       flags [:tw]
     end
-    output.should == "<ul class=\"f32\"><li class=\"flag tw\" data-cc=\"tw\" data-country_name=\"Taiwan\" data-language_name=\"zh:Chinese,zh-tw:Taiwanese\" data-locale=\"tw\">&nbsp;</li></ul>"
+    output.should == "<ul class=\"f32 flags\"><li class=\"flag tw\" data-cc=\"tw\" data-country_name=\"Taiwan\" data-language_name=\"zh:Chinese,zh-tw:Taiwanese\" data-locale=\"tw\"></li></ul>"
   end
 end

data/spec/world_flags/json/locale_flag_spec.rb

@@ -23,6 +23,6 @@ describe WorldFlags::Helper::View 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>"
+    output.should == "<ul class=\"f32 flags\"><li class=\"flag ar\" data-cc=\"ar\" data-country_name=\"Argentina\" data-language_name=\"Spanish\" data-locale=\"ar\"></li><li class=\"flag gb\" data-cc=\"gb\" data-country_name=\"United Kingdom\" data-language_name=\"British English\" data-locale=\"gb\"></li></ul>"
   end
 end

data/world-flags.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "world-flags"
-  s.version = "0.6.5"
+  s.version = "0.6.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
@@ -71,28 +71,28 @@ Gem::Specification.new do |s|
     "spec/world_flags/json/json_languages_spec.rb",
     "spec/world_flags/json/locale_flag_spec.rb",
     "spec/world_flags/language_spec.rb",
-    "vendor/assets/images/flags/flags16.png",
-    "vendor/assets/images/flags/flags16_semi.png",
-    "vendor/assets/images/flags/flags24.png",
-    "vendor/assets/images/flags/flags24_semi.png",
-    "vendor/assets/images/flags/flags32.png",
-    "vendor/assets/images/flags/flags32_semi.png",
-    "vendor/assets/images/flags/flags48.png",
-    "vendor/assets/images/flags/flags48_semi.png",
-    "vendor/assets/images/flags/flags64.png",
-    "vendor/assets/images/flags/flags64_semi.png",
-    "vendor/assets/javascripts/world_flags/url_helper.js",
-    "vendor/assets/stylesheets/flags/basic.css",
-    "vendor/assets/stylesheets/flags/basic.scss.css",
-    "vendor/assets/stylesheets/flags/flags16.css.erb",
-    "vendor/assets/stylesheets/flags/flags16.css.scss.erb",
-    "vendor/assets/stylesheets/flags/flags24.css.erb",
-    "vendor/assets/stylesheets/flags/flags24.css.scss.erb",
-    "vendor/assets/stylesheets/flags/flags32.css.erb",
-    "vendor/assets/stylesheets/flags/flags32.css.scss.erb",
-    "vendor/assets/stylesheets/flags/flags48.css.erb",
-    "vendor/assets/stylesheets/flags/flags48.css.scss.erb",
-    "vendor/assets/stylesheets/flags/flags64.css.scss.erb",
+    "app/assets/images/flags/flags16.png",
+    "app/assets/images/flags/flags16_semi.png",
+    "app/assets/images/flags/flags24.png",
+    "app/assets/images/flags/flags24_semi.png",
+    "app/assets/images/flags/flags32.png",
+    "app/assets/images/flags/flags32_semi.png",
+    "app/assets/images/flags/flags48.png",
+    "app/assets/images/flags/flags48_semi.png",
+    "app/assets/images/flags/flags64.png",
+    "app/assets/images/flags/flags64_semi.png",
+    "app/assets/javascripts/world_flags/url_helper.js",
+    "app/assets/stylesheets/flags/basic.css",
+    "app/assets/stylesheets/flags/basic.scss.css",
+    "app/assets/stylesheets/flags/flags16.css.erb",
+    "app/assets/stylesheets/flags/flags16.css.scss.erb",
+    "app/assets/stylesheets/flags/flags24.css.erb",
+    "app/assets/stylesheets/flags/flags24.css.scss.erb",
+    "app/assets/stylesheets/flags/flags32.css.erb",
+    "app/assets/stylesheets/flags/flags32.css.scss.erb",
+    "app/assets/stylesheets/flags/flags48.css.erb",
+    "app/assets/stylesheets/flags/flags48.css.scss.erb",
+    "app/assets/stylesheets/flags/flags64.css.scss.erb",
     "world-flags.gemspec"
   ]
   s.homepage = "http://github.com/kristianmandrup/world-flags"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: world-flags
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Kristian Mandrup
@@ -14,98 +14,98 @@ dependencies:
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.5'
 description: Use world flag icons in your Rails app
@@ -116,8 +116,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .document
-- .rspec
+- ".document"
+- ".rspec"
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
@@ -125,6 +125,28 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- app/assets/images/flags/flags16.png
+- app/assets/images/flags/flags16_semi.png
+- app/assets/images/flags/flags24.png
+- app/assets/images/flags/flags24_semi.png
+- app/assets/images/flags/flags32.png
+- app/assets/images/flags/flags32_semi.png
+- app/assets/images/flags/flags48.png
+- app/assets/images/flags/flags48_semi.png
+- app/assets/images/flags/flags64.png
+- app/assets/images/flags/flags64_semi.png
+- app/assets/javascripts/world_flags/url_helper.js
+- app/assets/stylesheets/flags/basic.css
+- app/assets/stylesheets/flags/basic.scss.css
+- app/assets/stylesheets/flags/flags16.css.erb
+- app/assets/stylesheets/flags/flags16.css.scss.erb
+- app/assets/stylesheets/flags/flags24.css.erb
+- app/assets/stylesheets/flags/flags24.css.scss.erb
+- app/assets/stylesheets/flags/flags32.css.erb
+- app/assets/stylesheets/flags/flags32.css.scss.erb
+- app/assets/stylesheets/flags/flags48.css.erb
+- app/assets/stylesheets/flags/flags48.css.scss.erb
+- app/assets/stylesheets/flags/flags64.css.scss.erb
 - config/countries/locale_countries.en.json
 - config/languages/locale_languages.en.json
 - config/locale_map/locale_to_country_code.json
@@ -170,28 +192,6 @@ files:
 - spec/world_flags/json/json_languages_spec.rb
 - spec/world_flags/json/locale_flag_spec.rb
 - spec/world_flags/language_spec.rb
-- vendor/assets/images/flags/flags16.png
-- vendor/assets/images/flags/flags16_semi.png
-- vendor/assets/images/flags/flags24.png
-- vendor/assets/images/flags/flags24_semi.png
-- vendor/assets/images/flags/flags32.png
-- vendor/assets/images/flags/flags32_semi.png
-- vendor/assets/images/flags/flags48.png
-- vendor/assets/images/flags/flags48_semi.png
-- vendor/assets/images/flags/flags64.png
-- vendor/assets/images/flags/flags64_semi.png
-- vendor/assets/javascripts/world_flags/url_helper.js
-- vendor/assets/stylesheets/flags/basic.css
-- vendor/assets/stylesheets/flags/basic.scss.css
-- vendor/assets/stylesheets/flags/flags16.css.erb
-- vendor/assets/stylesheets/flags/flags16.css.scss.erb
-- vendor/assets/stylesheets/flags/flags24.css.erb
-- vendor/assets/stylesheets/flags/flags24.css.scss.erb
-- vendor/assets/stylesheets/flags/flags32.css.erb
-- vendor/assets/stylesheets/flags/flags32.css.scss.erb
-- vendor/assets/stylesheets/flags/flags48.css.erb
-- vendor/assets/stylesheets/flags/flags48.css.scss.erb
-- vendor/assets/stylesheets/flags/flags64.css.scss.erb
 - world-flags.gemspec
 homepage: http://github.com/kristianmandrup/world-flags
 licenses:
@@ -203,17 +203,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: World flags as sprites