iso 0.1.1 → 0.2.0

data/README.md

@@ -26,7 +26,16 @@ Regions are defined by **ISO 3166-1**; that is the 2 letter uppercase region cod
 	
 	=> #<ISO::Region:0x007fe2ba070e50
 			@code="MX",
-			@name="Mexico"> 
+			@name="Mexico">
+			
+Regions can also be defined by the **UN M49** standard; that is the 3 digit region code. 
+
+	> ISO::UN::Region.find('419')
+	
+	=> #<ISO::Region:0x007fe2ba43db50
+			@code="419",
+			@name="Latin America and the Caribbean">
+
 	
 ## Tags
 
@@ -46,8 +55,8 @@ The combination of a language and a region is called a Tag :
 				
 You can check if a Tag is valid like so :
 
-  > ISO::Tag.new('pt-BR').valid? => true
-  > ISO::Tag.new('lolcat').valid? => false
+	> ISO::Tag.new('pt-BR').valid? => true
+	> ISO::Tag.new('lolcat').valid? => false
 
 ## I18n
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/data/un-m49.yml

@@ -0,0 +1,502 @@
+'002':
+'004':
+  iso_code: AF
+'005':
+'008':
+  iso_code: AL
+'009':
+'011':
+'012':
+  iso_code: DZ
+'013':
+'014':
+'015':
+'016':
+  iso_code: AS
+'017':
+'018':
+'019':
+'020':
+  iso_code: AD
+'021':
+'024':
+  iso_code: AO
+'028':
+  iso_code: AG
+'029':
+'030':
+'031':
+  iso_code: AZ
+'032':
+  iso_code: AR
+'034':
+'035':
+'036':
+  iso_code: AU
+'039':
+'040':
+  iso_code: AT
+'044':
+  iso_code: BS
+'048':
+  iso_code: BH
+'050':
+  iso_code: BD
+'051':
+  iso_code: AM
+'052':
+  iso_code: BB
+'053':
+'054':
+'056':
+  iso_code: BE
+'057':
+'060':
+  iso_code: BM
+'061':
+'064':
+  iso_code: BT
+'068':
+  iso_code: BO
+'070':
+  iso_code: BA
+'072':
+  iso_code: BW
+'076':
+  iso_code: BR
+'084':
+  iso_code: BZ
+'090':
+  iso_code: SB
+'092':
+  iso_code: VG
+'096':
+  iso_code: BN
+'100':
+  iso_code: BG
+'104':
+  iso_code: MM
+'108':
+  iso_code: BI
+'112':
+  iso_code: BY
+'116':
+  iso_code: KH
+'120':
+  iso_code: CM
+'124':
+  iso_code: CA
+'132':
+  iso_code: CV
+'136':
+  iso_code: KY
+'140':
+  iso_code: CF
+'142':
+'143':
+'144':
+  iso_code: LK
+'145':
+'148':
+  iso_code: TD
+'150':
+'151':
+'152':
+  iso_code: CL
+'154':
+'155':
+'156':
+  iso_code: CN
+'170':
+  iso_code: CO
+'174':
+  iso_code: KM
+'175':
+  iso_code: YT
+'178':
+  iso_code: CG
+'180':
+  iso_code: CD
+'184':
+  iso_code: CK
+'188':
+  iso_code: CR
+'191':
+  iso_code: HR
+'192':
+  iso_code: CU
+'196':
+  iso_code: CY
+'203':
+  iso_code: CZ
+'204':
+  iso_code: BJ
+'208':
+  iso_code: DK
+'212':
+  iso_code: DM
+'214':
+  iso_code: DO
+'218':
+  iso_code: EC
+'222':
+  iso_code: SV
+'226':
+  iso_code: GQ
+'231':
+  iso_code: ET
+'232':
+  iso_code: ER
+'233':
+  iso_code: EE
+'234':
+  iso_code: FO
+'238':
+  iso_code: FK
+'242':
+  iso_code: FJ
+'246':
+  iso_code: FI
+'248':
+'250':
+  iso_code: FR
+'254':
+  iso_code: GF
+'258':
+  iso_code: PF
+'262':
+  iso_code: DJ
+'266':
+  iso_code: GA
+'268':
+  iso_code: GE
+'270':
+  iso_code: GM
+'275':
+  iso_code: PS
+'276':
+  iso_code: DE
+'288':
+  iso_code: GH
+'292':
+  iso_code: GI
+'296':
+  iso_code: KI
+'300':
+  iso_code: GR
+'304':
+  iso_code: GL
+'308':
+  iso_code: GD
+'312':
+  iso_code: GP
+'316':
+  iso_code: GU
+'320':
+  iso_code: GT
+'324':
+  iso_code: GN
+'328':
+  iso_code: GY
+'332':
+  iso_code: HT
+'336':
+  iso_code: VE
+'340':
+  iso_code: HN
+'344':
+'348':
+  iso_code: HU
+'352':
+  iso_code: IS
+'356':
+  iso_code: IN
+'360':
+  iso_code: ID
+'364':
+  iso_code: IR
+'368':
+  iso_code: IQ
+'372':
+  iso_code: IE
+'376':
+  iso_code: IL
+'380':
+  iso_code: IT
+'384':
+  iso_code: CI
+'388':
+  iso_code: JM
+'392':
+  iso_code: JP
+'398':
+  iso_code: KZ
+'400':
+  iso_code: JO
+'404':
+  iso_code: KE
+'408':
+  iso_code: KP
+'410':
+  iso_code: KR
+'414':
+  iso_code: KW
+'417':
+  iso_code: KG
+'418':
+  iso_code: LA
+'419':
+'422':
+  iso_code: LB
+'426':
+  iso_code: LS
+'428':
+  iso_code: LV
+'430':
+  iso_code: LR
+'434':
+  iso_code: LY
+'438':
+  iso_code: LI
+'440':
+  iso_code: LT
+'442':
+  iso_code: LU
+'446':
+'450':
+  iso_code: MG
+'454':
+  iso_code: MW
+'458':
+  iso_code: MY
+'462':
+  iso_code: MV
+'466':
+  iso_code: ML
+'470':
+  iso_code: MT
+'474':
+  iso_code: MQ
+'478':
+  iso_code: MR
+'480':
+  iso_code: MU
+'484':
+  iso_code: MX
+'492':
+  iso_code: MC
+'496':
+  iso_code: MN
+'498':
+  iso_code: MD
+'499':
+  iso_code: ME
+'500':
+  iso_code: MS
+'504':
+  iso_code: MA
+'508':
+  iso_code: MZ
+'512':
+  iso_code: OM
+'516':
+  iso_code: NA
+'520':
+  iso_code: NR
+'524':
+  iso_code: NP
+'528':
+  iso_code: NL
+'531':
+'533':
+  iso_code: AW
+'534':
+  iso_code: SX
+'535':
+'540':
+  iso_code: NC
+'548':
+  iso_code: VU
+'554':
+  iso_code: NZ
+'558':
+  iso_code: NI
+'562':
+  iso_code: NE
+'566':
+  iso_code: NG
+'570':
+  iso_code: NU
+'574':
+  iso_code: NF
+'578':
+  iso_code: 'NO'
+'580':
+  iso_code: MP
+'583':
+  iso_code: FM
+'584':
+  iso_code: MH
+'585':
+  iso_code: PW
+'586':
+  iso_code: PK
+'591':
+  iso_code: PA
+'598':
+  iso_code: PG
+'600':
+  iso_code: PY
+'604':
+  iso_code: PE
+'608':
+  iso_code: PH
+'612':
+  iso_code: PN
+'616':
+  iso_code: PL
+'620':
+  iso_code: PT
+'624':
+  iso_code: GW
+'626':
+  iso_code: TL
+'630':
+  iso_code: PR
+'634':
+  iso_code: QA
+'638':
+'642':
+  iso_code: RO
+'643':
+  iso_code: RU
+'646':
+  iso_code: RW
+'652':
+  iso_code: BL
+'654':
+  iso_code: SH
+'659':
+  iso_code: KN
+'660':
+  iso_code: AI
+'662':
+  iso_code: LC
+'663':
+  iso_code: MF
+'666':
+  iso_code: PM
+'670':
+  iso_code: VC
+'674':
+  iso_code: SM
+'678':
+  iso_code: ST
+'680':
+'682':
+  iso_code: SA
+'686':
+  iso_code: SN
+'688':
+  iso_code: RS
+'690':
+  iso_code: SC
+'694':
+  iso_code: SL
+'702':
+  iso_code: SG
+'703':
+  iso_code: SK
+'704':
+  iso_code: VN
+'705':
+  iso_code: SI
+'706':
+  iso_code: SO
+'710':
+  iso_code: ZA
+'716':
+  iso_code: ZW
+'724':
+  iso_code: ES
+'728':
+  iso_code: SS
+'729':
+  iso_code: SD
+'732':
+  iso_code: EH
+'740':
+  iso_code: SR
+'744':
+  iso_code: SJ
+'748':
+  iso_code: SZ
+'752':
+  iso_code: SE
+'756':
+  iso_code: CH
+'760':
+  iso_code: SY
+'762':
+  iso_code: TJ
+'764':
+  iso_code: TH
+'768':
+  iso_code: TG
+'772':
+  iso_code: TK
+'776':
+  iso_code: TO
+'780':
+  iso_code: TT
+'784':
+  iso_code: AE
+'788':
+  iso_code: TN
+'792':
+  iso_code: TR
+'795':
+  iso_code: TM
+'796':
+  iso_code: TC
+'798':
+  iso_code: TV
+'800':
+  iso_code: UG
+'804':
+  iso_code: UA
+'807':
+  iso_code: MK
+'818':
+  iso_code: EG
+'826':
+  iso_code: GB
+'830':
+'831':
+  iso_code: GG
+'832':
+  iso_code: JE
+'833':
+  iso_code: IM
+'834':
+  iso_code: TZ
+'840':
+  iso_code: US
+'850':
+  iso_code: VG
+'854':
+  iso_code: BF
+'858':
+  iso_code: UY
+'860':
+  iso_code: UZ
+'862':
+  iso_code: VE
+'876':
+  iso_code: WS
+'882':
+  iso_code: WS
+'887':
+  iso_code: YE
+'894':
+  iso_code: ZM

data/iso.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{iso}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Christopher Dell}]
-  s.date = %q{2012-10-25}
+  s.date = %q{2012-11-11}
   s.description = %q{A subset of the ISO spec implemented in ruby}
   s.email = %q{chris@tigrish.com}
   s.extra_rdoc_files = [
@@ -28,12 +28,14 @@ Gem::Specification.new do |s|
     "VERSION",
     "data/iso-3166-1.yml",
     "data/iso-639-1.yml",
+    "data/un-m49.yml",
     "iso.gemspec",
     "lib/iso.rb",
     "lib/iso/language.rb",
     "lib/iso/region.rb",
     "lib/iso/subtag.rb",
     "lib/iso/tag.rb",
+    "lib/iso/un/region.rb",
     "locales/en.yml",
     "locales/fr.yml",
     "spec/fixtures/base.yml",
@@ -41,6 +43,7 @@ Gem::Specification.new do |s|
     "spec/lib/iso/region_spec.rb",
     "spec/lib/iso/subtag_spec.rb",
     "spec/lib/iso/tag_spec.rb",
+    "spec/lib/iso/un/region_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/tigrish/iso}

data/lib/iso.rb

@@ -6,3 +6,4 @@ require 'iso/tag'
 require 'iso/subtag'
 require 'iso/language'
 require 'iso/region'
+require 'iso/un/region'

data/lib/iso/region.rb

@@ -1,11 +1,12 @@
 class ISO::Region < ISO::Subtag
-  DEFINITIONS_FILE = "#{File.dirname(__FILE__)}/../../data/iso-3166-1.yml"
+  DEFINITIONS_FILE   = "#{File.dirname(__FILE__)}/../../data/iso-3166-1.yml"
 
   def self.identify(full_code)
     full_code =~ /[-_]([A-Z]{2})$/ ? find($1) : nil
   end
 
 private
+
   def i18n_scope
     super << ".regions"
   end

data/lib/iso/subtag.rb

@@ -4,6 +4,7 @@ module ISO
 
     def initialize(code, options={})
       @code = code
+      @options = options
     end
 
     def ==(object)
@@ -11,7 +12,7 @@ module ISO
     end
 
     def name
-      I18n.t(code, :scope => i18n_scope)
+      @options[:name] || I18n.t(code, :scope => i18n_scope)
     end
 
     def full_name

data/lib/iso/tag.rb

@@ -5,7 +5,7 @@ module ISO
     def initialize(code)
       @code     = code
       @language = Language.identify(code)
-      @region   = Region.identify(code)
+      @region   = Region.identify(code) || UN::Region.identify(code)
     end
 
     def codes

data/lib/iso/un/region.rb

@@ -0,0 +1,23 @@
+module ISO
+  module UN
+    class Region < ISO::Region
+      DEFINITIONS_FILE = "#{File.dirname(__FILE__)}/../../../data/un-m49.yml"
+
+      attr_reader :iso_code
+
+      def initialize(code, options={})
+        @iso_code = options[:iso_code]
+        super(code, options)
+      end
+      
+      def name
+        return super if iso_code.nil?
+        @options[:name] || I18n.t(iso_code, :scope => i18n_scope)
+      end
+
+      def self.identify(full_code)
+        full_code =~ /-(\d{3})$/ ? find($1) : nil
+      end
+    end
+  end
+end

data/locales/en.yml

@@ -187,6 +187,42 @@ en:
         zh: Chinese
         zu: Zulu
       regions:
+        '002': Africa
+        '005': South America
+        '009': Oceania
+        '011': Western Africa
+        '013': Central America
+        '014': Eastern Africa
+        '015': Northern Africa
+        '017': Middle Africa
+        '018': Southern Africa
+        '019': Americas
+        '021': Northern Americab
+        '029': Caribbean
+        '030': Eastern Asia
+        '034': Southern Asia
+        '035': South-Eastern Asia
+        '039': Southern Europe
+        '053': Australia and New Zealand
+        '054': Melanesia
+        '057': Micronesia
+        '061': Polynesia
+        '142': Asia
+        '143': Central Asia
+        '145': Western Asia
+        '150': Europe
+        '151': Eastern Europe
+        '154': Northern Europe
+        '155': Western Europe
+        '248': Land Islands
+        '344': China, Hong Kong Special Administrative Region
+        '419': Latin America and the Caribbean
+        '446': China, Macao Special Administrative Region
+        '531': Curaao
+        '535': Bonaire, Saint Eustatius and Saba
+        '638': Runion
+        '680': Sark
+        '830': Channel Islands
         AF: Afghanistan
         AX: Aland Islands
         AL: Albania

data/spec/lib/iso/subtag_spec.rb

@@ -20,6 +20,22 @@ describe ISO::Subtag do
     end
   end
 
+  describe "#name" do
+    let(:fake_region)  { ISO::Subtag.new('FR', name: 'This is a lie') }
+    let(:mars)  { ISO::Subtag.new('MRS') }
+
+    it 'will accept a name option' do
+      I18n.should_not_receive(:t)
+      fake_region.name.should == 'This is a lie'
+    end
+
+    it 'falls back to the translation' do
+      I18n.should_receive(:t).with('MRS', scope: 'vendor.iso').and_return('Mars')
+      mars.name.should == 'Mars'
+    end
+
+  end
+
   describe "#full_name" do
     it "is composed of the code and the name" do
       full_name = Subtag.find('fr').full_name

data/spec/lib/iso/tag_spec.rb

@@ -8,6 +8,12 @@ describe ISO::Tag do
       tag.region.code.should   == 'MX'
     end
 
+    it "returns a tag containing the language and UN region" do
+      tag = ISO::Tag.new('en-419')
+      tag.language.code.should == 'en'
+      tag.region.code.should   == '419'
+    end
+
     it "returns a tag containing the language only" do
       tag = ISO::Tag.new('en-XXXXXX')
       tag.language.code.should == 'en'
@@ -19,6 +25,12 @@ describe ISO::Tag do
       tag.language.should be_nil
       tag.region.code.should == 'CH'
     end
+    
+    it "returns a tag containing the UN region only" do
+      tag = ISO::Tag.new('gsw-419')
+      tag.language.should be_nil
+      tag.region.code.should == '419'
+    end
 
     it "returns a tag containing no language or region" do
       tag = ISO::Tag.new('csb-XXXXXX')
@@ -62,6 +74,10 @@ describe ISO::Tag do
       ISO::Tag.new('da-AT').should be_valid
     end
 
+    it "returns true when a valid language an UN region are supplied" do
+      ISO::Tag.new('es-419').should be_valid
+    end
+
     it "returns false when no code is supplied" do
       ISO::Tag.new('').should_not be_valid
     end
@@ -73,5 +89,6 @@ describe ISO::Tag do
     it "returns false when supplied region is invalid" do
       ISO::Tag.new('en-lol').should_not be_valid
     end
+
   end
 end

data/spec/lib/iso/un/region_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe ISO::UN::Region do
+  let(:has_iso) { ISO::UN::Region.find('004') }
+  let(:no_iso)  { ISO::UN::Region.find('002') }
+
+  describe "#iso_code" do
+    it "returns the corresponding iso code" do
+      has_iso.iso_code.should == 'AF'
+    end
+
+    it "returns nil when there is no corresponding iso code" do
+      no_iso.iso_code.should be_nil
+    end
+  end
+
+  describe "#name" do
+    it "uses the correct scope when there is an iso code" do
+      has_iso.name.should == 'Afghanistan'
+    end
+
+    it "uses the correct scope when there is no iso code" do
+      no_iso.name.should == 'Africa'
+    end
+  end
+
+  describe ".identify(full_code)" do
+    it "identifies from 'es-419'" do
+      region = ISO::UN::Region.identify('es-419')
+      region.should_not be_nil
+      region.should == ISO::UN::Region.find('419')
+    end
+
+    it "returns nil when it can't identify" do
+      ISO::UN::Region.identify('gsw').should be_nil
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iso
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70118927370020 !ruby/object:Gem::Requirement
+  requirement: &70215111244900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70118927370020
+  version_requirements: *70215111244900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70118927368240 !ruby/object:Gem::Requirement
+  requirement: &70215111244420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70118927368240
+  version_requirements: *70215111244420
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70118927365460 !ruby/object:Gem::Requirement
+  requirement: &70215111243940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70118927365460
+  version_requirements: *70215111243940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70118927379700 !ruby/object:Gem::Requirement
+  requirement: &70215111243460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70118927379700
+  version_requirements: *70215111243460
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70118927387480 !ruby/object:Gem::Requirement
+  requirement: &70215111242980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *70118927387480
+  version_requirements: *70215111242980
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70118927394080 !ruby/object:Gem::Requirement
+  requirement: &70215111242500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70118927394080
+  version_requirements: *70215111242500
 - !ruby/object:Gem::Dependency
   name: localeapp
-  requirement: &70118927405320 !ruby/object:Gem::Requirement
+  requirement: &70215111242020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70118927405320
+  version_requirements: *70215111242020
 description: A subset of the ISO spec implemented in ruby
 email: chris@tigrish.com
 executables: []
@@ -107,12 +107,14 @@ files:
 - VERSION
 - data/iso-3166-1.yml
 - data/iso-639-1.yml
+- data/un-m49.yml
 - iso.gemspec
 - lib/iso.rb
 - lib/iso/language.rb
 - lib/iso/region.rb
 - lib/iso/subtag.rb
 - lib/iso/tag.rb
+- lib/iso/un/region.rb
 - locales/en.yml
 - locales/fr.yml
 - spec/fixtures/base.yml
@@ -120,6 +122,7 @@ files:
 - spec/lib/iso/region_spec.rb
 - spec/lib/iso/subtag_spec.rb
 - spec/lib/iso/tag_spec.rb
+- spec/lib/iso/un/region_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/tigrish/iso
 licenses:
@@ -136,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4393858548374140125
+      hash: 2282321289166675717
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: