rss2mail 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 017417bfb43b6f08d3d3c796a060ea0acf87f5de
-  data.tar.gz: 7f7368f9f3d2bf056d4252fbf79cf1c24b4f27ef
+  metadata.gz: da44450970cae6a855ed36595edbf43fbbb726eb
+  data.tar.gz: 4ef9eb4347a2c48a511a8d9c06e1e5a1de96b2f9
 SHA512:
-  metadata.gz: 437ecbd3b9f6bb2fb5a1087f0ee8f3bc0371531216c3e5bcd9d6725d0690fc22da8447215de6b2d6adfa89b6bd7c2629ef923bef8b2b4a65866fb2fc117600f5
-  data.tar.gz: c896efbe7131abe1ba37a88a1ec9af9cd6c9fb4bac427aea5a4a483953f8cccc953a6926474b2ed4b18b742ac7f0e89b5b87d1e837935b7b6d91c649afc9bd5d
+  metadata.gz: 501b93b1ece8e8fbf11868c04b30a6d6ed6b40b3318677100a6888d10fbcf821cc7e68ad4a15493369605295becfc605fafc6b7baf5a0afc64e35c8329194dbf
+  data.tar.gz: 7a69c1b5ca75868bd6bc9ba3aeb86c0f668bac13aa8bda6a5518f90f04b6ef6208496491c8402d48218626208ea4e9888ceb13c537ed7bfa0a4dbe06247fb689

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to rss2mail version 0.4.1
+This documentation refers to rss2mail version 0.4.2
 
 
 == DESCRIPTION

data/Rakefile

@@ -4,19 +4,21 @@ begin
   require 'hen'
 
   Hen.lay! {{
-    :gem => {
-      :name         => %q{rss2mail},
-      :version      => RSS2Mail::VERSION,
-      :summary      => %q{Send RSS feeds as e-mail},
-      :author       => %q{Jens Wille},
-      :email        => %q{jens.wille@gmail.com},
-      :license      => %q{AGPL-3.0},
-      :homepage     => :blackwinter,
-      :extra_files  => FileList['templates/*'].to_a,
-      :dependencies => %w[
+    gem: {
+      name:         %q{rss2mail},
+      version:      RSS2Mail::VERSION,
+      summary:      %q{Send RSS feeds as e-mail},
+      author:       %q{Jens Wille},
+      email:        %q{jens.wille@gmail.com},
+      license:      %q{AGPL-3.0},
+      homepage:     :blackwinter,
+      extra_files:  FileList['templates/*'].to_a,
+      dependencies: %w[
         cyclops nokogiri ruby-nuggets safe_yaml
         simple-rss sinatra unidecoder
-      ]
+      ],
+
+      required_ruby_version: '>= 1.9.3'
     }
   }}
 rescue LoadError => err

data/lib/rss2mail/app.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>                                       #
@@ -28,12 +28,11 @@
 
 require 'sinatra'
 require 'rss2mail/util'
-require 'safe_yaml/load'
 
 use Rack::Auth::Basic do |user, pass|
   @auth ||= begin
-    file = File.join(settings.root, 'auth.yaml')
-    File.readable?(file) ? SafeYAML.load_file(file) : {}
+    auth_file = File.join(settings.root, 'auth.yaml')
+    File.readable?(auth_file) ? SafeYAML.load_file(auth_file) : {}
   end
 
   @auth[user] == pass
@@ -42,7 +41,7 @@ end
 helpers ERB::Util
 
 get '/' do
-  prepare
+  prepare(false)
 
   if @feed_url = RSS2Mail::Util.discover_feed(@url = params[:url])
     @title = Nokogiri.HTML(open(@feed_url)).at_css('title').content rescue nil
@@ -54,29 +53,46 @@ 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
+  update { |feeds, feed|
+    new_feed = { url: @feed_url, title: @title, to: @to }
+    feed ? feed.update(new_feed) : feeds << new_feed
+  }
+
+  erb :index
+end
+
+delete '/' do
+  prepare
+
+  update { |feeds, feed|
+    feeds.delete(feed) or error(404)
+    @title, @to = feed.values_at(:title, :to)
+  }
 
   erb :index
 end
 
-def prepare
+def prepare(feed = true)
   user = request.env['REMOTE_USER'] or error(400)
 
   @feeds_file = File.join(settings.root, 'feeds.d', "#{user}.yaml")
-  @feeds      = File.readable?(@feeds_file) ?
-    SafeYAML.load_file(@feeds_file, :deserialize_symbols => true) : {}
+  @feeds      = RSS2Mail::Util.load_feeds(@feeds_file) || {}
   @targets    = @feeds.keys.sort_by { |t, _| t.to_s }
+
+  if feed
+    @feed_url = params[:feed_url] or error(400)
+
+    @target = params[:target]
+    @target = @targets.find { |t| t.to_s == @target } || :daily
+  end
+end
+
+def update
+  yield feeds = @feeds[@target], feeds.find { |f| f[:url] == @feed_url }
+  RSS2Mail::Util.dump_feeds(@feeds_file, @feeds)
 end
 
 __END__
@@ -91,25 +107,50 @@ __END__
 <% 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>
+  <style type="text/css">
+    a.skip {
+      text-decoration: line-through;
+    }
+
+    input[type="submit"] {
+      margin-top:  0.6em;
+      font-weight: bold;
+    }
+
+    button {
+      background:  none;
+      border:      none;
+      cursor:      pointer;
+      color:       inherit;
+      font-size:   large;
+      font-weight: bold;
+      line-height: 0.6;
+      padding:     0;
+    }
+  </style>
 </head>
 <body>
-  <h1>rss2mail - send rss feeds as e-mail</h1>
+  <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" />
+    <input type="text" id="feed_url" name="feed_url" value="<%=h @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 %>]
+    [<a href="<%=h @url %>">link</a><% if @feed_url %> | <a href="<%=h @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" />
+    <input type="text" id="to" name="to" value="<%=h @to %>" size="54" list="tos" />
+    <datalist id="tos">
+    <% for to in @feeds.values.map { |feeds| feeds.map { |feed| feed[:to] } }.flatten.uniq.sort %>
+      <option value="<%=h to %>" />
+    <% end %>
+    </datalist>
     <label for="to">»to«</label>
     <br />
     <select id="target" name="target">
@@ -118,7 +159,7 @@ __END__
     <% end %>
     </select>
     <br />
-    <input type="submit" value="subscribe!" style="margin-top: 0.6em; font-weight: bold" />
+    <input type="submit" value="subscribe" />
   </form>
 
   <h2>subscriptions</h2>
@@ -131,8 +172,14 @@ __END__
       <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>
+          <form method="post">
+            <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>
+          </form>
         </li>
       <% end %>
       </ul>
@@ -142,7 +189,7 @@ __END__
 
   <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 %>
+    and <a href="http://sinatrarb.com">Sinatra</a> — v<%=h RSS2Mail::VERSION %>
   </em></p>
 </body>
 </html>

data/lib/rss2mail/cli.rb

@@ -68,9 +68,7 @@ module RSS2Mail
       }
 
       (options.delete(:files) || default_files).each { |feeds_file|
-        feeds = begin
-          SafeYAML.load_file(feeds_file, deserialize_symbols: true)
-        rescue Errno::ENOENT
+        feeds = RSS2Mail::Util.load_feeds(feeds_file) or begin
           warn "Feeds file not found: #{feeds_file}"
           next
         end
@@ -84,9 +82,7 @@ module RSS2Mail
           Feed.new(feed, options).deliver(templates) unless feed[:skip]
         }
 
-        unless options[:debug]
-          File.open(feeds_file, 'w') { |file| YAML.dump(feeds, file) }
-        end
+        RSS2Mail::Util.dump_feeds(feeds_file, feeds) unless options[:debug]
       }
     end
 

data/lib/rss2mail/rss.rb

@@ -114,13 +114,13 @@ module RSS2Mail
       end
 
       def date
-        @date ||= value_for({ :date => %w[pubDate updated dc_date] }, :content) { |field, value|
+        @date ||= value_for({ date: %w[pubDate updated dc_date] }, :content) { |field, value|
           field == 'updated' && value.respond_to?(:content) ? Time.at(value.content.to_i) : value
         }
       end
 
       def author
-        @author ||= value_for({ :author => %w[contributor dc_creator] }, %w[name content])
+        @author ||= value_for({ author: %w[contributor dc_creator] }, %w[name content])
       end
 
       def body(tag = nil, encoding = nil)
@@ -162,7 +162,7 @@ module RSS2Mail
       end
 
       def get_description(unescape_html)
-        description = value_for({ :description => %w[summary content] }, :content)
+        description = value_for({ description: %w[summary content] }, :content)
 
         if description && unescape_html
           description.gsub!(/&lt;/, '<')
@@ -196,7 +196,7 @@ module RSS2Mail
 
       def clean_subject(str)
         str.replace_diacritics!
-        str.gsub!(SUB_RE) { |m| SUB[m] }
+        str.gsub!(SUB_RE, SUB)
         str.to_ascii
       end
 

data/lib/rss2mail/util.rb

@@ -26,6 +26,7 @@
 
 require 'open-uri'
 require 'nokogiri'
+require 'safe_yaml/load'
 
 require 'rss2mail/version'
 
@@ -61,6 +62,15 @@ module RSS2Mail
       open(url, options.merge('User-Agent' => USER_AGENT), &block)
     end
 
+    def load_feeds(feeds_file)
+      return unless File.readable?(feeds_file)
+      SafeYAML.load_file(feeds_file, deserialize_symbols: true)
+    end
+
+    def dump_feeds(feeds_file, feeds)
+      File.open(feeds_file, 'w') { |file| YAML.dump(feeds, file) }
+    end
+
   end
 
 end

data/lib/rss2mail/version.rb

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

metadata

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