iso639 1.0.1 → 1.0.2

data/lib/iso639.rb

@@ -1,10 +1,14 @@
 require "iso639/version"
+require "iso639/language"
 require "iso639/insensitive_hash"
 
 # Public: Various methods useful for performing ISO-639 language code lookup
 # either given their ISO-639-1 or ISO-639-2 character code value or from human
 # input.
 #
+# Language code mappings came from
+# http://loc.gov/standards/iso639-2/ISO-639-2_utf-8.txt
+#
 # Examples
 #
 #   Iso639["en"]                          # => #<Iso639::Language:...>
@@ -25,34 +29,6 @@ require "iso639/insensitive_hash"
 #   Iso639["German"].english_name         # => "German"
 #   Iso639["German"].french_name          # => "allemand"
 module Iso639
-  class Language
-    attr_reader :alpha3_bibliographic, :alpha3_terminology, :alpha2, :english_name, :french_name
-    alias_method :alpha3, :alpha3_bibliographic
-    alias_method :name, :english_name
-
-    # Public: Initialize a Language.
-    #
-    # 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)
-      @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)
-    end
-
-    private
-
-    def strip_to_nil(val)
-      val = val.strip if val
-      return val unless val.nil? || val.empty?
-    end
-  end
-
   LanguagesByAlpha2 = InsensitiveHash.new
   LanguagesByAlpha3Bibliographic = LanguagesByAlpha3 = InsensitiveHash.new
   LanguagesByAlpha3Terminology = InsensitiveHash.new
@@ -62,15 +38,26 @@ module Iso639
   iso639_file = File.expand_path(File.join("..", "iso639", "ISO-639-2_utf-8.txt"), __FILE__)
   File.readlines(iso639_file).each do |line|
     lang = Language.new *line.split("|")
-    LanguagesByAlpha2[lang.alpha2.downcase.strip]          = lang if lang.alpha2
-    LanguagesByAlpha3[lang.alpha3.downcase.strip]          = lang if lang.alpha3
-    LanguagesByAlpha3Terminology[lang.alpha3_terminology.downcase.strip] = lang if lang.alpha3_terminology
-    LanguagesByName[lang.name.downcase.strip]              = lang if lang.name
-    LanguagesByFrenchName[lang.french_name.downcase.strip] = lang if lang.french_name
+    LanguagesByAlpha2[lang.alpha2]          = lang if lang.alpha2
+    LanguagesByAlpha3[lang.alpha3]          = lang if lang.alpha3
+    LanguagesByAlpha3Terminology[lang.alpha3_terminology] = lang if lang.alpha3_terminology
+    LanguagesByName[lang.name]              = lang if lang.name
+    LanguagesByFrenchName[lang.french_name] = lang if lang.french_name
   end
 
-  def self.[](alpha_code_or_name)
-    lookup = alpha_code_or_name.to_s.downcase.strip
+  # Public: Find a language by any common lookup value
+  #
+  # lookup - A String representing an alpha-2, alpha-3, or language name
+  #
+  # Examples
+  #
+  #   Iso639["en"].alpha3        # => "eng"
+  #   Iso639["English"].alpha2   # => "en"
+  #   Iso639["FRENCH"].alpha3    # => "fre"
+  #   Iso639["deu"].alpha3       # => "ger"
+  #
+  # Returns an Iso639::Language object
+  def self.[](lookup)
     LanguagesByAlpha2[lookup] ||
       LanguagesByAlpha3Bibliographic[lookup] ||
       LanguagesByAlpha3Terminology[lookup] ||

data/lib/iso639/insensitive_hash.rb

@@ -1,11 +1,11 @@
 module Iso639
   class InsensitiveHash < Hash # :nodoc:
     def [](key)
-      key.respond_to?(:downcase) ? super(key.downcase) : super(key)
+      super(key.to_s.downcase.strip)
     end
 
     def []=(key, value)
-      key.respond_to?(:downcase) ? super(key.downcase, value) : super(key, value)
+      super(key.to_s.downcase.strip, value)
     end
   end
 end

data/lib/iso639/language.rb

@@ -0,0 +1,29 @@
+module Iso639
+  class Language
+    attr_reader :alpha3_bibliographic, :alpha3_terminology, :alpha2, :english_name, :french_name
+    alias_method :alpha3, :alpha3_bibliographic
+    alias_method :name, :english_name
+
+    # Public: Initialize a Language.
+    #
+    # 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)
+      @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)
+    end
+
+    private
+
+    def strip_to_nil(val)
+      val = val.strip if val
+      return val unless val.nil? || val.empty?
+    end
+  end
+end

data/lib/iso639/version.rb

@@ -1,3 +1,3 @@
 module Iso639
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/test/iso639_test.rb

@@ -78,7 +78,21 @@ describe Iso639 do
     assert_equal "en", Iso639["EN"].alpha2
     assert_equal "fr", Iso639["fre"].alpha2
     assert_equal "fr", Iso639["fra"].alpha2
-    assert_equal "fr", Iso639["FRENCH"].alpha2
+    assert_equal "fr", Iso639["French"].alpha2
     assert_equal "fr", Iso639["français"].alpha2
   end
+
+  it "should ignore case sensitivity" do
+    assert_equal "en", Iso639["EN"].alpha2
+    assert_equal "fr", Iso639["Fre"].alpha2
+    assert_equal "fr", Iso639["FRA"].alpha2
+    assert_equal "fr", Iso639["french"].alpha2
+  end
+
+  it "should ignore whitespace" do
+    assert_equal "en", Iso639[" en"].alpha2
+    assert_equal "fr", Iso639["\tfre\t"].alpha2
+    assert_equal "fr", Iso639["   fra   "].alpha2
+    assert_equal "fr", Iso639[" french\t"].alpha2
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: iso639
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ryan McGeary
@@ -60,6 +60,7 @@ files:
 - lib/iso639.rb
 - lib/iso639/ISO-639-2_utf-8.txt
 - lib/iso639/insensitive_hash.rb
+- lib/iso639/language.rb
 - lib/iso639/version.rb
 - test/insensitive_hash_test.rb
 - test/iso639_test.rb