Refactor Feed and FeedItem into separate files.

3 files changed, 69 insertions, 43 deletions

diff --git a/lib/feed.rb b/lib/feed.rb
new file mode 100644
index 0000000..a2f3db4
--- /dev/null
+++ b/lib/feed.rb
@@ -0,0 +1,36 @@
+# A Simple RSS reader
+# Copyright (C) 2015  Harald Eilertsen
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'rss'
+require 'open-uri'
+
+class Feed
+  attr_reader :title, :url
+
+  def initialize(title, args)
+    @title, @url = title, args['url']
+  end
+
+  def fetch
+    open(url) do |rss|
+      feed = RSS::Parser.parse(rss)
+
+      feed.entries.each do |item|
+        yield item
+      end
+    end
+  end
+end
diff --git a/lib/feed_item.rb b/lib/feed_item.rb
new file mode 100644
index 0000000..a64c9fc
--- /dev/null
+++ b/lib/feed_item.rb
@@ -0,0 +1,27 @@
+# A Simple RSS reader
+# Copyright (C) 2015  Harald Eilertsen
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+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
+  end
+end
diff --git a/rss.rb b/rss.rb
index 12a439c..15be5ed 100644
--- a/rss.rb
+++ b/rss.rb
@@ -14,56 +14,19 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require 'rss'
-require 'open-uri'
-require 'yaml'
-
-
-class Item
-  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
-  end
-end
-
-
-class Feed
-  attr_reader :title, :url, :items
-
-  def initialize(title, args)
-    @title, @url = title, args['url']
-    @items = []
-    slurp
-  end
-
-  private
-
-  def slurp
-    open(url) do |rss|
-      feed = RSS::Parser.parse(rss)
-
-      feed.entries.each do |item|
-        add Item.new(item)
-      end
-    end
-  end
+require_relative 'lib/feed_item'
+require_relative 'lib/feed'
 
-  def add(item)
-    @items << item
-  end
-end
+require 'yaml'
 
 feeds = YAML.load(IO.read('feeds.yml'))
 items = []
 
 feeds.each do |t, f|
   feed = Feed.new(t, f)
-  feed.items.each do |item|
+  feed.fetch do |entry|
+    item = FeedItem.new(entry)
+
     puts %{<article>}
     puts %{  <header>}
     puts %{    <h1>#{item.title}</h1>}