iso_country_codes 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a57d57e0f1e172cf16443c548c96321b05a4fc5
-  data.tar.gz: 6d71a4bdc9fc06940a053432ff01d276e81c8071
+  metadata.gz: e3407315feef40a75fcfc9513b41b094aedbe17b
+  data.tar.gz: 0b53033413873611069018b59cc3fcb36f72cd20
 SHA512:
-  metadata.gz: 6bab4f20d2b0b179d480cc671a7eec18e7cc8354e96a5e2ff07b9fc6a68b9701333fbfda59a588a7f1cfd814a1b981497dfc5ce2dcab0c069d36cf4c49e42b11
-  data.tar.gz: 3f400ffeb54f50c1625c6626fcf1bb960a2949e942141bfd7fbaf800494fff4bdf3a796966da7314b02912471f128c8ef55226b84e75a8d6054f1be1dc91e4db
+  metadata.gz: b39f3664b3ca8aad85dae6bb60838139fe5b6fb20ea483f7e5f86e704c652a1a352b244889a3b523a8513b4fa6a90de7ae01f9a7da77f06f1078e1c3be19aefe
+  data.tar.gz: 43fae37741f6c235335cc4cb4b7ca9c4f96c5de5acef5ac753f7283fa54162f2412bcd85af8dff9d3cc46d0cd69150b77fc6bc0f943a1157927a498da62f35ca

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.7.8
+
+* Add (internal) override mechanism, and call TWN "Taiwan". (see #44)
+
 ## 0.7.7
 
 * Updated the main currency for Lithuania from `LTL` to `EUR` (see #43)

data/Gemfile

@@ -6,5 +6,5 @@ gem 'rdoc'
 group :development, :test do
   gem 'nokogiri'
   gem 'erubis'
-  gem "test-unit", "~> 3.0"
+  gem 'test-unit', '~> 3.0'
 end

data/README.rdoc

@@ -43,6 +43,20 @@ Provides ISO codes, names and currencies for countries.
 
   gem install iso_country_codes
 
+== DATA SOURCE:
+
+IsoCountryCodes pulls its data from the Wikipedia ISO 3166-1 tables
+(https://en.wikipedia.org/wiki/ISO_3166-1), combined with a small number of
+overrides contained in the `overrides.yml` file. For example, the country name
+of TWN is overridden to "Taiwan" from "Taiwan, Province of China", to make it
+less politicised.
+
+The format of the `overrides.yml` file is the 3-letter alpha country
+code as the key, and the fields one wants to override as follows:
+
+  "TWN":
+    :name: "Taiwan"
+
 == LICENSE:
 
 (The MIT License)

data/VERSION

@@ -1 +1 @@
-0.7.7
+0.7.8

data/lib/iso_country_codes/iso_3166_1.rb

@@ -1306,7 +1306,7 @@ class IsoCountryCodes
     end
     class TWN < Code #:nodoc:
       self.numeric = %q{158}
-      self.name    = %q{Taiwan, Province of China}
+      self.name    = %q{Taiwan}
       self.alpha2  = %q{TW}
       self.alpha3  = %q{TWN}
     end

data/overrides.yml

@@ -0,0 +1,3 @@
+---
+"TWN":
+  :name: "Taiwan"

data/rakelib/iso_3166_1.rb

@@ -1,6 +1,7 @@
 require 'nokogiri'
 require 'open-uri'
 require 'erubis'
+require 'yaml'
 
 class IsoCountryCodes
   module Task
@@ -30,6 +31,14 @@ class IsoCountryCodes
 
             next if value == ''
 
+            # This is a terrible hack to skip the first table of the
+            # Wikipedia page, under "Naming and disputes".  The
+            # giveaway is that this table doesn't include a "Numeric
+            # code" field.
+            if key == :numeric
+              next unless value.to_i > 0
+            end
+
             value_hash[key] = value
 
             if value_hash.length == code_labels.length - 1
@@ -40,6 +49,8 @@ class IsoCountryCodes
           end
         end
 
+        codes = recurse_merge(codes, self.exceptions)
+
         to_ruby(codes) if codes
       end
 
@@ -48,6 +59,16 @@ class IsoCountryCodes
         eruby = Erubis::Eruby.new(tmpl)
         eruby.result(:codes => codes)
       end
+
+      def self.exceptions
+        @config ||= YAML.load_file('overrides.yml')
+      end
+
+      def self.recurse_merge(a,b)
+        a.merge(b) do |_,x,y|
+          (x.is_a?(Hash) && y.is_a?(Hash)) ? recurse_merge(x,y) : y
+        end
+      end
     end # UpdateCodes
   end # Task
 end # IsoCountryCodes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iso_country_codes
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Alex Rabarts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +91,7 @@ files:
 - lib/iso_country_codes/iso_3166_1.rb
 - lib/iso_country_codes/iso_4217.rb
 - lib/iso_country_codes/iso_country_codes.rb
+- overrides.yml
 - rakelib/cultivate.rake
 - rakelib/iso_3166_1.rake
 - rakelib/iso_3166_1.rb
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Provides ISO 3166-1 country codes/names and ISO 4217 currencies.