ActionItem833: going up only 2 levels when using region

Antonio Terceiro
1 parent c692f7b2
Showing 2 changed files with 4 additions and 3 deletions Show diff stats
app/models/profile.rb
test/unit/profile_test.rb
@@ -113,7 +113,7 @@ class Profile &lt; ActiveRecord::Base
   def location
     myregion = self.region
     if myregion
-      myregion.hierarchy.reverse.map(&:name).join(' - ')
+      myregion.hierarchy.reverse.first(2).map(&:name).join(' - ')
     else
       [ :city, :state, :country ].map {|item| self.respond_to?(item) ? self.send(item) : nil }.compact.join(' - ')
     end
@@ -702,8 +702,9 @@ class ProfileTest &lt; Test::Unit::TestCase
     assert_equal 'Some ackwrad region name', p.location
   end
-  should 'query region hierarchy for location' do
-    state = Region.new(:name => "Bahia")
+  should 'query region hierarchy for location up to 2 levels' do
+    country = Region.new(:name => "Brazil")
+    state = Region.new(:name => "Bahia", :parent => country)
     city = Region.new(:name => "Salvador", :parent => state)
     p = Profile.new(:region => city)
     assert_equal 'Salvador - Bahia', p.location
	@@ -113,7 +113,7 @@ class Profile < ActiveRecord::Base		@@ -113,7 +113,7 @@ class Profile < ActiveRecord::Base
113	def location	113	def location
114	myregion = self.region	114	myregion = self.region
115	if myregion	115	if myregion
116	- myregion.hierarchy.reverse.map(&:name).join(' - ')	116	+ myregion.hierarchy.reverse.first(2).map(&:name).join(' - ')
117	else	117	else
118	[ :city, :state, :country ].map {\|item\| self.respond_to?(item) ? self.send(item) : nil }.compact.join(' - ')	118	[ :city, :state, :country ].map {\|item\| self.respond_to?(item) ? self.send(item) : nil }.compact.join(' - ')
119	end	119	end