rss2mail 0.1.0 → 0.1.1

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to rss2mail version 0.1.0
+This documentation refers to rss2mail version 0.1.1
 
 
 == DESCRIPTION

data/lib/rss2mail/feed.rb

@@ -28,12 +28,12 @@ require 'erb'
 require 'nuggets/file/which'
 require 'nuggets/string/evaluate'
 
-require 'rss2mail/rss'
-
 module RSS2Mail
 
   class Feed
 
+    include Util
+
     HOST = ENV['HOSTNAME'] || ENV['HOST'] || %x{hostname}.chomp
 
     attr_reader :feed, :reload, :verbose, :debug, :simple, :updated, :content, :rss
@@ -146,7 +146,7 @@ module RSS2Mail
       log conditions.inspect, debug
 
       begin
-        open(feed[:url], conditions) { |uri|
+        open_feed(feed[:url], conditions) { |uri|
           if etag = uri.meta['etag']
             feed[:etag] = etag
           end

data/lib/rss2mail/rss.rb

@@ -27,7 +27,6 @@
 #++
 
 require 'rss'
-require 'open-uri'
 require 'simple-rss'
 require 'unidecode'
 require 'nuggets/util/i18n'
@@ -42,7 +41,7 @@ module RSS2Mail
 
   class RSS
 
-    USER_AGENT = "RSS2Mail/#{VERSION}".freeze
+    include Util
 
     SUBSTITUTIONS = {
       '–'     => '--',
@@ -57,7 +56,7 @@ module RSS2Mail
     attr_reader :content, :rss
 
     def self.parse(url, *args)
-      new(open(url, 'User-Agent' => USER_AGENT), *args)
+      new(open_feed(url), *args)
     end
 
     def initialize(content, simple = false)
@@ -118,7 +117,7 @@ module RSS2Mail
       end
 
       def subject
-        @subject ||= title ? clean_subject(title) : 'NO TITLE'
+        @subject ||= title ? clean_subject(title.dup) : 'NO TITLE'
       end
 
       private
@@ -165,7 +164,7 @@ module RSS2Mail
       def get_body(tag, encoding)
         body = case tag
           when nil    then return
-          when true   then open(link).read
+          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}"
@@ -179,19 +178,18 @@ module RSS2Mail
 
       def extract_body(expr, attribute = nil)
         if defined?(Hpricot)
-          elem = Hpricot(open(link)).at(expr)
+          elem = Hpricot(open_feed(link)).at(expr)
           attribute ? elem[attribute] : elem.to_s
         else
-          open(link).read
+          open_feed(link).read
         end
       end
 
-      def clean_subject(string)
-        string.
-          replace_diacritics.
-          gsub(SUBSTITUTIONS_RE) { |m| SUBSTITUTIONS[m] }.
-          to_ascii.
-          gsub(/'/, "'\\\\''")
+      def clean_subject(str)
+        str.replace_diacritics!
+        str.gsub!(SUBSTITUTIONS_RE) { |m| SUBSTITUTIONS[m] }
+        str.gsub!(/'/, "'\\\\''")
+        str.to_ascii
       end
 
     end

data/lib/rss2mail/util.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # A component of rss2mail, the RSS to e-mail forwarder.                       #
 #                                                                             #
-# Copyright (C) 2007-2011 Jens Wille                                          #
+# Copyright (C) 2007-2012 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <ww@blackwinter.de>                                          #
@@ -28,23 +28,27 @@ require 'uri'
 require 'open-uri'
 require 'hpricot'
 
+require 'rss2mail/version'
+
 module RSS2Mail
 
   module Util
 
     extend self
 
-    FEED_REGEXP = %r{\Aapplication/(?:atom|rss)\+xml\z}io
+    USER_AGENT = "RSS2Mail/#{VERSION}".freeze
+
+    FEED_RE = %r{\Aapplication/(?:atom|rss)\+xml\z}i
 
     # cf. <http://www.rssboard.org/rss-autodiscovery>
     def discover_feed(url, or_self = false)
       default = or_self ? url : nil
 
       unless url.nil? || url.empty? || url == 'about:blank'
-        doc = Hpricot(open(url))
+        doc = Hpricot(open_feed(url))
 
         if feed_element = doc.search('//link[@rel="alternate"').find { |link|
-          link[:type] =~ FEED_REGEXP
+          link[:type] =~ FEED_RE
         }
           if feed_href = feed_element[:href]
             return feed_href if feed_href =~ URI.regexp(%w[http https])
@@ -58,6 +62,10 @@ module RSS2Mail
       default
     end
 
+    def open_feed(url, options = {}, &block)
+      open(url, options.merge('User-Agent' => USER_AGENT), &block)
+    end
+
   end
 
 end

data/lib/rss2mail/version.rb

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

data/lib/rss2mail.rb

@@ -3,7 +3,7 @@
 #                                                                             #
 # rss2mail -- Send RSS feeds as e-mail                                        #
 #                                                                             #
-# Copyright (C) 2007-2011 Jens Wille                                          #
+# Copyright (C) 2007-2012 Jens Wille                                          #
 #                                                                             #
 # Authors:                                                                    #
 #     Jens Wille <ww@blackwinter.de>                                          #
@@ -24,8 +24,9 @@
 ###############################################################################
 #++
 
+require 'rss2mail/util'
 require 'rss2mail/feed'
-require 'rss2mail/version'
+require 'rss2mail/rss'
 
 module RSS2Mail
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rss2mail
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2012-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple-rss
@@ -107,7 +107,7 @@ rdoc_options:
 - --line-numbers
 - --all
 - --title
-- rss2mail Application documentation (v0.1.0)
+- rss2mail Application documentation (v0.1.1)
 - --main
 - README
 require_paths: