From 8553413dd92448dcc580ef59b19035f4a68be99a Mon Sep 17 00:00:00 2001 From: AntonioTerceiro Date: Thu, 27 Dec 2007 19:52:58 +0000 Subject: [PATCH] ActionItem23: using strings instead of symbols --- app/models/rss_feed.rb | 8 ++++---- test/unit/rss_feed_test.rb | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/models/rss_feed.rb b/app/models/rss_feed.rb index 5b51a3d..38e3b34 100644 --- a/app/models/rss_feed.rb +++ b/app/models/rss_feed.rb @@ -31,7 +31,7 @@ class RssFeed < Article def include=(value) settings[:include] = value end - validates_inclusion_of :include, :in => [ :all, :parent_and_children ], :if => :include + validates_inclusion_of :include, :in => [ 'all', 'parent_and_children' ], :if => :include # determinates what to include in the feed as items' description. Possible # values are +:body+ (default) and +:abstract+. @@ -41,7 +41,7 @@ class RssFeed < Article def feed_item_description=(value) settings[:feed_item_description] = value end - validates_inclusion_of :feed_item_description, :in => [ :body, :abstract ], :if => :feed_item_description + validates_inclusion_of :feed_item_description, :in => [ 'body', 'abstract' ], :if => :feed_item_description # TODO def to_html @@ -55,7 +55,7 @@ class RssFeed < Article # FIXME feed real data into the RSS feed def data articles = - if (self.include == :parent_and_children) && self.parent + if (self.include == 'parent_and_children') && self.parent self.parent.map_traversal else profile.recent_documents(self.limit || 10) @@ -76,7 +76,7 @@ class RssFeed < Article unless self == article xml.item do xml.title(article.name) - if self.feed_item_description == :body + if self.feed_item_description == 'body' xml.description(article.body) else xml.description(article.abstract) diff --git a/test/unit/rss_feed_test.rb b/test/unit/rss_feed_test.rb index 269bbb7..2bebdf6 100644 --- a/test/unit/rss_feed_test.rb +++ b/test/unit/rss_feed_test.rb @@ -11,11 +11,11 @@ class RssFeedTest < Test::Unit::TestCase assert_kind_of Hash, feed.body feed.body = { - :feed_item_description => :abstract, - :search => :parent_and_children, + :feed_item_description => 'abstract', + :search => 'parent_and_children', } feed.valid? - assert !feed.errors.invalid?(:body) + assert !feed.errors.invalid?('body') end should 'alias body as "settings"' do @@ -64,7 +64,7 @@ class RssFeedTest < Test::Unit::TestCase should 'be able to choose to put abstract or entire body on feed' do profile = create_user('testuser').person - a1 = profile.articles.build(:name => 'article 1', :abstract => 'my abstract', :body => 'my text'); a1.save! + a1 = profile.articles.build(:name => 'article 1', 'abstract' => 'my abstract', 'body' => 'my text'); a1.save! feed = RssFeed.new(:name => 'feed') feed.profile = profile @@ -74,7 +74,7 @@ class RssFeedTest < Test::Unit::TestCase assert_match /my abstract<\/description>/, rss assert_no_match /my text<\/description>/, rss - feed.feed_item_description = :body + feed.feed_item_description = 'body' rss = feed.data assert_match /my text<\/description>/, rss assert_no_match /my abstract<\/description>/, rss @@ -93,7 +93,7 @@ class RssFeedTest < Test::Unit::TestCase feed = RssFeed.new(:name => 'feed') feed.parent = a3 feed.profile = profile - feed.include = :parent_and_children + feed.include = 'parent_and_children' feed.save! rss = feed.data @@ -134,32 +134,32 @@ class RssFeedTest < Test::Unit::TestCase assert !feed.errors.invalid?(:limit) end - should 'allow only :parent_and_children and :all as include setting' do + should 'allow only parent_and_children and all as include setting' do feed = RssFeed.new feed.include = :something_else feed.valid? assert feed.errors.invalid?(:include) - feed.include = :parent_and_children + feed.include = 'parent_and_children' feed.valid? assert !feed.errors.invalid?(:include) - feed.include = :all + feed.include = 'all' feed.valid? assert !feed.errors.invalid?(:include) end - should 'allow only :body and :abstract as feed_item_description' do + should 'allow only body and abstract as feed_item_description' do feed = RssFeed.new feed.feed_item_description = :something_else feed.valid? assert feed.errors.invalid?(:feed_item_description) - feed.feed_item_description = :body + feed.feed_item_description = 'body' feed.valid? assert !feed.errors.invalid?(:feed_item_description) - feed.feed_item_description = :abstract + feed.feed_item_description = 'abstract' feed.valid? assert !feed.errors.invalid?(:feed_item_description) end -- libgit2 0.21.2