iso 0.1.1 → 0.4.0

data/iso.gemspec

@@ -2,16 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: iso 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = %q{iso}
-  s.version = "0.1.1"
+  s.name = "iso".freeze
+  s.version = "0.4.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.description = %q{A subset of the ISO spec implemented in ruby}
-  s.email = %q{chris@tigrish.com}
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Christopher Dell".freeze, "Thibault Dalban".freeze]
+  s.date = "2020-11-17"
+  s.description = "A subset of the ISO spec implemented in ruby".freeze
+  s.email = "chris@tigrish.com".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -19,6 +21,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "Guardfile",
@@ -28,12 +31,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,42 +46,42 @@ 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}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{A ruby implementation of ISO}
+  s.homepage = "http://github.com/tigrish/iso".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "3.0.3".freeze
+  s.summary = "A ruby implementation of ISO".freeze
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<i18n>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.2.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_development_dependency(%q<guard-rspec>, [">= 0"])
-      s.add_development_dependency(%q<localeapp>, [">= 0"])
+      s.add_runtime_dependency(%q<i18n>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rspec>.freeze, ["~> 3.9"])
+      s.add_development_dependency(%q<rdoc>.freeze, ["~> 6.2"])
+      s.add_development_dependency(%q<bundler>.freeze, ["~> 2.0"])
+      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.3"])
+      s.add_development_dependency(%q<guard-rspec>.freeze, [">= 0"])
+      s.add_development_dependency(%q<localeapp>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.2.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-      s.add_dependency(%q<guard-rspec>, [">= 0"])
-      s.add_dependency(%q<localeapp>, [">= 0"])
+      s.add_dependency(%q<i18n>.freeze, [">= 0"])
+      s.add_dependency(%q<rspec>.freeze, ["~> 3.9"])
+      s.add_dependency(%q<rdoc>.freeze, ["~> 6.2"])
+      s.add_dependency(%q<bundler>.freeze, ["~> 2.0"])
+      s.add_dependency(%q<jeweler>.freeze, ["~> 2.3"])
+      s.add_dependency(%q<guard-rspec>.freeze, [">= 0"])
+      s.add_dependency(%q<localeapp>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.2.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    s.add_dependency(%q<guard-rspec>, [">= 0"])
-    s.add_dependency(%q<localeapp>, [">= 0"])
+    s.add_dependency(%q<i18n>.freeze, [">= 0"])
+    s.add_dependency(%q<rspec>.freeze, ["~> 3.9"])
+    s.add_dependency(%q<rdoc>.freeze, ["~> 6.2"])
+    s.add_dependency(%q<bundler>.freeze, ["~> 2.0"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 2.3"])
+    s.add_dependency(%q<guard-rspec>.freeze, [">= 0"])
+    s.add_dependency(%q<localeapp>.freeze, [">= 0"])
   end
 end
 

data/lib/iso.rb

@@ -2,7 +2,8 @@ require 'i18n'
 I18n.load_path << Dir[File.join(File.expand_path(File.dirname(__FILE__) + '/../locales'), '*.yml')]
 I18n.load_path.flatten!
 
-require 'iso/tag'
-require 'iso/subtag'
-require 'iso/language'
-require 'iso/region'
+require_relative 'iso/tag'
+require_relative 'iso/subtag'
+require_relative 'iso/language'
+require_relative 'iso/region'
+require_relative '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

@@ -1,9 +1,12 @@
+require 'yaml'
+
 module ISO
   class Subtag
     attr_reader :code
 
     def initialize(code, options={})
       @code = code
+      @options = options
     end
 
     def ==(object)
@@ -11,7 +14,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': Curaçao
+        '535': Bonaire, Saint Eustatius and Saba
+        '638': Runion
+        '680': Sark
+        '830': Channel Islands
         AF: Afghanistan
         AX: Aland Islands
         AL: Albania
@@ -227,6 +263,7 @@ en:
         CM: Cameroon
         CA: Canada
         CV: Cape Verde
+        CW: Curaçao
         KY: Cayman Islands
         CF: Central African Republic
         TD: Chad

data/locales/fr.yml

@@ -227,6 +227,7 @@ fr:
         CM: Cameroun
         CA: Canada
         CV: Cap-Vert
+        CW: Curaçao
         KY: Îles Caïmans
         CF: République centrafricaine
         TD: Tchad

data/spec/lib/iso/language_spec.rb

@@ -4,50 +4,50 @@ describe ISO::Language do
   let(:language) { ISO::Language.new('de', name: 'German') }
 
   it "is a ISO Subtag" do
-    language.should be_kind_of(ISO::Subtag)
+    expect(language).to be_kind_of(ISO::Subtag)
   end
 
   it "has a code" do
-    language.code.should == 'de'
+    expect(language.code).to eq 'de'
   end
 
   it "has a name" do
-    language.name.should == 'German'
+    expect(language.name).to eq 'German'
   end
 
   describe "#plural_rule_names" do
     it "defaults to %w(one other)" do
-      language.plural_rule_names.should == ISO::Language::DEFAULT_PLURAL_RULE_NAMES
+      expect(language.plural_rule_names).to eq ISO::Language::DEFAULT_PLURAL_RULE_NAMES
     end
 
     it "is overwriteable" do
       language = ISO::Language.new('ja', plural_rule_names: ['other'])
-      language.plural_rule_names.should == ['other']
+      expect(language.plural_rule_names).to eq ['other']
     end
   end
 
   describe "#direction" do
     it "defaults to 'ltr'" do
-      language.direction.should == 'ltr'
+      expect(language.direction).to eq 'ltr'
     end
 
     it "is overwriteable" do
       language = ISO::Language.new('ar', direction: :rtl)
-      language.direction.should == :rtl
+      expect(language.direction).to eq :rtl
     end
   end
 
   describe ".identify(full_code)" do
     it "identifies from 'de'" do
-      ISO::Language.identify('de').should == ISO::Language.new('de')
+      expect(ISO::Language.identify('de')).to eq ISO::Language.new('de')
     end
 
     it "identifies from 'fr-CH'" do
-      ISO::Language.identify('fr-CH').should == ISO::Language.new('fr')
+      expect(ISO::Language.identify('fr-CH')).to eq ISO::Language.new('fr')
     end
 
     it "returns nil when it can't identify" do
-      ISO::Language.identify('csb').should be_nil
+      expect(ISO::Language.identify('csb')).to be_nil
     end
   end
 end

data/spec/lib/iso/region_spec.rb

@@ -4,28 +4,28 @@ describe ISO::Region do
   let(:region) { ISO::Region.new('FR', name: 'France') }
 
   it "is a ISO Subtag" do
-    region.should be_kind_of(ISO::Subtag)
+    expect(region).to be_kind_of(ISO::Subtag)
   end
 
   it "has a code" do
-    region.code.should == 'FR'
+    expect(region.code).to eq 'FR'
   end
 
   it "has a name" do
-    region.name.should == 'France'
+    expect(region.name).to eq 'France'
   end
 
   describe ".identify(full_code)" do
     it "identifies from 'fr-CH'" do
-      ISO::Region.identify('fr-CH').should == ISO::Region.find('CH')
+      expect(ISO::Region.identify('fr-CH')).to eq ISO::Region.find('CH')
     end
 
     it "identifies from 'es_MX" do
-      ISO::Region.identify('es_MX').should == ISO::Region.find('MX')
+      expect(ISO::Region.identify('es_MX')).to eq ISO::Region.find('MX')
     end
 
     it "returns nil when it can't identify" do
-      ISO::Region.identify('gsw').should be_nil
+      expect(ISO::Region.identify('gsw')).to be_nil
     end
   end
 end

data/spec/lib/iso/subtag_spec.rb

@@ -12,52 +12,68 @@ end
 describe ISO::Subtag do
   describe "#==(object)" do
     it "returns true when both have the same code" do
-      ISO::Region.find('SY').should == ISO::Region.find('SY')
+      expect(ISO::Region.find('SY')).to eq ISO::Region.find('SY')
     end
 
     it "returns false when they have different codes" do
-      ISO::Region.find('FR').should_not == ISO::Region.find('GB')
+      expect(ISO::Region.find('FR')).to_not eq ISO::Region.find('GB')
     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
+      expect(I18n).to_not receive(:t)
+      expect(fake_region.name).to eq 'This is a lie'
+    end
+
+    it 'falls back to the translation' do
+      expect(I18n).to receive(:t).with('MRS', scope: 'vendor.iso').and_return('Mars')
+      expect(mars.name).to eq 'Mars'
+    end
+
+  end
+
   describe "#full_name" do
     it "is composed of the code and the name" do
       full_name = Subtag.find('fr').full_name
-      full_name.should match(/fr/)
-      full_name.should match(/French/)
+      expect(full_name).to match(/fr/)
+      expect(full_name).to match(/French/)
     end
   end
 
   describe ".all" do
     it "gets its definition from the DEFINITIONS_FILE" do
       subtags = Subtag.all
-      subtags[0].should == Subtag.find('en')
-      subtags[1].should == Subtag.find('fr')
-      subtags[2].should == Subtag.find('de')
+      expect(subtags[0]).to eq Subtag.find('en')
+      expect(subtags[1]).to eq Subtag.find('fr')
+      expect(subtags[2]).to eq Subtag.find('de')
     end
   end
 
   describe ".find(code)" do
     it "finds a subtag by code" do
       subtag = Subtag.find('de')
-      subtag.code.should == 'de'
-      subtag.name.should == 'German'
+      expect(subtag.code).to eq 'de'
+      expect(subtag.name).to eq 'German'
     end
 
     it "returns nil when no language can be found" do
-      Subtag.find('xxxx').should be_nil
+      expect(Subtag.find('xxxx')).to be_nil
     end
   end
 
   describe ".default" do
     it "finds from DEFAULT_CODE" do
-      Subtag.default.should == Subtag.find('fr')
+      expect(Subtag.default).to eq Subtag.find('fr')
     end
   end
 
   describe ".codes" do
     it "returns an array of all codes" do
-      Subtag.codes.should == %w(en fr de)
+      expect(Subtag.codes).to eq %w(en fr de)
     end
   end
 end

data/spec/lib/iso/tag_spec.rb

@@ -4,74 +4,91 @@ describe ISO::Tag do
   describe ".new(code)" do
     it "returns a tag containing the language and region" do
       tag = ISO::Tag.new('en-MX')
-      tag.language.code.should == 'en'
-      tag.region.code.should   == 'MX'
+      expect(tag.language.code).to eq 'en'
+      expect(tag.region.code).to eq 'MX'
+    end
+
+    it "returns a tag containing the language and UN region" do
+      tag = ISO::Tag.new('en-419')
+      expect(tag.language.code).to eq 'en'
+      expect(tag.region.code).to eq '419'
     end
 
     it "returns a tag containing the language only" do
       tag = ISO::Tag.new('en-XXXXXX')
-      tag.language.code.should == 'en'
-      tag.region.should be_nil
+      expect(tag.language.code).to eq 'en'
+      expect(tag.region).to be_nil
     end
 
     it "returns a tag containing the region only" do
       tag = ISO::Tag.new('gsw-CH')
-      tag.language.should be_nil
-      tag.region.code.should == 'CH'
+      expect(tag.language).to be_nil
+      expect(tag.region.code).to eq 'CH'
+    end
+
+    it "returns a tag containing the UN region only" do
+      tag = ISO::Tag.new('gsw-419')
+      expect(tag.language).to be_nil
+      expect(tag.region.code).to eq '419'
     end
 
     it "returns a tag containing no language or region" do
       tag = ISO::Tag.new('csb-XXXXXX')
-      tag.language.should be_nil
-      tag.region.should be_nil
+      expect(tag.language).to be_nil
+      expect(tag.region).to be_nil
     end
   end
 
   describe "#codes" do
     it "returns an array containing each subtag's code" do
-      ISO::Tag.new('en-US').codes.should == %w(en US)
+      expect(ISO::Tag.new('en-US').codes).to eq %w(en US)
     end
   end
 
   describe "#subtags" do
     it "returns an array containing the language" do
       tag = ISO::Tag.new('fr')
-      tag.subtags.size.should == 1
-      tag.subtags.first.should be_kind_of(ISO::Language)
-      tag.subtags.first.code.should == 'fr'
+      expect(tag.subtags.size).to eq 1
+      expect(tag.subtags.first).to be_kind_of(ISO::Language)
+      expect(tag.subtags.first.code).to eq 'fr'
     end
 
     it "returns an array containing the language and the region" do
       tag = ISO::Tag.new('fr-CH')
-      tag.subtags.size.should == 2
+      expect(tag.subtags.size).to eq 2
 
-      tag.subtags.first.should be_kind_of(ISO::Language)
-      tag.subtags.first.code.should == 'fr'
+      expect(tag.subtags.first).to be_kind_of(ISO::Language)
+      expect(tag.subtags.first.code).to eq 'fr'
 
-      tag.subtags.last.should be_kind_of(ISO::Region)
-      tag.subtags.last.code.should == 'CH'
+      expect(tag.subtags.last).to be_kind_of(ISO::Region)
+      expect(tag.subtags.last.code).to eq 'CH'
     end
   end
 
   describe "#valid?" do
     it "returns true when a valid language is supplied" do
-      ISO::Tag.new('da').should be_valid
+      expect(ISO::Tag.new('da')).to be_valid
     end
 
     it "returns true when a valid language and region are supplied" do
-      ISO::Tag.new('da-AT').should be_valid
+      expect(ISO::Tag.new('da-AT')).to be_valid
+    end
+
+    it "returns true when a valid language an UN region are supplied" do
+      expect(ISO::Tag.new('es-419')).to be_valid
     end
 
     it "returns false when no code is supplied" do
-      ISO::Tag.new('').should_not be_valid
+      expect(ISO::Tag.new('')).to_not be_valid
     end
 
     it "returns false when supplied language is invalid" do
-      ISO::Tag.new('lol').should_not be_valid
+      expect(ISO::Tag.new('lol')).to_not be_valid
     end
 
     it "returns false when supplied region is invalid" do
-      ISO::Tag.new('en-lol').should_not be_valid
+      expect(ISO::Tag.new('en-lol')).to_not be_valid
     end
+
   end
 end