@@ -1,4 +1,5 @@ require 'planet/config' +require 'html5/tokenizer' class PlanetFormatter @@ -8,7 +9,27 @@ class PlanetFormatter def plain(value) #TODO add HTML stripper - return value + tokenizer = HTML5::HTMLTokenizer.new(value) + line = "" + tokenizer.each { |t| +# puts "PLAIN: token, type=#{t[:type]}, data=#{t[:data]}, name=#{t[:name]}\n" + + case t[:type] + when :StartTag, :EndTag, :EmptyTag, :Comment + next + when :SpaceCharacters + line << t[:data] + when :Characters + line << t[:data] + when :ParseError + puts "PLAIN: parse error, data=#{t[:data]}, name=#{t[:name]}\n" + puts "PLAIN: parse error, value=#{value}\n" + line << value + else + puts "PLAIN: uncaught type #{t[:type]}\n" + end + } + return line end def string(value) @@ -18,14 +39,18 @@ class PlanetFormatter def planet_date(value) df = Planet.config['Planet']['date_format'] - df = "%B %d, %Y %I:%M %p" unless df - return value ? Time.parse(value).gmtime.strftime(df): nil + df ||= "%B %d, %Y %I:%M %p" + t = value ? Time.parse(value).gmtime.strftime(df): nil + t.gsub!('"', '') + return t end def new_date(value) ndf = Planet.config['Planet']['new_date_format'] - ndf = "%B %d, %Y %I:%M %p" unless ndf - return value ? Time.parse(value).gmtime.strftime(ndf): nil + ndf ||= "%B %d, %Y %I:%M %p" + t = value ? Time.parse(value).gmtime.strftime(ndf): nil + t.gsub!('"', '') + return t end def rfc822(value) planet/formatter.rb @@ -24,10 +24,10 @@ class HamlFormatter < PlanetFormatter out['logo'] = string(f.logo) if f.logo out['message'] = string(f.message) if f.message out['name'] = string(f.name) if f.name - out['rights'] = string(f.rights) if f.rights - out['subtitle'] = string(f.subtitle) if f.subtitle - out['title'] = string(f.title) if f.title - out['title_plain'] = plain(f.title) if f.title + out['rights'] = string(f.rights) unless f.rights.size == 0 + out['subtitle'] = string(f.subtitle) unless f.subtitle.size == 0 + out['title'] = string(f.title) unless f.title.size == 0 + out['title_plain'] = plain(f.title) unless f.title.size == 0 out['url'] = string(f.url) if f.url return out end @@ -77,7 +77,7 @@ class HamlFormatter < PlanetFormatter out['published_822'] = rfc822(e.published) if e.published out['published_iso'] = rfc3399(e.published) if e.published out['rights'] = string(e.rights) unless e.rights.size == 0 - out['source'] = string(e.source) if e.source + out['source'] = string(e.source.name) if e.source.name out['summary_language'] = string(e.summary_detail.language) if e.summary_detail.language rescue nil out['title'] = string(e.title) unless e.title.size == 0 out['title_language'] = string(e.title_detail.language) if e.title_detail.language rescue nil @@ -199,10 +199,10 @@ class HamlFormatter < PlanetFormatter result << "logo: #{f['logo']}\n" if f['logo'] result << "message: #{f['message']}\n" if f['message'] result << "name: #{f['name']}\n" if f['name'] - result << "rights: #{f['rights']}\n" if f['rights'].length > 0 - result << "subtitle: #{f['subtitle']}\n" if f['subtitle'].length > 0 - result << "title: #{f['title']}\n" if f['title'].length > 0 - result << "title_plain: #{f['title']}\n" if f['title'].length > 0 + result << "rights: #{f['rights']}\n" if f['rights'] + result << "subtitle: #{f['subtitle']}\n" if f['subtitle'] + result << "title: #{f['title']}\n" if f['title'] + result << "title_plain: #{f['title']}\n" if f['title'] result << "................................\n\n" return result end planet/hamlformatter.rb @@ -71,7 +71,7 @@ class HamlTestCase < Test::Unit::TestCase when /Description:\s*(.*?)\s*; Expect:\s*(.*)\s*/ desc = TestCaseConverter.python2ruby($2, file) Planet.config.read file - doc = Planet.harvest('test/data/filter/haml/new_channel.xml') + doc = Planet.harvest('test/data/filter/haml/id.xml') output = HamlFormatter.new.haml_info(doc) # copy haml hash to environment test/haml.rb @@ -20,7 +20,7 @@ feed_timeout = 30 # items_per_page: How many items to put on each page template_files = index.html.haml validate.html.xslt atom.xml.xslt rss10.xml.haml items_per_page = 50 -date_format = "%a %b $d $H:%M:%S %Y" +date_format = "%a %b %d %H:%M:%S %Y" new_date_format = "%A, %d %B %Y" filters = foo themes/intertwingly/basic.ini 127bdf5d62b9f25fa140dc9b73294e99fbe87d71 Jim Holt jim.holt3@gmail.com http://github.com/joshu/mars/commit/f09cbe485c4ded878a85ae29e47775468404c307 f09cbe485c4ded878a85ae29e47775468404c307 2008-04-20T14:37:57-07:00 2008-04-20T14:37:57-07:00 Hack for quote bug & strip HTML on plain 259d311ce05f595c0ed8dcf711c0820559c769e0 Jim Holt jim.holt3@gmail.com