uncharted 0.0.10 → 0.0.11

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+0.0.11 (2011-11-14)
+-------------------
+
+  - Country.find_by_name and Territory.find_by_name
+
+
+0.0.10 (2011-11-11)
+-------------------
+
+  - Internationalization finally working (need to update translations though)
+
 0.0.7 (2011-08-31)
 ------------------
 

data/lib/uncharted/country.rb

@@ -21,6 +21,10 @@ module Uncharted
       I18n.t("countries.#{@alpha2}", {locale: options[:locale] || I18n.locale, default: @name})
     end
     
+    def names
+      @names ||= Country.split_name(@name)
+    end
+    
     def to_s
       @alpha2
     end
@@ -35,10 +39,24 @@ module Uncharted
         objects.collect {|c| data[c]}
       when Country
         objects
-      else
-        data[objects]
+      else # code
+        code = objects.to_s
+        code.upcase!
+        data[code]
       end
     end
+    
+    def self.find_by_name(name)
+      closest = [nil, 0]
+      @data.each do |code, country|
+        return country if country.name == name
+        intersection = country.names & Country.split_name(name)
+        size = intersection.size
+        return country if size == country.names.size
+        closest = [country, size] if closest.last < size 
+      end
+      return closest.first
+    end
 
     def self.countries
       @data.values
@@ -47,6 +65,12 @@ module Uncharted
     def self.data
       @data ||= {}
     end
+    
+    def self.split_name(name)
+      name = I18n.transliterate(name)
+      name.downcase!
+      name.split
+    end
         
   end
 

data/lib/uncharted/territory.rb

@@ -47,18 +47,35 @@ module Uncharted
       I18n.t("territories.#{@country_code}#{@abbr}", {locale: options[:locale] || I18n.locale}, default: @name)
     end
     
+    def names
+      @names ||= Country.split_name(@name)
+    end
+    
     def to_s
       @abbr
     end
     
     def self.find(object)
-      object.is_a?(Territory) ? object : data[object]
+      territory = object.is_a?(Territory) ? object : data[object]
     end
-
+   
     def self.data
       @data ||= {}
     end
 
+    def self.find_by_name(name)
+      closest = [nil, 0]
+      @data.each do |code, territory|
+        return territory if territory.name == name
+        intersection = territory.names & Country.split_name(name)
+        size = intersection.size
+        return territory if size == territory.names.size
+        closest = [territory, size] if closest.last < size 
+      end
+      return closest.first
+    end
+    
+
   end
 
 end

data/lib/uncharted/version.rb

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

data/test/country_test.rb

@@ -24,22 +24,19 @@ class TestCountry < MiniTest::Unit::TestCase
   def test_to_s
     assert_equal 'BR', @br.to_s
   end
-  
-  def test_country_count
-    assert_equal 247, Country.count
-    assert_equal  27, Country.subdivisions.values.count
-  end
 
   def test_territories
     df = Territory.find('BR-DF')
+    assert_equal @br, df.country
     assert_equal [df], @br.districts
     assert_equal 26, @br.states.count
     assert_equal 27, @br.subdivisions.count
     assert @br.territories.empty?
 
-    assert_equal 'Paraná', Territory.find('BR-PR').name
-    assert_equal 'PR', Territory.find('BR-PR').abbr
-    assert_equal 'PR', Territory.find('BR-PR').to_s
+    pr = Territory.find('BR-PR')
+    assert_equal 'Paraná', pr.name
+    assert_equal 'PR', pr.abbr
+    assert_equal 'PR', pr.to_s
   end
   
   def test_classes
@@ -53,11 +50,20 @@ class TestCountry < MiniTest::Unit::TestCase
   
   def test_translation
     assert_equal "Brazil", @br.name(locale: :en)
-    assert_equal "Brasil", @br.name(locale: 'pt-BR')
+    assert_equal "Brasil", @br.name(locale: :'pt-BR')
   end
   
   def test_inspection
     assert_equal "BR: 'Brazil'", @br.inspect
   end
+  
+  def test_find_by_name
+    assert_equal Country.find('US'),      Country.find_by_name('States United')
+    assert_equal Country.find('GB'),      Country.find_by_name('Kingdom')
+    assert_equal Country.find('FR'),      Country.find_by_name('France')
+    assert_equal Territory.find('BR-PR'), Territory.find_by_name('Paraná')
+    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
 
 end

metadata

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