@@ -135,34 +135,43 @@ module Icalendar if key =~ /ip_.*/ key = key[3..-1] end + + prelude = "#{key.gsub(/_/, '-').upcase}" # Property name - unless multiline_property?(key) - prelude = "#{key.gsub(/_/, '-').upcase}" + - - # Possible parameters - print_parameters(val) - - # Property value - value = ":#{val.to_ical}" - escaped = prelude + value.gsub("\\", "\\\\").gsub("\n", "\\n").gsub(",", "\\,").gsub(";", "\\;") - s << escaped.slice!(0, MAX_LINE_LENGTH) << "\r\n " while escaped.size > MAX_LINE_LENGTH - s << escaped << "\r\n" - s.gsub!(/ *$/, '') + s << if multiline_property?(key) + val.inject('') do |res, v| + res << print_value(v, prelude) + end + elsif multi_property?(key) + prelude + ':' + print_parameters(val) + val.map do |v| + escape(v.to_ical) + end.join('\,') << "\r\n" else - prelude = "#{key.gsub(/_/, '-').upcase}" - val.each do |v| - params = print_parameters(v) - value = ":#{v.to_ical}" - escaped = prelude + params + value.gsub("\\", "\\\\").gsub("\n", "\\n").gsub(",", "\\,").gsub(";", "\\;") - s << escaped.slice!(0, MAX_LINE_LENGTH) << "\r\n " while escaped.size > MAX_LINE_LENGTH - s << escaped << "\r\n" - s.gsub!(/ *$/, '') - end + print_value val, prelude end end s end + + def print_value(value, prelude) + s = '' + params = print_parameters(value) + value = value.to_ical + escaped = prelude + params + ':' << escape(value) + s << escaped.slice!(0, MAX_LINE_LENGTH) << "\r\n " while escaped.size > MAX_LINE_LENGTH + s << escaped << "\r\n" + s.gsub!(/ *$/, '') + end + + def escape(value) + if value.respond_to?(:no_escape) && value.no_escape + value + else + value.gsub("\\", "\\\\").gsub("\n", "\\n").gsub(",", "\\,").gsub(";", "\\;") + end + end + # Print the parameters for a specific property def print_parameters(val) lib/icalendar/component.rb @@ -44,6 +44,18 @@ class Array end end +class Hash + def to_ical + string = map do |key, value| + key.to_s + '=' + value.to_s + end.join(';') + def string.no_escape + true + end + string + end +end + module URI class Generic def to_ical lib/icalendar/conversions.rb @@ -94,4 +94,12 @@ EOS assert_equal(folded, @cal.to_ical) end + def test_multi_properties_with_params + @cal.event do + add_recurrence_rule({'FREQ' => 'YEARLY', 'BYMONTH' => '10', 'BYDAY' => '-1SU'}) + end + + assert @cal.to_ical.include?('RRULE:BYMONTH=10;FREQ=YEARLY;BYDAY=-1SU'), @cal.to_ical << 'does not include ' << 'RRULE:BYMONTH=10;FREQ=YEARLY;BYDAY=-1SU' + end + end test/conversions_test.rb ba983b1918847d941896b359ccda567f97b3fec2 Alexander Lang alex@skywalker.local http://github.com/langalex/icalendar/commit/2de83eebd3e74a733f88cedbbb80bad0f17dc7d7 2de83eebd3e74a733f88cedbbb80bad0f17dc7d7 2008-09-11T03:28:36-07:00 2008-09-11T03:28:36-07:00 made recurrence_rules working, using add_recurrence_rule('FREQ' => 'DAILY', 'INTERVAL' => 1, 'COUNT' => 10) will generate a line RRULE:COUNT=10;INTERVAL=1;FREQ=DAILY 7a0002ea5290b0379b37a1755e323a270b5123fa Alexander Lang alex@skywalker.local