rrimm 0.6.0 → 0.7.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWM5MjRiNDNmMGQ1MGFmZjVhNjcwYWEyNGIwNjhkNmI1NTA3MmQ5Yg==
+    NWM5M2NiOTY1MzE3YzUzMjUzZWEyMWE3MDZkNDE1MmIxZTFlZWRiMA==
   data.tar.gz: !binary |-
-    NzIzMGNkYmU0NTJkMDYyNGZjODZlMmI3MDdmZTM0NDdhMWM2MWYwYQ==
+    YzUyYzE1YThjMWMxNGM4NWEwMWVmZjQ2M2EzYjkwM2MwZGJhMTc2MQ==
 SHA512:
   metadata.gz: !binary |-
-    N2M0MDNlOWFiNTZjODg5ZTAzYjQ1NzFhOTliYTM5MWZjYTU1NzY4NzhhZjEz
-    ZjZiNWYyMDAxMWI5MGI0MWEwNjc3MDQzOTA5NjgwYmYyZjc2NDQ1MDFlNzUy
-    NGJiN2E1MzQ5YWM1NTcwNDBlNDFhMjIxOTliOTJkMjMxZDNhNTI=
+    NjZmY2NlZWM3MzIxMjEwYmU5YWMwYTU5N2JmNDQzZDM2NDc5Yzk5ZTc1NjEz
+    ZmMyMGY1YzMxNjg5NGUyOTA4MWYzYjBmMDNiYmMyOGM2MjRlOTMxOGQ0M2I4
+    ZTk4NWZjNTExNDBmZGU1YjFkMDI2OTI5MjY1MjRhMWJmZTU1ZTU=
   data.tar.gz: !binary |-
-    OWY4ZjNiMjFlOWM4MDY2YzNhY2FlNjJjYjQ4ZWYwZTMxOGM0MjkzMmJkYTBm
-    OTIxMzlhNDZiYjY5ZmUzNjBjOGU4MWEyYjI2NWMxMDA1NmNlY2M3NWViOTRj
-    MDc1YWY4MGE3ZWY4MTVlNmE1ZTRjZDMwODIwNjA0MjY4ZjY5MzM=
+    MmY5ZTc2ZTg5YzQ5YjlmNDIzY2EzMGY0MmEzY2E3YzZlMjFiYWQ0MGY2MDc0
+    NjBjMTUzMmIzZDAyMTFlMTljYjk5MDZkM2I3NTA0OWMxOThiNDZmNWQwMDAw
+    ZDI5ZmE1YjZiOGMyZjg1MTE3YTA4OTQ3YWY5MTNkMDc0OTMzYTE=

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    rrimm (0.6.0)
+    rrimm (0.7.1)
       colorize
-      feedzirra
+      feedjira
       open_uri_redirections
       parallel
 
@@ -12,7 +12,7 @@ GEM
   specs:
     codeclimate-test-reporter (0.3.0)
       simplecov (>= 0.7.1, < 1.0.0)
-    colorize (0.7.0)
+    colorize (0.7.2)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
@@ -22,19 +22,19 @@ GEM
     curb (0.8.5)
     diff-lcs (1.2.5)
     docile (1.1.3)
-    feedzirra (0.7.1)
+    feedjira (1.2.0)
       curb (~> 0.8.1)
       loofah (~> 1.2.1)
       sax-machine (~> 0.2.1)
     loofah (1.2.1)
       nokogiri (>= 1.4.4)
     mime-types (2.1)
-    mini_portile (0.5.2)
+    mini_portile (0.5.3)
     multi_json (1.9.0)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     open_uri_redirections (0.1.4)
-    parallel (0.9.2)
+    parallel (1.0.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.14.1)

data/lib/rrimm/fetcher.rb

@@ -1,4 +1,4 @@
-require 'feedzirra'
+require 'feedjira'
 require 'open-uri'
 require 'open_uri_redirections'
 require 'parallel'
@@ -36,7 +36,7 @@ module RRImm
     def fetch_feed(name, feed_config)
       last_read = Time.at(@config.get_cache.read(feed_config))
       puts name unless @quiet
-      feed = Feedzirra::Feed.fetch_and_parse(feed_config.uri)
+      feed = Feedjira::Feed.fetch_and_parse(feed_config.uri)
       items = feed.entries.select { |item| item.published > last_read }
       last_read = items.collect { |item| item.published }.max unless items.empty?
       items.each do |item|

data/lib/rrimm/item_formatter/mail.rb

@@ -9,18 +9,17 @@ module RRImm
         @sender = hash[:from]
       end
 
-      def default_author(feed_config)
-        if feed_config.default_name?
-          "RRImm <#{@sender}>"
+      def guess_author(feed_config, item_author)
+        name = "RRImm"
+        name = feed_config.name unless feed_config.default_name?
+        name = item_author if item_author
+        if name.include? '@'
+          name
         else
-          "#{feed_config.name} <#{@sender}>"
+          "#{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
@@ -28,7 +27,7 @@ module RRImm
       end
 
       def format(feed, item, feed_config, pipe)
-        pipe.write "From: #{from [item.author, default_author(feed_config)]}\n"
+        pipe.write "From: #{guess_author(feed_config, item.author)}\n"
         pipe.write "To: #{dest}\n"
         pipe.write "Date: #{item.published.rfc2822}\n"
         pipe.write "Subject: #{subject(feed, item, feed_config)}\n"

data/rrimm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'rrimm'
-  s.version     = '0.6.0'
+  s.version     = '0.7.1'
   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"
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'open_uri_redirections'
   s.add_dependency 'parallel'
-  s.add_dependency 'feedzirra'
+  s.add_dependency 'feedjira'
   s.add_dependency 'colorize'
 
   s.add_development_dependency 'rspec'

data/spec/xkcd_spec.rb

@@ -8,7 +8,7 @@ describe RRImm::ItemFormatter::Mail do
       to: 'to@example.com'
     )
     xkcd_file = File.join('file://', File.dirname(__FILE__), 'xkcd.xml')
-    feed = Feedzirra::Feed.fetch_and_parse(xkcd_file)
+    feed = Feedjira::Feed.fetch_and_parse(xkcd_file)
     expect(feed.entries.size).to be > 0
     s = StringIO.new
     config = double('config')
@@ -27,7 +27,7 @@ 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)
+    feed = Feedjira::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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rrimm
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Grégoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
+date: 2014-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open_uri_redirections
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: feedzirra
+  name: feedjira
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='