From b962a14b19dff69f54818c3052f536c3aa94a38a Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Thu, 14 May 2015 20:49:25 +0200 Subject: Put classes into module. --- bin/rss2html | 2 +- lib/rss2html/feed.rb | 56 ++++++++++++++++++++++++----------------------- lib/rss2html/feed_item.rb | 18 ++++++++------- 3 files changed, 40 insertions(+), 36 deletions(-) diff --git a/bin/rss2html b/bin/rss2html index b7be920..294fd1b 100755 --- a/bin/rss2html +++ b/bin/rss2html @@ -30,6 +30,6 @@ feeds = YAML.load(IO.read(config_file)) items = [] feeds.each do |t, f| - feed = Feed.new(t, f) + feed = Rss2Html::Feed.new(t, f) puts feed.render end diff --git a/lib/rss2html/feed.rb b/lib/rss2html/feed.rb index 0f3f01e..8df2055 100644 --- a/lib/rss2html/feed.rb +++ b/lib/rss2html/feed.rb @@ -18,43 +18,45 @@ require 'rss' require 'open-uri' require 'erb' -class Feed - attr_reader :title, :url +module Rss2Html + class Feed + attr_reader :title, :url - def initialize(title, args) - @title, @url = title, args['url'] + def initialize(title, args) + @title, @url = title, args['url'] - @feed_header = load_template('feed_header.html.erb') - @feed_footer = load_template('feed_footer.html.erb') - @item_template = load_template('item.html.erb') - end + @feed_header = load_template('feed_header.html.erb') + @feed_footer = load_template('feed_footer.html.erb') + @item_template = load_template('item.html.erb') + end - def fetch - open(url) do |rss| - feed = RSS::Parser.parse(rss) + def fetch + open(url) do |rss| + feed = RSS::Parser.parse(rss) - feed.entries.each do |item| - yield item + feed.entries.each do |item| + yield item + end end end - end - def render - feed = self - output = @feed_header.result(binding) + def render + feed = self + output = @feed_header.result(binding) - fetch do |entry| - item = FeedItem.new(entry) - output += @item_template.result(binding) - end + fetch do |entry| + item = FeedItem.new(entry) + output += @item_template.result(binding) + end - output += @feed_footer.result(binding) - end + output += @feed_footer.result(binding) + end - private + private - def load_template(t) - view_path = File.join(File.dirname(__FILE__), 'views') - ERB.new(IO.read(File.join(view_path, t))) + def load_template(t) + view_path = File.join(File.dirname(__FILE__), 'views') + ERB.new(IO.read(File.join(view_path, t))) + end end end diff --git a/lib/rss2html/feed_item.rb b/lib/rss2html/feed_item.rb index a64c9fc..82adb4b 100644 --- a/lib/rss2html/feed_item.rb +++ b/lib/rss2html/feed_item.rb @@ -14,14 +14,16 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -class FeedItem - attr_reader :title, :author, :date, :summary, :url +module Rss2Html + class FeedItem + attr_reader :title, :author, :date, :summary, :url - def initialize(item) - @title = item.title.content - @author = item.author.name.content - @date = item.updated.content - @summary = item.summary.content.strip - @url = item.link.href + def initialize(item) + @title = item.title.content + @author = item.author.name.content + @date = item.updated.content + @summary = item.summary.content.strip + @url = item.link.href + end end end -- cgit v1.2.3