rrimm 0.11.0 → 0.12.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2UwODJmOTk2M2IwMzljZDg3NTc3NmJkZGNkNjRmMWNhNjRjZTM1Mg==
+    NjM4NjM5NDhhMzZiYzc4MjlmZDZmNzE3MzJiZTliODcyYzZkY2VlMA==
   data.tar.gz: !binary |-
-    MDEyNWQ3NDgzN2ZjM2VmZWVlNDI0ZDZiNTg3YjYxYmFkMjg4YWMwYQ==
+    NzUyMzkwYWU5ZGIyZDE4YzMzN2FkMDE4ZWI3YWRlOGQ2MzAyMzg1Zg==
 SHA512:
   metadata.gz: !binary |-
-    NDQyMDk4MWJkZTQ3MjAxOWVlZTgzY2ZiZjAxZTZlODQzMjI0ZGFmMjMyNmZj
-    NDJiOTIzZDY2NzYzNzE1OWQzYzc0NTk4MDdhNDRkNjQ5MGJhZDFlNmVlMmEz
-    NWIxMGU1ZTA4NTY3Mjc3YmViOGRhZmQ5NDk5OGQxZWZlYzA2ODA=
+    Y2YxODJmODFmMzE2YTdkN2M5ZDhhMWI4YTE1YzAxZWU1NGZkODM0NDBmMmM4
+    YzM0YjY4MWRlYzViMTBjNTM4YWUxM2I2ODJiYzdjOWQzYjRmZGM1OGI4MGE3
+    OWUzYWE3YmYwODg5MjdiMTk3NDY5MDI0N2I1ZGViNGYzOTlhZDg=
   data.tar.gz: !binary |-
-    NTc2NmEwNmE4Y2FiNjljYmM2YzNiNDllOWYxNjZlYzA0NDBjYTRlYzI4MjFj
-    YmVjY2Y1NDVkYjljNThlYjQ0YmE3ZjgwZmI5NzI5MTg2NDFiYjgzYTVmNWYx
-    ZDQ4YjQ3YzIwNzYwYjFiYWNmNjNiM2YxYWNkMmQyODkxYjg5YzQ=
+    MWQ0MWU5NGQ0ZjM5ZTg1MWFiOGI1NTA1NTZhNDcwMTE5OWYyNmRiZDNmNDk5
+    MzYwYjEyNmNjOGI1Y2YyOWJlY2Y5ZGI4YjI3YjQ0YjUzN2JiMjlkNzI1MGE2
+    NGY0ZDRhOTM3NGNiZjkyZjE4Nzk5MWM5OTBmMWUxMjUzNTUwMzc=

data/lib/rrimm.rb

@@ -1,4 +1,5 @@
-require_relative 'rrimm/feed'
+require_relative 'rrimm/feed_config'
+require_relative 'rrimm/feed_config_extensions'
 require_relative 'rrimm/config'
 require_relative 'rrimm/fetcher'
 require_relative 'rrimm/item_formatter'

data/lib/rrimm/config.rb

@@ -62,7 +62,7 @@ module RRImm
     def evaluate_feed_definition(feed_name, &block)
       #this allow to redefine feeds if necessary
       existing_feed = @feeds[feed_name]
-      new_feed = (existing_feed || Feed.new(feed_name))
+      new_feed = (existing_feed || FeedConfig.new(feed_name))
       new_feed.formatter = default_formatter if default_formatter
       new_feed.pipe = pipe if pipe
       new_feed.instance_eval(&block) if block
@@ -89,7 +89,7 @@ module RRImm
     end
 
     def category(cat_name, &block)
-      Feed.module_eval do
+      FeedConfig.module_eval do
         @@tmp_cat_name = cat_name
         alias :old_initialize :initialize
         def initialize(feed_name)
@@ -99,7 +99,7 @@ module RRImm
       end
       self.instance_eval(&block) if block
     ensure
-      Feed.module_eval do
+      FeedConfig.module_eval do
         alias :initialize :old_initialize
       end
     end

data/lib/rrimm/{feed.rb → feed_config.rb}

@@ -2,21 +2,39 @@ require 'mixlib/shellout'
 require 'stringio'
 
 module RRImm
-  class Feed
+  class FeedConfig
  
     attr_accessor :name
     attr_accessor :uri
     attr_accessor :formatter_class, :formatter
     attr_accessor :category
     attr_accessor :pipe
+    attr_accessor :massages
 
     def initialize(name, &block)
       @name = name
       @uri = name
       @formatter_class = RRImm::ItemFormatter::Default
+      @massages = []
       self.instance_eval(&block) if block
     end
 
+    # may apply modifications on feeds
+    # must return an enumerable of feeditems
+    # massage method applies @massages keys as methods on "feed"
+    # it also uses the value as a block if a block is given
+    def massage(feed)
+      @massages.inject(feed) do |mem, method_with_arg|
+        arg = method_with_arg.values.first
+        method = method_with_arg.keys.first
+        if arg
+          mem.send(method, &arg)
+        else
+          mem.send(method)
+        end
+      end
+    end
+
     def format(feed, item)
       @formatter ||= @formatter_class.new
       s = ""

data/lib/rrimm/feed_config_extensions.rb

@@ -0,0 +1,22 @@
+require 'mixlib/shellout'
+require 'stringio'
+
+module RRImm
+  module FeedConfigExtensions
+
+    def method_missing(name, *args, &block)
+      if Enumerable.instance_methods(false).include? name
+        @massages << { name => block }
+      else
+        raise NoMethodError
+      end
+    end
+
+  end
+end
+
+module RRImm
+  class FeedConfig
+    include FeedConfigExtensions
+  end
+end

data/lib/rrimm/fetcher.rb

@@ -58,7 +58,7 @@ module RRImm
       if feed.respond_to? :entries
         items = feed.entries.select { |item| item.published > last_read }
         last_read = items.collect { |item| item.published }.max unless items.empty?
-        items.each do |item|
+        feed_config.massage(items).each do |item|
           feed_config.format(feed, item)
         end
         @config.get_cache.save(feed_config, last_read.to_i, false)

data/lib/rrimm/item_formatter/mail.rb

@@ -13,6 +13,7 @@ module RRImm
         name = "RRImm"
         name = feed_config.name unless feed_config.default_name?
         name = item_author if item_author
+        name = name.gsub(/,/, ' ') # clean from field
         if name.include? '@'
           name
         else

data/rrimm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'rrimm'
-  s.version     = '0.11.0'
+  s.version     = '0.12.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"
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'open_uri_redirections'
   s.add_dependency 'parallel'
   s.add_dependency 'ruby-progressbar'
-  s.add_dependency 'feedjira'
+  s.add_dependency 'feedjira', '< 2'
   s.add_dependency 'colorize'
   s.add_dependency 'mixlib-shellout'
 

data/spec/cache_spec.rb

@@ -10,7 +10,7 @@ describe RRImm::Cache do
   end
 
   it 'reads default timestamp if cache is not present' do
-    feed = RRImm::Feed.new 'http://kernel.org/rss'
+    feed = RRImm::FeedConfig.new 'http://kernel.org/rss'
     Dir.mktmpdir do |dir|
       cache = RRImm::Cache.new dir
       expect(cache.read(feed)).to eq RRImm::Cache::DEFAULT_TIMESTAMP
@@ -18,7 +18,7 @@ describe RRImm::Cache do
   end
 
   it 'reads the correct timestamp' do
-    feed = RRImm::Feed.new 'http://kernel.org/rss'
+    feed = RRImm::FeedConfig.new 'http://kernel.org/rss'
     now = Time.now.to_i
     Dir.mktmpdir do |dir|
       cache = RRImm::Cache.new dir

data/spec/config_spec.rb

@@ -37,9 +37,9 @@ describe RRImm::Config do
       ios = StringIO.new
       allow(RRImm::Cache).to receive(:new).and_return(cache)
       conf = RRImm::Config.new
-      conf.feeds['1_very_old'] = RRImm::Feed.new 'very_old'
-      conf.feeds['3_old'] = RRImm::Feed.new 'old'
-      conf.feeds['7_recent'] = RRImm::Feed.new 'recent'
+      conf.feeds['1_very_old'] = RRImm::FeedConfig.new 'very_old'
+      conf.feeds['3_old'] = RRImm::FeedConfig.new 'old'
+      conf.feeds['7_recent'] = RRImm::FeedConfig.new 'recent'
       expect{ conf.status(ios, 5, 3, false) }.not_to raise_error
       expect(ios.string).to include "#{Time.at(1)} very_old\n".red
       expect(ios.string).to include "#{Time.at(4)} old\n".yellow

data/spec/feed_config_spec.rb

@@ -0,0 +1,57 @@
+require_relative 'spec_helper'
+
+describe RRImm::FeedConfig do
+  describe "#new" do
+    it 'uses the name as uri by default' do
+      f = RRImm::FeedConfig.new 'a random feed'
+      expect(f.name).to eq('a random feed')
+      expect(f.uri).to eq('a random feed')
+      expect(f.default_name?).to be true
+    end
+
+    it 'calls the block if one is specifed' do
+      f = RRImm::FeedConfig.new 'a another feed' do
+        pipe "cat | cat"
+        formatter_class RRImm::ItemFormatter::Mail
+      end
+      expect(f.pipe).to eq "cat | cat"
+      expect(f.formatter_class).to eq RRImm::ItemFormatter::Mail
+    end
+  end
+
+  describe ".massage" do
+    it 'returns argument when no massage' do
+      feed = double('test feed')
+      f = RRImm::FeedConfig.new 'a random feed'
+      expect(f.massage(feed)).to be(feed)
+    end
+    it 'applies simple massage' do
+      feed = (1..5)
+      f = RRImm::FeedConfig.new 'a random feed'
+      f.massages << {select: Proc.new { |el| el % 2 == 0 }}
+      expect(f.massage(feed)).to eq([2,4])
+    end
+  end
+
+  describe ".format" do
+    it 'calls formatter' do
+      formatter = double('formatter')
+      f = RRImm::FeedConfig.new 'a random feed'
+      f.pipe "cat /dev/null"
+      f.formatter = formatter
+      expect(formatter).to receive(:format)
+      expect { f.format(nil, nil) }.not_to raise_error
+    end
+  end
+end
+
+describe RRImm::FeedConfigExtensions do
+  describe 'select' do
+    it 'applies select on feed' do
+      feed = (1..5)
+      f = RRImm::FeedConfig.new 'a random feed'
+      f.select { |el| el % 2 == 0 }
+      expect(f.massage(feed)).to eq([2,4])
+    end
+  end
+end

data/spec/fetcher_spec.rb

@@ -3,7 +3,7 @@ require_relative 'spec_helper'
 describe RRImm::Fetcher do
   let(:basic_conf) do
     xkcd_file = File.join('file://', File.dirname(__FILE__), 'xkcd.xml')
-    feed = RRImm::Feed.new xkcd_file do
+    feed = RRImm::FeedConfig.new xkcd_file do
       pipe 'cat > /dev/null'
     end
     cache = double('cache_mock')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rrimm
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Grégoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: open_uri_redirections
@@ -56,16 +56,16 @@ dependencies:
   name: feedjira
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +156,8 @@ files:
 - lib/rrimm.rb
 - lib/rrimm/cache.rb
 - lib/rrimm/config.rb
-- lib/rrimm/feed.rb
+- lib/rrimm/feed_config.rb
+- lib/rrimm/feed_config_extensions.rb
 - lib/rrimm/fetcher.rb
 - lib/rrimm/item_formatter.rb
 - lib/rrimm/item_formatter/default.rb
@@ -167,7 +168,7 @@ files:
 - script/test
 - spec/cache_spec.rb
 - spec/config_spec.rb
-- spec/feed_spec.rb
+- spec/feed_config_spec.rb
 - spec/fetcher_spec.rb
 - spec/spec_helper.rb
 - spec/xkcd.xml
@@ -199,7 +200,7 @@ summary: RSS to email tool
 test_files:
 - spec/cache_spec.rb
 - spec/config_spec.rb
-- spec/feed_spec.rb
+- spec/feed_config_spec.rb
 - spec/fetcher_spec.rb
 - spec/spec_helper.rb
 - spec/xkcd.xml

data/spec/feed_spec.rb

@@ -1,32 +0,0 @@
-require_relative 'spec_helper'
-
-describe RRImm::Feed do
-  describe "#new" do
-    it 'uses the name as uri by default' do
-      f = RRImm::Feed.new 'a random feed'
-      expect(f.name).to eq('a random feed')
-      expect(f.uri).to eq('a random feed')
-      expect(f.default_name?).to be true
-    end
-
-    it 'calls the block if one is specifed' do
-      f = RRImm::Feed.new 'a another feed' do
-        pipe "cat | cat"
-        formatter_class RRImm::ItemFormatter::Mail
-      end
-      expect(f.pipe).to eq "cat | cat"
-      expect(f.formatter_class).to eq RRImm::ItemFormatter::Mail
-    end
-  end
-
-  describe ".format" do
-    it 'calls formatter' do
-      formatter = double('formatter')
-      f = RRImm::Feed.new 'a random feed'
-      f.pipe "cat /dev/null"
-      f.formatter = formatter
-      expect(formatter).to receive(:format)
-      expect { f.format(nil, nil) }.not_to raise_error
-    end
-  end
-end