iso639 1.0.5 → 1.1.0

data/README.md

@@ -33,7 +33,7 @@ Iso639["en"]                          # => "English"
 Iso639["en"].alpha2                   # => "en"
 Iso639["en"].alpha3                   # => "eng"
 Iso639["en"].alpha3_bibliographic     # => "eng"
-Iso639["en"].alpha3_terminology       # => nil
+Iso639["en"].alpha3_terminology       # => "eng"
 Iso639["en"].name                     # => "English"
 Iso639["en"].english_name             # => "English"
 Iso639["en"].french_name              # => "anglais"

data/lib/iso639.rb

@@ -15,7 +15,7 @@ require "iso639/insensitive_hash"
 #   Iso639["en"].alpha2                   # => "en"
 #   Iso639["en"].alpha3                   # => "eng"
 #   Iso639["en"].alpha3_bibliographic     # => "eng"
-#   Iso639["en"].alpha3_terminology       # => nil
+#   Iso639["en"].alpha3_terminology       # => "eng"
 #   Iso639["en"].name                     # => "English"
 #   Iso639["en"].english_name             # => "English"
 #   Iso639["en"].french_name              # => "anglais"

data/lib/iso639/language.rb

@@ -8,31 +8,32 @@ module Iso639
     # alpha3_bibliographic - A String representing the alpha-3 bibliographic code
     # alpha3_terminology - A String representing the alpha-3 terminology code
     # alpha2 - A String representing the alpha-2 code
-    # english_name - A String representing the English name
-    # french_name - A String representing the French name
-    def initialize(alpha3_bibliographic, alpha3_terminology, alpha2, english_name, french_name)
+    # english_names - A String representing the English names (semi-colon delimited)
+    # french_names - A String representing the French names (semi-colon delimited)
+    def initialize(alpha3_bibliographic, alpha3_terminology, alpha2, english_names, french_names)
       @alpha3_bibliographic = strip_to_nil(alpha3_bibliographic)
-      @alpha3_terminology   = strip_to_nil(alpha3_terminology)
+      @alpha3_terminology   = strip_to_nil(alpha3_terminology) || @alpha3_bibliographic
       @alpha2               = strip_to_nil(alpha2)
-      @english_names        = english_name.split(/;\s*/).map { |n| strip_to_nil(n) }
-      @french_names         = french_name.split(/;\s*/).map { |n| strip_to_nil(n) }
+      @english_names        = split_and_strip(english_names)
+      @french_names         = split_and_strip(french_names)
     end
 
     def english_name
       english_names.first
     end
     alias_method :name, :english_name
+    alias_method :to_s, :english_name
 
     def french_name
       french_names.first
     end
 
-    def to_s
-      name
-    end
-
     private
 
+    def split_and_strip(names)
+      names.split(/;\s*/).map { |n| strip_to_nil(n) }
+    end
+
     def strip_to_nil(val)
       val = val.strip if val
       return val unless val.nil? || val.empty?

data/lib/iso639/version.rb

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

data/test/iso639_test.rb

@@ -36,10 +36,13 @@ describe Iso639::LanguagesByAlpha3Terminology do
     assert_equal "German", Iso639::LanguagesByAlpha3Terminology["DEU"].name
   end
 
+  it "should return valid languages by alpha-3 terminology code when it matches the bibliographic" do
+    assert_equal "English", Iso639::LanguagesByAlpha3Terminology["eng"].name
+  end
+
   it "should return nil for unknown codes" do
     assert_nil Iso639::LanguagesByAlpha3Terminology["xxx"]
     assert_nil Iso639::LanguagesByAlpha3Terminology["en"]
-    assert_nil Iso639::LanguagesByAlpha3Terminology["eng"]
     assert_nil Iso639::LanguagesByAlpha3Terminology["English"]
   end
 end

data/test/language_test.rb

@@ -33,6 +33,12 @@ describe Iso639::Language do
     assert_nil lang.french_name
   end
 
+  it "should assign bibliographic value to terminology if no terminolgy value" do
+    lang = Iso639::Language.new "eng", "", "en", "English", "anglais"
+    assert_equal "eng", lang.alpha3_bibliographic
+    assert_equal "eng", lang.alpha3_terminology
+  end
+
   it "should return english name for #to_s" do
     lang = Iso639::Language.new "", "", "", "English", ""
     assert_equal "English", lang.to_s

metadata

@@ -2,47 +2,47 @@
 name: iso639
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan McGeary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2013-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.3'
-    none: false
   name: minitest
   type: :development
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.3'
-    none: false
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
-    none: false
+        version: '4.3'
+- !ruby/object:Gem::Dependency
   name: rake
   type: :development
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
 description: ISO 639-1 and ISO 639-2 lookups by name, alpha-2 code, or alpha-3 code
 email:
 - ryan@mcgeary.org
@@ -73,17 +73,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23