iso_country_codes 0.4.0 → 0.4.1

data/Gemfile

@@ -1,9 +1,8 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'rake'
 gem 'rdoc'
 
 group :development do
-  gem 'jeweler'
   gem 'nokogiri'
 end

data/Gemfile.lock

@@ -1,11 +1,6 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    git (1.2.5)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
     json (1.6.1)
     nokogiri (1.5.2)
     rake (0.9.2.2)
@@ -16,7 +11,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  jeweler
   nokogiri
   rake
   rdoc

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.4.1 / 2013-04-03
+
+* Fixed a problem with IsoCountryCodes.search_by_name when an exception is thrown
+* Remvoed Jeweller dependency in development
+
 === 0.4.0 / 2013-01-29
 
 * Added country calling codes, which may be accessed with the `calling` instance method

data/Rakefile

@@ -1,23 +1,8 @@
 require 'rake'
 require './lib/iso_country_codes.rb'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = 'iso_country_codes'
-    s.summary = %Q{
-      Provides ISO 3166-1 country codes/names and ISO 4217 currencies.
-    }
-    s.email = "alexrabarts@gmail.com"
-    s.homepage = "http://github.com/alexrabarts/iso_country_codes"
-    s.description = "ISO country code and currency library"
-    s.authors = ["alex"]
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
-
+require 'bundler/gem_tasks'
 require 'rake/testtask'
+
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib' << 'test'
   t.pattern = 'test/**/*_test.rb'

data/VERSION

@@ -0,0 +1 @@
+0.4.1

data/iso_country_codes.gemspec

@@ -1,58 +1,21 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{iso_country_codes}
-  s.version = "0.4.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["alex"]
-  s.date = %q{2013-01-29}
+  s.version = File.read('VERSION').strip
+  s.authors = ["Alex Rabarts"]
   s.description = %q{ISO country code and currency library}
-  s.email = %q{alexrabarts@gmail.com}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "Gemfile",
-     "Gemfile.lock",
-     "History.txt",
-     "Manifest.txt",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION.yml",
-     "iso_country_codes.gemspec",
-     "lib/iso_country_codes.rb",
-     "lib/iso_country_codes/calling.rb",
-     "lib/iso_country_codes/code.rb",
-     "lib/iso_country_codes/iso_3166_1.rb",
-     "lib/iso_country_codes/iso_4217.rb",
-     "lib/iso_country_codes/iso_country_codes.rb",
-     "rakelib/cultivate.rake",
-     "rakelib/iso_3166_1.rake",
-     "rakelib/iso_3166_1.rb",
-     "rakelib/iso_3166_1.rb.erb",
-     "test/iso_country_codes_test.rb"
-  ]
+  s.summary = %q{Provides ISO 3166-1 country codes/names and ISO 4217 currencies.}
   s.homepage = %q{http://github.com/alexrabarts/iso_country_codes}
+  s.email = %q{alexrabarts@gmail.com}
+  s.extra_rdoc_files = ["README.rdoc"]
+  s.files = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Provides ISO 3166-1 country codes/names and ISO 4217 currencies.}
-  s.test_files = [
-    "test/iso_country_codes_test.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.require_paths = ['lib']
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
+  ['bundler', 'shoulda', 'mocha', 'nokogiri'].each do |gem|
+    s.add_development_dependency *gem.split(' ')
   end
 end

data/lib/iso_country_codes/iso_country_codes.rb

@@ -37,7 +37,7 @@ class IsoCountryCodes # :nodoc:
       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 '#{code}'." if instances.empty?
+      raise UnknownCodeError, "No ISO 3166-1 codes could be found searching with name '#{str}'." if instances.empty?
 
       instances
     end
@@ -68,4 +68,4 @@ class IsoCountryCodes # :nodoc:
       instances
     end
   end
-end
+end

data/test/iso_country_codes_test.rb

@@ -22,6 +22,12 @@ class TestIsoCountryCodes < Test::Unit::TestCase
     assert_equal IsoCountryCodes::Code::AUS.instance, IsoCountryCodes.find('AU')
   end
 
+  def test_find_with_unknown_alpha2_code_and_raise_exception
+    assert_raise IsoCountryCodes::UnknownCodeError do
+      IsoCountryCodes.find('xx')
+    end
+  end
+
   def test_find_with_lowercase_alpha3
     assert_equal IsoCountryCodes::Code::AUS.instance, IsoCountryCodes.find('aus')
   end
@@ -59,6 +65,12 @@ class TestIsoCountryCodes < Test::Unit::TestCase
     ], IsoCountryCodes.search_by_name('democratic'))
   end
 
+  def test_search_by_name_unknown_country_and_raise_exception
+    assert_raise IsoCountryCodes::UnknownCodeError do
+      IsoCountryCodes.search_by_name('unknown country')
+    end
+  end
+
   def test_search_by_currency_lowercase
     assert_equal([
       IsoCountryCodes::Code::CCK.instance,
@@ -83,6 +95,12 @@ class TestIsoCountryCodes < Test::Unit::TestCase
     ], IsoCountryCodes.search_by_currency('AUD'))
   end
 
+  def test_search_by_currency_invalid_value_and_raise_exception
+    assert_raise IsoCountryCodes::UnknownCodeError do
+      IsoCountryCodes.search_by_currency('USS')
+    end
+  end
+
   def test_search_by_calling_code
     assert_equal [IsoCountryCodes::Code::ZAF.instance], IsoCountryCodes.search_by_calling_code('+27')
     assert_equal([
@@ -92,6 +110,12 @@ class TestIsoCountryCodes < Test::Unit::TestCase
     ], IsoCountryCodes.search_by_calling_code('+61'))
   end
 
+  def test_search_by_calling_code_invalid_value_and_raise_exception
+    assert_raise IsoCountryCodes::UnknownCodeError do
+      IsoCountryCodes.search_by_calling_code('00')
+    end
+  end
+
   def test_get_main_currency
     assert_equal 'AUD', IsoCountryCodes.find('AUS').main_currency
   end

metadata

@@ -1,33 +1,87 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: iso_country_codes
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 0
-  version: 0.4.0
+version: !ruby/object:Gem::Version
+  version: 0.4.1
+  prerelease: 
 platform: ruby
-authors: 
-- alex
+authors:
+- Alex Rabarts
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-29 00:00:00 +00:00
-default_executable: 
-dependencies: []
-
+date: 2013-04-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ISO country code and currency library
 email: alexrabarts@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -35,7 +89,7 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- VERSION.yml
+- VERSION
 - iso_country_codes.gemspec
 - lib/iso_country_codes.rb
 - lib/iso_country_codes/calling.rb
@@ -48,39 +102,30 @@ files:
 - rakelib/iso_3166_1.rb
 - rakelib/iso_3166_1.rb.erb
 - test/iso_country_codes_test.rb
-has_rdoc: true
 homepage: http://github.com/alexrabarts/iso_country_codes
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Provides ISO 3166-1 country codes/names and ISO 4217 currencies.
-test_files: 
+test_files:
 - test/iso_country_codes_test.rb

data/VERSION.yml

@@ -1,4 +0,0 @@
---- 
-:minor: 4
-:patch: 0
-:major: 0