rss2mail 0.1.2 → 0.1.3

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to rss2mail version 0.1.2
+This documentation refers to rss2mail version 0.1.3
 
 
 == DESCRIPTION

data/lib/rss2mail/feed.rb

@@ -25,6 +25,7 @@
 #++
 
 require 'erb'
+require 'open3'
 require 'nuggets/file/which'
 require 'nuggets/string/evaluate'
 
@@ -34,9 +35,15 @@ module RSS2Mail
 
     include Util
 
-    HOST = ENV['HOSTNAME'] || ENV['HOST'] || %x{hostname}.chomp
+    unless MAIL = File.which(mail = 'mail'.freeze)
+      class << MAIL; self; end.send(:define_method, :to_s) { mail }
+    end
+
+    HOST = ENV['HOSTNAME'] || ENV['HOST'] || %x{hostname}.chomp.freeze
+
+    FROM = "From: rss2mail@#{HOST}".freeze
 
-    attr_reader :feed, :reload, :verbose, :debug, :simple, :updated, :content, :rss
+    KEEP = 100
 
     def initialize(feed, options = {})
       raise TypeError, "Hash expected, got #{feed.class}" unless feed.is_a?(Hash)
@@ -50,19 +57,21 @@ module RSS2Mail
       @debug   = options[:debug]
 
       required = [:url, :to, :title]
-      required.delete_if { |i| feed.has_key?(i) }
+      required.delete_if { |key| feed.has_key?(key) }
 
-      raise ArgumentError, "Feed incomplete: #{required.join(', ')} missing" unless required.empty?
+      unless required.empty?
+        raise ArgumentError, "Feed incomplete: #{required.join(', ')} missing"
+      end
     end
 
-    def deliver(templates)
-      unless mail_cmd = File.which(_mail_cmd = 'mail')
-        raise "Mail command not found: #{_mail_cmd}"
-      end
+    attr_reader :feed, :simple, :updated,
+                :reload, :verbose, :debug,
+                :content, :rss
 
-      to = [*feed[:to]]
+    def deliver(templates)
+      raise "Mail command not found: #{MAIL}" unless MAIL
 
-      if to.empty?
+      if (to = Array(feed[:to])).empty?
         log 'No one to send to'
         return
       end
@@ -72,58 +81,38 @@ module RSS2Mail
         return
       end
 
-      if rss.items.empty?
+      if (items = rss.items).empty?
         log 'No new items'
         return
       end
 
-      content_type = feed[:content_type] || 'text/html'
-      encoding     = feed[:encoding]     || 'UTF-8'
-
-      feed[:sent] ||= []
+      type     = feed[:content_type] || 'text/html'
+      encoding = feed[:encoding]     || 'UTF-8'
 
-      content_type_header = "Content-type: #{content_type}; charset=#{encoding}"
+      type_header = "Content-type: #{type}; charset=#{encoding}"
 
-      unless template = templates[content_type[/\/(.*)/, 1]]
-        log "Template not found: #{content_type}"
+      unless template = templates[type[/\/(.*)/, 1]]
+        log "Template not found: #{type}"
         return
       end
 
-      cmd = [
-        mail_cmd,
-        '-e',
-        "-a '#{content_type_header}'",
-        "-a 'From: rss2mail@#{HOST}'",
-        "-s '[#{feed[:title]}] \#{subject}'",
-        *to
-      ].join(' ')
-
-      sent = 0
-
-      rss.items.each { |item|
-        title       = item.title
-        link        = item.link
-        description = item.description(feed[:unescape_html])
-        date        = item.date
-        author      = item.author
-        body        = item.body(feed[:body])
-        subject     = item.subject
-
-        log "#{title} / #{date} [#{author}]", debug
-        log "<#{link}>", debug
-
-        send_mail(cmd.evaluate(binding), ERB.new(template).result(binding)) {
-          feed[:sent] << link
-          sent += 1
+      sent = feed[:sent] ||= []
+      count, title = 0, feed[:title]
+
+      items.each { |item|
+        link, subject, body = render(feed, item, template)
+
+        send_mail(type_header, to, title, subject, body) {
+          sent << link
+          count += 1
         }
       }
 
-      # only keep the last 100 entries
-      feed[:sent].uniq!
-      feed[:sent].slice!(0...-100)
+      sent.uniq!
+      sent.slice!(0...-KEEP)
 
-      log "#{sent} items sent"
-      sent
+      log "#{count} items sent"
+      count
     end
 
     private
@@ -169,25 +158,25 @@ module RSS2Mail
         error err, 'while getting feed'
       end
 
-      @content
+      content
     end
 
     def parse(reload = reload)
       @rss = nil if reload
 
-      if content && @rss ||= begin
-        RSS2Mail::RSS.new(content, simple)
-      rescue ::SimpleRSSError, ::RSS::NotWellFormedError => err
-        error err, 'while parsing feed'
-      end
-        sent = feed[:sent]
+      if content
+        @rss ||= RSS.feed(content, simple) { |err|
+          error err, 'while parsing feed'
+        }
+
+        if rss && !reload
+          sent = feed[:sent]
 
-        unless reload
-          @rss.items.delete_if { |item|
+          rss.items.delete_if { |item|
             if updated && date = item.date
               date <= updated
-            else
-              sent && sent.include?(item.link)
+            elsif sent
+              sent.include?(item.link)
             end
           }
         end
@@ -195,15 +184,35 @@ module RSS2Mail
         log 'Nothing to parse'
       end
 
-      @rss
+      rss
     end
 
-    def send_mail(cmd, body)
+    def render(feed, item, template)
+      title       = item.title
+      link        = item.link
+      description = item.description(feed[:unescape_html])
+      date        = item.date
+      author      = item.author
+      body        = item.body(feed[:body])
+      subject     = item.subject
+
+      log "#{title} / #{date} [#{author}]", debug
+      log "<#{link}>", debug
+
+      [link, subject, ERB.new(template).result(binding)]
+    end
+
+    def send_mail(type_header, to, title, subject, body)
       return if debug
 
-      IO.popen(cmd, 'w') { |mail| mail.puts body }
+      Open3.popen3(MAIL, '-e', '-a', type_header, '-a', FROM,
+        '-s', "[#{title}] #{subject}", *to) { |mail, _, _|
+        mail.puts body
+        mail.close
+      }
+
       yield if block_given?
-    rescue Errno::EPIPE => err
+    rescue Errno::EPIPE, IOError => err
       error err, 'while sending mail', cmd
     end
 

data/lib/rss2mail/rss.rb

@@ -43,20 +43,28 @@ module RSS2Mail
 
     include Util
 
-    SUBSTITUTIONS = {
+    SUB = {
       '–'     => '--',
       '«'     => '<<',
       '&amp;' => '&'
     }
 
-    SUBSTITUTIONS_RE = Regexp.union(*SUBSTITUTIONS.keys)
+    SUB_RE = Regexp.union(*SUB.keys)
 
-    TAGS_TO_KEEP = %w[a p br h1 h2 h3 h4]
+    KEEP = %w[a p br h1 h2 h3 h4]
 
-    attr_reader :content, :rss
+    class << self
+
+      def parse(url, *args)
+        new(open_feed(url), *args)
+      end
+
+      def feed(*args)
+        new(*args)
+      rescue ::SimpleRSSError, ::RSS::NotWellFormedError => err
+        yield err if block_given?
+      end
 
-    def self.parse(url, *args)
-      new(open_feed(url), *args)
     end
 
     def initialize(content, simple = false)
@@ -66,6 +74,8 @@ module RSS2Mail
       @rss = simple ? simple_parse : parse
     end
 
+    attr_reader :content, :rss
+
     def simple?
       @simple
     end
@@ -172,7 +182,7 @@ module RSS2Mail
           else raise ArgumentError, "don't know how to handle tag of type #{tag.class}"
         end
 
-        body.gsub!(/<\/?(.*?)>/) { |m| m if TAGS_TO_KEEP.include?($1.split.first.downcase) }
+        body.gsub!(/<\/?(.*?)>/) { |m| m if KEEP.include?($1.split.first.downcase) }
         body.gsub!(/<a\s+href=['"](?!http:).*?>(.*?)<\/a>/mi, '\1')
 
         encoding ? Iconv.conv('UTF-8', encoding, body) : body
@@ -189,8 +199,7 @@ module RSS2Mail
 
       def clean_subject(str)
         str.replace_diacritics!
-        str.gsub!(SUBSTITUTIONS_RE) { |m| SUBSTITUTIONS[m] }
-        str.gsub!(/'/, "'\\\\''")
+        str.gsub!(SUB_RE) { |m| SUB[m] }
         str.to_ascii
       end
 

data/lib/rss2mail/version.rb

@@ -4,7 +4,7 @@ module RSS2Mail
 
     MAJOR = 0
     MINOR = 1
-    TINY  = 2
+    TINY  = 3
 
     class << self
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rss2mail
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -107,7 +107,7 @@ rdoc_options:
 - --line-numbers
 - --all
 - --title
-- rss2mail Application documentation (v0.1.2)
+- rss2mail Application documentation (v0.1.3)
 - --main
 - README
 require_paths: