rss2mail 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1cebb26a57946562655f2e77128c4ac1e79f59d
-  data.tar.gz: a92e4910d17b9b01a53595ca3a40ec60e8fe74c6
+  metadata.gz: 49e011a01e55c46ab776dff195817d5fe7716503
+  data.tar.gz: 7a036e2c3d8db37ce9cccea15e3a1583ef04ff5f
 SHA512:
-  metadata.gz: 3aba6eafd1401bb860ab10ea082979fc98a24fde3958029d61f2c50aaab0f4ca42383fd4abb3cac18c8a67fbbe976d399b0f400556f917e7ae63da32536e278c
-  data.tar.gz: d17547ba512506441c1efc6d52793b0101a9faf1f159897198cbd7b7c1aa260f064c4f65ef6598b3effcf2e3e721cf13dacff7f59825a52067ca381b25bee0f2
+  metadata.gz: 24992fc5fb61a447dfe005769ab27abf9adfb4dfad5d7814527351afd63526afa19941d4293f68c4edb1f8c08a34ff3b4f200afb11ff3decb583fdada9b9826e
+  data.tar.gz: 74a0c2bbc0a020b013ea81e74c97673e969cf007d38213de778ae7208b37236ee0a95d4468872e097b068a67c41fba04f8673d6ea1329b8bc668cf0269ad43ee

data/ChangeLog

@@ -1,3 +1,5 @@
+# markup: rd
+
 = Revision history for rss2mail
 
 == 0.0.1 [2008-12-18]

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to rss2mail version 0.1.4
+This documentation refers to rss2mail version 0.2.0
 
 
 == DESCRIPTION

data/Rakefile

@@ -12,7 +12,7 @@ begin
       :email        => %q{jens.wille@gmail.com},
       :homepage     => :blackwinter,
       :extra_files  => FileList['templates/*'].to_a,
-      :dependencies => %w[simple-rss hpricot unidecode ruby-nuggets]
+      :dependencies => %w[nokogiri unidecode ruby-nuggets simple-rss sinatra]
     }
   }}
 rescue LoadError => err

data/example/config.ru

@@ -0,0 +1,6 @@
+require 'rss2mail/app'
+
+set :root,  File.dirname(__FILE__)
+set :title, 'My RSS subscriptions'
+
+run Sinatra::Application

data/lib/rss2mail/app.rb

@@ -0,0 +1,147 @@
+# encoding: utf-8
+
+#--
+###############################################################################
+#                                                                             #
+# A component of rss2mail, the RSS to e-mail forwarder.                       #
+#                                                                             #
+# Copyright (C) 2007-2013 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/>.            #
+#                                                                             #
+###############################################################################
+#++
+
+require 'yaml'
+require 'sinatra'
+require 'rss2mail/util'
+
+use Rack::Auth::Basic do |user, pass|
+  @auth ||= begin
+    file = File.join(settings.root, 'auth.yaml')
+    File.readable?(file) ? YAML.load_file(file) : {}
+  end
+
+  @auth[user] == pass
+end
+
+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
+
+  erb :index
+end
+
+post '/' do
+  prepare
+
+  @feed_url = params[:feed_url] or error(400)
+
+  @target = params[:target]
+  @target = @targets.find { |t| t.to_s == @target } || :daily
+
+  @title, @to = params[:title] || '', params[:to]
+  @title = @feed_url[/[^\/]+\z/][/[\w.]+/] if @title.empty?
+
+  unless (feeds = @feeds[@target]).find { |f| f[:url] == @feed_url }
+    feeds << { :url => @feed_url, :title => @title, :to => @to }
+    File.open(@feeds_file, 'w') { |f| YAML.dump(@feeds, f) }
+  end
+
+  erb :index
+end
+
+def prepare
+  user = request.env['REMOTE_USER'] or error(400)
+
+  @feeds_file = File.join(settings.root, 'feeds.d', "#{user}.yaml")
+  @feeds      = File.readable?(@feeds_file) ? YAML.load_file(@feeds_file) : {}
+  @targets    = @feeds.keys.sort_by { |t, _| t.to_s }
+end
+
+__END__
+@@index
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+  <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
+  <title><%=h settings.title || 'rss2mail' %></title>
+<% if settings.style %>
+  <link rel="stylesheet" type="text/css" href="<%=h settings.style %>" />
+<% end %>
+  <style type="text/css">a.skip { text-decoration: line-through; }</style>
+</head>
+<body>
+  <h1>rss2mail - send rss feeds as e-mail</h1>
+
+  <h2>subscribe</h2>
+
+  <form method="post">
+    <input type="text" id="feed_url" name="feed_url" value="<%= @feed_url || @url %>" size="54" />
+  <% if @url.nil? || @url.empty? %>
+    <label for="feed_url">»url«</label>
+  <% else %>
+    [<a href="<%= @url %>">link</a><% if @feed_url %> | <a href="<%= @feed_url %>">feed</a><% end %>]
+  <% end %>
+    <br />
+    <input type="text" id="title" name="title" value="<%=h @title %>" size="54" />
+    <label for="title">»title«</label>
+    <br />
+    <input type="text" id="to" name="to" value="<%=h @to %>" size="54" />
+    <label for="to">»to«</label>
+    <br />
+    <select id="target" name="target">
+    <% for target in @targets %>
+      <option<%= target == @target ? ' selected="selected"' : '' %>><%=h target %></option>
+    <% end %>
+    </select>
+    <br />
+    <input type="submit" value="subscribe!" style="margin-top: 0.6em; font-weight: bold" />
+  </form>
+
+  <h2>subscriptions</h2>
+
+  <ul>
+  <% for target in @targets %>
+    <li>
+      <strong><%=h target %></strong> (<%= @feeds[target].size %>)
+
+      <ul>
+      <% for feed in @feeds[target].sort_by { |f| f[:title].downcase } %>
+        <li>
+          <a href="<%= feed[:url] %>" class="<%= 'skip' if feed[:skip] %>"><%=h feed[:title] %></a>
+          <small>(<%=h Array(feed[:to]).join(', ') %>)</small>
+        </li>
+      <% end %>
+      </ul>
+    </li>
+  <% end %>
+  </ul>
+
+  <p><em>
+    powered by <a href="http://blackwinter.github.com/rss2mail">RSS2Mail</a>
+    and <a href="http://sinatrarb.com">Sinatra</a> -- v<%=h RSS2Mail::VERSION %>
+  </em></p>
+</body>
+</html>

data/lib/rss2mail/rss.rb

@@ -27,16 +27,11 @@
 #++
 
 require 'rss'
-require 'simple-rss'
+require 'nokogiri'
 require 'unidecode'
+require 'simple-rss'
 require 'nuggets/i18n'
 
-begin
-  require 'hpricot'
-rescue LoadError => err
-  warn err
-end
-
 module RSS2Mail
 
   class RSS
@@ -185,16 +180,13 @@ module RSS2Mail
         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
+        body.encode!(encoding) if encoding
+        body
       end
 
       def extract_body(expr, attribute = nil)
-        if defined?(Hpricot)
-          elem = Hpricot(open_feed(link)).at(expr)
-          attribute ? elem[attribute] : elem.to_s
-        else
-          open_feed(link).read
-        end
+        elem = Nokogiri.HTML(open_feed(link)).at(expr)
+        attribute ? elem[attribute] : elem.to_s
       end
 
       def clean_subject(str)

data/lib/rss2mail/util.rb

@@ -24,9 +24,8 @@
 ###############################################################################
 #++
 
-require 'uri'
 require 'open-uri'
-require 'hpricot'
+require 'nokogiri'
 
 require 'rss2mail/version'
 
@@ -40,26 +39,22 @@ module RSS2Mail
 
     FEED_RE = %r{\Aapplication/(?:atom|rss)\+xml\z}i
 
+    URI_RE = URI.regexp(%w[http https])
+
     # 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_feed(url))
-
-        if feed_element = doc.search('//link[@rel="alternate"').find { |link|
-          link[:type] =~ FEED_RE
-        }
-          if feed_href = feed_element[:href]
-            return feed_href if feed_href =~ URI.regexp(%w[http https])
+        doc = Nokogiri.HTML(open_feed(url))
 
-            base_href = doc.at('base')[:href] rescue url
-            return URI.join(base_href, feed_href).to_s
+        if link = doc.xpath('//link[@rel="alternate"]').find { |i| i[:type] =~ FEED_RE }
+          if href = link[:href]
+            return href =~ URI_RE ? href :
+              URI.join((base = doc.at_xpath('//base')) && base[:href] || url, href).to_s
           end
         end
       end
 
-      default
+      url if or_self
     end
 
     def open_feed(url, options = {}, &block)

data/lib/rss2mail/version.rb

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

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: rss2mail
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: simple-rss
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hpricot
+  name: unidecode
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: unidecode
+  name: ruby-nuggets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -53,7 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-nuggets
+  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:
     - - '>='
@@ -77,6 +91,7 @@ extra_rdoc_files:
 - ChangeLog
 files:
 - lib/rss2mail.rb
+- lib/rss2mail/app.rb
 - lib/rss2mail/feed.rb
 - lib/rss2mail/rss.rb
 - lib/rss2mail/util.rb
@@ -88,6 +103,7 @@ files:
 - ChangeLog
 - README
 - Rakefile
+- example/config.ru
 - example/feeds.yaml
 homepage: http://github.com/blackwinter/rss2mail
 licenses: []
@@ -99,7 +115,7 @@ rdoc_options:
 - --line-numbers
 - --all
 - --title
-- rss2mail Application documentation (v0.1.4)
+- rss2mail Application documentation (v0.2.0)
 - --main
 - README
 require_paths: