ActionItem449: adding http:// also when reading

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2022 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem449: adding http:// also when reading
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2022 3f533792-8f58-4932-b0fe-aaf55b0a4547
AntonioTerceiro
1 parent 911de09a
Showing 2 changed files with 21 additions and 6 deletions Show diff stats
app/models/event.rb
test/unit/event_test.rb
@@ -84,12 +84,21 @@ class Event &lt; Article
   end
   def link=(value)
-    self.body[:link] =
-      if value =~ /https?:\/\//
-        value
-      else
-        'http://' + value
-      end
+    self.body[:link] = maybe_add_http(value)
+  end
+
+  def link
+    maybe_add_http(self.body[:link])
+  end
+
+  protected
+
+  def maybe_add_http(value)
+    if value =~ /https?:\/\//
+      value
+    else
+      'http://' + value
+    end
   end
 end
@@ -143,6 +143,12 @@ class EventTest &lt; ActiveSupport::TestCase
     assert_equal 'http://www.nohttp.net', a.link
   end
+  should 'add http:// when reading link' do
+    a = Event.new
+    a.body[:link] = 'www.gnu.org'
+    assert_equal 'http://www.gnu.org', a.link
+  end
+
   protected
   def assert_tag_in_string(text, options)
	@@ -84,12 +84,21 @@ class Event < Article		@@ -84,12 +84,21 @@ class Event < Article
84	end	84	end
85		85
86	def link=(value)	86	def link=(value)
87	- self.body[:link] =
88	- if value =~ /https?:\/\//
89	- value
90	- else
91	- 'http://' + value
92	- end	87	+ self.body[:link] = maybe_add_http(value)
		88	+ end
		89	+
		90	+ def link
		91	+ maybe_add_http(self.body[:link])
		92	+ end
		93	+
		94	+ protected
		95	+
		96	+ def maybe_add_http(value)
		97	+ if value =~ /https?:\/\//
		98	+ value
		99	+ else
		100	+ 'http://' + value
		101	+ end
93	end	102	end
94		103
95	end	104	end
	@@ -143,6 +143,12 @@ class EventTest < ActiveSupport::TestCase		@@ -143,6 +143,12 @@ class EventTest < ActiveSupport::TestCase
143	assert_equal 'http://www.nohttp.net', a.link	143	assert_equal 'http://www.nohttp.net', a.link
144	end	144	end
145		145
		146	+ should 'add http:// when reading link' do
		147	+ a = Event.new
		148	+ a.body[:link] = 'www.gnu.org'
		149	+ assert_equal 'http://www.gnu.org', a.link
		150	+ end
		151	+
146	protected	152	protected
147		153
148	def assert_tag_in_string(text, options)	154	def assert_tag_in_string(text, options)