rss2mail 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3f44f1b63398c70b3ec0350c00d00e5f983df0c
-  data.tar.gz: 620630082c4f11f38780e091c0206eed398138ce
+  metadata.gz: 2ab6a446362c67e63d9cb8f6df6c7944ebf57fde
+  data.tar.gz: 26ac3bb913287311660c844bda123d634417ce50
 SHA512:
-  metadata.gz: abca2de4146677c09a077e4d09908f08fc36a144eb4096b3e4284defd7e8ab1602a911bf51534ba04f12d24e523113ad03a58aff8d87e1d10f57aa5a1054012e
-  data.tar.gz: b15e68309061549f0437b6448bfdba0349e1fcdebb4a1088e8a51441a315c1a6c04495669f78fe70433f7194a57d8500ccc66a2c70724e2e27e4af5dc6a87ee4
+  metadata.gz: cf4cb4d6742279b979a8ac46c4118599567ec307d6fac41c9908f87762861e396c0f5da9330acf9ee2a719ddb7019028b0aafcb445da841ee6a16323e65c288c
+  data.tar.gz: 5760b2a4d4957335de6eb4ffa32ec4328e9c5f9cdd956320a6aac01d3c2c1dd7b5e47f530692cc17a2ea19b2d057c6173fbcba82942c3fef4771becd97402ec4

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to rss2mail version 0.2.2
+This documentation refers to rss2mail version 0.3.0
 
 
 == DESCRIPTION
@@ -26,7 +26,7 @@ RubyGem::       http://rubygems.org/gems/rss2mail
 
 == LICENSE AND COPYRIGHT
 
-Copyright (C) 2007-2013 Jens Wille
+Copyright (C) 2007-2014 Jens Wille
 
 rss2mail 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

data/Rakefile

@@ -10,7 +10,7 @@ begin
       :summary      => %q{Send RSS feeds as e-mail},
       :author       => %q{Jens Wille},
       :email        => %q{jens.wille@gmail.com},
-      :license      => %q{AGPL},
+      :license      => %q{AGPL-3.0},
       :homepage     => :blackwinter,
       :extra_files  => FileList['templates/*'].to_a,
       :dependencies => %w[nokogiri ruby-nuggets simple-rss sinatra blackwinter-unidecoder]

data/lib/rss2mail/feed.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # A component of rss2mail, the RSS to e-mail forwarder.                       #
 #                                                                             #
-# Copyright (C) 2007-2013 Jens Wille                                          #
+# Copyright (C) 2007-2014 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -25,9 +25,6 @@
 #++
 
 require 'erb'
-require 'open3'
-require 'nuggets/file/which'
-require 'nuggets/string/evaluate'
 
 module RSS2Mail
 
@@ -35,19 +32,17 @@ module RSS2Mail
 
     include Util
 
-    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
-
     KEEP = 100
 
     def initialize(feed, options = {})
       raise TypeError, "Hash expected, got #{feed.class}" unless feed.is_a?(Hash)
 
+      required = [:url, :to, :title].delete_if { |key| feed.key?(key) }
+
+      unless required.empty?
+        raise ArgumentError, "Feed incomplete: #{required.join(', ')} missing"
+      end
+
       @feed    = feed
       @simple  = feed[:simple]
       @updated = feed[:updated]
@@ -56,20 +51,18 @@ module RSS2Mail
       @verbose = options[:verbose]
       @debug   = options[:debug]
 
-      required = [:url, :to, :title]
-      required.delete_if { |key| feed.has_key?(key) }
+      klass, opt = transport_from(options)
+      @transport = "#{klass.name.split('::').last} @ #{opt}"
 
-      unless required.empty?
-        raise ArgumentError, "Feed incomplete: #{required.join(', ')} missing"
-      end
+      extend klass
     end
 
     attr_reader :feed, :simple, :updated,
                 :reload, :verbose, :debug,
-                :content, :rss
+                :transport, :content, :rss
 
     def deliver(templates)
-      raise "Mail command not found: #{MAIL}" unless MAIL
+      check_deliver_requirements if respond_to?(:check_deliver_requirements)
 
       if (to = Array(feed[:to])).empty?
         log 'No one to send to'
@@ -86,12 +79,11 @@ module RSS2Mail
         return
       end
 
-      type     = feed[:content_type] || 'text/html'
-      encoding = feed[:encoding]     || 'UTF-8'
-
-      type_header = "Content-type: #{type}; charset=#{encoding}"
+      type = feed[:content_type] || 'text/html'
 
-      unless template = templates[type[/\/(.*)/, 1]]
+      if template = templates[type[/\/(.*)/, 1]]
+        type = "Content-type: #{type}; charset=#{feed[:encoding] || 'UTF-8'}"
+      else
         log "Template not found: #{type}"
         return
       end
@@ -102,7 +94,7 @@ module RSS2Mail
       items.each { |item|
         link, subject, body = render(feed, item, template)
 
-        send_mail(type_header, to, title, subject, body) {
+        send_mail(to, "[#{title}] #{subject}", body, type) {
           sent << link
           count += 1
         }
@@ -117,6 +109,18 @@ module RSS2Mail
 
     private
 
+    def transport_from(options)
+      if lmtp = options[:lmtp]
+        @lmtp = lmtp.split(':')
+        [Transport::LMTP, lmtp]
+      elsif smtp = options[:smtp]
+        @smtp = smtp.split(':')
+        [Transport::SMTP, smtp]
+      else
+        [klass = Transport::Mail, "#{klass::CMD} = #{klass::BIN.inspect}"]
+      end
+    end
+
     def get(reload = reload)
       conditions = {}
 
@@ -158,8 +162,8 @@ module RSS2Mail
         }
 
         log feed.values_at(:etag, :mtime, :updated).inspect, debug
-      rescue OpenURI::HTTPError
-        log 'Feed not found or unchanged'
+      rescue OpenURI::HTTPError => err
+        log "Feed not found or unchanged: #{err} (#{err.class})"
       rescue Exception => err
         error err, 'while getting feed'
       end
@@ -207,18 +211,14 @@ module RSS2Mail
       [link, subject, ERB.new(template).result(binding)]
     end
 
-    def send_mail(type_header, to, title, subject, body)
+    def send_mail(*args)
       return if debug
 
-      Open3.popen3(MAIL, '-e', '-a', type_header, '-a', FROM,
-        '-s', "[#{title}] #{subject}", *to) { |mail, _, _|
-        mail.puts body
-        mail.close
-      }
+      deliver_mail(*args)
 
       yield if block_given?
-    rescue Errno::EPIPE, IOError => err
-      error err, 'while sending mail', cmd
+    rescue Exception => err
+      error err, 'while sending mail', transport
     end
 
     def log(msg, verbose = verbose)

data/lib/rss2mail/rss.rb

@@ -5,7 +5,7 @@
 #                                                                             #
 # A component of rss2mail, the RSS to e-mail forwarder.                       #
 #                                                                             #
-# Copyright (C) 2007-2013 Jens Wille                                          #
+# Copyright (C) 2007-2014 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -56,8 +56,8 @@ module RSS2Mail
 
       def feed(*args)
         new(*args)
-      rescue ::SimpleRSSError, ::RSS::NotWellFormedError => err
-        yield err if block_given?
+      rescue Exception => err
+        block_given? ? yield(err) : raise
       end
 
     end
@@ -80,7 +80,11 @@ module RSS2Mail
     end
 
     def parse
-      ::RSS::Parser.parse(content, false) || simple_parse
+      strict_parse || simple_parse
+    end
+
+    def strict_parse
+      ::RSS::Parser.parse(content, false)
     end
 
     def simple_parse
@@ -182,7 +186,7 @@ module RSS2Mail
 
         body.encode!(encoding) if encoding
         body
-      rescue OpenURI::HTTPError, EOFError
+      rescue OpenURI::HTTPError, EOFError, SocketError
       end
 
       def extract_body(expr, attribute = nil)

data/lib/rss2mail/transport.rb

@@ -0,0 +1,124 @@
+# encoding: utf-8
+
+#--
+###############################################################################
+#                                                                             #
+# A component of rss2mail, the RSS to e-mail forwarder.                       #
+#                                                                             #
+# Copyright (C) 2007-2014 Jens Wille                                          #
+#                                                                             #
+# Authors:                                                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
+#                                                                             #
+# rss2mail 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.                                                          #
+#                                                                             #
+# rss2mail 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 rss2mail. If not, see <http://www.gnu.org/licenses/>.            #
+#                                                                             #
+###############################################################################
+#++
+
+module RSS2Mail
+
+  module Transport
+
+    HOST = ENV['HOSTNAME'] || ENV['HOST'] || %x{hostname}.chomp.freeze
+
+    FROM = "From: rss2mail@#{HOST}".freeze
+
+    module Mail
+
+      require 'open3'
+      require 'nuggets/file/which'
+
+      CMD = ENV['RSS2MAIL_MAIL_CMD'] || 'mail'.freeze
+
+      BIN = ENV['RSS2MAIL_MAIL_BIN'] || File.which(CMD)
+
+      def check_deliver_requirements
+        raise "Mail command not found: #{CMD}" unless BIN
+      end
+
+      def deliver_mail(to, subject, body, type)
+        Open3.popen3(
+          BIN, '-e',
+          '-a', type,
+          '-a', FROM,
+          '-s', subject,
+          *to
+        ) { |mail, _, _|
+          mail.puts body
+        }
+      end
+
+    end
+
+    module SMTP
+
+      require 'net/smtp'
+      require 'securerandom'
+
+      def deliver_mail(to, *args)
+        deliver_smtp(Net::SMTP, @smtp, [to], *args)
+      end
+
+      private
+
+      def deliver_smtp(klass, args, to, subject, body, type)
+        klass.start(*args) { |smtp|
+          to.each { |_to|
+            smtp.send_message(<<-EOT, FROM, *_to)
+#{FROM}
+To: #{Array(_to).join(', ')}
+Date: #{Time.now.rfc822}
+Subject: #{subject}
+Message-Id: #{SecureRandom.uuid}
+#{type}
+
+#{body}
+            EOT
+          }
+        }
+      end
+
+    end
+
+    module LMTP
+
+      include SMTP
+
+      def deliver_mail(to, *args)
+        deliver_smtp(Net::LMTP, @lmtp, to, *args)
+      end
+
+    end
+
+  end
+
+end
+
+module Net
+
+  class LMTP < SMTP
+
+    # Send LMTP's LHLO command instead of SMTP's HELO command
+    def helo(domain)
+      getok("LHLO #{domain}")
+    end
+
+    # Send LMTP's LHLO command instead of ESMTP's EHLO command
+    def ehlo(domain)
+      getok("LHLO #{domain}")
+    end
+
+  end
+
+end

data/lib/rss2mail/version.rb

@@ -3,8 +3,8 @@ module RSS2Mail
   module Version
 
     MAJOR = 0
-    MINOR = 2
-    TINY  = 2
+    MINOR = 3
+    TINY  = 0
 
     class << self
 

data/lib/rss2mail.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # rss2mail -- Send RSS feeds as e-mail                                        #
 #                                                                             #
-# Copyright (C) 2007-2013 Jens Wille                                          #
+# Copyright (C) 2007-2014 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <jens.wille@gmail.com>                                       #
@@ -24,9 +24,13 @@
 ###############################################################################
 #++
 
+require 'rss2mail/transport'
 require 'rss2mail/util'
 require 'rss2mail/feed'
 require 'rss2mail/rss'
 
 module RSS2Mail
 end
+
+require 'nuggets/pluggable'
+Nuggets::Pluggable.load_plugins_for(RSS2Mail)

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: rss2mail
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-nuggets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simple-rss
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: blackwinter-unidecoder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Send RSS feeds as e-mail
@@ -90,50 +90,51 @@ extra_rdoc_files:
 - COPYING
 - ChangeLog
 files:
+- COPYING
+- ChangeLog
+- README
+- Rakefile
+- bin/rss2mail
+- example/config.ru
+- example/feeds.yaml
 - lib/rss2mail.rb
 - lib/rss2mail/app.rb
 - lib/rss2mail/feed.rb
 - lib/rss2mail/rss.rb
+- lib/rss2mail/transport.rb
 - lib/rss2mail/util.rb
 - lib/rss2mail/version.rb
-- bin/rss2mail
 - templates/html.erb
 - templates/plain.erb
-- COPYING
-- ChangeLog
-- README
-- Rakefile
-- example/config.ru
-- example/feeds.yaml
 homepage: http://github.com/blackwinter/rss2mail
 licenses:
-- AGPL
+- AGPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset
+- "--title"
+- rss2mail Application documentation (v0.3.0)
+- "--charset"
 - UTF-8
-- --line-numbers
-- --all
-- --title
-- rss2mail Application documentation (v0.2.2)
-- --main
+- "--line-numbers"
+- "--all"
+- "--main"
 - README
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Send RSS feeds as e-mail