lib/html2rss/feed_builder.rb in html2rss-0.5.2 vs lib/html2rss/feed_builder.rb in html2rss-0.6.0

@@ -1,56 +1,59 @@
 require 'rss'
 require_relative 'item'
 
 module Html2rss
+  ##
+  # The purpose is to build the feed, consisting of
+  #
+  # - the 'channel' and
+  # - the 'item'
+  #
+  # parts.
   class FeedBuilder
     def initialize(config)
       @config = config
     end
 
     ##
     # @return [RSS:Rss]
     def rss
       RSS::Maker.make('2.0') do |maker|
-        add_channel_to_maker(maker)
+        add_channel(maker)
 
         feed_items.map do |feed_item|
-          add_item_to_items(feed_item, maker.items)
+          add_item(feed_item, maker.items.new_item)
         end
       end
     end
 
     private
 
     attr_reader :config
 
-    def add_channel_to_maker(maker)
+    def add_channel(maker)
       %i[language author title description link ttl].each do |attribute_name|
         maker.channel.public_send("#{attribute_name}=".to_sym, config.public_send(attribute_name))
       end
 
       maker.channel.generator = "html2rss V. #{::Html2rss::VERSION}"
       maker.channel.lastBuildDate = Time.now.to_s
     end
 
     def feed_items
-      @feed_items ||= Item.from_url config.url, config
+      @feed_items ||= Item.from_url(config.url, config).keep_if(&:valid?)
     end
 
-    def add_item_to_items(feed_item, items)
-      return unless feed_item.valid?
+    def add_item(feed_item, rss_item)
+      feed_item.available_attributes.each do |attribute_name|
+        rss_item.public_send("#{attribute_name}=".to_sym, feed_item.public_send(attribute_name))
+      end
 
-      items.new_item do |rss_item|
-        feed_item.available_attributes.each do |attribute_name|
-          rss_item.public_send("#{attribute_name}=".to_sym, feed_item.public_send(attribute_name))
-        end
-
-        feed_item.categories.each do |category|
-          rss_item.categories.new_category.content = category
-        end
-
-        rss_item.guid.content = Digest::SHA1.hexdigest(feed_item.title)
-        rss_item.guid.isPermaLink = false
+      feed_item.categories.each do |category|
+        rss_item.categories.new_category.content = category
       end
+
+      rss_item.guid.content = Digest::SHA1.hexdigest(feed_item.title)
+      rss_item.guid.isPermaLink = false
     end
   end
 end