rss2mail 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9caa784387678cab2092fbd159b7b03491445d62
-  data.tar.gz: 5a8b2b47e81fa752ddd9c2c05fe91929159f3723
+  metadata.gz: 8cfccc00c87ea1cfb42ac84ec359ab83ab127f9b
+  data.tar.gz: 0821128c1c9a3816ff2ad772919c34eb3cb97c3a
 SHA512:
-  metadata.gz: 4d3090010753a6f3b9e802f32a61952e7b923dd8b02c48b8d5898cbc88efe83776358c61c3f92897e3a5e52c69311cfb987fca7d1d4284230b4da43cfa53f227
-  data.tar.gz: 633772786d5ee96802a14f3f7f3c25c608310e7be6693c5f479b01b9022ed004e80872d91e76f35df64c06275527ad23cf1ea4904115ae4408bc8ad767d4d9a7
+  metadata.gz: 6ed5b865c7051d96d44c35e3ddb5ca2e41db2ab46c8b780c7e5e8cc9fd4f99b9a6e67333912c25e803c1972217f6c8ae0aba4d03bcda70a666f07d6c7f743831
+  data.tar.gz: 5f706b37c825e27719acc0fb2449625797edd7bd7d4cf87f6a2631fceddbc3b1da0a263a2b6311c95fd2c161baac013a1838c37a1c94f22046d827b8f4783c24

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to rss2mail version 0.4.5
+This documentation refers to rss2mail version 0.4.6
 
 
 == DESCRIPTION

data/lib/rss2mail/app.rb

@@ -5,7 +5,7 @@
 #                                                                             #
 # A component of rss2mail, the RSS to e-mail forwarder.                       #
 #                                                                             #
-# Copyright (C) 2007-2014 Jens Wille                                          #
+# Copyright (C) 2007-2015 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -43,9 +43,10 @@ helpers ERB::Util
 get '/' do
   prepare
 
-  if @feed_url = RSS2Mail::Util.discover_feed(@url = params[:url])
-    @title = Nokogiri.HTML(open(@feed_url)).at_css('title').content rescue nil
-  end
+  @feed_url = RSS2Mail::Util.discover_feed(@url = params[:url])
+
+  RSS2Mail::Util.load_feed(@feed_url) { |doc|
+    @title = doc.at_css('title').content } if @feed_url
 
   erb :index
 end

data/lib/rss2mail/feed.rb

@@ -95,7 +95,7 @@ module RSS2Mail
         send_mail(to, "[#{title}] #{subject}", body, type) {
           sent << link
           count += 1
-        }
+        } if link
       }
 
       sent.uniq!
@@ -218,6 +218,8 @@ module RSS2Mail
       log "<#{link}>", debug
 
       [link, subject, ERB.new(template).result(binding)]
+    rescue => err
+      error err, 'while rendering feed', title
     end
 
     def send_mail(*args)

data/lib/rss2mail/rss.rb

@@ -174,12 +174,12 @@ module RSS2Mail
 
       def get_body(tag, encoding)
         body = case tag
-          when nil    then return
+          when nil    then # nothing
           when true   then open_feed(link).read
           when String then extract_body(tag)
           when Array  then extract_body(*tag)
           else raise ArgumentError, "don't know how to handle tag of type #{tag.class}"
-        end
+        end or return
 
         body.gsub!(/<\/?(.*?)>/) { |m| m if KEEP.include?($1.split.first.downcase) }
         body.gsub!(/<a\s+href=['"](?!http:).*?>(.*?)<\/a>/mi, '\1')
@@ -190,8 +190,8 @@ module RSS2Mail
       end
 
       def extract_body(expr, attribute = nil)
-        elem = Nokogiri.HTML(open_feed(link)).at(expr)
-        attribute ? elem[attribute] : elem.to_s
+        load_feed(link) { |doc| elem = doc.at(expr)
+          attribute ? elem[attribute] : elem.to_s }
       end
 
       def clean_subject(str)

data/lib/rss2mail/util.rb

@@ -51,11 +51,7 @@ module RSS2Mail
     # cf. <http://www.rssboard.org/rss-autodiscovery>
     def discover_feed(url, fallback = false)
       unless url.nil? || url.empty? || url == 'about:blank'
-        begin
-          doc = Nokogiri.HTML(open_feed(url))
-        rescue => err
-          warn "Unable to discover feed `#{url}': #{err} (#{err.class})"
-        else
+        load_feed(url) { |doc|
           doc.xpath(ALTERNATE_XPATH).each { |link|
             if link[:type] =~ FEED_RE && href = link[:href]
               return href =~ URI_RE ? href : begin
@@ -68,14 +64,26 @@ module RSS2Mail
           doc.xpath(FACEBOOK_XPATH).each { |node|
             return FACEBOOK_FEED + node[:id][/\d+/]
           } if url.include?('facebook.com')
-        end
+        }
       end
 
       url if fallback
     end
 
-    def open_feed(url, options = {}, &block)
+    def load_feed(url)
+      doc = Nokogiri.HTML(open_feed(url))
+    rescue => err
+      warn "Unable to load feed `#{url}': #{err} (#{err.class})"
+    else
+      block_given? ? yield(doc) : doc
+    end
+
+    def open_feed(url, options = {}, tries = 10, &block)
       open(url, options.merge('User-Agent' => USER_AGENT), &block)
+    rescue RuntimeError => err
+      raise unless err.to_s.include?('redirection loop') && (tries -= 1) > 0
+      sleep 10 - tries
+      retry
     end
 
     def load_feeds(feeds_file, options = { deserialize_symbols: true })

data/lib/rss2mail/version.rb

@@ -4,7 +4,7 @@ module RSS2Mail
 
     MAJOR = 0
     MINOR = 4
-    TINY  = 5
+    TINY  = 6
 
     class << self
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rss2mail
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cyclops
@@ -117,7 +117,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -176,7 +176,7 @@ metadata: {}
 post_install_message: 
 rdoc_options:
 - "--title"
-- rss2mail Application documentation (v0.4.5)
+- rss2mail Application documentation (v0.4.6)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Send RSS feeds as e-mail