language_list 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f694a7105df99148d7a9f8a7d2a8bfceceac7a1
-  data.tar.gz: 7d45966d267cee5b931269a4e97e68533cf5e437
+  metadata.gz: '068bbf4dc0c63ec1a2f51b7f88d04359d6343c3c'
+  data.tar.gz: 72465669955bcd970f4bb8caff0ed2d0a5bfff7f
 SHA512:
-  metadata.gz: e76121fbd53e3317ca32d4e65a39670589f115dbea52923bc9f4d9e11d912e87faa227aeb386bc3b592e01a0ada009405c8039e24a480b58ce671a5880b4527e
-  data.tar.gz: b2566e64c6bda74ce1f308e3113a5d11fade539a1eecbb5f84092ecbfb8fbcdb9751e3ede3df44a595e1f85ed268dea66d9d636742e4f85c35f2bf5e89b443b0
+  metadata.gz: 6c29043d299c748cf72a34b00be615aa8faa787f54558a73321f4461c2a6747aeba62eddc855b9d52edb0ea35a758660761e7be5c2a94eaf001ca521e3a5329e
+  data.tar.gz: 7f685621ee567bde0a23d14b89a74422423545f66a0b60ede9aada402f7d60d50f338c776c57de57a7fc92c409676561e3fb295ea8d6dbdd24e117201ee46f26

data/.travis.yml

@@ -1,12 +1,15 @@
 language: ruby
 rvm:
+  - 2.4.0
+  - 2.3
   - 2.2
   - 2.1
   - 1.9.3
   - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
   - 1.8.7
 
+before_install:
+  - gem update bundler
+
 script: bundle exec rake test

data/README.md

@@ -7,7 +7,7 @@ A list of languages based upon ISO-639-1 and ISO-639-3 with functions to retriev
     # Get an array of LanguageList::LanguageInfo classes
     all_languages = LanguageList::ALL_LANGUAGES
     common_languages = LanguageList::COMMON_LANGUAGES
-    
+
     # Finding a language based on its ISO-639-1 or ISO-639-3 code or
     # name
     german  = LanguageList::LanguageInfo.find('German')
@@ -21,6 +21,12 @@ A list of languages based upon ISO-639-1 and ISO-639-3 with functions to retriev
 
     rake
 
+## Upgrading
+
+### 1.1 to 1.2
+
+  * Version 1.2 freezes all of the constants once they're loaded.
+
 ## Thanks
 Thanks goes to Steve Hardie for his work on creating a list of common languages (http://stevehardie.com/2009/10/list-of-common-languages/).
 

data/lib/language_list.rb

@@ -2,13 +2,15 @@ require 'yaml'
 
 module LanguageList
   class LanguageInfo
-    attr_reader :name, :iso_639_3, :iso_639_1, :type
+    attr_reader :name, :iso_639_3, :iso_639_1, :iso_639_2b, :iso_639_2t, :type
 
     def initialize(options)
       @name = options[:name]
       @common_name = options[:common_name]
       @iso_639_3 = options[:iso_639_3]
       @iso_639_1 = options[:iso_639_1]
+      @iso_639_2b = options[:iso_639_2b]
+      @iso_639_2t = options[:iso_639_2t]
       @common = options[:common]
       @type = options[:type]
     end
@@ -47,12 +49,25 @@ module LanguageList
       LanguageList::BY_ISO_639_3[code]
     end
 
+    def self.find_by_iso_639_2b(code)
+      LanguageList::BY_ISO_639_2B[code]
+    end
+
+    def self.find_by_iso_639_2t(code)
+      LanguageList::BY_ISO_639_2T[code]
+    end
+
     def self.find_by_name(name)
-      LanguageList::BY_NAME[name]
+      LanguageList::BY_NAME[name.downcase]
     end
 
     def self.find(code)
-      find_by_iso_639_1(code) || find_by_iso_639_3(code) || find_by_name(code)
+      code.downcase!
+      find_by_iso_639_1(code) ||
+        find_by_iso_639_3(code) ||
+        find_by_iso_639_2b(code) ||
+        find_by_iso_639_2t(code) ||
+        find_by_name(code)
     end
   end
 
@@ -62,18 +77,26 @@ module LanguageList
     warn "Reverting to hash load: #{e.message}"
     yaml_data = YAML.load_file(File.expand_path(File.join(File.dirname(__FILE__),'..', 'data', 'languages.yml')))
     yaml_data.map{|e| LanguageInfo.new(e) }
-  end
-  ISO_639_1 = ALL_LANGUAGES.select(&:iso_639_1?)
-  LIVING_LANGUAGES = ALL_LANGUAGES.select(&:living?)
-  COMMON_LANGUAGES = ALL_LANGUAGES.select(&:common?)
+  end.freeze
+  ISO_639_1 = ALL_LANGUAGES.select(&:iso_639_1?).freeze
+  LIVING_LANGUAGES = ALL_LANGUAGES.select(&:living?).freeze
+  COMMON_LANGUAGES = ALL_LANGUAGES.select(&:common?).freeze
 
   BY_NAME      = {}
   BY_ISO_639_1 = {}
   BY_ISO_639_3 = {}
+  BY_ISO_639_2B = {}
+  BY_ISO_639_2T = {}
   ALL_LANGUAGES.each do |lang|
-    BY_NAME[lang.name] = lang
+    BY_NAME[lang.name.downcase] = lang
     BY_ISO_639_1[lang.iso_639_1] = lang if lang.iso_639_1
     BY_ISO_639_3[lang.iso_639_3] = lang if lang.iso_639_3
+    BY_ISO_639_2B[lang.iso_639_2b] = lang if lang.iso_639_2b
+    BY_ISO_639_2T[lang.iso_639_2t] = lang if lang.iso_639_2t
   end
-
+  BY_NAME.freeze
+  BY_ISO_639_1.freeze
+  BY_ISO_639_3.freeze
+  BY_ISO_639_2B.freeze
+  BY_ISO_639_2T.freeze
 end

data/lib/language_list/version.rb

@@ -1,3 +1,3 @@
 module LanguageList
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/test/language_list_test.rb

@@ -36,6 +36,15 @@ class LanguageListTest < Minitest::Test
     english = LanguageList::LanguageInfo.find_by_name('English')
     assert_equal 'en', english.iso_639_1
     assert_equal 'eng', english.iso_639_3
+    assert_equal 'eng', english.iso_639_2b
+    assert_equal 'eng', english.iso_639_2t
+    assert_equal 'English', english.name
+  end
+
+  def test_case_insensitive_find_by_name
+    english = LanguageList::LanguageInfo.find_by_name('english')
+    assert_equal 'en', english.iso_639_1
+    assert_equal 'eng', english.iso_639_3
     assert_equal 'English', english.name
   end
 
@@ -46,6 +55,49 @@ class LanguageListTest < Minitest::Test
     assert_equal 'English', english.name
   end
 
+  def test_case_insensitive_find_with_iso_639_1_code
+    english = LanguageList::LanguageInfo.find('EN')
+    assert_equal 'en', english.iso_639_1
+    assert_equal 'eng', english.iso_639_3
+    assert_equal 'English', english.name
+  end
+
+  def test_find_with_iso_639_2b_code
+    macedonian = LanguageList::LanguageInfo.find('mac')
+    assert_equal 'mk', macedonian.iso_639_1
+    assert_equal 'mac', macedonian.iso_639_2b
+    assert_equal 'mkd', macedonian.iso_639_2t
+    assert_equal 'mkd', macedonian.iso_639_3
+    assert_equal 'Macedonian', macedonian.name
+  end
+
+  def test_case_insensitive_find_with_iso_639_2b_code
+    macedonian = LanguageList::LanguageInfo.find('MAC')
+    assert_equal 'mk', macedonian.iso_639_1
+    assert_equal 'mac', macedonian.iso_639_2b
+    assert_equal 'mkd', macedonian.iso_639_2t
+    assert_equal 'mkd', macedonian.iso_639_3
+    assert_equal 'Macedonian', macedonian.name
+  end
+
+  def test_find_with_iso_639_2t_code
+    macedonian = LanguageList::LanguageInfo.find('mkd')
+    assert_equal 'mk', macedonian.iso_639_1
+    assert_equal 'mac', macedonian.iso_639_2b
+    assert_equal 'mkd', macedonian.iso_639_2t
+    assert_equal 'mkd', macedonian.iso_639_3
+    assert_equal 'Macedonian', macedonian.name
+  end
+
+  def test_case_insensitive_find_with_iso_639_2t_code
+    macedonian = LanguageList::LanguageInfo.find('MKD')
+    assert_equal 'mk', macedonian.iso_639_1
+    assert_equal 'mac', macedonian.iso_639_2b
+    assert_equal 'mkd', macedonian.iso_639_2t
+    assert_equal 'mkd', macedonian.iso_639_3
+    assert_equal 'Macedonian', macedonian.name
+  end
+
   def test_find_with_iso_639_3_code
     english = LanguageList::LanguageInfo.find('eng')
     assert_equal 'en', english.iso_639_1
@@ -53,10 +105,19 @@ class LanguageListTest < Minitest::Test
     assert_equal 'English', english.name
   end
 
+  def test_case_insensitive_find_with_iso_639_3_code
+    english = LanguageList::LanguageInfo.find('Eng')
+    assert_equal 'en', english.iso_639_1
+    assert_equal 'eng', english.iso_639_3
+    assert_equal 'English', english.name
+  end
+
   def test_find_with_name
     english = LanguageList::LanguageInfo.find('English')
     assert_equal 'en', english.iso_639_1
     assert_equal 'eng', english.iso_639_3
+    assert_equal 'eng', english.iso_639_2b
+    assert_equal 'eng', english.iso_639_2t
     assert_equal 'English', english.name
   end
 
@@ -76,4 +137,42 @@ class LanguageListTest < Minitest::Test
     english = LanguageList::LanguageInfo.find('en')
     assert_equal english.name, english.common_name
   end
+
+  def test_cannot_change_constants
+    assert_raises RuntimeError, TypeError do
+      LanguageList::ALL_LANGUAGES[0] = nil
+    end
+
+    assert_raises RuntimeError, TypeError do
+      LanguageList::ISO_639_1[0] = nil
+    end
+
+    assert_raises RuntimeError, TypeError do
+      LanguageList::LIVING_LANGUAGES[0] = nil
+    end
+
+    assert_raises RuntimeError, TypeError do
+      LanguageList::COMMON_LANGUAGES[0] = nil
+    end
+
+    assert_raises RuntimeError, TypeError do
+      LanguageList::BY_NAME[0] = nil
+    end
+
+    assert_raises RuntimeError, TypeError do
+      LanguageList::BY_ISO_639_1[0] = nil
+    end
+
+    assert_raises RuntimeError, TypeError do
+      LanguageList::BY_ISO_639_3[0] = nil
+    end
+
+    assert_raises RuntimeError, TypeError do
+      LanguageList::BY_ISO_639_2T[0] = nil
+    end
+
+    assert_raises RuntimeError, TypeError do
+      LanguageList::BY_ISO_639_2B[0] = nil
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: language_list
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Steve Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: language_list
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A list of languages and methods to find and work with these languages.