rss2mail 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19c5eb6339d4ffc691faac4c7b350fd85439f00b
-  data.tar.gz: 973e021b179b3c2ab6d58ac6d31388e5279ea628
+  metadata.gz: ef8bedfd16d99cdc944139b587acb2cc62b1967f
+  data.tar.gz: 62fd84a1410ea0601a9c978e00c52f49007c1e16
 SHA512:
-  metadata.gz: 2dc5517ca3bfa91ae4b4c1755fb9006ffab3f310b7d84a6769c48c866d6af10d109459aa04df9efbf794cf34abd856f5ed9d3d34811bee143b7064ab24757d50
-  data.tar.gz: e2485e05eff43f7d0b18d4a1d2861b929f52018e9fd96036d5cd85dad87dc6e1817176679d363d018184844587a14037d47c2d12390524f49d724603a5ec769b
+  metadata.gz: c82d6b18e1909fcbdb57418279a36da537676172400f1ffb036c4aefeba23028dfc58e04272f471cf90abf10ce767c1d7201995db5e13155d02d9b64c30622b6
+  data.tar.gz: 3e4215196b5e62655f360cbbf72aea4f22156a459fd8e96205abd284b99f33f2f87096e34a4825ae5d0459d3bee52e74470fa0b538e9fb33b6602ef3638f4d07

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to rss2mail version 0.4.3
+This documentation refers to rss2mail version 0.4.4
 
 
 == DESCRIPTION

data/Rakefile

@@ -1,4 +1,4 @@
-require File.expand_path(%q{../lib/rss2mail/version}, __FILE__)
+require_relative 'lib/rss2mail/version'
 
 begin
   require 'hen'
@@ -14,9 +14,9 @@ begin
       homepage:     :blackwinter,
       extra_files:  FileList['templates/*'].to_a,
       dependencies: %w[
-        cyclops nokogiri nuggets safe_yaml
+        cyclops nokogiri nuggets
         simple-rss sinatra unidecoder
-      ],
+      ] << ['safe_yaml-store', '~> 0.0'],
 
       required_ruby_version: '>= 1.9.3'
     }

data/lib/rss2mail/app.rb

@@ -78,20 +78,27 @@ end
 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 }
+  @feeds = RSS2Mail::Util.load_feeds(
+    File.join(settings.root, 'feeds.d', "#{user}.yaml"))
+
+  @tos = []
+
+  @feeds.transaction(true) {
+    @targets = @feeds.roots.sort_by(&:to_s).each { |target|
+      @feeds[target].each { |feed| @tos.concat(Array(feed[:to])) } } }
+
+  @tos.uniq!
 end
 
 def update(create = false)
-  feeds = @feeds[@target]
+  feeds = @feeds.get(@target)
 
   feed = feeds.find { |f| f[:url] == @feed_url }
   error(404) unless feed || create
 
   yield feeds, feed
 
-  RSS2Mail::Util.dump_feeds(@feeds_file, @feeds)
+  RSS2Mail::Util.dump_feeds(@feeds, @target, feeds)
   @title, @to = feed.values_at(:title, :to) unless create
 end
 
@@ -157,7 +164,7 @@ __END__
     <br />
     <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 %>
+    <% for to in @tos.sort %>
       <option value="<%=h to %>" />
     <% end %>
     </datalist>
@@ -176,12 +183,12 @@ __END__
   <h2>subscriptions</h2>
 
   <ul>
-  <% for target in @targets %>
+  <% for target in @targets; feeds = @feeds.get(target) %>
     <li>
-      <strong><%=h target %></strong> (<%= @feeds[target].size %>)
+      <strong><%=h target %></strong> (<%= feeds.size %>)
 
       <ul>
-      <% for feed in @feeds[target].sort_by { |f| f[:title].downcase } %>
+      <% for feed in feeds.sort_by { |f| f[:title].downcase } %>
         <li>
           <form method="post">
             <input type="hidden" name="target" value="<%=h target %>" />

data/lib/rss2mail/cli.rb

@@ -68,12 +68,14 @@ module RSS2Mail
       }
 
       (options.delete(:files) || default_files).each { |feeds_file|
-        feeds = RSS2Mail::Util.load_feeds(feeds_file) or begin
+        unless File.readable?(feeds_file)
           warn "Feeds file not found: #{feeds_file}"
           next
         end
 
-        unless target_feeds = feeds[target]
+        feeds = Util.load_feeds(feeds_file)
+
+        unless target_feeds = feeds.get(target)
           warn "Feeds target not found in #{feeds_file}: #{target}"
           next
         end
@@ -82,7 +84,7 @@ module RSS2Mail
           Feed.new(feed, options).deliver(templates) unless feed[:skip]
         }
 
-        RSS2Mail::Util.dump_feeds(feeds_file, feeds) unless options[:debug]
+        Util.dump_feeds(feeds, target, target_feeds) unless options[:debug]
       }
     end
 

data/lib/rss2mail/feed.rb

@@ -130,7 +130,7 @@ module RSS2Mail
       end
     end
 
-    def get(reload = reload)
+    def get(reload = reload())
       conditions = {}
 
       if reload
@@ -180,7 +180,7 @@ module RSS2Mail
       content
     end
 
-    def parse(reload = reload)
+    def parse(reload = reload())
       @rss = nil if reload
 
       if content
@@ -230,7 +230,7 @@ module RSS2Mail
       error err, 'while sending mail', transport
     end
 
-    def log(msg, verbose = verbose)
+    def log(msg, verbose = verbose())
       warn "[#{feed[:title]}] #{msg}" if verbose
     end
 

data/lib/rss2mail/util.rb

@@ -24,9 +24,9 @@
 ###############################################################################
 #++
 
+require 'safe_yaml/store'
 require 'open-uri'
 require 'nokogiri'
-require 'safe_yaml/load'
 
 require 'rss2mail/version'
 
@@ -70,13 +70,14 @@ 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)
+    def load_feeds(feeds_file, options = { deserialize_symbols: true })
+      SafeYAML::Store.new(feeds_file, {}, options).tap { |store|
+        def store.get(key); transaction(true) { self[key] }; end
+      }
     end
 
-    def dump_feeds(feeds_file, feeds)
-      File.open(feeds_file, 'w') { |file| YAML.dump(feeds, file) }
+    def dump_feeds(store, key, value)
+      store.transaction { store[key] = value }
     end
 
   end

data/lib/rss2mail/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rss2mail
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cyclops
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: safe_yaml
+  name: simple-rss
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simple-rss
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: unidecoder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,33 +95,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: unidecoder
+  name: safe_yaml-store
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: hen
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -170,7 +176,7 @@ metadata: {}
 post_install_message: 
 rdoc_options:
 - "--title"
-- rss2mail Application documentation (v0.4.3)
+- rss2mail Application documentation (v0.4.4)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -191,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Send RSS feeds as e-mail