countries_and_languages 0.1.6 → 0.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    countries_and_languages (0.1.6)
+    countries_and_languages (0.2.0)
       i18n_data
 
 GEM

data/lib/countries_and_languages.rb

@@ -2,8 +2,6 @@
 require 'i18n_data'
 
 module CountriesAndLanguages
-  extend self
-
   module Helpers
     def countries
       @@countries ||= {}
@@ -11,7 +9,7 @@ module CountriesAndLanguages
     end
 
     def country(country_code)
-      countries.rassoc(country_code.to_s.upcase)[0] rescue ''
+      (countries.rassoc(country_code.to_s.upcase) || [''])[0]
     end
 
     def languages
@@ -20,17 +18,17 @@ module CountriesAndLanguages
     end
 
     def language(language_code)
-      languages.rassoc(language_code.to_s.upcase)[0] rescue ''
+      (languages.rassoc(language_code.to_s.upcase) || [''])[0]
     end
   end
 
-  def clean_and_sort(data)
+  def self.clean_and_sort(data)
     data = data.to_a
     data.map!{|code,name| [clean_name(name), code] }
-    data.sort_by{|code,name| convert_umlaut_to_base(code) }
+    data.sort_by{|code,_| convert_umlaut_to_base(code) }
   end
 
-  def clean_name(name)
+  def self.clean_name(name)
     #General fixes
     name = name.sub(/\s*[,;(].*/,'')
 
@@ -58,7 +56,7 @@ module CountriesAndLanguages
 
   RUBY_18 = RUBY_VERSION < "1.9"
 
-  def convert_umlaut_to_base(input)
+  def self.convert_umlaut_to_base(input)
     input = input.dup
     if RUBY_18
       old = $KCODE

data/lib/countries_and_languages/version.rb

@@ -1,3 +1,3 @@
 module CountriesAndLanguages
-  VERSION = Version = '0.1.6'
+  VERSION = Version = '0.2.0'
 end

data/spec/countries_and_languages_spec.rb

@@ -19,7 +19,7 @@ describe CountriesAndLanguages do
     end
 
     it "returns blank when not found" do
-      send(method,'XC').should be_blank
+      send(method,'XC').should == ''
     end
   end
 

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 6
-  version: 0.1.6
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Michael Grosser