@@ -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
@@ -9,31 +9,33 @@ H_FILES.map! {|name| name.index('.') ? name : name+".xml"}
H_TESTS = H_FILES.map {|arg| Dir[File.join('test/data/filter',arg)]}
# test cases are in Python syntax, convert to something that eval will accept
-def python2ruby(expr, source)
- # unicode strings
- expr.gsub! " u'", " '"
- expr.gsub! ' u"', ' "'
+class TestCaseConverter
+ def self.python2ruby(expr, source)
+ # unicode strings
+ expr.gsub! " u'", " '"
+ expr.gsub! ' u"', ' "'
- # triple strings
- expr.gsub! /"""(.*?)"""/, '%q{\1}'
+ # triple strings
+ expr.gsub! /"""(.*?)"""/, '%q{\1}'
- # dict to hash
- expr.gsub! "': '", "' => '"
+ # dict to hash
+ expr.gsub! "': '", "' => '"
- # const to variable
- expr.gsub! "Items[", "items["
- expr.gsub! "Channels[", "channels["
+ # const to variable
+ expr.gsub! "Items[", "items["
+ expr.gsub! "Channels[", "channels["
- # true
- expr = "true" if expr == "1"
+ # true
+ expr = "true" if expr == "1"
- # differences in XML/URI serializations
- name = source.split('/').last.split('.').first
- expr.sub!('"','%22') if name == 'missing_quote_in_attr'
- expr.sub! '>', '>' if name == 'tag_in_attr'
- expr.gsub!('"', "\\\\'").gsub!('"','"') if name == 'quote_in_attr'
+ # differences in XML/URI serializations
+ name = source.split('/').last.split('.').first
+ expr.sub!('"','%22') if name == 'missing_quote_in_attr'
+ expr.sub! '>', '>' if name == 'tag_in_attr'
+ expr.gsub!('"', "\\\\'").gsub!('"','"') if name == 'quote_in_attr'
- expr
+ expr
+ end
end
require 'planet/formatter'
@@ -59,7 +61,7 @@ class HamlTestCase < Test::Unit::TestCase
case testdata
# for .xml files
when /Description:\s*(.*?)\s*Expect:\s*(.*)\s*/
- desc = python2ruby($2, file)
+ desc = TestCaseConverter.python2ruby($2, file)
doc = Planet.harvest(file)
output = HamlFormatter.new.haml_info(doc)
channels = output['channels']
@@ -67,9 +69,9 @@ class HamlTestCase < Test::Unit::TestCase
# for .ini files... any xml will do
when /Description:\s*(.*?)\s*; Expect:\s*(.*)\s*/
- desc = python2ruby($2, file)
+ 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
4a78accbadeaadb4f580f186baae6dc82e4ececb
f09cbe485c4ded878a85ae29e47775468404c307
Sam Ruby
rubys@intertwingly.net
http://github.com/rubys/mars/commit/6c3227414c1c3157eaf93ecf6edd7aff67b36fd5
6c3227414c1c3157eaf93ecf6edd7aff67b36fd5
2008-09-28T17:36:29-07:00
2008-09-28T17:36:29-07:00
Merge branch 'master' of git://github.com/joshu/mars
9c62e48fb58400a16f653999092cda2e8da5f6d5
Sam Ruby
rubys@intertwingly.net