iso_country_codes 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bceead1622c275bdc8e39e5f7dd676a8f3f51214
-  data.tar.gz: 25940d7dc70dae061934fce6152521d95234a02a
+  metadata.gz: 8bcbc624cb853a459884e1d83c6e348f96a481f6
+  data.tar.gz: cf8c1e261462ef9f0c91071b988c72ad7f658173
 SHA512:
-  metadata.gz: 84146dc600c4ceb76df414ccb26ee2daeaa3a8bff563bb7c9d652d0744ed3b46afe8869de755c8d0589cbab6483833c540fc8791bcbae861a9a0bfa4f2a56cc7
-  data.tar.gz: f90fd6cfdf3a96874592a72bccba90511ed86e5b6b9e324f056aeee122883243b23a2aadfd66f5b8e92d6293455b629ee953eba124664bb4c239ae1af4a6dd94
+  metadata.gz: a4186a05e1c54e6020144837b22599c7a34b0cc8fc6cb872c82e96e9e32f5339c7017d6632cdf7c0164b57c264020fe51f93e6a29d6dd05b5467c5d8734fe4bb
+  data.tar.gz: 0f3cab4fe9ac280d55aedc1b4ae620047c4df1292fca5f2a5adba8af818099583b1b308dac86c3a4cc6fcd37f08231582e2e09c24aff70c083a25921c435a4d3

data/.gitignore

@@ -1 +1,2 @@
 iso_country_codes-*.gem
+.bundle/

data/.travis.yml

@@ -1,6 +1,9 @@
 language: ruby
 bundler_args: --without development
 rvm:
+  - 2.3.0
+  - 2.2.4
+  - 2.1
   - 2.0.0
   - 1.9.3
   - ruby-head

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.7.5
+
+* Improved `search_by_name` to handle names with commas and parentheses (see #37)
+
 ## 0.7.4
 
 * Fixed calling code for Monaco

data/Gemfile

@@ -3,7 +3,8 @@ source 'https://rubygems.org'
 gem 'rake'
 gem 'rdoc'
 
-group :development do
+group :development, :test do
   gem 'nokogiri'
   gem 'erubis'
+  gem "test-unit", "~> 3.0"
 end

data/Gemfile.lock

@@ -6,9 +6,12 @@ GEM
     mini_portile (0.6.2)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
+    power_assert (0.2.7)
     rake (10.4.2)
     rdoc (4.2.0)
       json (~> 1.4)
+    test-unit (3.1.8)
+      power_assert
 
 PLATFORMS
   ruby
@@ -18,3 +21,7 @@ DEPENDENCIES
   nokogiri
   rake
   rdoc
+  test-unit (~> 3.0)
+
+BUNDLED WITH
+   1.11.2

data/README.rdoc

@@ -1,5 +1,5 @@
 = iso_country_codes
-{<img src="https://travis-ci.org/alexrabarts/iso_country_codes.png" alt="Build Status" />}[https://travis-ci.org/alexrabarts/iso_country_codes]
+{<img src="https://travis-ci.org/alexrabarts/iso_country_codes.svg" alt="Build Status" />}[https://travis-ci.org/alexrabarts/iso_country_codes]
 
 == DESCRIPTION:
 

data/VERSION

@@ -1 +1 @@
-0.7.4
+0.7.5

data/lib/iso_country_codes/iso_3166_1.rb

@@ -224,6 +224,12 @@ class IsoCountryCodes
       self.alpha2  = %q{BI}
       self.alpha3  = %q{BDI}
     end
+    class CPV < Code #:nodoc:
+      self.numeric = %q{132}
+      self.name    = %q{Cabo Verde}
+      self.alpha2  = %q{CV}
+      self.alpha3  = %q{CPV}
+    end
     class KHM < Code #:nodoc:
       self.numeric = %q{116}
       self.name    = %q{Cambodia}
@@ -242,12 +248,6 @@ class IsoCountryCodes
       self.alpha2  = %q{CA}
       self.alpha3  = %q{CAN}
     end
-    class CPV < Code #:nodoc:
-      self.numeric = %q{132}
-      self.name    = %q{Cabo Verde}
-      self.alpha2  = %q{CV}
-      self.alpha3  = %q{CPV}
-    end
     class CYM < Code #:nodoc:
       self.numeric = %q{136}
       self.name    = %q{Cayman Islands}

data/lib/iso_country_codes/iso_country_codes.rb

@@ -41,6 +41,7 @@ class IsoCountryCodes # :nodoc:
       instances = all.select { |c| c.name.to_s.upcase == str.to_s.upcase }
       instances = all.select { |c| c.name.to_s.match(/^#{Regexp.escape(str)}/i) } if instances.empty?
       instances = all.select { |c| c.name.to_s.match(/#{Regexp.escape(str)}/i) } if instances.empty?
+      instances = all.select { |c| word_set(c.name) == word_set(str) } if instances.empty?
 
       return fallback.call "No ISO 3166-1 codes could be found searching with name '#{str}'." if instances.empty?
 
@@ -87,5 +88,10 @@ class IsoCountryCodes # :nodoc:
 
       instances
     end
+
+    private
+    def word_set(str)
+      str.to_s.upcase.split(/\W/).reject(&:empty?).to_set
+    end
   end
 end

data/rakelib/iso_3166_1.rb

@@ -6,7 +6,7 @@ class IsoCountryCodes
   module Task
     module UpdateCodes
       def self.get
-        doc    = Nokogiri::HTML.parse(open('http://en.wikipedia.org/wiki/ISO_3166-1'), nil, 'UTF-8')
+        doc    = Nokogiri::HTML.parse(open('https://en.wikipedia.org/wiki/ISO_3166-1'), nil, 'UTF-8')
         codes  = {}
         td_map = {
           :name    => 1,
@@ -24,7 +24,9 @@ class IsoCountryCodes
             selector = "td:nth-of-type(#{td_map[key]})"
             selector << ' a' if key == :name
 
-            value = row.search(selector).text.strip
+            value = row.search(selector).
+                        reject { |el| el.parent.name == 'sup' }.
+                        map(&:text).join.strip
 
             next if value == ''
 

data/test/iso_country_codes_test.rb

@@ -59,6 +59,14 @@ class TestIsoCountryCodes < Test::Unit::TestCase
     assert_equal [IsoCountryCodes::Code::AUS.instance], IsoCountryCodes.search_by_name('Australia')
   end
 
+  def test_search_comma_separated_name
+    assert_equal [IsoCountryCodes::Code::PSE.instance], IsoCountryCodes.search_by_name('State of Palestine')
+  end
+
+  def test_search_parenthetical_name
+    assert_equal [IsoCountryCodes::Code::KOR.instance], IsoCountryCodes.search_by_name('Republic of Korea')
+  end
+
   def test_search_by_name_returning_many_results_starting_wth_the_search_string
     assert_equal([
       IsoCountryCodes::Code::ARE.instance,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iso_country_codes
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Alex Rabarts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler