ActionItem941: looking up country names

Antonio Terceiro
1 parent d2b6e21e
Showing 7 changed files with 44 additions and 10 deletions Show diff stats
app/helpers/countries_helper.rb
app/helpers/profile_editor_helper.rb
app/models/profile.rb
app/views/blocks/profile_info.rhtml
db/schema.rb
test/unit/countries_helper_test.rb
test/unit/profile_test.rb
 class CountriesHelper
+  include Singleton
+
   include GetText
   bindtextdomain 'iso_3166'
@@ -253,6 +255,11 @@ class CountriesHelper
     ["Zimbabwe", "ZW"]
   ]
+  COUNTRIES_HASH = COUNTRIES.inject({}) do |hash,entry|
+    hash[entry[1]] = entry[0]
+    hash
+  end
+
   def self.countries
     COUNTRIES
   end
@@ -261,4 +268,8 @@ class CountriesHelper
     self.class.countries.map {|item| [gettext(item[0]), item[1] ]}.sort_by { |entry| entry.first.transliterate }
   end
+  def lookup(code)
+    gettext(COUNTRIES_HASH[code])
+  end
+
 end
@@ -102,7 +102,7 @@ module ProfileEditorHelper
   end
   def country_helper
-    @country_helper ||= CountriesHelper.new
+    @country_helper ||= CountriesHelper.instance
   end
   def select_country(title, object, method, options)
@@ -140,10 +140,14 @@ class Profile &lt; ActiveRecord::Base
     if myregion
       myregion.hierarchy.reverse.first(2).map(&:name).join(' - ')
     else
-      [ :city, :state, :country ].map {|item| self.respond_to?(item) ? self.send(item) : nil }.compact.join(' - ')
+      [ :city, :state, :country_name ].map {|item| self.respond_to?(item) ? self.send(item) : nil }.compact.join(' - ')
     end
   end
+  def country_name
+    CountriesHelper.instance.lookup(country) if respond_to?(:country)
+  end
+
   def pending_categorizations
     @pending_categorizations ||= []
   end
@@ -31,7 +31,7 @@
 <%=
   [ [ profile.city, 'locality' ],
     [ profile.state, 'region' ],
-    [ profile.country, 'country-name' ]
+    [ profile.country_name, 'country-name' ]
   ].map{ |s,c| s =~ /^\s*$/ ? nil : content_tag( 'span', s, :class => c ) }.compact.join ' - '
 %>
 </div>
@@ -83,8 +83,8 @@ ActiveRecord::Schema.define(:version =&gt; 62) do
     t.boolean "virtual",     :default => false
   end
-  add_index "articles_categories", ["category_id"], :name => "index_articles_categories_on_category_id"
   add_index "articles_categories", ["article_id"], :name => "index_articles_categories_on_article_id"
+  add_index "articles_categories", ["category_id"], :name => "index_articles_categories_on_category_id"
   create_table "blocks", :force => true do |t|
     t.string  "title"
@@ -124,8 +124,8 @@ ActiveRecord::Schema.define(:version =&gt; 62) do
     t.boolean "virtual",     :default => false
   end
-  add_index "categories_profiles", ["category_id"], :name => "index_categories_profiles_on_category_id"
   add_index "categories_profiles", ["profile_id"], :name => "index_categories_profiles_on_profile_id"
+  add_index "categories_profiles", ["category_id"], :name => "index_categories_profiles_on_category_id"
   create_table "comments", :force => true do |t|
     t.string   "title"
@@ -192,8 +192,8 @@ ActiveRecord::Schema.define(:version =&gt; 62) do
     t.datetime "updated_at"
   end
-  add_index "product_categorizations", ["category_id"], :name => "index_product_categorizations_on_category_id"
   add_index "product_categorizations", ["product_id"], :name => "index_product_categorizations_on_product_id"
+  add_index "product_categorizations", ["category_id"], :name => "index_product_categorizations_on_category_id"
   create_table "products", :force => true do |t|
     t.integer  "enterprise_id"
@@ -260,7 +260,7 @@ ActiveRecord::Schema.define(:version =&gt; 62) do
     t.string  "name"
     t.text    "permissions"
     t.string  "key"
-    t.boolean "system",                     :default => false
+    t.boolean "system",      :default => false
   end
   create_table "taggings", :force => true do |t|
@@ -270,8 +270,8 @@ ActiveRecord::Schema.define(:version =&gt; 62) do
     t.datetime "created_at"
   end
-  add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type"
   add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
+  add_index "taggings", ["taggable_id", "taggable_type"], :name => "index_taggings_on_taggable_id_and_taggable_type"
   create_table "tags", :force => true do |t|
     t.string  "name"
@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class CountriesHelperTest < Test::Unit::TestCase
   def setup
-    @helper = CountriesHelper.new
+    @helper = CountriesHelper.instance
   end
   attr_reader :helper
@@ -33,4 +33,14 @@ class CountriesHelperTest &lt; Test::Unit::TestCase
     assert_equal [["Åland Islands", "AX"], ["Brazil", "BR"]], helper.countries
   end
+  should 'lookup country names by code' do
+    assert_equal 'France', helper.lookup('FR')
+    assert_equal 'Germany', helper.lookup('DE')
+  end
+
+  should 'translate lookups' do
+    helper.expects(:gettext).with('Germany').returns('Alemanha')
+    assert_equal 'Alemanha', helper.lookup('DE')
+  end
+
 end
@@ -715,10 +715,19 @@ class ProfileTest &lt; Test::Unit::TestCase
     p.expects(:region).returns(nil)
     p.expects(:city).returns("Salvador")
     p.expects(:state).returns("Bahia")
-    p.expects(:country).returns("Brasil")
+    p.expects(:country_name).returns("Brasil")
     assert_equal 'Salvador - Bahia - Brasil', p.location
   end
+  should 'lookup country name' do
+    p = Profile.new
+    # two sample countries; trust the rest works
+    p.stubs(:country).returns('BR')
+    assert_equal 'Brazil', p.country_name
+    p.stubs(:country).returns('AR')
+    assert_equal 'Argentina', p.country_name
+  end
+
   should 'give empty location if nothing is available' do
     p = Profile.new
     p.expects(:region).returns(nil)
	@@ -102,7 +102,7 @@ module ProfileEditorHelper		@@ -102,7 +102,7 @@ module ProfileEditorHelper
102	end	102	end
103		103
104	def country_helper	104	def country_helper
105	- @country_helper \|\|= CountriesHelper.new	105	+ @country_helper \|\|= CountriesHelper.instance
106	end	106	end
107		107
108	def select_country(title, object, method, options)	108	def select_country(title, object, method, options)
	@@ -31,7 +31,7 @@		@@ -31,7 +31,7 @@
31	<%=	31	<%=
32	[ [ profile.city, 'locality' ],	32	[ [ profile.city, 'locality' ],
33	[ profile.state, 'region' ],	33	[ profile.state, 'region' ],
34	- [ profile.country, 'country-name' ]	34	+ [ profile.country_name, 'country-name' ]
35	].map{ \|s,c\| s =~ /^\s*$/ ? nil : content_tag( 'span', s, :class => c ) }.compact.join ' - '	35	].map{ \|s,c\| s =~ /^\s*$/ ? nil : content_tag( 'span', s, :class => c ) }.compact.join ' - '
36	%>	36	%>
37	</div>	37	</div>
	@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'		@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
3	class CountriesHelperTest < Test::Unit::TestCase	3	class CountriesHelperTest < Test::Unit::TestCase
4		4
5	def setup	5	def setup
6	- @helper = CountriesHelper.new	6	+ @helper = CountriesHelper.instance
7	end	7	end
8	attr_reader :helper	8	attr_reader :helper
9		9
	@@ -33,4 +33,14 @@ class CountriesHelperTest < Test::Unit::TestCase		@@ -33,4 +33,14 @@ class CountriesHelperTest < Test::Unit::TestCase
33	assert_equal [["Åland Islands", "AX"], ["Brazil", "BR"]], helper.countries	33	assert_equal [["Åland Islands", "AX"], ["Brazil", "BR"]], helper.countries
34	end	34	end
35		35
		36	+ should 'lookup country names by code' do
		37	+ assert_equal 'France', helper.lookup('FR')
		38	+ assert_equal 'Germany', helper.lookup('DE')
		39	+ end
		40	+
		41	+ should 'translate lookups' do
		42	+ helper.expects(:gettext).with('Germany').returns('Alemanha')
		43	+ assert_equal 'Alemanha', helper.lookup('DE')
		44	+ end
		45	+
36	end	46	end