feedium 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a623533c3b3481c071ddc840d3cc1de3a9394ecc
-  data.tar.gz: c868ef117f2d8d2efa6de0246c0897a8d24fb973
+  metadata.gz: 87bb2ca448ee83469233e386786cd2eb0ca79769
+  data.tar.gz: 8cf645f6f608dae97d64d09d484316d831a2bbb7
 SHA512:
-  metadata.gz: 750503cb57adcd45da96ae582026b649e3793b6cdf92801f2994ebb5863855a1d62d6153c53f337e3b65b62bf6cf586ca3775962d78ec0ffdf828d69774c6cf8
-  data.tar.gz: ace8902a68177ce88e91c1a5eace6ba886d6a468d55edc6a16da8511f04ed739de017a87893398097614e0ff7b59d86e343685eb5a29fa7b84629acd4a667cc7
+  metadata.gz: 6a3db6240adb8c5dfc7e0df4bebc0f6a3c1845b6981aee11be381ad7471bdd2a943f5dec61e7eea00cf5ff1e8ef1422edb5bfbbf7e2ae2c173c4afeb3f55f5e7
+  data.tar.gz: b5a2b8fefe268e6be2d6104c6abdf0e654125879ec27d15210a839fccb0b628f10e704b204f46b345e7a46a3bec620bdbc903daf494cdc3c12da370becb93cbd

data/examples/parse.rb

@@ -2,4 +2,4 @@ dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 require File.join(dir, 'feedium')
 
 # puts Feedium.parse('http://mangastream.com/rss')
-puts Feedium.parse('https://mrmondialisation.org/feed/')
+puts Feedium.find('http://www.gazzettadelsud.it/feed.jsp')

data/lib/feedium/request.rb

@@ -4,7 +4,9 @@ class Feedium::Request
   URI_REQEX         = /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/ix
   MAX_CONTENT_SIZE  = 5 * 1048576 # bytes in 1MB
 
-  def initialize(url)
+  def initialize(url, base_uri = nil)
+    url = URI.parse(base_uri).merge(url).to_s if base_uri
+
     begin
       @uri = URI.parse(url)
     rescue URI::InvalidURIError => e

data/lib/feedium/version.rb

@@ -1,3 +1,3 @@
 module Feedium
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/lib/feedium.rb

@@ -25,20 +25,25 @@ module Feedium
     doc   = Nokogiri::HTML(@request.io.read)
 
     if doc.at('base') && doc.at('base')['href']
-      base_uri = doc.at('base')['href']
+      @base_uri = doc.at('base')['href']
     else
-      base_uri = "#{@request.uri.scheme}://#{@request.uri.host}"
+      @base_uri = "#{@request.uri.scheme}://#{@request.uri.host}"
     end
 
     doc.xpath("//link[@rel='alternate'][@href][@type]").each do |l|
       if CONTENT_TYPES.include?(l['type'].downcase.strip)
-        return @request.url if self.feed?(base_uri ? URI.parse(base_uri).merge(l['href']).to_s : l['href'])
+        return @request.url if self.feed?(l['href'])
       end
     end
 
     doc.xpath("//a[@href]").each do |a|
-      url = %w(feed rss atom).detect {|k| a['href'].end_with?(k) }
-      return @request.url if url && self.feed?(base_uri ? URI.parse(base_uri).merge(url).to_s : url)
+      found = %w(feed rss atom).detect {|k| !a['href'].index(k).nil? }
+
+      begin
+        return @request.url if found && self.feed?(a['href'])
+      rescue Feedium::RequestError
+        next
+      end
     end
 
     nil
@@ -53,7 +58,7 @@ module Feedium
   end
 
   def self.feed?(url)
-    @request = Request.new(url)
+    @request = Request.new(url, @base_uri)
     @request.send
 
     content_type = @request.io.content_type.downcase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feedium
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Alex