uncharted 0.0.11 → 0.0.12

data/lib/uncharted/config/locales/pt-BR.yml

@@ -1,9 +1,9 @@
 pt-BR:
   countries:
-    AC: Ascenção
+    AC: Ascensão
     AD: Andorra
     AE: United Arab Emirates
-    AF: Afghanistan
+    AF: Afeganistão
     AG: Antigua and Barbuda
     AI: Anguilla
     AL: Albania
@@ -231,7 +231,7 @@ pt-BR:
     UA: Ukraine
     UG: Uganda
     UM: Midway Islands
-    US: United States
+    US: Estados Unidos
     UY: Uruguay
     UZ: Uzbekistan
     VA: Vatican City

data/lib/uncharted/country.rb

@@ -37,7 +37,7 @@ module Uncharted
       case objects
       when Array
         objects.collect {|c| data[c]}
-      when Country
+      when Country, nil
         objects
       else # code
         code = objects.to_s
@@ -47,6 +47,7 @@ module Uncharted
     end
     
     def self.find_by_name(name)
+      return nil if name.nil? || name == ""
       closest = [nil, 0]
       @data.each do |code, country|
         return country if country.name == name
@@ -57,6 +58,10 @@ module Uncharted
       end
       return closest.first
     end
+    
+    def self.search(object)
+      find(object) || find_by_name(object)
+    end
 
     def self.countries
       @data.values

data/lib/uncharted/extensions/mongoid.rb

@@ -9,7 +9,8 @@ module Uncharted
       code && Country.find(code)
     end
 
-    def serialize(country)
+    def serialize(object)
+      country = object.is_a?(Country) ? object : Country.search(object)
       country && country.code
     end
   end
@@ -21,7 +22,8 @@ module Uncharted
       code && Territory.find(code)
     end
 
-    def serialize(territory)
+    def serialize(object)
+      territory = object.is_a?(Territory) ? object : Territory.search(object) 
       territory && territory.code
     end
   end

data/lib/uncharted/territory.rb

@@ -56,7 +56,7 @@ module Uncharted
     end
     
     def self.find(object)
-      territory = object.is_a?(Territory) ? object : data[object]
+      territory = object && object.is_a?(Territory) ? object : data[object]
     end
    
     def self.data
@@ -75,6 +75,10 @@ module Uncharted
       return closest.first
     end
     
+    def self.search(object)
+      find(object) || find_by_name(object)
+    end
+    
 
   end
 

data/lib/uncharted/version.rb

@@ -1,4 +1,4 @@
 
 module Uncharted
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

data/test/country_test.rb

@@ -65,5 +65,15 @@ class TestCountry < MiniTest::Unit::TestCase
     assert_equal Territory.find('BR-RN'), Territory.find_by_name('Rio Grande do Norte')
     assert_equal Territory.find('BR-RS'), Territory.find_by_name('R Grande do Sul')
   end
+  
+  def test_search
+    assert_equal Country.find('US'),      Country.search('States United')
+    assert_equal Country.find('US'),      Country.search('US')
+    assert_equal Country.find('FR'),      Country.search('France')
+    assert_equal Territory.find('BR-PR'), Territory.search('Paraná')
+    assert_equal Territory.find('BR-RN'), Territory.search('Rio Grande do Norte')
+    assert_equal Territory.find('BR-RS'), Territory.search('BR-RS')
+    assert_nil   Territory.search('RS')
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uncharted
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-16 00:00:00.000000000 Z
+date: 2011-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2160752460 !ruby/object:Gem::Requirement
+  requirement: &2152785820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160752460
+  version_requirements: *2152785820
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2160751920 !ruby/object:Gem::Requirement
+  requirement: &2152784260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160751920
+  version_requirements: *2152784260
 - !ruby/object:Gem::Dependency
   name: purdytest
-  requirement: &2160751300 !ruby/object:Gem::Requirement
+  requirement: &2152783100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160751300
+  version_requirements: *2152783100
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2160750860 !ruby/object:Gem::Requirement
+  requirement: &2152781840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160750860
+  version_requirements: *2152781840
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2160750380 !ruby/object:Gem::Requirement
+  requirement: &2152780420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160750380
+  version_requirements: *2152780420
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2160749660 !ruby/object:Gem::Requirement
+  requirement: &2152779780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160749660
+  version_requirements: *2152779780
 description: Provide ISO 3166 codes and english name for countries and their political
   divisions
 email: