countries 0.5.3 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.6.0

data/countries.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{countries}
-  s.version = "0.5.3"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["hexorx"]
-  s.date = %q{2011-07-12}
+  s.authors = [%q{hexorx}]
+  s.date = %q{2011-09-01}
   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,8 +230,8 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/hexorx/countries}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{Gives you a country object full of all sorts of useful information.}
 
   if s.respond_to? :specification_version then

data/lib/countries/country.rb

@@ -1,7 +1,9 @@
 module ISO3166; end
 
 class ISO3166::Country
-  attr_reader :data
+  Data = YAML.load_file(File.join(File.dirname(__FILE__), '..', 'data', 'countries.yaml')) || {}
+  Names = Data.map {|k,v| [v['name'],k]}.sort
+  NameIndex = Hash[*Names.flatten]
 
   AttrReaders = [
     :number,
@@ -27,32 +29,20 @@ class ISO3166::Country
     end
   end
 
-  Data = YAML.load_file(File.join(File.dirname(__FILE__), '..', 'data', 'countries.yaml')) || {}
-  Names = Data.map {|k,v| [v['name'],k]}.sort
-  NameIndex = Hash[*Names.flatten]
+  attr_reader :data
 
   def initialize(country_code)
     @data = Data[country_code]
   end
+  
+  def valid?
+    !!@data
+  end
 
   def currency
     ISO4217::Currency.from_code(@data['currency'])
   end
 
-  def self.search(query)
-    self.new(query)
-  end
-
-  def self.[](query)
-    self.search(query)
-  end
-
-  def self.find_by_name(name)
-    Data.select do |k,v|
-      v["name"] == name || v["names"].include?(name)
-    end.first
-  end
-
   def subdivisions
     @subdivisions ||= subdivisions? ? YAML.load_file(File.join(File.dirname(__FILE__), '..', 'data', 'subdivisions', "#{alpha2}.yaml")) : {}
   end
@@ -63,4 +53,26 @@ class ISO3166::Country
     File.exist?(File.join(File.dirname(__FILE__), '..', 'data', 'subdivisions', "#{alpha2}.yaml"))
   end
   
+  class << self
+    def all
+      Data.map { |country,data| [data['name'],country] }
+    end
+    
+    alias :countries :all
+
+    def search(query)
+      country = self.new(query.to_s.upcase)
+      country.valid? ? country : false
+    end
+
+    def [](query)
+      self.search(query)
+    end
+
+    def find_by_name(name)
+      Data.select do |k,v|
+        v["name"] == name || v["names"].include?(name)
+      end.first
+    end
+  end
 end

data/spec/country_spec.rb

@@ -75,11 +75,48 @@ describe ISO3166::Country do
       country.states.should have(57).states
     end
   end
+  
+  describe 'valid?' do
+    it 'should return true if country is valid' do
+      ISO3166::Country.new('US').should be_valid
+    end
 
+    it 'should return false if country is invalid' do
+      ISO3166::Country.new('fubar').should_not be_valid
+    end
+  end
+  
+  describe 'all' do
+    it 'should return an arry list of all countries' do
+      countries = ISO3166::Country.all
+      countries.should be_an(Array)
+      countries.first.should be_an(Array)
+      countries.should have(246).countries
+    end
+  end
+  
+  describe 'countries' do
+    it 'should be the same as all' do
+      ISO3166::Country.countries.should == ISO3166::Country.all
+    end
+  end
+  
   describe 'search' do
-    it 'should return new country object when a valid alpha2 is passed' do
+    it 'should return new country object when a valid alpha2 string is passed' do
       ISO3166::Country.search('US').should be_a(ISO3166::Country)
     end
+
+    it 'should return fals when an invalid alpha2 string is passed' do
+      ISO3166::Country.search('fubar').should be_false
+    end
+
+    it 'should return new country object when a valid alpha2 symbol is passed' do
+      ISO3166::Country.search(:us).should be_a(ISO3166::Country)
+    end
+
+    it 'should return false when an invalid alpha2 symbol is passed' do
+      ISO3166::Country.search(:fubar).should be_false
+    end
   end
 
   describe 'currency' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: countries
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 3
-  version: 0.5.3
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - hexorx
@@ -15,13 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-12 00:00:00 -06:00
-default_executable: 
+date: 2011-09-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -33,11 +30,11 @@ dependencies:
         - 0
         version: 0.4.0
   name: currencies
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,11 +46,11 @@ dependencies:
         - 4
         version: 1.6.4
   name: jeweler
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -65,11 +62,11 @@ dependencies:
         - 1
         version: 1.3.1
   name: rspec
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,11 +76,11 @@ dependencies:
         - 0
         version: "0"
   name: rake
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -95,11 +92,11 @@ dependencies:
         - 4
         version: 0.6.4
   name: yard
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
-  type: :runtime
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -111,11 +108,11 @@ dependencies:
         - 0
         version: 0.2.0
   name: currencies
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -125,11 +122,11 @@ dependencies:
         - 0
         version: "0"
   name: rspec
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -139,7 +136,9 @@ dependencies:
         - 0
         version: "0"
   name: yard
-  version_requirements: *id008
+  type: :development
+  prerelease: false
+  requirement: *id008
 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: []
@@ -361,7 +360,6 @@ files:
 - lib/iso3166.rb
 - spec/country_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/hexorx/countries
 licenses: []
 
@@ -391,7 +389,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Gives you a country object full of all sorts of useful information.