rrimm 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c13bf813e548a68a49472947ae6c453580548a5
-  data.tar.gz: 864bdd0041627f75e9a09fa6645d6e73be6dda9d
+  metadata.gz: fe165abd85bdd5c571e37e41e89763e500c94a8e
+  data.tar.gz: 4d1f772e68e92b5a7a6a078aaa5f486919f37522
 SHA512:
-  metadata.gz: 0a1b16871bd6cba0bc09623acea7a34c9584b6ae4d2daa94d52b753c968dcc55677e4bcfa3d959b84dade4c40193ddd21a3c75b976a622220e98f9c3bfea3935
-  data.tar.gz: 59866fbf2487a5990570a0a90e1e0445d719d57f092824e9fcff4da78f47a1c3f0ce908127d4e751e1a31027794efc3ad7a8ea8a4f882841aca8a879c8c33aef
+  metadata.gz: 8a8a4626df8cedb7ffd9677fbfb1c97426755c718cdea89f8fa63c7d5821e322a4ca81925949a912a418779017b5cb318ab05880d21b20f6f2f4ff1a41af44d5
+  data.tar.gz: 610e769fcf85197cae7429e42f57e80e809617b90934dba572bebbf8b92f2aa7f0534765a11d7f919e157635aeaf5f03d59933d7bbaaaaeacecb74a50574f3e4

data/.gitignore

@@ -0,0 +1,2 @@
+coverage/
+*gem

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    rrimm (0.1.1)
+    rrimm (0.2.0)
+      feedzirra
       open_uri_redirections
       parallel
 
@@ -14,10 +15,20 @@ GEM
       simplecov (>= 0.7)
       term-ansicolor
       thor
+    curb (0.8.5)
     diff-lcs (1.2.5)
     docile (1.1.3)
+    feedzirra (0.7.1)
+      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)
     multi_json (1.9.0)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
     open_uri_redirections (0.1.4)
     parallel (0.9.2)
     rest-client (1.6.7)
@@ -30,6 +41,8 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
+    sax-machine (0.2.1)
+      nokogiri (~> 1.6.0)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json

data/bin/rrimm

@@ -11,7 +11,6 @@ require 'optparse'
 options = {
   'action' => :sync,
   'conf_file' => File.join(ENV['HOME'], '.config', 'rrimm', 'rrimm.rb'),
-  'concurrency' => 1,
 }
 
 OptionParser.new do |opts|
@@ -46,7 +45,7 @@ fetcher = RRImm::Fetcher.new(conf)
 
 case options['action']
 when :sync
-  fetcher.parallel_fetch(options['concurrency'])
+  fetcher.fetch(options['concurrency'])
 when :show
   conf.show
 end

data/lib/rrimm.rb

@@ -3,5 +3,3 @@ require_relative 'rrimm/config'
 require_relative 'rrimm/fetcher'
 require_relative 'rrimm/item_formatter'
 require_relative 'rrimm/cache'
-require_relative 'rrimm/generic_item'
-require_relative 'rrimm/generic_feed'

data/lib/rrimm/fetcher.rb

@@ -1,4 +1,4 @@
-require 'rss'
+require 'feedzirra'
 require 'open-uri'
 require 'open_uri_redirections'
 require 'parallel'
@@ -12,13 +12,21 @@ module RRImm
       @config = config
     end
 
+    def fetch(concurrency=nil)
+      if concurrency
+        parallel_fetch(concurrency)
+      else
+        linear_fetch
+      end
+    end
+
     def parallel_fetch(concurrency)
       Parallel.map(@config.feeds, :in_threads => concurrency) do |name,feed_config|
         fetch_feed(name, feed_config)
       end
     end
 
-    def fetch
+    def linear_fetch
       @config.feeds.map do |name,feed_config|
         fetch_feed(name, feed_config)
       end
@@ -27,14 +35,11 @@ module RRImm
     def fetch_feed(name, feed_config)
       last_read = Time.at(@config.get_cache.read(feed_config))
       puts name
-      open(feed_config.uri, :allow_redirections => :safe) do |rss|
-        feed = RSS::Parser.parse(rss)
-        feed = GenericFeed.new feed
-        items = feed.items.select { |item| item.date > last_read }
-        last_read = items.collect { |item| item.date }.max unless items.empty?
-        items.each do |item|
-          feed_config.format(feed, item)
-        end
+      feed = Feedzirra::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|
+        feed_config.format(feed, item)
       end
       @config.get_cache.save(feed_config, last_read.to_i)
     end

data/lib/rrimm/item_formatter/default.rb

@@ -2,7 +2,7 @@ module RRImm
   module ItemFormatter
     class Default
       def format(feed, item, feed_config, pipe)
-        pipe.write "#{feed.channel.title}: #{item.title} (#{item.date})"
+        pipe.write "#{feed.title}: #{item.title} (#{item.published})"
         pipe.write "\n"
       end
     end

data/lib/rrimm/item_formatter/mail.rb

@@ -29,9 +29,9 @@ module RRImm
         pipe.write "Subject: #{subject(feed, item, feed_config)}\n"
         pipe.write "Content-Type: text/html;\n"
         pipe.write "\n"
-        pipe.write item.link
+        pipe.write item.url
         pipe.write "\n\n"
-        pipe.write item.content if item.content
+        pipe.write (item.content || item.summary)
         pipe.write "\n"
       end
     end

data/rrimm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'rrimm'
-  s.version     = '0.1.1'
+  s.version     = '0.2.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"
@@ -15,4 +15,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'coveralls'
   s.add_dependency 'open_uri_redirections'
   s.add_dependency 'parallel'
+  s.add_dependency 'feedzirra'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rrimm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Grégoire Seux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: feedzirra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: imm reboot in ruby. Retrieve rss feeds and send them by email
 email: rrimm@familleseux.net
 executables:
@@ -74,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .coveralls.yml
+- .gitignore
 - .travis.yml
 - Gemfile
 - Gemfile.lock
@@ -86,8 +101,6 @@ files:
 - lib/rrimm/config.rb
 - lib/rrimm/feed.rb
 - lib/rrimm/fetcher.rb
-- lib/rrimm/generic_feed.rb
-- lib/rrimm/generic_item.rb
 - lib/rrimm/item_formatter.rb
 - lib/rrimm/item_formatter/default.rb
 - lib/rrimm/item_formatter/mail.rb
@@ -116,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: RSS to email tool

data/lib/rrimm/generic_feed.rb

@@ -1,20 +0,0 @@
-module RRImm
-  class GenericFeed
-    def initialize(feed)
-      @underlying = feed
-      @items = feed.items.map {|item| GenericItem.new item }
-      case feed
-      when RSS::Rss
-        @title = feed.channel.title
-      when RSS::Atom
-      end
-    end
-
-    attr_accessor :underlying
-    attr_accessor :title
-
-    attr_accessor :items
-
-
-  end
-end

data/lib/rrimm/generic_item.rb

@@ -1,38 +0,0 @@
-module RRImm
-  class GenericItem
-    def initialize(item)
-      @underlying = item
-      case item
-      when RSS::Rss::Channel::Item
-        @date = item.date
-        @title = item.title
-        @link = item.link
-        @content = item.description
-        @author = item.author
-      when RSS::Atom::Feed::Entry
-        @date = item.date || item.updated.content
-        @title = item.title.content
-        @link = item.link
-        @content = item.content
-        @author = item.author
-      else
-        puts item.class
-        fail "Please code this case !"
-        @updated_date = item.updated_date
-        @content = item.content
-      end
-    end
-
-    attr_accessor :underlying
-
-    attr_accessor :title
-    attr :updated_date, :date
-    attr_accessor :link
-    attr_accessor :content
-    attr_accessor :author
-
-    def date
-      @updated_date || @date
-    end
-  end
-end