yarss 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5fc31207ee7282e79e3f9d031087d1c77e8dba7
-  data.tar.gz: 0e06a204c7c09a60c6c9ea09666b1aebe6a82d2a
+  metadata.gz: df8227811b0fa37c7605e53cbe37106a67fd4f5f
+  data.tar.gz: 239430b572285f2db67d39c3bc29ca743118eee3
 SHA512:
-  metadata.gz: d2c85c04789c1e6864756f26bd5951ba92475dea47f228b78f09c2300e0f719c00042a198a5c515855aee9b275f3cf64bd4154d506a2485247b6f224c10136da
-  data.tar.gz: 581178f47cc9542e111f2211ecf79e05961657807f8cf92c4a4fe5a94e3be46db2e601d3b9095c4a7be5634665b2f157c14418914780933051099480d75a7dee
+  metadata.gz: 01c7ee7bb21d06cf598ad31f9b80980487ad52e62e3380c6125c2bc14204855faed438347b5109e2a272bcba3128ee620ca1b428e2a05bdf74f2dff8655a4e04
+  data.tar.gz: 318a7f1a2d7589e1e2ed8a887ddc15ff31126c4ce2ac8e9c49ca45f66957887241efa9a8304958bdf3617cc05dc054b99cb1bd68d5858893ae313a46112825f3

data/lib/yarss/atom/feed_parser.rb

@@ -78,7 +78,7 @@ module Yarss
       def items
         items = feed.fetch('entry')
         items = [items] unless items.is_a?(Array)
-        items.map { |d| ItemParser.new(d).parse }
+        items.map { |d| ItemParser.new(d, feed_link: link).parse }
       rescue KeyError => e
         raise ParseError, e
       end

data/lib/yarss/atom/item_parser.rb

@@ -11,9 +11,16 @@ module Yarss
       # @return [Hash]
       attr_accessor :data
 
-      # @param data [Hash] Parsed Atom feed item.
-      def initialize(data)
-        self.data = data
+      # Feed link URL.
+      #
+      # @return [String]
+      attr_accessor :feed_link
+
+      # @param data      [Hash]   Parsed Atom feed item.
+      # @param feed_link [String] Feed link URL.
+      def initialize(data, feed_link: '')
+        self.data      = data
+        self.feed_link = feed_link
       end
 
       # Parse out the feed item id, title, updated, link and content and wrap
@@ -92,8 +99,9 @@ module Yarss
       def content
         summary = Attribute.value(data['summary'] || '')
         content = Attribute.value(data['content'] || '')
-        return content unless content.empty?
-        summary
+        content = summary if content.empty?
+
+        Attribute.absolutize_urls(content, feed_link)
       end
     end
   end

data/lib/yarss/attribute.rb

@@ -79,8 +79,8 @@ module Yarss
         link_value(value.fetch('href'))
       when Array
         item = value.find { |l| l.is_a?(String) } ||
-               value.find { |l| l['rel'] && l['rel'] == 'self' } ||
-               value.find { |l| l['rel'] && l['rel'] == 'alternate' }
+               value.find { |l| l['rel'] && l['rel'] == 'alternate' } ||
+               value.find { |l| l['rel'].nil? }
         raise KeyError unless item
         link_value(item)
       when String
@@ -91,5 +91,29 @@ module Yarss
     rescue KeyError => e
       raise ParseError, e
     end
+
+    # Make relative URLs absolute.
+    #
+    # @param content [String] Item content.
+    # @param base    [String] Base URL.
+    #
+    # @return [String]
+    def self.absolutize_urls(content, base)
+      return content if base.empty? || content.empty?
+
+      regex = %r{
+        (?<=src="|href="|src='|href=')
+        /
+        ([^/"'].+?)? # Don't match "//xx" but do match "/".
+        (?="|')
+      }x
+
+      content = content.gsub(regex) do |url|
+        "#{base.chomp('/')}#{url}"
+      end
+      content.gsub!("\r\n", "\n")
+
+      content.freeze
+    end
   end
 end

data/lib/yarss/rdf/feed_parser.rb

@@ -101,7 +101,7 @@ module Yarss
       def items
         items = feed.fetch('item')
         items = [items] unless items.is_a?(Array)
-        items.map { |d| ItemParser.new(d).parse }
+        items.map { |d| ItemParser.new(d, feed_link: link).parse }
       rescue KeyError => e
         raise ParseError, e
       end

data/lib/yarss/rdf/item_parser.rb

@@ -9,9 +9,16 @@ module Yarss
       # @return [Hash]
       attr_accessor :data
 
-      # @param data [Hash] Parsed Rdf feed item.
-      def initialize(data)
-        self.data = data
+      # Feed link URL.
+      #
+      # @return [String]
+      attr_accessor :feed_link
+
+      # @param data      [Hash]   Parsed Rdf feed item.
+      # @param feed_link [String] Feed link URL.
+      def initialize(data, feed_link: '')
+        self.data      = data
+        self.feed_link = feed_link
       end
 
       # Parse out the feed item id, title, updated, link and content and wrap
@@ -105,7 +112,8 @@ module Yarss
       #
       # @return [String]
       def description
-        Attribute.value(data.fetch('description'))
+        description = Attribute.value(data.fetch('description'))
+        Attribute.absolutize_urls(description, feed_link)
       rescue KeyError => e
         raise ParseError, e
       end

data/lib/yarss/rss/feed_parser.rb

@@ -84,7 +84,7 @@ module Yarss
       def items
         items = feed.fetch('item')
         items = [items] unless items.is_a?(Array)
-        items.map { |d| ItemParser.new(d).parse }
+        items.map { |d| ItemParser.new(d, feed_link: link).parse }
       rescue KeyError => e
         raise ParseError, e
       end

data/lib/yarss/rss/item_parser.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'digest'
+
 module Yarss
   module Rss
     # Extract id, title, updated, link and content from a feed item.
@@ -11,9 +13,16 @@ module Yarss
       # @return [Hash]
       attr_accessor :data
 
-      # @param data [Hash] Parsed RSS feed item.
-      def initialize(data)
-        self.data = data
+      # Feed link URL.
+      #
+      # @return [String]
+      attr_accessor :feed_link
+
+      # @param data      [Hash]   Parsed RSS feed item.
+      # @param feed_link [String] Feed link URL.
+      def initialize(data, feed_link: '')
+        self.data      = data
+        self.feed_link = feed_link
       end
 
       # Parse out the feed item id, title, updated, link and content and wrap
@@ -102,12 +111,16 @@ module Yarss
       #
       # @return [String]
       def description
-        description = Attribute.value(data['description'] || '')
-
-        return Attribute.value(data['content:encoded']) if
-          description.empty? && data['content:encoded']
+        content = if data['content:encoded']
+                    data['content:encoded']
+                  elsif data['description']
+                    data['description']
+                  else
+                    ''
+                  end
 
-        description
+        content = Attribute.value(content)
+        Attribute.absolutize_urls(content, feed_link)
       end
     end
   end

data/lib/yarss/version.rb

@@ -2,5 +2,5 @@
 
 module Yarss
   # Version number, happy now?
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yarss
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Oldrich Vetesnik