iso_country_codes 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b068a38c7d7b521e7405175c90656f0639fc1967
-  data.tar.gz: d221055e2da8108c8c1335ca3441f375c09939e5
+  metadata.gz: d04d03b9d8eaf22ad3a697f58bfd6297c1a6ca96
+  data.tar.gz: f8a169a08884eb555deef316727213cacfb2f8d5
 SHA512:
-  metadata.gz: fb391ef4e86acec128fc4ca4ab5fffce502136d52636fe7913e280d19d4d9f9cbd40141a5e40d7d78708cebffc3da02315cd93b478e32c7d0386cc8d111f3499
-  data.tar.gz: 141b333bd255b15fb3d14dd7761cef87a5a86dc08b715017d4bfb16763fd90cbf88f62d349f5edfe67adb7a7bbb599f7c4c0e053bc31e2d80cec0b5ec25934c1
+  metadata.gz: 681e85eb7097630b81c383809f02da955f5924295c45b520ffdb50a294292b10a9cc6847560a9f9ce12c8900570da553f120ad040e7636a75c8c69f8a60175ab
+  data.tar.gz: 46ef6cf0d7bfd5c35933c5759c683b0554093dbf76884c6ec4e20545a09f44b0053a878dc864ff47bdb51e579eaed57de8c742faa264b02df42f96894b25745c

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.6.0 / 2014-10-23
+
+* Added ability to raise custom fallbacks and return default values
+
 === 0.5.0 / 2014-10-13
 
 * Added continent codes

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/iso_country_codes/iso_country_codes.rb

@@ -11,7 +11,10 @@ class IsoCountryCodes # :nodoc:
       Code.all
     end
 
-    def find(code)
+    DEFAULT_FALLBACK = lambda { |error| raise UnknownCodeError, error }
+
+    def find(code, &fallback)
+      fallback ||= DEFAULT_FALLBACK
       code     = code.to_s.upcase
       instance = nil
 
@@ -27,35 +30,41 @@ class IsoCountryCodes # :nodoc:
         instance = all.select { |c| c.alpha3 == code }.first
       end
 
-      raise UnknownCodeError, "No ISO 3166-1 code could be found for '#{code}'." if instance.nil?
+      return fallback.call "No ISO 3166-1 code could be found for '#{code}'." if instance.nil?
 
       instance
     end
 
-    def search_by_name(str)
+    def search_by_name(str, &fallback)
+      fallback ||= DEFAULT_FALLBACK
+
       instances = all.select { |c| c.name.upcase == str.upcase }
       instances = all.select { |c| c.name.match(/^#{str}/i) } if instances.empty?
       instances = all.select { |c| c.name.match(/#{str}/i) } if instances.empty?
 
-      raise UnknownCodeError, "No ISO 3166-1 codes could be found searching with name '#{str}'." if instances.empty?
+      return fallback.call "No ISO 3166-1 codes could be found searching with name '#{str}'." if instances.empty?
 
       instances
     end
 
-    def search_by_calling_code(code)
+    def search_by_calling_code(code, &fallback)
+      fallback ||= DEFAULT_FALLBACK
+
       code = "+#{code.to_i}" # Normalize code
       instances = all.select { |c| c.calling == code }
 
-      raise UnknownCodeError, "No ISO 3166-1 codes could be found searching with calling code '#{code}'." if instances.empty?
+      return fallback.call "No ISO 3166-1 codes could be found searching with calling code '#{code}'." if instances.empty?
 
       instances
     end
 
-    def search_by_calling(code) # Alias of search_by_calling_code
-      search_by_calling_code code
+    def search_by_calling(code, &fallback) # Alias of search_by_calling_code
+      search_by_calling_code code, &fallback
     end
 
-    def search_by_currency(code)
+    def search_by_currency(code, &fallback)
+      fallback ||= DEFAULT_FALLBACK
+
       code = code.to_str.upcase
       instances = all.select { |c|
         c.currencies.select { |currency|
@@ -63,7 +72,7 @@ class IsoCountryCodes # :nodoc:
         }.empty?
       }
 
-      raise UnknownCodeError, "No ISO 3166-1 codes could be found searching with currency '#{code}'." if instances.empty?
+      return fallback.call "No ISO 3166-1 codes could be found searching with currency '#{code}'." if instances.empty?
 
       instances
     end

data/test/iso_country_codes_test.rb

@@ -28,6 +28,17 @@ class TestIsoCountryCodes < Test::Unit::TestCase
     end
   end
 
+  def test_find_with_unknown_alpha2_code_and_raise_custom_exception
+    assert_raise ArgumentError do
+      IsoCountryCodes.find('xx') { |error| raise ArgumentError }
+    end
+  end
+
+  def test_find_with_unknown_alpha2_code_and_return_custom_value
+    assert_equal IsoCountryCodes.find('xx') { IsoCountryCodes::Code::AUS.instance },
+      IsoCountryCodes::Code::AUS.instance
+  end
+
   def test_find_with_lowercase_alpha3
     assert_equal IsoCountryCodes::Code::AUS.instance, IsoCountryCodes.find('aus')
   end
@@ -71,6 +82,16 @@ class TestIsoCountryCodes < Test::Unit::TestCase
     end
   end
 
+  def test_search_by_name_unknown_country_and_raise_custom_exception
+    assert_raise ArgumentError do
+      IsoCountryCodes.search_by_name('unknown country') {|error| raise ArgumentError }
+    end
+  end
+
+  def test_search_by_name_unknown_country_and_return_custom_value
+    assert_equal IsoCountryCodes.search_by_name('unknown country') {[]}, []
+  end
+
   def test_search_by_name_exact_match
     assert_equal(
       [IsoCountryCodes::Code::CCK.instance],
@@ -108,6 +129,16 @@ class TestIsoCountryCodes < Test::Unit::TestCase
     end
   end
 
+  def test_search_by_currency_invalid_value_and_raise_custom_exception
+    assert_raise ArgumentError do
+      IsoCountryCodes.search_by_currency('USS') { |error| raise ArgumentError }
+    end
+  end
+
+  def test_search_by_currency_invalid_value_and_return_custom_value
+    assert_equal IsoCountryCodes.search_by_currency('USS') {[]}, []
+  end
+
   def test_search_by_calling_code
     assert_equal [IsoCountryCodes::Code::ZAF.instance], IsoCountryCodes.search_by_calling_code('+27')
     assert_equal([
@@ -123,6 +154,16 @@ class TestIsoCountryCodes < Test::Unit::TestCase
     end
   end
 
+  def test_search_by_calling_code_invalid_value_and_raise_custom_exception
+    assert_raise ArgumentError do
+      IsoCountryCodes.search_by_calling_code('00'){ |error| raise ArgumentError }
+    end
+  end
+
+  def test_search_by_calling_code_invalid_value_and_return_custom_value
+    assert_equal IsoCountryCodes.search_by_calling_code('00') {[]}, []
+  end
+
   def test_get_main_currency
     assert_equal 'AUD', IsoCountryCodes.find('AUS').main_currency
   end
@@ -186,4 +227,14 @@ class TestIsoCountryCodes < Test::Unit::TestCase
       IsoCountryCodes.find('FOO')
     end
   end
+
+  def test_unknown_iso_code_and_return_custom_value
+    assert_equal IsoCountryCodes.find('FOO') { [] }, []
+  end
+
+  def test_unknown_iso_code_and_raise_custom_error
+    assert_raise ArgumentError do
+      IsoCountryCodes.find('FOO') { |error| raise ArgumentError }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iso_country_codes
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Alex Rabarts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler