ruby-feedparser 0.9.7 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e198cf8ee7423ff4edf5ba4367ac809ba1fe2a9d6361fcf53d12b984aa138228
-  data.tar.gz: bbbd8c024c4e85c991ae2ceae4494e24d8b0865d2fe6a4df2646007e798e96ac
+  metadata.gz: aed5dc094f3df2dc51b9d2be81c4966b4b48de319e91df05f13c550ddcc384f4
+  data.tar.gz: 9ff2a1c9b591222b79e59e52b3db1980c9515a5df937884c9731420102e94281
 SHA512:
-  metadata.gz: ac90154cfa40180e03d4b7b1d631186c6db1d70d79bdbb7f4edb4c54a66eddab3085e04480ed965b7c2e055770976873224b9d12f20be3d282817d6cd34245be
-  data.tar.gz: 4f658dc07c1d692b44f9abd0d400449cb0e1aa3d1cda8c782b052e45b193a8ad462ce7e2d8f951b3d15b301764e651f3781da93cf07f28c1ea8438ab87a1c989
+  metadata.gz: '09cb81364cab19764aec4b8ddd5a6d107b021d89c5372643be893abdee45c0c4706cbf19a854a499862efae27da75ad70157d7442943de105ef2d6054aebc342'
+  data.tar.gz: e315743c486510b9b441c96973470b5d333581dadae93b0659c631da7c91424be1f419a98dc881c21995123bdd10ba97e3d7a005d4d503b8be6978851f8a94c0

data/Rakefile

@@ -9,13 +9,13 @@ require_relative 'lib/feedparser/version.rb'
 PKG_NAME = 'ruby-feedparser'
 PKG_VERSION = FeedParser::VERSION
 
-PKG_FILES = [ 'ChangeLog.md', 'README', 'COPYING', 'LICENSE', 'setup.rb', 'Rakefile']
+PKG_FILES = [ 'README', 'COPYING', 'LICENSE', 'setup.rb', 'Rakefile']
 Find.find('lib/', 'test/', 'tools/') do |f|
-	if FileTest.directory?(f) and f =~ /\.svn/
-		Find.prune
-	else
-		PKG_FILES << f
-	end
+  if FileTest.directory?(f) and f =~ /\.svn/
+    Find.prune
+  else
+    PKG_FILES << f
+  end
 end
 
 PKG_FILES.reject! { |f| f =~ /^test\/(source|.*_output)\// }
@@ -23,8 +23,9 @@ PKG_FILES.reject! { |f| f =~ /^test\/(source|.*_output)\// }
 task :default => [:test]
 
 Rake::TestTask.new do |t|
-	t.libs << "test"
-	t.test_files = FileList['test/tc_*.rb']
+  t.libs << "test"
+  t.test_files = FileList['test/tc_*.rb']
+  t.verbose = true
 end
 
 Rake::RDocTask.new do |rd|
@@ -50,36 +51,36 @@ end
 
 task :doctoweb => [:rdoc] do |t|
    # copies the rdoc to the CVS repository for ruby-feedparser website
-	# repository is in $CVSDIR (default: ~/dev/ruby-feedparser-web)
+  # repository is in $CVSDIR (default: ~/dev/ruby-feedparser-web)
    sh "tools/doctoweb.bash"
 end
 
 Rake::PackageTask.new(PKG_NAME, PKG_VERSION) do |p|
-	p.need_tar = true
+  p.need_tar = true
   p.need_zip = true
-	p.package_files = PKG_FILES
+  p.package_files = PKG_FILES
 end
 
 # "Gem" part of the Rakefile
 begin
-	spec = Gem::Specification.new do |s|
-		s.platform = Gem::Platform::RUBY
-		s.summary = "Ruby library to parse ATOM and RSS feeds"
-		s.name = PKG_NAME
-		s.version = PKG_VERSION
-		s.requirements << 'none'
-		s.require_path = 'lib'
-		s.autorequire = 'feedparser'
-		s.files = PKG_FILES
-		s.description = "Ruby library to parse ATOM and RSS feeds"
-		s.authors = ['Lucas Nussbaum']
-		s.add_runtime_dependency 'magic'
-	end
+  spec = Gem::Specification.new do |s|
+    s.platform = Gem::Platform::RUBY
+    s.summary = "Ruby library to parse ATOM and RSS feeds"
+    s.name = PKG_NAME
+    s.version = PKG_VERSION
+    s.requirements << 'none'
+    s.require_path = 'lib'
+    s.autorequire = 'feedparser'
+    s.files = PKG_FILES
+    s.description = "Ruby library to parse ATOM and RSS feeds"
+    s.authors = ['Lucas Nussbaum']
+    s.add_runtime_dependency 'magic'
+  end
 
-	Gem::PackageTask.new(spec) do |pkg|
-		pkg.need_zip = true
-		pkg.need_tar = true
-	end
+  Gem::PackageTask.new(spec) do |pkg|
+    pkg.need_zip = true
+    pkg.need_tar = true
+  end
 rescue LoadError
   puts "Will not generate gem."
 end

data/lib/feedparser/html-output.rb

@@ -2,38 +2,78 @@ require 'feedparser'
 require 'feedparser/filesizes'
 
 module FeedParser
+  STYLESHEET = <<~EOF
+  <style type="text/css">
+  body {
+    margin: 2em auto;
+    max-width: 960px;
+  }
+
+  table.header {
+    margin-bottom: 1em;
+  }
+
+  table.header, table.metadata, table.attachments {
+    font-family: Helvetica, Verdana, sans-serif;
+  }
+
+  table.header, table.metadata, table.attachments, pre {
+    width: 100%;
+    padding: 0.5em;
+    background: #eeeeec;
+    border: 1px solid #babdb6;
+  }
+
+  table.header th, table.metadata th, table.attachments th {
+    text-align: right;
+    width: 50px;
+  }
+
+  blockquote {
+    font-style: italic;
+    color: #2e3436;
+    border-left: 2px solid #babdb6;
+    padding-left: 0.5em;
+  }
+
+  hr {
+    border: none;
+    border-top: 1px solid #babdb6;
+    margin: 1em auto
+  }
+  </style>
+  EOF
   class Feed
     def to_html(localtime = true)
       s = ''
-      s += '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">'
-      s += "\n"
-      s += "<html>\n"
+      s += "<!doctype html>\n"
+      s += "<html lang=en>\n"
       s += "<head>\n"
+      s += "<meta charset=\"utf-8\"/>\n"
       s += "<title>#{@title.escape_html}</title>\n"
-      s += "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\">\n"
+      s += FeedParser::STYLESHEET
       s += "</head>\n"
       s += "<body>\n"
 
       s += <<-EOF
-<table border="1" width="100%" cellpadding="0" cellspacing="0" borderspacing="0"><tr><td>
-<table width="100%" bgcolor="#EDEDED" cellpadding="4" cellspacing="2">
+<table class="feed-header">
       EOF
       r = ""
       r += "<a href=\"#{@link}\">\n" if @link
       if @title
-        r += "<b>#{@title.escape_html}</b>\n"
+        r += @title.escape_html
       elsif @link
-        r += "<b>#{@link.escape_html}</b>\n"
+        r += @link.escape_html
       else
-        r += "<b>Unnamed feed</b>\n"
+        r += "Unnamed feed"
       end
       r += "</a>\n" if @link
-      headline = "<tr><td align=\"right\"><b>%s</b></td>\n<td width=\"100%%\">%s</td></tr>"
+      headline = "<tr><th>%s</th>\n<td>%s</td></tr>"
       s += (headline % ["Feed title:", r])
       s += (headline % ["Type:", @type])
       s += (headline % ["Encoding:", @encoding])
       s += (headline % ["Creator:", @creator.escape_html]) if @creator
-      s += "</table></td></tr></table>\n"
+      s += "</table>\n"
 
       if @description and @description !~ /\A\s*</m
         s += "<br/>\n"
@@ -51,44 +91,47 @@ module FeedParser
 
   class FeedItem
     def to_html_with_headers(localtime = true)
-      s = <<-EOF
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<body>
-  EOF
+      s = "<!doctype html>\n"
+      s += '<html lang="en">'
+      s += '<head>'
+      s += '<meta charset="utf-8"/>'
+      s += "<title>#{@title.escape_html}</title>\n"
+      s += FeedParser::STYLESHEET
+      s += '</head>'
+      s += '<body>'
       s += to_html(localtime)
-      s += "\n</body>\n</html>"
+      s += "</body>"
+      s += "</html>"
       s
     end
 
     def to_html(localtime = true)
       s = <<-EOF
-<table border="1" width="100%" cellpadding="0" cellspacing="0" borderspacing="0"><tr><td>
-<table width="100%" bgcolor="#EDEDED" cellpadding="4" cellspacing="2">
+<table class="header">
       EOF
       r = ""
       r += "<a href=\"#{@feed.link}\">\n" if @feed.link
       if @feed.title
-        r += "<b>#{@feed.title.escape_html}</b>\n"
+        r += @feed.title.escape_html
       elsif @feed.link
-        r += "<b>#{@feed.link.escape_html}</b>\n"
+        r += @feed.link.escape_html
       else
-        r += "<b>Unnamed feed</b>\n"
+        r += "Unnamed feed"
       end
       r += "</a>\n" if @feed.link
-      headline = "<tr><td align=\"right\"><b>%s</b></td>\n<td width=\"100%%\">%s</td></tr>"
+      headline = "<tr><th>%s</th>\n<td>%s</td></tr>"
       s += (headline % ["Feed:", r])
 
       r = ""
       r += "<a href=\"#{link}\">" if link
       if @title
-        r += "<b>#{@title.escape_html}</b>\n"
+        r += @title.escape_html
       elsif link
-        r += "<b>#{link.escape_html}</b>\n"
+        r += link.escape_html
       end
       r += "</a>\n" if link
       s += (headline % ["Item:", r])
-      s += "</table></td></tr></table>\n"
+      s += "</table>\n"
       s += "\n"
       if @content and @content !~ /\A\s*</m
         s += "<br/>\n"
@@ -96,19 +139,18 @@ module FeedParser
       s += "#{@content}" if @content
       if @enclosures and @enclosures.length > 0
         s += <<-EOF
-<table border="1" width="100%" cellpadding="0" cellspacing="0" borderspacing="0"><tr><td>
-<table width="100%" bgcolor="#EDEDED" cellpadding="2" cellspacing="2">
+<table class="attachments">
         EOF
-        s += '<tr><td width="100%"><b>Files:</b></td></tr>'
+        s += '<tr><th>Files:</th></tr>'
         s += "\n"
         @enclosures.each do |e|
-          s += "<tr><td>&nbsp;&nbsp;&nbsp;<a href=\"#{e[0]}\">#{e[0].split('/')[-1]}</a> (#{e[1].to_i.to_human_readable}, #{e[2]})</td></tr>\n"
+          s += "<tr><td><a href=\"#{e[0]}\">#{e[0].split('/')[-1]}</a> (#{e[1].to_i.to_human_readable}, #{e[2]})</td></tr>\n"
         end
-        s += "</table></td></tr></table>\n"
+        s += "</table>\n"
       end
-      s += "\n<hr width=\"100%\"/>\n"
-      s += '<table width="100%" cellpadding="0" cellspacing="0">' + "\n"
-      l = '<tr><td align="right"><font color="#ababab">%s</font>&nbsp;&nbsp;</td><td><font color="#ababab">%s</font></td></tr>' + "\n"
+      s += "\n<hr/>\n"
+      s += '<table class="metadata">' + "\n"
+      l = '<tr><th>%s</th><td>%s</td></tr>' + "\n"
       if @date
         if localtime
           s += l % [ 'Date:', @date.to_s ]

data/lib/feedparser/version.rb

@@ -1,3 +1,3 @@
 module FeedParser
-  VERSION = "0.9.7"
+  VERSION = "0.10.0"
 end

data/test/tc_item_htmloutput.rb

@@ -0,0 +1,17 @@
+require 'test/unit'
+require 'feedparser'
+require 'feedparser/html-output'
+
+
+class ItemHTMLOutputTest < Test::Unit::TestCase
+  def test_html_with_headers
+    feed = FeedParser::Feed.new
+    item = FeedParser::FeedItem.new(nil, feed)
+    item.title = "Some great title"
+    item.content = "Lorem ipsum ..."
+    html = item.to_html_with_headers(false)
+    assert_match(/Some great title/, html)
+    assert_match(/Lorem ipsum .../, html)
+    assert_match(/<style type="text\/css">/, html)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-feedparser
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.10.0
 platform: ruby
 authors:
 - Lucas Nussbaum
 autorequire: feedparser
 bindir: bin
 cert_chain: []
-date: 2021-02-06 00:00:00.000000000 Z
+date: 2021-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: magic
@@ -31,7 +31,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - COPYING
-- ChangeLog.md
 - LICENSE
 - README
 - Rakefile
@@ -50,6 +49,7 @@ files:
 - test/tc_feeditem.rb
 - test/tc_html2text_parser.rb
 - test/tc_htmloutput.rb
+- test/tc_item_htmloutput.rb
 - test/tc_parser.rb
 - test/tc_sgml_parser.rb
 - test/tc_textoutput.rb
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.2.5
+rubygems_version: 3.2.27
 signing_key: 
 specification_version: 4
 summary: Ruby library to parse ATOM and RSS feeds

data/ChangeLog.md

@@ -1,66 +0,0 @@
-# 0.9.4 (25/03/2016)
-
-Bug fixes:
-
-* feedparser: relax exception check for Magic errors; by Eric Wong
-* Always sort author list to avoid unecessary invalidation of caches; by Sébastien Dailly
-
-# 0.7 (27/07/2009)
-
-* Handled several creators per feed item
-* Fix bug with urls into tag attributes
-* Better item categories support
-* Reworked text output formatting
-* Ignore ­, as some blog software (dotclear2) misuse it.
-
-# 0.6 (23/07/2008)
-
-* Moved `to_human_readable` from class Fixnum to class Integer.
-* Correctly parse http://www.tbray.org/ongoing/ongoing.atom. Thanks
-  to Janico Greifenberg for reporting this.
-* String#html2text now takes an additional wrapto parameter, allowing
-  to wrap the text to a specified number of chars. Thanks to
-  Maxime Petazzoni for the patch.
-
-# 0.5 (26/10/2007)
-
-* Fixed a bug with items with both non-escaped and escaped HTML. Reported,
-  then patch provided by Gregory Hartman <gghartma@cs.cmu.edu>.
-* In Atom feeds, use the date provided in <updated>, and use it in
-  preference to the one in <published> if both are available.
-  Closes gna bug #8987.
-* "require 'feedparser'" now requires 'feedparser/text-output'. Fixes a bug
-  reported by Sebastian Probst Eide.
-* Make checks for HTML tags case-insensitive. Broke Dilbert feeds!!
-  Reported by Michal Čihař. Closes gna bug #10199.
-
-# 0.4 (01/05/2007)
-
-* Fixed a problem with html entities in the items' titles.
-* Date was not fetched for blogspot's atom feeds.
-  Patch from Jason Ling <jason.ling@jeyel.com>.
-* Tests are now timezone-friendly. (closes GNA bug #8145).
-* Much nicer text output.
-
-# 0.3 (01/12/2006)
-
-* Much nicer HTML output
-* Fixed a problem with some feeds with broken enclosures (without url)
-* Now automatically fixes non-absolute `<a href>` or `<img src>`
-* Fixed small parser bugs
-* Now displays enclosures in the text and html outputs. Ready for
-  podcasting :-)
-* Now escape title, creator, subject and category internally. This minor
-  fix avoids &amp; stuff in the titles, for example.
-
-* 0.2 (05/06/2006)
-
-* Fixed a problem when parsing some ATOM feeds with <link> without type
-  attribute. (Thanks Michal Cihar !)
-* FeedParser::Feed and FeedParser::FeedItem now have an xml attribute to
-  get the related REXML::Element.
-* <enclosure/> support in RSS.
-
-# 0.1 (24/11/2005)
-
-* first public release.