iso-639 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c1644722c56e4a17a8fdcfa3bfcd4b8b48842e2
-  data.tar.gz: ea8dbec6a423b9eaeaef0dcc262543568fe7ca1e
+  metadata.gz: 0263cfd7186c66c99ef204cae8d806be734572e4
+  data.tar.gz: 1a63d2d476333d43a3c33bd370bbfcb602a97eec
 SHA512:
-  metadata.gz: 55341b7cb9629618bd6233a96bbf154437530765a67f0e62dad891efd358dad2b7b64beef8bf10dcefe8c7f1a57a0e22f1da4617061e69444b04a44d3f065d3d
-  data.tar.gz: d9528fe3161762d4602b8bbc7c1a41196b9b5333d0182d6f0da8f80708209203db9d72a58ddb376823f8c8463ae263a35eaf9aa4dfd7906fb7c2fb809c6e89b9
+  metadata.gz: 654bb7a95891255fbdff11d2bb3c18972010f7f7db152868c562400c53df56f91f66529e744157bec811abcfcb1ab835658fc657cfd7927b47d2b6f0bd1ed976
+  data.tar.gz: 026f9abed71f92bfdaf89a73a4f930e26f755d5f29b07553b55dd732a6de71298fc68f3b22cef910a88095ef7eac7fa6225659292c09e22d089fce692d8a5e39

data/Gemfile

@@ -6,9 +6,10 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development, :test do
-  gem "minitest", "~> 4.7.5"
-  gem "mocha", "~> 0.14.0"
-  gem "rdoc", "~> 3.12"
-  gem "shoulda", ">= 0"
+  gem "minitest"
+  gem "mocha"
   gem "rake"
+  gem "rdoc"
+  gem "rubocop"
+  gem "test-unit"
 end

data/Gemfile.lock

@@ -1,32 +1,41 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    i18n (0.6.1)
-    json (1.7.5)
-    metaclass (0.0.1)
-    minitest (4.7.5)
-    mocha (0.14.0)
+    ast (2.2.0)
+    json (1.8.3)
+    metaclass (0.0.4)
+    minitest (5.8.4)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    parser (2.3.1.0)
+      ast (~> 2.2)
+    power_assert (0.3.0)
+    powerpack (0.1.1)
+    rainbow (2.1.0)
+    rake (11.1.2)
+    rdoc (4.2.2)
       json (~> 1.4)
-    shoulda (3.3.2)
-      shoulda-context (~> 1.0.1)
-      shoulda-matchers (~> 1.4.1)
-    shoulda-context (1.0.1)
-    shoulda-matchers (1.4.1)
-      activesupport (>= 3.0.0)
+    rubocop (0.40.0)
+      parser (>= 2.3.1.0, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.0)
+    test-unit (3.1.8)
+      power_assert
+    unicode-display_width (1.0.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  minitest (~> 4.7.5)
-  mocha (~> 0.14.0)
+  minitest
+  mocha
   rake
-  rdoc (~> 3.12)
-  shoulda
+  rdoc
+  rubocop
+  test-unit
+
+BUNDLED WITH
+   1.12.2

data/README.markdown

@@ -33,7 +33,7 @@ always returns an array of 0 or more results. For example:
     # => [["spa", "", "es", "Spanish; Castilian", "espagnol; castillan"]]
 
 Entries are arrays with convenience methods for accessing fields:
-    
+
     @entry = ISO_639.find("slo")
     # => ["slo", "slk", "sk", "Slovak", "slovaque"]
     @entry.alpha3_bibliographic
@@ -52,7 +52,7 @@ Entries are arrays with convenience methods for accessing fields:
 The full data set is available through the `ISO_639::ISO_639_1` and `ISO_639::ISO_639_2` constants.
 
 ## Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a

data/Rakefile

@@ -18,7 +18,7 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :default => :test
+task default: :test
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|

data/iso-639.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "iso-639"
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Melody"]
-  s.date = "2014-07-20"
+  s.date = "2016-05-09"
   s.description = "ISO 639-1 and ISO 639-2 language code entries and convenience methods"
   s.email = "hi@williammelody.com"
   s.extra_rdoc_files = [
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
     "iso-639.gemspec",
     "lib/iso-639.rb",
     "test/helper.rb",
-    "test/test_ISO_639.rb"
+    "test/test_iso_639.rb"
   ]
   s.homepage = "http://github.com/alphabetum/iso-639"
   s.licenses = ["MIT"]
@@ -34,25 +34,27 @@ Gem::Specification.new do |s|
   s.rubygems_version = "1.8.24"
   s.summary = "ISO 639-1 and ISO 639-2 language code entries and convenience methods"
 
-  if s.respond_to? :specification_version then
+  if s.respond_to? :specification_version
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<minitest>, ["~> 4.7.5"])
-      s.add_development_dependency(%q<mocha>, ["~> 0.14.0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0')
+      s.add_development_dependency("minitest", [">= 0"])
+      s.add_development_dependency("mocha", [">= 0"])
+      s.add_development_dependency("rdoc", [">= 0"])
+      s.add_development_dependency("rubocop", [">= 0"])
+      s.add_development_dependency("test-unit", [">= 0"])
     else
-      s.add_dependency(%q<minitest>, ["~> 4.7.5"])
-      s.add_dependency(%q<mocha>, ["~> 0.14.0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency("minitest", [">= 0"])
+      s.add_dependency("mocha", [">= 0"])
+      s.add_dependency("rdoc", [">= 0"])
+      s.add_dependency("rubocop", [">= 0"])
+      s.add_dependency("test-unit", [">= 0"])
     end
   else
-    s.add_dependency(%q<minitest>, ["~> 4.7.5"])
-    s.add_dependency(%q<mocha>, ["~> 0.14.0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency("minitest", [">= 0"])
+    s.add_dependency("mocha", [">= 0"])
+    s.add_dependency("rdoc", [">= 0"])
+    s.add_dependency("rubocop", [">= 0"])
+    s.add_dependency("test-unit", [">= 0"])
   end
 end
-

data/lib/iso-639.rb

@@ -2,7 +2,6 @@
 # http://www.loc.gov/standards/iso639-2/ascii_8bits.html
 
 class ISO_639 < Array
-  
   # The ISO 639-2 dataset as an array of entries. Each entry is an array with
   # the following format:
   # * [0]: an alpha-3 (bibliographic) code
@@ -500,7 +499,7 @@ class ISO_639 < Array
 
   # An inverted index generated from the ISO_639_2 data. Used for searching
   # all words and codes in all fields.
-  INVERTED_INDEX = lambda {
+  INVERTED_INDEX = lambda do
     index = {}
     ISO_639_2.each_with_index do |record, i|
       record.each do |field|
@@ -518,8 +517,8 @@ class ISO_639 < Array
       end
     end
     return index
-  }.call
-  
+  end.call
+
   # The ISO 639-1 dataset as an array of entries. Each entry is an array with
   # the following format:
   # * [0]: an ISO 369-2 alpha-3 (bibliographic) code
@@ -530,7 +529,7 @@ class ISO_639 < Array
   ISO_639_1 = ISO_639_2.collect do |entry|
     entry unless entry[2].empty?
   end.compact
-  
+
   class << self
     # Returns the entry array for an alpha-2 or alpha-3 code
     def find_by_code(code)
@@ -547,14 +546,14 @@ class ISO_639 < Array
       end
     end
     alias_method :find, :find_by_code
-    
+
     # Returns the entry array for a language specified by its English name.
     def find_by_english_name(name)
       ISO_639_2.detect do |entry|
         entry if entry.english_name == name
       end
     end
-    
+
     # Returns the entry array for a language specified by its French name.
     def find_by_french_name(name)
       ISO_639_2.detect do |entry|
@@ -572,17 +571,30 @@ class ISO_639 < Array
       indexes ? ISO_639_2.values_at(*indexes).uniq : []
     end
   end
-  
+
   # The entry's alpha-3 bibliotigraphic code.
-  def alpha3_bibliographic;   self[0] end
+  def alpha3_bibliographic
+    self[0]
+  end
   alias_method :alpha3, :alpha3_bibliographic
+
   # The entry's alpha-3 terminologic (when given)
-  def alpha3_terminologic;    self[1] end
+  def alpha3_terminologic
+    self[1]
+  end
+
   # The entry's alpha-2 code (when given)
-  def alpha2;                 self[2] end
+  def alpha2
+    self[2]
+  end
+
   # The entry's english name.
-  def english_name;           self[3] end
+  def english_name
+    self[3]
+  end
+
   # The entry's french name.
-  def french_name;            self[4] end
-  
+  def french_name
+    self[4]
+  end
 end

data/test/helper.rb

@@ -7,13 +7,10 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'test/unit'
-require 'shoulda'
+require 'minitest/autorun'
+require 'minitest/pride'
 require 'mocha/setup'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'iso-639'
-
-class Test::Unit::TestCase
-end

data/test/{test_ISO_639.rb → test_iso_639.rb}

@@ -1,71 +1,70 @@
 # encoding: UTF-8
 require 'helper'
 
-class TestISO639 < Test::Unit::TestCase
-  
-  should "have full code list in ISO_639_2" do
+describe ISO_639 do
+  it "should have full code list in ISO_639_2" do
     assert_equal 485, ISO_639::ISO_639_2.length
   end
-  
-  should "have shorter code list in ISO_639_1" do
+
+  it "should have shorter code list in ISO_639_1" do
     assert_equal 184, ISO_639::ISO_639_1.length
   end
-  
-  should "return nil find_by_code when code does not exist or is invalid" do
+
+  it "should return nil find_by_code when code does not exist or is invalid" do
     assert ISO_639.find_by_code(nil).nil?, 'nil code'
     assert ISO_639.find_by_code('xxx').nil?, 'xxx alfa-3 not existing code'
     assert ISO_639.find_by_code('xx').nil?, 'xx alfa-2 not existing code'
     assert ISO_639.find_by_code('xxxx').nil?, 'xxxx lengthy code'
-    assert ISO_639.find_by_code('').nil? ,'empty string code'
+    assert ISO_639.find_by_code('').nil?, 'empty string code'
   end
-  
-  should "return entry for alpha-2 code" do
+
+  it "should return entry for alpha-2 code" do
     assert_equal ["eng", "", "en", "English", "anglais"], ISO_639.find_by_code("en")
     assert_equal ["eng", "", "en", "English", "anglais"], ISO_639.find("en")
   end
 
-  should "return entry for alpha-3 terminologic code" do
+  it "should return entry for alpha-3 terminologic code" do
     assert_equal ["ger", "deu", "de", "German", "allemand"], ISO_639.find("deu")
   end
-  
-  should "find by english name" do
+
+  it "should find by english name" do
     assert_equal ["eng", "", "en", "English", "anglais"], ISO_639.find_by_english_name("English")
   end
-  
-  should "find by french name" do
+
+  it "should find by french name" do
     assert_equal ["eng", "", "en", "English", "anglais"], ISO_639.find_by_french_name("anglais")
   end
-  
-  %w[
+
+  %w(
     alpha3_bibliographic
     alpha3
     alpha3_terminologic
     alpha2
     english_name
     french_name
-  ].each_with_index do |m, i|
-    should "respond to and return #{m}" do
+  ).each_with_index do |m, i|
+    it "should respond to and return #{m}" do
       @entry = ISO_639.find("en")
       assert @entry.respond_to?(m)
       assert_equal ["eng", "eng", "", "en", "English", "anglais"][i], @entry.send(m)
     end
   end
 
-  should "return single record array by searching a unique code" do
+  it "should return single record array by searching a unique code" do
     assert_equal(
       [["spa", "", "es", "Spanish; Castilian", "espagnol; castillan"]],
       ISO_639.search("es")
     )
   end
 
-  should "return single record array by searching a unique term" do
+  it "should return single record array by searching a unique term" do
     assert_equal(
       [["spa", "", "es", "Spanish; Castilian", "espagnol; castillan"]],
       ISO_639.search("spanish")
     )
   end
 
-  should "return multiple record array by searching a common term" do
+  it "should return multiple record array by searching a common term" do
     assert_equal(
       [
         ["egy", "", "", "Egyptian (Ancient)", "égyptien"],
@@ -75,21 +74,20 @@ class TestISO639 < Test::Unit::TestCase
     )
   end
 
-  should "return empty array when searching a non-existent term" do
+  it "should return empty array when searching a non-existent term" do
     assert_equal(
       [], ISO_639.search("bad term")
     )
   end
 
-  should "return empty array when searching a nil term" do
+  it "should return empty array when searching a nil term" do
     assert_equal [], ISO_639.search(nil)
   end
 
-  should "return single record array by searching a unique multi-word term" do
+  it "should return single record array by searching a unique multi-word term" do
     assert_equal(
       [["ypk", "", "", "Yupik languages", "yupik, langues"]],
       ISO_639.search("yupik, langues")
     )
   end
-  
 end

metadata

@@ -1,59 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: iso-639
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - William Melody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-20 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -83,7 +97,7 @@ files:
 - iso-639.gemspec
 - lib/iso-639.rb
 - test/helper.rb
-- test/test_ISO_639.rb
+- test/test_iso_639.rb
 homepage: http://github.com/alphabetum/iso-639
 licenses:
 - MIT
@@ -104,8 +118,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 3
 summary: ISO 639-1 and ISO 639-2 language code entries and convenience methods
 test_files: []
+has_rdoc: