iso-639 0.2.4 → 0.2.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2c1644722c56e4a17a8fdcfa3bfcd4b8b48842e2
+  data.tar.gz: ea8dbec6a423b9eaeaef0dcc262543568fe7ca1e
+SHA512:
+  metadata.gz: 55341b7cb9629618bd6233a96bbf154437530765a67f0e62dad891efd358dad2b7b64beef8bf10dcefe8c7f1a57a0e22f1da4617061e69444b04a44d3f065d3d
+  data.tar.gz: d9528fe3161762d4602b8bbc7c1a41196b9b5333d0182d6f0da8f80708209203db9d72a58ddb376823f8c8463ae263a35eaf9aa4dfd7906fb7c2fb809c6e89b9

data/Gemfile

@@ -6,7 +6,8 @@ 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 "mocha", ">= 0"
+  gem "minitest", "~> 4.7.5"
+  gem "mocha", "~> 0.14.0"
   gem "rdoc", "~> 3.12"
   gem "shoulda", ">= 0"
   gem "rake"

data/Gemfile.lock

@@ -7,7 +7,8 @@ GEM
     i18n (0.6.1)
     json (1.7.5)
     metaclass (0.0.1)
-    mocha (0.12.7)
+    minitest (4.7.5)
+    mocha (0.14.0)
       metaclass (~> 0.0.1)
     multi_json (1.3.6)
     rake (0.9.2.2)
@@ -24,7 +25,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  mocha
+  minitest (~> 4.7.5)
+  mocha (~> 0.14.0)
   rake
   rdoc (~> 3.12)
   shoulda

data/iso-639.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "iso-639"
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Melody"]
-  s.date = "2013-10-23"
+  s.date = "2014-07-20"
   s.description = "ISO 639-1 and ISO 639-2 language code entries and convenience methods"
   s.email = "hi@williammelody.com"
   s.extra_rdoc_files = [
@@ -38,16 +38,19 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<mocha>, [">= 0"])
+      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"])
     else
-      s.add_dependency(%q<mocha>, [">= 0"])
+      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"])
     end
   else
-    s.add_dependency(%q<mocha>, [">= 0"])
+    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"])
   end

data/lib/iso-639.rb

@@ -534,29 +534,39 @@ class ISO_639 < Array
   class << self
     # Returns the entry array for an alpha-2 or alpha-3 code
     def find_by_code(code)
+      return if code.nil?
       case code.length
       when 3
-        ISO_639_2.detect { |entry| entry if entry.alpha3 == code || entry.alpha3_terminologic == code }
+        ISO_639_2.detect do |entry|
+          entry if entry.alpha3 == code || entry.alpha3_terminologic == code
+        end
       when 2
-        ISO_639_1.detect { |entry| entry if entry.alpha2 == code }
+        ISO_639_1.detect do |entry|
+          entry if entry.alpha2 == code
+        end
       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 { |entry| entry if entry.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 { |entry| entry if entry.french_name == name }
+      ISO_639_2.detect do |entry|
+        entry if entry.french_name == name
+      end
     end
 
     # Returns an array of matches for the search term. The term can be a code
     # of any kind, or it can be one of the words contained in the English or
     # French name field.
     def search(term)
+      term ||= ''
       normalized_term = term.downcase.strip
       indexes         = INVERTED_INDEX[normalized_term]
       indexes ? ISO_639_2.values_at(*indexes).uniq : []

data/test/helper.rb

@@ -9,11 +9,11 @@ rescue Bundler::BundlerError => e
 end
 require 'test/unit'
 require 'shoulda'
-require 'mocha'
+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
+end

data/test/test_ISO_639.rb

@@ -11,6 +11,14 @@ class TestISO639 < Test::Unit::TestCase
     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
+    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'
+  end
+  
   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")
@@ -73,6 +81,10 @@ class TestISO639 < Test::Unit::TestCase
     )
   end
 
+  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
     assert_equal(
       [["ypk", "", "", "Yupik languages", "yupik, langues"]],

metadata

@@ -1,76 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: iso-639
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 4
-  version: 0.2.4
+version: !ruby/object:Gem::Version
+  version: 0.2.5
 platform: ruby
-authors: 
+authors:
 - William Melody
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-10-23 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: mocha
+date: 2014-07-20 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
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.7.5
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 3
-        - 12
-        version: "3.12"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ISO 639-1 and ISO 639-2 language code entries and convenience methods
 email: hi@williammelody.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.markdown
-files: 
-- .document
+files:
+- ".document"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -81,37 +85,27 @@ files:
 - test/helper.rb
 - test/test_ISO_639.rb
 homepage: http://github.com/alphabetum/iso-639
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 3
 summary: ISO 639-1 and ISO 639-2 language code entries and convenience methods
 test_files: []
-