rss2mail 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da44450970cae6a855ed36595edbf43fbbb726eb
-  data.tar.gz: 4ef9eb4347a2c48a511a8d9c06e1e5a1de96b2f9
+  metadata.gz: 19c5eb6339d4ffc691faac4c7b350fd85439f00b
+  data.tar.gz: 973e021b179b3c2ab6d58ac6d31388e5279ea628
 SHA512:
-  metadata.gz: 501b93b1ece8e8fbf11868c04b30a6d6ed6b40b3318677100a6888d10fbcf821cc7e68ad4a15493369605295becfc605fafc6b7baf5a0afc64e35c8329194dbf
-  data.tar.gz: 7a69c1b5ca75868bd6bc9ba3aeb86c0f668bac13aa8bda6a5518f90f04b6ef6208496491c8402d48218626208ea4e9888ceb13c537ed7bfa0a4dbe06247fb689
+  metadata.gz: 2dc5517ca3bfa91ae4b4c1755fb9006ffab3f310b7d84a6769c48c866d6af10d109459aa04df9efbf794cf34abd856f5ed9d3d34811bee143b7064ab24757d50
+  data.tar.gz: e2485e05eff43f7d0b18d4a1d2861b929f52018e9fd96036d5cd85dad87dc6e1817176679d363d018184844587a14037d47c2d12390524f49d724603a5ec769b

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to rss2mail version 0.4.2
+This documentation refers to rss2mail version 0.4.3
 
 
 == DESCRIPTION
@@ -13,7 +13,7 @@ recipients. See <tt>example/</tt> directory for a sample configuration file.
 
 == LINKS
 
-Documentation:: https://blackwinter.github.io/rss2mail/
+Documentation:: https://blackwinter.github.com/rss2mail
 Source code::   https://github.com/blackwinter/rss2mail
 RubyGem::       https://rubygems.org/gems/rss2mail
 

data/Rakefile

@@ -14,7 +14,7 @@ begin
       homepage:     :blackwinter,
       extra_files:  FileList['templates/*'].to_a,
       dependencies: %w[
-        cyclops nokogiri ruby-nuggets safe_yaml
+        cyclops nokogiri nuggets safe_yaml
         simple-rss sinatra unidecoder
       ],
 

data/lib/rss2mail/app.rb

@@ -41,7 +41,7 @@ end
 helpers ERB::Util
 
 get '/' do
-  prepare(false)
+  prepare
 
   if @feed_url = RSS2Mail::Util.discover_feed(@url = params[:url])
     @title = Nokogiri.HTML(open(@feed_url)).at_css('title').content rescue nil
@@ -53,46 +53,46 @@ end
 post '/' do
   prepare
 
-  @title, @to = params[:title] || '', params[:to]
-  @title = @feed_url[/[^\/]+\z/][/[\w.]+/] if @title.empty?
-
-  update { |feeds, feed|
-    new_feed = { url: @feed_url, title: @title, to: @to }
-    feed ? feed.update(new_feed) : feeds << new_feed
-  }
+  @feed_url = params[:feed_url] or error(400)
 
-  erb :index
-end
+  @target = params[:target]
+  @target = @targets.find { |t| t.to_s == @target } || :daily
 
-delete '/' do
-  prepare
+  if params[:delete] == 'delete'
+    update { |feeds, feed| feeds.delete(feed) }
+  elsif params[:skip] == 'toggle'
+    update { |feeds, feed| feed[:skip] = !feed[:skip] }
+  else
+    @title, @to = params[:title] || '', params[:to]
+    @title = @feed_url[/[^\/]+\z/][/[\w.]+/] if @title.empty?
 
-  update { |feeds, feed|
-    feeds.delete(feed) or error(404)
-    @title, @to = feed.values_at(:title, :to)
-  }
+    update(true) { |feeds, feed|
+      new_feed = { url: @feed_url, title: @title, to: @to }
+      feed ? feed.update(new_feed) : feeds << new_feed
+    }
+  end
 
   erb :index
 end
 
-def prepare(feed = true)
+def prepare
   user = request.env['REMOTE_USER'] or error(400)
 
   @feeds_file = File.join(settings.root, 'feeds.d', "#{user}.yaml")
   @feeds      = RSS2Mail::Util.load_feeds(@feeds_file) || {}
   @targets    = @feeds.keys.sort_by { |t, _| t.to_s }
+end
 
-  if feed
-    @feed_url = params[:feed_url] or error(400)
+def update(create = false)
+  feeds = @feeds[@target]
 
-    @target = params[:target]
-    @target = @targets.find { |t| t.to_s == @target } || :daily
-  end
-end
+  feed = feeds.find { |f| f[:url] == @feed_url }
+  error(404) unless feed || create
+
+  yield feeds, feed
 
-def update
-  yield feeds = @feeds[@target], feeds.find { |f| f[:url] == @feed_url }
   RSS2Mail::Util.dump_feeds(@feeds_file, @feeds)
+  @title, @to = feed.values_at(:title, :to) unless create
 end
 
 __END__
@@ -117,6 +117,12 @@ __END__
       font-weight: bold;
     }
 
+    input[type="submit"] + a {
+      margin-left: 2px;
+      font-weight: bold;
+      color:       inherit;
+    }
+
     button {
       background:  none;
       border:      none;
@@ -127,6 +133,10 @@ __END__
       line-height: 0.6;
       padding:     0;
     }
+
+    small + button {
+      margin-left: 2px;
+    }
   </style>
 </head>
 <body>
@@ -160,6 +170,7 @@ __END__
     </select>
     <br />
     <input type="submit" value="subscribe" />
+    <a href="<%= url('/') %>" title="clear">[×]</a>
   </form>
 
   <h2>subscriptions</h2>
@@ -173,12 +184,14 @@ __END__
       <% for feed in @feeds[target].sort_by { |f| f[:title].downcase } %>
         <li>
           <form method="post">
+            <input type="hidden" name="target" value="<%=h target %>" />
+            <input type="hidden" name="feed_url" value="<%=h feed[:url] %>" />
+
             <a href="<%=h feed[:url] %>" class="<%= 'skip' if feed[:skip] %>"><%=h feed[:title] %></a>
             <small>(<%=h Array(feed[:to]).join(', ') %>)</small>
-            <input type="hidden" name="_method"  value="delete" />
-            <input type="hidden" name="target"   value="<%=h target %>" />
-            <input type="hidden" name="feed_url" value="<%=h feed[:url] %>" />
-            <button type="submit" title="delete">×</button>
+
+            <button type="submit" name="skip" value="toggle" title="<%= feed[:skip] ? 'unskip' : 'skip' %>"><%= feed[:skip] ? '+' : '-' %></button>
+            <button type="submit" name="delete" value="delete" title="delete">×</button>
           </form>
         </li>
       <% end %>

data/lib/rss2mail/util.rb

@@ -42,20 +42,28 @@ module RSS2Mail
 
     URI_RE = URI.regexp(%w[http https])
 
+    XPATH = '//link[@rel="alternate"]'
+
     # cf. <http://www.rssboard.org/rss-autodiscovery>
-    def discover_feed(url, or_self = false)
+    def discover_feed(url, fallback = false)
       unless url.nil? || url.empty? || url == 'about:blank'
-        doc = Nokogiri.HTML(open_feed(url))
-
-        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
+        begin
+          doc = Nokogiri.HTML(open_feed(url))
+        rescue => err
+          warn "Unable to discover feed `#{url}': #{err} (#{err.class})"
+        else
+          doc.xpath(XPATH).each { |link|
+            if link[:type] =~ FEED_RE && href = link[:href]
+              return href =~ URI_RE ? href : begin
+                base = doc.at_xpath('//base')
+                URI.join(base && base[:href] || url, href).to_s
+              end
+            end
+          }
         end
       end
 
-      url if or_self
+      url if fallback
     end
 
     def open_feed(url, options = {}, &block)

data/lib/rss2mail/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rss2mail
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cyclops
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-nuggets
+  name: nuggets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -170,7 +170,7 @@ metadata: {}
 post_install_message: 
 rdoc_options:
 - "--title"
-- rss2mail Application documentation (v0.4.2)
+- rss2mail Application documentation (v0.4.3)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2.x
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Send RSS feeds as e-mail