iso639 1.0.4 → 1.0.5

data/lib/iso639/language.rb

@@ -1,8 +1,7 @@
 module Iso639
   class Language
-    attr_reader :alpha3_bibliographic, :alpha3_terminology, :alpha2, :english_name, :french_name
+    attr_reader :alpha3_bibliographic, :alpha3_terminology, :alpha2, :english_names, :french_names
     alias_method :alpha3, :alpha3_bibliographic
-    alias_method :name, :english_name
 
     # Public: Initialize a Language.
     #
@@ -15,8 +14,17 @@ module Iso639
       @alpha3_bibliographic = strip_to_nil(alpha3_bibliographic)
       @alpha3_terminology   = strip_to_nil(alpha3_terminology)
       @alpha2               = strip_to_nil(alpha2)
-      @english_name         = strip_to_nil(english_name)
-      @french_name          = strip_to_nil(french_name)
+      @english_names        = english_name.split(/;\s*/).map { |n| strip_to_nil(n) }
+      @french_names         = french_name.split(/;\s*/).map { |n| strip_to_nil(n) }
+    end
+
+    def english_name
+      english_names.first
+    end
+    alias_method :name, :english_name
+
+    def french_name
+      french_names.first
     end
 
     def to_s

data/lib/iso639/version.rb

@@ -1,3 +1,3 @@
 module Iso639
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/lib/iso639.rb

@@ -41,12 +41,8 @@ module Iso639
     LanguagesByAlpha2[lang.alpha2]          = lang if lang.alpha2
     LanguagesByAlpha3[lang.alpha3]          = lang if lang.alpha3
     LanguagesByAlpha3Terminology[lang.alpha3_terminology] = lang if lang.alpha3_terminology
-    lang.name.split(/;\s*/).each do |name|
-      LanguagesByName[name] = lang
-    end
-    lang.french_name.split(/;\s*/).each do |name|
-      LanguagesByFrenchName[name] = lang
-    end
+    lang.english_names.each { |name| LanguagesByName[name]       = lang }
+    lang.french_names.each  { |name| LanguagesByFrenchName[name] = lang }
   end
 
   # Public: Find a language by any common lookup value

data/test/iso639_test.rb

@@ -52,7 +52,7 @@ describe Iso639::LanguagesByEnglishName do
     assert_equal "German",  Iso639::LanguagesByName["german"].name
     assert_equal "spa",     Iso639::LanguagesByName["spanish"].alpha3
     assert_equal "klingon", Iso639::LanguagesByName["Klingon"].french_name
-    assert_equal "Klingon; tlhIngan-Hol", Iso639::LanguagesByName["tlhIngan-Hol"].name
+    assert_equal "Klingon", Iso639::LanguagesByName["tlhIngan-Hol"].name
   end
 
   it "should return nil for unknown codes" do

data/test/language_test.rb

@@ -39,6 +39,18 @@ describe Iso639::Language do
     assert_equal "English", "#{lang}"
   end
 
+  it "should handle multiple english names" do
+    lang = Iso639::Language.new "", "", "", "Spanish; Castilian", ""
+    assert_equal "Spanish", lang.name
+    assert_equal ["Spanish", "Castilian"], lang.english_names
+  end
+
+  it "should handle multiple french names" do
+    lang = Iso639::Language.new "", "", "", "", "espagnol; castillan"
+    assert_equal "espagnol", lang.french_name
+    assert_equal ["espagnol", "castillan"], lang.french_names
+  end
+
   it "should not be mutable" do
     lang = Iso639::Language.new("eng", nil, "en", "English", "anglais").freeze
     begin

metadata

@@ -2,7 +2,7 @@
 name: iso639
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Ryan McGeary