iso639 1.1.0 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 578e3c4f186ee6ce7be47626269bd9b4e0939d3d
+  data.tar.gz: c3716f2cad4b92f1c6f2b50d4447a8c621e658e7
+SHA512:
+  metadata.gz: 5d75b6b0d94a7ebe9f3bfbfbb7bbc032d1a6d8ec4a3f3c3920cc1a67400106115ba7447fbcc10150318b8051e6216a1e95011aa55c1e6951e8ecb3eda139b92b
+  data.tar.gz: effba8a1517835e0578196b56b13f2f8514b33b542df689b1032c9ff17b27236a7e23e1fa7c3fab4e56f24572b50573b5dec0ae9cdb860d8ace180efb9c02d74

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 1.8.7
   - 1.9.3
+  - 2.0.0
   - jruby-18mode
   - jruby-19mode
   - rbx-18mode

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in iso639.gemspec
 gemspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Ryan McGeary
+Copyright (c) 2012-2013 Ryan McGeary
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,4 +1,4 @@
-# iso639 [![Build Status](https://travis-ci.org/rmm5t/iso639.png?branch=master)](https://travis-ci.org/rmm5t/iso639)
+# iso639 [![Gem Version](https://badge.fury.io/rb/iso639.png)](http://badge.fury.io/rb/iso639) [![Build Status](https://travis-ci.org/rmm5t/iso639.png?branch=master)](https://travis-ci.org/rmm5t/iso639) [![Code Climate](https://codeclimate.com/github/rmm5t/iso639.png)](https://codeclimate.com/github/rmm5t/iso639)
 
 The iso639 gem provides convenience methods for looking up ISO-639-1 or
 ISO-639-2 language codes by their english name, 2-char, or 3-char counterpart

data/iso639.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{ISO 639-1 and ISO 639-2 lookups by name, alpha-2 code, or alpha-3 code}
   gem.summary       = gem.description
   gem.homepage      = "https://github.com/rmm5t/iso639"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/iso639/insensitive_hash.rb

@@ -1,11 +1,17 @@
 module Iso639
   class InsensitiveHash < Hash # :nodoc:
     def [](key)
-      super(key.to_s.downcase.strip)
+      super normalize(key)
     end
 
     def []=(key, value)
-      super(key.to_s.downcase.strip, value)
+      super normalize(key), value
+    end
+
+    private
+
+    def normalize(key)
+      key.to_s.downcase.strip.split("_").first
     end
   end
 end

data/lib/iso639/version.rb

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

data/test/insensitive_hash_test.rb

@@ -1,14 +1,34 @@
 require "test_helper"
 
 describe Iso639::InsensitiveHash do
-  it "should returns results ignore case" do
+  it "should return results ignoring case" do
     hash = Iso639::InsensitiveHash.new
     hash["foo"] = "one thing"
     hash["Bar"] = "another thing"
     hash["BAZ"] = "last thing"
 
-    assert_equal hash["foo"], hash["FOO"]
-    assert_equal hash["BAR"], hash["bar"]
-    assert_equal hash["Baz"], hash["baz"]
+    assert_equal "one thing",     hash["FOO"]
+    assert_equal "another thing", hash["bar"]
+    assert_equal "last thing",    hash["baz"]
+  end
+
+  it "should return results ignoring whitespace" do
+    hash = Iso639::InsensitiveHash.new
+    hash[" foo \t"] = "one thing"
+    hash["Bar"] = "another thing"
+    hash["\tBAZ\n"] = "last thing"
+
+    assert_equal "one thing",     hash["FOO"]
+    assert_equal "another thing", hash["  bar \t"]
+    assert_equal "last thing",    hash["baz"]
+  end
+
+  it "should return results ignoring regional designators" do
+    hash = Iso639::InsensitiveHash.new
+    hash["en_GB"] = "english"
+    hash["fr_CA"] = "french"
+
+    assert_equal "english", hash["en_US"]
+    assert_equal "french",  hash["fr_FR"]
   end
 end

data/test/iso639_test.rb

@@ -101,4 +101,11 @@ describe Iso639 do
     assert_equal "fr", Iso639["   fra   "].alpha2
     assert_equal "fr", Iso639[" french\t"].alpha2
   end
+
+  it "should ignore regional designations" do
+    assert_equal "en", Iso639["en_US"].alpha2
+    assert_equal "en", Iso639["en_GB"].alpha2
+    assert_equal "fr", Iso639["fr_CA"].alpha2
+    assert_equal "fr", Iso639["fr_FR"].alpha2
+  end
 end

metadata

@@ -1,44 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: iso639
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ryan McGeary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  type: :development
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.3'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  type: :development
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -67,28 +62,28 @@ files:
 - test/language_test.rb
 - test/test_helper.rb
 homepage: https://github.com/rmm5t/iso639
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ISO 639-1 and ISO 639-2 lookups by name, alpha-2 code, or alpha-3 code
 test_files:
 - test/insensitive_hash_test.rb