countries 0.6.1 → 0.7.0

data/Gemfile

@@ -5,6 +5,6 @@ gem 'currencies', '=0.4.0', :require => 'iso4217'
 group :development, :test do
   gem 'jeweler', '>=1.6.4'
   gem 'rspec', '=1.3.1'
-  gem 'rake'
+  gem 'rake', '0.8.7'
   gem 'yard', '=0.6.4'
 end

data/Gemfile.lock

@@ -17,6 +17,6 @@ PLATFORMS
 DEPENDENCIES
   currencies (= 0.4.0)
   jeweler (>= 1.6.4)
-  rake
+  rake (= 0.8.7)
   rspec (= 1.3.1)
   yard (= 0.6.4)

data/README.markdown

@@ -35,7 +35,19 @@ Simply load a new country object using Country.new(*alpha2*) or the shortcut Cou
 
     c = Country.new('US')
     c = Country['US']
-    
+
+Attribute-Based Finder Methods
+------------
+
+You can lookup a country or an array of countries using any of the data attributes via the find\_country\_by_*attribute* dynamic methods:
+
+    c = Country.find_country_by_name('united states')
+    list = Country.find_all_countries_by_region('Americas')
+    c = Country.find_country_by_alpha3('can')
+
+For a list of available attributes please see ISO3166::Country::AttrReaders.
+Note: searches are *case insensitive*.
+
 Country Info
 ------------
 

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.description = 'All sorts of useful information about every country packaged as pretty little country objects. It includes data from ISO 3166 (countries and subdivisions), ISO 4217 (currency), and E.164 (phone numbers). As a bonus it even adds a country_select helper to rails projects.'
     gem.email = "hexorx@gmail.com"
     gem.homepage = "http://github.com/hexorx/countries"
-    gem.authors = ["hexorx"]
+    gem.authors = ["hexorx", "Joe Corcoran"]
     gem.add_dependency('currencies', '>= 0.2.0')
     gem.add_development_dependency "rspec"
     gem.add_development_dependency "yard"

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.7.0

data/countries.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{countries}
-  s.version = "0.6.1"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{hexorx}]
-  s.date = %q{2011-09-16}
+  s.authors = ["hexorx", "Joe Corcoran"]
+  s.date = %q{2011-12-06}
   s.description = %q{All sorts of useful information about every country packaged as pretty little country objects. It includes data from ISO 3166 (countries and subdivisions), ISO 4217 (currency), and E.164 (phone numbers). As a bonus it even adds a country_select helper to rails projects.}
   s.email = %q{hexorx@gmail.com}
   s.extra_rdoc_files = [
@@ -230,18 +230,19 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/hexorx/countries}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Gives you a country object full of all sorts of useful information.}
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<currencies>, ["= 0.4.0"])
       s.add_development_dependency(%q<jeweler>, [">= 1.6.4"])
       s.add_development_dependency(%q<rspec>, ["= 1.3.1"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<rake>, ["= 0.8.7"])
       s.add_development_dependency(%q<yard>, ["= 0.6.4"])
       s.add_runtime_dependency(%q<currencies>, [">= 0.2.0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
@@ -250,7 +251,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<currencies>, ["= 0.4.0"])
       s.add_dependency(%q<jeweler>, [">= 1.6.4"])
       s.add_dependency(%q<rspec>, ["= 1.3.1"])
-      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rake>, ["= 0.8.7"])
       s.add_dependency(%q<yard>, ["= 0.6.4"])
       s.add_dependency(%q<currencies>, [">= 0.2.0"])
       s.add_dependency(%q<rspec>, [">= 0"])
@@ -260,7 +261,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<currencies>, ["= 0.4.0"])
     s.add_dependency(%q<jeweler>, [">= 1.6.4"])
     s.add_dependency(%q<rspec>, ["= 1.3.1"])
-    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rake>, ["= 0.8.7"])
     s.add_dependency(%q<yard>, ["= 0.6.4"])
     s.add_dependency(%q<currencies>, [">= 0.2.0"])
     s.add_dependency(%q<rspec>, [">= 0"])

data/lib/countries/country.rb

@@ -9,6 +9,7 @@ class ISO3166::Country
     :number,
     :alpha2,
     :alpha3,
+    :currency,
     :name,
     :names,
     :latitude,
@@ -31,8 +32,8 @@ class ISO3166::Country
 
   attr_reader :data
 
-  def initialize(country_code)
-    @data = Data[country_code]
+  def initialize(country_data)
+    @data = country_data.is_a?(Hash) ? country_data : Data[country_data]
   end
   
   def valid?
@@ -68,17 +69,33 @@ class ISO3166::Country
     def [](query)
       self.search(query)
     end
-
-    def find_by_name(name)
-      name.downcase!
-      Data.select do |k,v|
-        v["name"].downcase == name || v["names"].map{ |n| n.downcase }.include?(name)
-      end.first
+    
+    def method_missing(*m)
+      if m.first.to_s.match /^find_(country_)?by_(.+)/
+        country = self.find_all_by($~[2].downcase, m[1].to_s.downcase).first
+        $~[1].nil? ? country : self.new(country.last) if country
+      elsif m.first.to_s.match /^find_all_(countries_)?by_(.+)/
+        self.find_all_by($~[2].downcase, m[1].to_s.downcase).inject([]) do |list, c|
+          list << ($~[1].nil? ? c : self.new(c.last)) if c
+          list
+        end
+      else
+        super
+      end
     end
-
-    def find_country_by_name(name)
-      result = self.find_by_name(name)
-      result ? self.new(result.first) : nil
+    
+    def find_all_by(attribute, val)
+      raise "Invalid attribute name '#{attribute}'" unless AttrReaders.include?(attribute.to_sym)
+      attribute = ['name', 'names'] if attribute == 'name'
+      Data.select do |k,v|
+        Array(attribute).map do |attr|
+          if v[attr].kind_of?(Enumerable)
+            v[attr].map{ |n| n.downcase }.include?(val)
+          else
+            v[attr] && v[attr].downcase == val
+          end
+        end.uniq.include?(true) 
+      end
     end
   end
 end

data/lib/countries/select_helper.rb

@@ -11,12 +11,12 @@ module ActionView
         country_options = ""
 
         if priority_countries
-          priority_countries = [*priority_countries].map {|x| [x,Country::NameIndex[x]] }
+          priority_countries = [*priority_countries].map {|x| [x,ISO3166::Country::NameIndex[x]] }
           country_options += options_for_select(priority_countries, selected)
           country_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n"
         end
 
-        return country_options + options_for_select(Country::Names, selected)
+        return country_options + options_for_select(ISO3166::Country::Names, selected)
       end
     end
     
@@ -24,7 +24,7 @@ module ActionView
       def to_country_select_tag(priority_countries, options, html_options)
         html_options = html_options.stringify_keys
         add_default_name_and_id(html_options)
-        value = value(object)
+        value = options.delete(:selected) || value(object)
         content_tag("select",
           add_options(
             country_options_for_select(value, priority_countries),
@@ -40,4 +40,4 @@ module ActionView
       end
     end
   end
-end
+end

data/lib/data/countries.yaml

@@ -201,7 +201,7 @@ AO:
 AQ: 
   alpha2: AQ
   alpha3: ATA
-  country_code: ""
+  country_code: "672"
   currency: ~
   international_prefix: ""
   latitude: "90 00 S"
@@ -350,7 +350,7 @@ AW:
 AX: 
   alpha2: AX
   alpha3: ALA
-  country_code: ""
+  country_code: "358"
   currency: ~
   international_prefix: ""
   latitude: ""
@@ -597,7 +597,7 @@ BJ:
 BL: 
   alpha2: BL
   alpha3: BLM
-  country_code: ""
+  country_code: "590"
   currency: ~
   international_prefix: ""
   latitude: "17 90 N"
@@ -963,9 +963,9 @@ CI:
   international_prefix: "00"
   latitude: "8 00 N"
   longitude: "5 00 W"
-  name: "Côte D\\'Ivoire"
+  name: "Côte D'Ivoire"
   names: 
-    - "Côte D\\'Ivoire"
+    - "Côte D'Ivoire"
   national_destination_code_lengths: 
     - 2
   national_number_lengths: 
@@ -1153,7 +1153,7 @@ CV:
 CX: 
   alpha2: CX
   alpha3: CXR
-  country_code: "618"
+  country_code: "61"
   currency: AUD
   international_prefix: "0011"
   latitude: "10 30 S"
@@ -1431,7 +1431,7 @@ EG:
 EH: 
   alpha2: EH
   alpha3: ESH
-  country_code: ""
+  country_code: "212"
   currency: MAD
   international_prefix: ""
   latitude: "24 30 N"
@@ -1777,7 +1777,7 @@ GF:
 GG: 
   alpha2: GG
   alpha3: GGY
-  country_code: ""
+  country_code: "44"
   currency: GGP
   international_prefix: ""
   latitude: "49 28 N"
@@ -1975,7 +1975,7 @@ GR:
 GS: 
   alpha2: GS
   alpha3: SGS
-  country_code: ""
+  country_code: "500"
   currency: ~
   international_prefix: ""
   latitude: "54 30 S"
@@ -2290,7 +2290,7 @@ IL:
 IM: 
   alpha2: IM
   alpha3: IMN
-  country_code: ""
+  country_code: "44"
   currency: IMP
   international_prefix: ""
   latitude: "54 15 N"
@@ -2337,7 +2337,7 @@ IN:
 IO: 
   alpha2: IO
   alpha3: IOT
-  country_code: ""
+  country_code: "246"
   currency: USD
   international_prefix: ""
   latitude: "6 00 S"
@@ -2452,7 +2452,7 @@ IT:
 JE: 
   alpha2: JE
   alpha3: JEY
-  country_code: ""
+  country_code: "44"
   currency: JEP
   international_prefix: ""
   latitude: "49 15 N"
@@ -2803,7 +2803,7 @@ LA:
   international_prefix: "00"
   latitude: "18 00 N"
   longitude: "105 00 E"
-  name: "Lao People\\'s Democratic Republic"
+  name: "Lao People's Democratic Republic"
   names: 
     - Laos
     - Laos
@@ -3133,7 +3133,7 @@ ME:
 MF: 
   alpha2: MF
   alpha3: MAF
-  country_code: ""
+  country_code: "590"
   currency: EUR
   international_prefix: ""
   latitude: "18 05 N"
@@ -4043,7 +4043,7 @@ PM:
 PN: 
   alpha2: PN
   alpha3: PCN
-  country_code: "872"
+  country_code: ""
   currency: NZD
   international_prefix: "00"
   latitude: "25 04 S"

data/lib/iso3166.rb

@@ -1,6 +1,6 @@
 $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
 
-require 'YAML' unless defined?(YAML)
+require 'yaml' unless defined?(YAML::ENGINE)
 require 'iso4217'
 
 require 'countries/select_helper'

data/spec/country_spec.rb

@@ -155,7 +155,7 @@ describe ISO3166::Country do
     end
   end
 
-  describe ".find_by_name" do
+  describe "hash finder methods" do
     context "when search name in 'name'" do
       subject { ISO3166::Country.find_by_name("Poland") }
 
@@ -173,9 +173,32 @@ describe ISO3166::Country do
 
       its(:first) { should == "PL" }
     end
+    
+    context "when finding by invalid attribute" do
+      it "should raise an error" do
+        lambda { ISO3166::Country.find_by_invalid('invalid') }.should raise_error
+      end
+    end
+    
+    context "when using find_all method" do
+      let(:list) { ISO3166::Country.find_all_by_currency('USD') }
+
+      it "should be an Array of Arrays" do
+        list.should be_a(Array)
+        list.first.should be_a(Array)
+      end
+    end
+    
+    context "when using find_by method" do
+      subject { ISO3166::Country.find_by_alpha3('CAN') }
+      
+      its(:length) { should == 2 }
+      its(:first) { should be_a(String) }
+      its(:last) { should be_a(Hash) }
+    end
   end
 
-  describe ".find_country_by_name" do
+  describe "country finder methods" do
     context "when search name found" do
       let(:uk) { ISO3166::Country.find_country_by_name("United Kingdom") }
 
@@ -201,6 +224,29 @@ describe ISO3166::Country do
         bogus.should == nil
       end
     end
+    
+    context "when finding by invalid attribute" do
+      it "should raise an error" do
+        lambda { ISO3166::Country.find_country_by_invalid('invalid') }.should raise_error
+      end
+    end
+    
+    context "when using find_all method" do
+      let(:list) { ISO3166::Country.find_all_countries_by_currency('USD') }
+
+      it "should be an Array of Country objects" do
+        list.should be_a(Array)
+        list.first.should be_a(ISO3166::Country)
+      end
+    end
+    
+    context "when using find_by method" do
+      let(:country) { ISO3166::Country.find_country_by_alpha3('CAN') }
+      
+      it 'should be a single country object' do
+        country.should be_a(ISO3166::Country)
+      end
+    end
   end
 
   describe "names in Data" do

metadata

@@ -1,23 +1,27 @@
 --- !ruby/object:Gem::Specification 
 name: countries
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
+  hash: 3
+  prerelease: false
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  - 0
+  segments_generated: true
+  version: 0.7.0
 platform: ruby
 authors: 
 - hexorx
+- Joe Corcoran
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-09-16 00:00:00 Z
+date: 2011-12-06 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: currencies
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -28,12 +32,13 @@ dependencies:
         - 0
         - 4
         - 0
+        segments_generated: true
         version: 0.4.0
-  name: currencies
-  type: :runtime
   prerelease: false
   requirement: *id001
+  type: :runtime
 - !ruby/object:Gem::Dependency 
+  name: jeweler
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -44,12 +49,13 @@ dependencies:
         - 1
         - 6
         - 4
+        segments_generated: true
         version: 1.6.4
-  name: jeweler
-  type: :development
   prerelease: false
   requirement: *id002
+  type: :development
 - !ruby/object:Gem::Dependency 
+  name: rspec
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -60,26 +66,30 @@ dependencies:
         - 1
         - 3
         - 1
+        segments_generated: true
         version: 1.3.1
-  name: rspec
-  type: :development
   prerelease: false
   requirement: *id003
+  type: :development
 - !ruby/object:Gem::Dependency 
+  name: rake
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 49
         segments: 
         - 0
-        version: "0"
-  name: rake
-  type: :development
+        - 8
+        - 7
+        segments_generated: true
+        version: 0.8.7
   prerelease: false
   requirement: *id004
+  type: :development
 - !ruby/object:Gem::Dependency 
+  name: yard
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -90,12 +100,13 @@ dependencies:
         - 0
         - 6
         - 4
+        segments_generated: true
         version: 0.6.4
-  name: yard
-  type: :development
   prerelease: false
   requirement: *id005
+  type: :development
 - !ruby/object:Gem::Dependency 
+  name: currencies
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -106,12 +117,13 @@ dependencies:
         - 0
         - 2
         - 0
+        segments_generated: true
         version: 0.2.0
-  name: currencies
-  type: :runtime
   prerelease: false
   requirement: *id006
+  type: :runtime
 - !ruby/object:Gem::Dependency 
+  name: rspec
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -120,12 +132,13 @@ dependencies:
         hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  name: rspec
-  type: :development
   prerelease: false
   requirement: *id007
+  type: :development
 - !ruby/object:Gem::Dependency 
+  name: yard
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -134,11 +147,11 @@ dependencies:
         hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  name: yard
-  type: :development
   prerelease: false
   requirement: *id008
+  type: :development
 description: All sorts of useful information about every country packaged as pretty little country objects. It includes data from ISO 3166 (countries and subdivisions), ISO 4217 (currency), and E.164 (phone numbers). As a bonus it even adds a country_select helper to rails projects.
 email: hexorx@gmail.com
 executables: []
@@ -360,6 +373,7 @@ files:
 - lib/iso3166.rb
 - spec/country_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://github.com/hexorx/countries
 licenses: []
 
@@ -376,6 +390,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
@@ -385,11 +400,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Gives you a country object full of all sorts of useful information.