bf_multi_rss 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a12ae479d3f05d6952f7131b0c83309a0551b542
-  data.tar.gz: ef42582d41700d608a9e0e92ebd9f3a87faf3f8f
+  metadata.gz: f7f8b68ede65205602826b8ba45861ebddf403ef
+  data.tar.gz: 5a0f1943d2e79858fbdb1f22d31df63749887aae
 SHA512:
-  metadata.gz: 9ac0c2f8858987ddbff1c3b6b52a29ecbeb38c46728881892e5aeeb53af56c83ee9a528401dc1f1beaba9464080747814f25b48ee8b05cc0b90969cedfeba2ef
-  data.tar.gz: 3c29f8b4e443f2750c522a58e50981516d97449aa4e3d08529a089e7403d8561e1ad18a0059e32a982b4a436d589d660d7d71efeaccbd7784d71251f9c28400d
+  metadata.gz: 76746b80b089233a173388179f93897a88e4c60e0f659d22a159a00f61615b9f5d1019808c012503aca26b16efd4c987fb06e5773f94f75ed0dcf9163013e965
+  data.tar.gz: 33eae3cb22187df2d02e76558ab8b53e3d37fbeb2e2d79832198212a0eb5a03ea8a30505f75dc99123ced57581b3f984d689dd883d425f18dfb5a481cba43107

data/bf_multi_rss.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'bf_multi_rss/version'

data/lib/bf_multi_rss/fetcher.rb

@@ -2,6 +2,7 @@ require 'rss'
 require 'http'
 require 'parallel'
 require 'bf_multi_rss/rss_result'
+require 'bf_multi_rss/rss_error'
 
 module BfMultiRss
   class NotInvertibleError < StandardError
@@ -14,10 +15,15 @@ module BfMultiRss
       @errors = []
     end
 
-    def self.fetch_rss(uri)
+    def fetch_uri(uri)
       response = HTTP.get(uri)
       raise_errors(response, uri)
-      rss = RSS::Parser.parse(response.to_s, false)
+      response.to_s
+    end
+
+    def fetch_rss(uri)
+      response = fetch_uri(uri)
+      rss = RSS::Parser.parse(response, false)
       if rss.nil?
         err = 'ParseErr ' + uri
         raise NotInvertibleError, err
@@ -25,28 +31,30 @@ module BfMultiRss
       rss.items
     end
 
-    def self.raise_errors(response, uri)
+    def raise_errors(response, uri)
       case response.status
       when 500
         err = 'Http500 ' + uri
         raise NotInvertibleError, err
       when 404
         err = 'Http404 ' + uri
-        raise err
+        raise NotInvertibleError, err
       when 301
         err = 'Http301 ' + uri
         raise NotInvertibleError, err
       end
     end
 
-    def self.fetch_all(uris)
-      Parallel.map(
+    def fetch_all(uris)
+      @errors = []
+      results = Parallel.map(
         uris,
         in_processes: @concurrency
       ) do |uri|
         begin
           posts = fetch_rss(uri)
           BfMultiRss::RssResult.new(uri, posts)
+
         rescue  REXML::ParseException,
                 OpenURI::HTTPError,
                 Errno::EHOSTUNREACH,
@@ -56,11 +64,17 @@ module BfMultiRss
                 Net::ReadTimeout,
                 Errno::ECONNREFUSED,
                 Errno::ECONNRESET,
-                NotInvertibleError
-          puts uri
-          next
+                NotInvertibleError => e
+          BfMultiRss::RssError.new(uri, e)
         end
       end
+      errors = results.select do |result|
+        result.is_a? BfMultiRss::RssError
+      end
+      @errors = errors
+      results.select do |result|
+        !result.is_a? BfMultiRss::RssError
+      end
     end
   end
 end

data/lib/bf_multi_rss/rss_error.rb

@@ -0,0 +1,9 @@
+module BfMultiRss
+  class RssError
+    attr_reader :uri, :e
+    def initialize(uri, e)
+      @uri = uri
+      @e = e
+    end
+  end
+end

data/lib/bf_multi_rss/version.rb

@@ -1,3 +1,3 @@
 module BfMultiRss
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bf_multi_rss
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Sebastian Schürmann
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,7 @@ files:
 - bin/console
 - bin/setup
 - lib/bf_multi_rss/fetcher.rb
+- lib/bf_multi_rss/rss_error.rb
 - lib/bf_multi_rss/rss_result.rb
 - lib/bf_multi_rss/version.rb
 homepage: https://github.com/bundesfeeds