rrimm 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe165abd85bdd5c571e37e41e89763e500c94a8e
-  data.tar.gz: 4d1f772e68e92b5a7a6a078aaa5f486919f37522
+  metadata.gz: cb036536a321e067fc90a265804b35c33fa73c7e
+  data.tar.gz: 795bf60b495b3dca4d30f66a742568b84cdb8a9a
 SHA512:
-  metadata.gz: 8a8a4626df8cedb7ffd9677fbfb1c97426755c718cdea89f8fa63c7d5821e322a4ca81925949a912a418779017b5cb318ab05880d21b20f6f2f4ff1a41af44d5
-  data.tar.gz: 610e769fcf85197cae7429e42f57e80e809617b90934dba572bebbf8b92f2aa7f0534765a11d7f919e157635aeaf5f03d59933d7bbaaaaeacecb74a50574f3e4
+  metadata.gz: 5111bb5488f6ae6804b8fb765384420e2eb512ec8c2b5d5a9ca2b0a726f3f3c9c7e1f1d3f93db79cebd6d7d77884f6f83720359e8c8bbd0f8db04682ec0191d8
+  data.tar.gz: debc92ba0768fd0f993a4d5033ee71881ef17d203d7ca4f9158fe4e6a427bf1fdbeb42efe08b3a2d9686e48462360d1d94b532ae82af595f141f197ffb91039f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rrimm (0.2.0)
+    rrimm (0.3.0)
       feedzirra
       open_uri_redirections
       parallel

data/lib/rrimm/config.rb

@@ -27,7 +27,11 @@ module RRImm
       
       puts "Feeds:"
       @feeds.values.group_by { |f| f.category }.map do |cat, feeds|
-        puts "#{cat}:" unless cat.nil? or cat.empty?
+        if cat.nil? or cat.empty?
+          puts ""
+        else
+          puts "#{cat}:"
+        end
         feeds.each do |feed|
           fqdn = [feed.name]
           fqdn << feed.uri unless feed.name.eql? feed.uri
@@ -65,6 +69,23 @@ module RRImm
       @feeds[name] = feed_def
     end
 
+    def category(cat_name, &block)
+      Feed.module_eval do
+        @@tmp_cat_name = cat_name
+        alias :old_initialize :initialize
+        def initialize(feed_name)
+          old_initialize(feed_name)
+          @category = @@tmp_cat_name
+        end
+      end
+      self.instance_eval(&block) if block
+    ensure
+      Feed.module_eval do
+        alias :initialize :old_initialize
+      end
+    end
+
+
     def load(file)
       instance_eval(File.read(file), file)
     end

data/lib/rrimm/feed.rb

@@ -37,6 +37,10 @@ module RRImm
       @uri
     end
 
+    def default_name?
+      @name.eql? @uri
+    end
+
     def formatter_class(arg=nil)
       if arg
         @formatter_class = arg

data/lib/rrimm/item_formatter/mail.rb

@@ -9,14 +9,18 @@ module RRImm
         @sender = hash[:from]
       end
 
-      def from(item)
-        if item.author and item.author.include? '@'
-          item.author
+      def default_author(feed_config)
+        if feed_config.default_name?
+          "RRImm <#{@sender}>"
         else
-          @sender
+          "#{feed_config.name} <#{@sender}>"
         end
       end
 
+      def from(authors)
+        authors.compact.select { |a| a.include? '@' }.first
+      end
+
       def subject(feed, item, feed_config)
         subject = item.title
         subject = "[#{feed_config.category}]#{item.title}" if feed_config.category
@@ -24,7 +28,7 @@ module RRImm
       end
 
       def format(feed, item, feed_config, pipe)
-        pipe.write "From: #{from(item)}\n"
+        pipe.write "From: #{from [item.author, default_author(feed_config)]}\n"
         pipe.write "To: #{dest}\n"
         pipe.write "Subject: #{subject(feed, item, feed_config)}\n"
         pipe.write "Content-Type: text/html;\n"

data/rrimm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'rrimm'
-  s.version     = '0.2.0'
+  s.version     = '0.3.0'
   s.licenses    = ['Apache Licence v2']
   s.summary     = "RSS to email tool"
   s.description = "imm reboot in ruby. Retrieve rss feeds and send them by email"

data/spec/xkcd.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0"><channel><title>xkcd.com</title><link>http://xkcd.com/</link><description>xkcd.com: A webcomic of romance and math humor.</description><language>en</language><item><title>When You Assume</title><link>http://xkcd.com/1339/</link><description>&lt;img src="http://imgs.xkcd.com/comics/when_you_assume.png" title="You know what happens when you assert--you make an ass out of the emergency response team." alt="You know what happens when you assert--you make an ass out of the emergency response team." /&gt;</description><pubDate>Fri, 07 Mar 2014 05:00:00 -0000</pubDate><guid>http://xkcd.com/1339/</guid></item><item><title>Land Mammals</title><link>http://xkcd.com/1338/</link><description>&lt;img src="http://imgs.xkcd.com/comics/land_mammals.png" title="Bacteria still outweigh us thousands to one--and that's not even counting the several pounds of them in your body." alt="Bacteria still outweigh us thousands to one--and that's not even counting the several pounds of them in your body." /&gt;</description><pubDate>Wed, 05 Mar 2014 05:00:00 -0000</pubDate><guid>http://xkcd.com/1338/</guid></item><item><title>Hack</title><link>http://xkcd.com/1337/</link><description>&lt;img src="http://imgs.xkcd.com/comics/hack.png" title="HACK THE STARS" alt="HACK THE STARS" /&gt;</description><pubDate>Mon, 03 Mar 2014 05:00:00 -0000</pubDate><guid>http://xkcd.com/1337/</guid></item><item><title>Transformers</title><link>http://xkcd.com/1336/</link><description>&lt;img src="http://imgs.xkcd.com/comics/transformers.png" title="A helicopter bursts from a chrysalis and alights on a rock, rotors still damp." alt="A helicopter bursts from a chrysalis and alights on a rock, rotors still damp." /&gt;</description><pubDate>Fri, 28 Feb 2014 05:00:00 -0000</pubDate><guid>http://xkcd.com/1336/</guid></item></channel></rss>

data/spec/xkcd_spec.rb

@@ -0,0 +1,34 @@
+require_relative 'spec_helper'
+
+
+describe RRImm::ItemFormatter::Mail do
+  it 'formats correctly xkcd feed' do
+    mail_formatter = RRImm::ItemFormatter::Mail.new(
+      from: 'from@example.com',
+      to: 'to@example.com'
+    )
+    xkcd_file = File.join('file://', File.dirname(__FILE__), 'xkcd.xml')
+    feed = Feedzirra::Feed.fetch_and_parse(xkcd_file)
+    expect(feed.entries.size).to be > 0
+    s = StringIO.new
+    config = double('config')
+    config.should_receive(:category).and_return nil
+    config.should_receive(:default_name?).and_return(true)
+    mail_formatter.format(feed, feed.entries.first, config, s)
+    s.close
+    expect(s.string).to eq "From: RRImm <from@example.com>\nTo: to@example.com\nSubject: When You Assume\nContent-Type: text/html;\n\nhttp://xkcd.com/1339/\n\n<img src=\"http://imgs.xkcd.com/comics/when_you_assume.png\" title=\"You know what happens when you assert--you make an ass out of the emergency response team.\" alt=\"You know what happens when you assert--you make an ass out of the emergency response team.\" />\n"
+  end
+end
+
+describe RRImm::ItemFormatter::Default do
+  it 'formats correctly xkcd feed' do
+    default_formatter = RRImm::ItemFormatter::Default.new
+    xkcd_file = File.join('file://', File.dirname(__FILE__), 'xkcd.xml')
+    feed = Feedzirra::Feed.fetch_and_parse(xkcd_file)
+    expect(feed.entries.size).to be > 0
+    s = StringIO.new
+    default_formatter.format(feed, feed.entries.first, nil, s)
+    s.close
+    expect(s.string).to eq "xkcd.com: When You Assume (2014-03-07 05:00:00 UTC)\n"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rrimm
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Grégoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-09 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -109,6 +109,8 @@ files:
 - spec/config_spec.rb
 - spec/feed_spec.rb
 - spec/spec_helper.rb
+- spec/xkcd.xml
+- spec/xkcd_spec.rb
 homepage: http://github.com/kamaradclimber/rrimm
 licenses:
 - Apache Licence v2
@@ -138,3 +140,5 @@ test_files:
 - spec/config_spec.rb
 - spec/feed_spec.rb
 - spec/spec_helper.rb
+- spec/xkcd.xml
+- spec/xkcd_spec.rb