vpim 0.695 → 24.2.20

data/lib/vpim/rfc2425.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 =begin
   Copyright (C) 2008 Sam Roberts
 
@@ -21,13 +22,13 @@ module Vpim
 
     # <"> <Any character except CTLs, DQUOTE> <">
     QSTR    = '"([^"]*)"'
-     
+
     # *<Any character except CTLs, DQUOTE, ";", ":", ",">
     PTEXT   = '([^";:,]+)'
-      
+
     # param-value = ptext / quoted-string
     PVALUE  = "(?:#{QSTR}|#{PTEXT})"
-    
+
     # param = name "=" param-value *("," param-value)
     # Note: v2.1 allows a type or encoding param-value to appear without the type=
     # or the encoding=. This is hideous, but we try and support it, if there
@@ -76,29 +77,36 @@ module Vpim
   # This also supports the (invalid) encoding convention of allowing empty
   # lines to be inserted for readability - it does this by dropping zero-length
   # lines.
-  def Vpim.unfold(card) #:nodoc:
-      unfolded = []
-
-      card.each do |line|
-        line.chomp!
-        # If it's a continuation line, add it to the last.
-        # If it's an empty line, drop it from the input.
-        if( line =~ /^[ \t]/ )
-          unfolded[-1] << line[1, line.size-1]
-        elsif( line =~ /^$/ )
-        else
-          unfolded << line
-        end
+  #
+  # Also supports an the QUOTED-PRINTABLE soft line-break as described here:
+  # http://en.wikipedia.org/wiki/Quoted-printable
+  #
+  def Vpim.unfold(card) # :nodoc:
+    unfolded = []
+    # Ruby 1.9's String can no longer be iterated with #each, so the following
+    # code, which used to work with String, or Array, or File, or anything else
+    # which produced lines when iterated, now just works with String. Sucky.
+    card.each_line do |line|
+      line.chomp!
+      # If it's a continuation line, add it to the last.
+      # If it's an empty line, drop it from the input.
+      if( line =~ /^[ \t]/ )
+        unfolded[-1] << line[1, line.size-1]
+      elsif (unfolded.last && unfolded.last =~ /;ENCODING=QUOTED-PRINTABLE:.*?=$/)
+        unfolded.last << line
+      elsif( line =~ /^$/ )
+      else
+        unfolded << line
       end
-
-      unfolded
+    end
+    unfolded
   end
 
   # Convert a +sep+-seperated list of values into an array of values.
   def Vpim.decode_list(value, sep = ',') # :nodoc:
     list = []
-    
-    value.each(sep) do |item|
+
+    value.each_line(sep) do |item|
       item.chomp!(sep)
       list << yield(item)
     end
@@ -245,14 +253,14 @@ module Vpim
     # FIXME - I think this should trim leading and trailing space
     v.gsub(/\\(.)/) do
       case $1
-      when 'n', 'N' 
+      when 'n', 'N'
         "\n"
       else
         $1
       end
     end
   end
-  
+
   def Vpim.encode_text(v) #:nodoc:
     v.to_str.gsub(/([\\,;\n])/) { $1 == "\n" ? "\\n" : "\\"+$1 }
   end
@@ -286,7 +294,7 @@ module Vpim
     when %r{\A#{Bnf::SAFECHAR}*\z}
       value
     else
-      raise Vpim::Unencodable, "paramtext #{value.inspect}"
+      raise Vpim::Unencodeable, "paramtext #{value.inspect}"
     end
   end
 
@@ -297,7 +305,7 @@ module Vpim
     when %r{\A#{Bnf::QSAFECHAR}*\z}
       '"' + value + '"'
     else
-      raise Vpim::Unencodable, "param-value #{value.inspect}"
+      raise Vpim::Unencodeable, "param-value #{value.inspect}"
     end
   end
 

data/lib/vpim/rrule.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 =begin
   Copyright (C) 2008 Sam Roberts
 
@@ -65,20 +66,20 @@ module Vpim
 
        # Freq is mandatory, but must occur only once.
        @freq = nil
-   
+
        # Both Until and Count must not occur, neither is OK.
        @until = nil
        @count = nil
-   
+
        # Interval is optional, but defaults to 1.
        @interval = 1
 
        # WKST defines what day a week begins on, the default is monday.
        @wkst = 'MO'
-   
+
        # Recurrence can modified by these.
        @by = {}
-  
+
        if @rrule
          @rrule.scan(/([^;=]+)=([^;=]+)/) do |key,value|
            key.upcase!
@@ -256,10 +257,10 @@ module Vpim
         end
 
         # TODO - BYHOUR, BYMINUTE, BYSECOND
-        
-        hour   = [@dtstart.hour]   if !hour 
-        min    = [@dtstart.min]    if !min  
-        sec    = [@dtstart.sec]    if !sec 
+
+        hour   = [@dtstart.hour]   if !hour
+        min    = [@dtstart.min]    if !min
+        sec    = [@dtstart.sec]    if !sec
 
   #      debug days
 

data/lib/vpim/time.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 =begin
   Copyright (C) 2008 Sam Roberts
 

data/lib/vpim/vcard.rb

@@ -1,3 +1,4 @@
+# -*- encoding : binary -*-
 =begin
   Copyright (C) 2008 Sam Roberts
 
@@ -17,8 +18,8 @@ module Vpim
   # A vCard, a specialization of a directory info object.
   #
   # The vCard format is specified by:
-  # - RFC2426: vCard MIME Directory Profile (vCard 3.0)
-  # - RFC2425: A MIME Content-Type for Directory Information
+  # - RFC2426[http://www.ietf.org/rfc/rfc2426.txt]: vCard MIME Directory Profile (vCard 3.0)
+  # - RFC2425[http://www.ietf.org/rfc/rfc2425.txt]: A MIME Content-Type for Directory Information
   #
   # This implements vCard 3.0, but it is also capable of working with vCard 2.1
   # if used with care.
@@ -26,7 +27,7 @@ module Vpim
   # All line values can be accessed with Vcard#value, Vcard#values, or even by
   # iterating through Vcard#lines. Line types that don't have specific support
   # and non-standard line types ("X-MY-SPECIAL", for example) will be returned
-  # as a String, with any base64 or quoted-printable encoding removed. 
+  # as a String, with any base64 or quoted-printable encoding removed.
   #
   # Specific support exists to return more useful values for the standard vCard
   # types, where appropriate.
@@ -41,13 +42,10 @@ module Vpim
   # lines, and both the singular and plural forms will eventually be
   # implemented.
   #
-  # If there is sufficient demand, specific support for vCard 2.1 could be
-  # implemented.
-  #
   # For more information see:
-  # - link:rfc2426.txt: vCard MIME Directory Profile (vCard 3.0)
-  # - link:rfc2425.txt: A MIME Content-Type for Directory Information
-  # - http://www.imc.org/pdi/pdiproddev.html: vCard 2.1 Specifications
+  # - RFC2426[http://www.ietf.org/rfc/rfc2426.txt]: vCard MIME Directory Profile (vCard 3.0)
+  # - RFC2425[http://www.ietf.org/rfc/rfc2425.txt]: A MIME Content-Type for Directory Information
+  # - vCard2.1[http://www.imc.org/pdi/pdiproddev.html]: vCard 2.1 Specifications
   #
   # vCards are usually transmitted in files with <code>.vcf</code>
   # extensions.
@@ -155,7 +153,7 @@ module Vpim
       def Address.decode(card, field) #:nodoc:
         adr = new
 
-        parts = Vpim.decode_text_list(field.value_raw, ';')
+        parts = Vpim.decode_text_list(field.value, ';')
 
         @@adr_parts.each_with_index do |part,i|
           adr.instance_variable_set(part, parts[i] || '')
@@ -275,7 +273,7 @@ module Vpim
     end
 
     # Represents the value of a TEL field.
-    # 
+    #
     # The value is supposed to be a "X.500 Telephone Number" according to RFC
     # 2426, but that standard is not freely available. Otherwise, anything that
     # looks like a phone number should be OK.
@@ -672,6 +670,8 @@ module Vpim
         raise ArgumentError, "Vcard.decode cannot be called with a #{card.type}"
       end
 
+      string.force_encoding "BINARY"
+
       case string
         when /^\xEF\xBB\xBF/
           string = string.sub("\xEF\xBB\xBF", '')
@@ -689,6 +689,8 @@ module Vpim
           string = string.unpack('v*').pack('U*')
       end
 
+      string.force_encoding "utf-8"
+
       entities = Vpim.expand(Vpim.decode(string))
 
       # Since all vCards must have a begin/end, the top-level should consist
@@ -1384,7 +1386,7 @@ module Vpim
       # Copy the fields from +card+ into self using #add_field. If a block is
       # provided, each Field from +card+ is yielded. The block should return a
       # Field to add, or nil.  The Field doesn't have to be the one yielded,
-      # allowing the field to be copied and modified (see Field#copy) before adding, or 
+      # allowing the field to be copied and modified (see Field#copy) before adding, or
       # not added at all if the block yields nil.
       #
       # The vCard fields BEGIN and END aren't copied, and VERSION, N, and FN are copied

data/lib/vpim/version.rb

@@ -7,9 +7,9 @@
 =end
 
 module Vpim
-  PRODID = '-//Ensemble Independent//vPim 0.695//EN'
+  PRODID = '-//Octet Cloud//vPim 24.2.20//EN'
 
-  VERSION = '0.695'
+  VERSION = '24.2.20'
 
   # Return the API version as a string.
   def Vpim.version

data/lib/vpim/vevent.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 =begin
   Copyright (C) 2008 Sam Roberts
 
@@ -103,7 +104,7 @@ module Vpim
 
           # put invitee in as field[1]
           fields << invitee.encode('ATTENDEE') if i == 1
-          
+
           fields << f unless f.name? 'ATTENDEE'
         end
 
@@ -135,6 +136,7 @@ module Vpim
       class Maker
         include Vpim::Icalendar::Set::Util #:nodoc:
         include Vpim::Icalendar::Set::Common
+        include Vpim::Icalendar::Set::Location
 
         # The event that changes are being made to.
         attr_reader :event
@@ -162,7 +164,7 @@ module Vpim
           set_date_or_datetime 'DTEND', 'DATE-TIME', dtend
         end
 
-        # Add a RRULE to this event. The rule can be provided as a pre-build
+        # Add a RRULE to this event. The rule can be provided as a pre-built
         # RRULE value, or the RRULE maker can be used.
         def add_rrule(rule = nil, &block) #:yield: Rrule::Maker
           # TODO - should be in Property::Reccurrence::Set

data/lib/vpim/view.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 =begin
   Copyright (C) 2008 Sam Roberts
 
@@ -6,11 +7,11 @@
   details.
 =end
 
-require "enumerator"
+require "vpim/enumerator"
 
 module Vpim
   module View
-    
+
     SECSPERDAY = 24 * 60 * 60
 
     # View only events occuring in the next week.
@@ -50,7 +51,7 @@ module Vpim
           end
 __
 =begin
-        block = lambda do |dountil| 
+        block = lambda do |dountil|
             unless block_given?
               return Enumerable::Enumerator.new(self, :occurrences, dountil)
             end

data/lib/vpim/vjournal.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 =begin
   Copyright (C) 2008 Sam Roberts
 

data/lib/vpim/vpim.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 =begin
   Copyright (C) 2008 Sam Roberts
 
@@ -21,7 +22,7 @@ module Vpim
   # If its unsupported, its likely because I didn't anticipate it being useful
   # to support this, and it likely it could be supported on request.
   class UnsupportedError < StandardError; end
-  
+
   # Exception used to indicate that encoding failed, probably because the
   # object would not result in validly encoded data. The message should
   # describe what is unsupported.

data/lib/vpim/vtodo.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 =begin
   Copyright (C) 2008 Sam Roberts
 
@@ -96,6 +97,52 @@ module Vpim
         propinteger 'PERCENT-COMPLETE'
       end
 
+      # Make a new Vtodo, or make changes to an existing Vtodo.
+      class Maker
+        include Vpim::Icalendar::Set::Util #:nodoc:
+        include Vpim::Icalendar::Set::Common
+        include Vpim::Icalendar::Set::Location
+
+        # The todo that changes are being made to.
+        attr_reader :todo
+
+        def initialize(todo) #:nodoc:
+          @todo = todo
+          @comp = todo
+        end
+
+        # Make changes to +todo+. If +todo+ is not specified, creates a new
+        # todo. Yields a Vtodo::Maker, and returns +todo+.
+        def self.make(todo = Vpim::Icalendar::Vtodo.create) #:yield:maker
+          m = self.new(todo)
+          yield m
+          m.todo
+        end
+
+        # Set transparency to "OPAQUE" or "TRANSPARENT", see Vpim::Vtodo#transparency.
+        def transparency(token)
+          set_token 'TRANSP', ["OPAQUE", "TRANSPARENT"], "OPAQUE", token
+        end
+
+        # Add a RRULE to this todo. The rule can be provided as a pre-built
+        # RRULE value, or the RRULE maker can be used.
+        def add_rrule(rule = nil, &block) #:yield: Rrule::Maker
+          # TODO - should be in Property::Reccurrence::Set
+          unless rule
+            rule = Rrule::Maker.new(&block).encode
+          end
+          @comp.properties.push(Vpim::DirectoryInfo::Field.create("RRULE", rule))
+          self
+        end
+
+        # Set the RRULE for this todo. See #add_rrule
+        def set_rrule(rule = nil, &block) #:yield: Rrule::Maker
+          rm_all("RRULE")
+          add_rrule(rule, &block)
+        end
+
+      end
+
     end
 
   end

data/lib/vpim.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 =begin
   Copyright (C) 2008 Sam Roberts
 

data/samples/agent.ru

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+# Run as "rackup agent.ru", default rackup arguments follow:
+#\ -p 4567
+
+require "vpim/agent/ics"
+
+use Rack::Reloader, 0
+
+run Vpim::Agent::Ics
+

data/samples/reminder.rb

@@ -2,7 +2,7 @@
 
 $-w = true
 
-require 'ubygems' rescue "ignored"
+require 'rubygems' rescue "ignored"
 
 require 'getoptlong'
 require 'pp'

data/test/test_all.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 #!/usr/bin/env ruby
 
 require 'pp'
@@ -5,6 +6,7 @@ require 'pp'
 $-w = true
 
 $:.unshift File.dirname(__FILE__) + "/../lib"
+$:.unshift File.dirname(__FILE__) + "/.."
 
 
 #pp [__LINE__, $:, $"]

data/test/test_date.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 #!/usr/bin/env ruby
 
 require 'vpim/date'
@@ -38,16 +39,16 @@ class TestVpimDate < Test::Unit::TestCase
 
   def test_bywday
 
-    #                               2004                              
-    # 
-    #       January               February               March        
+    #                               2004
+    #
+    #       January               February               March
     #  S  M Tu  W Th  F  S   S  M Tu  W Th  F  S   S  M Tu  W Th  F  S
     #              1  2  3   1  2  3  4  5  6  7      1  2  3  4  5  6
     #  4  5  6  7  8  9 10   8  9 10 11 12 13 14   7  8  9 10 11 12 13
     # 11 12 13 14 15 16 17  15 16 17 18 19 20 21  14 15 16 17 18 19 20
     # 18 19 20 21 22 23 24  22 23 24 25 26 27 28  21 22 23 24 25 26 27
     # 25 26 27 28 29 30 31  29                    28 29 30 31
-    # 
+    #
     do_bywday([2004,  1, 4,  1], [2004,  1,  1])
     do_bywday([2004,  1, 4,  2], [2004,  1,  8])
     do_bywday([2004,  1, 4, -1], [2004,  1, 29])
@@ -74,7 +75,7 @@ class TestVpimDate < Test::Unit::TestCase
     do_bywday([2004,-12, "th", -2], [2004,  1, 22])
     do_bywday([2004,-12, "th", -5], [2004,  1,  1])
 
-    #       October               November              December      
+    #       October               November              December
     #  S  M Tu  W Th  F  S   S  M Tu  W Th  F  S   S  M Tu  W Th  F  S
     #                 1  2      1  2  3  4  5  6            1  2  3  4
     #  3  4  5  6  7  8  9   7  8  9 10 11 12 13   5  6  7  8  9 10 11

data/test/test_dur.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 #!/usr/bin/env ruby
 
 require 'vpim/duration'

data/test/test_field.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 #!/usr/bin/env ruby
 
 require 'test/unit'
@@ -15,7 +16,7 @@ class TestField < Test::Unit::TestCase
     assert_equal("+\\+\n+\n+,+;+a+b+c+", dec)
     enc_out = Vpim.encode_text(dec)
     should_be = "+\\\\+\\n+\\n+\\,+\\;+a+b+c+"
-    # Note a, b, and c are allowed to be escaped, but shouldn't be and 
+    # Note a, b, and c are allowed to be escaped, but shouldn't be and
     # aren't in output
     #puts("<#{dec}> => <#{enc_out}>")
     assert_equal(should_be, enc_out)
@@ -134,7 +135,7 @@ class TestField < Test::Unit::TestCase
     assert_equal('Z.B', f.group)
 
     f.value = 'some text'
-    
+
     assert_equal('some text', f.value)
     assert_equal('some text', f.value_raw)
 

data/test/test_ical.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 #!/usr/bin/env ruby
 
 require 'vpim/icalendar'
@@ -170,7 +171,7 @@ ___
     # Hal was encoding raw strings, here's how to do it with the API.
 
     cal = Icalendar.create
-    
+
     start = Time.now
 
     event = Icalendar::Vevent.create(start,
@@ -329,7 +330,7 @@ __
     assert_equal(1, vc.events.to_a.size)
     assert_equal(1, vc.todos.to_a.size)
     assert_equal(1, vc.journals.to_a.size)
-    
+
     vc.to_s # Shouldn't raise...
     # TODO - encode isn't round-tripping, unknown components are lost, which is
     # not good.
@@ -421,6 +422,15 @@ __
     assert_equal(cal.events.last.location, nil)
   end
 
+  def test_set_location
+    vc = Icalendar.create2 do |vc|
+      vc.add_event do |m|
+        m.location("bien located")
+      end
+    end
+    assert_match(/LOCATION:bien located/, vc.to_s)
+  end
+
 
   def test_event_maker_w_rrule
     vc = Icalendar.create2 do |vc|
@@ -433,5 +443,16 @@ __
     assert_match(/RRULE:FREQ=DAILY/, vc.to_s)
   end
 
+  def test_todo_maker_w_rrule
+    vc = Icalendar.create2 do |vc|
+      vc.add_todo do |m|
+        m.add_rrule("freq=monthly")
+        m.set_rrule do |_| _.frequency = "daily" end
+      end
+    end
+    assert_no_match(/RRULE:FREQ=MONTHLY/, vc.to_s)
+    assert_match(/RRULE:FREQ=DAILY/, vc.to_s)
+  end
+
 end
 

data/test/test_misc.rb

@@ -0,0 +1,13 @@
+# -*- encoding : utf-8 -*-
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'vpim/version'
+
+class TestVpimMisc < Test::Unit::TestCase
+
+  def test_version
+    assert_match(/\d+.\d+.\d+/, Vpim.version)
+  end
+
+end

data/test/test_repo.rb

@@ -1,7 +1,8 @@
+# -*- encoding : utf-8 -*-
 #!/usr/bin/env ruby
 
 require 'vpim/repo'
-require 'test/common'
+require File.expand_path('../common', __FILE__)
 
 class TestRepo < Test::Unit::TestCase
   Apple3 = Vpim::Repo::Apple3
@@ -50,7 +51,7 @@ class TestRepo < Test::Unit::TestCase
     _test_each(repo, 1)
   end
 
-  def test_uri
+  def test_uri_http
     caldata = open('test/calendars/weather.calendar/Events/1205042405-0-0.ics').read
 
     server = data_on_port(caldata, 9876)
@@ -68,6 +69,25 @@ class TestRepo < Test::Unit::TestCase
     end
   end
 
+  def test_uri_webcal
+    caldata = open('test/calendars/weather.calendar/Events/1205042405-0-0.ics').read
+
+    server = data_on_port(caldata, 9876)
+    begin
+      c = Uri::Calendar.new("webcal://localhost:9876")
+      assert_equal(caldata, c.encode)
+
+      repo = Uri.new("webcal://localhost:9876")
+
+      assert_equal(1, repo.count)
+
+      _test_each(repo, 1)
+    ensure
+      server.kill
+    end
+  end
+
+
   def test_uri_invalid
     assert_raises(ArgumentError) do
       Uri.new("url")

data/test/test_rrule.rb

@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 #!/usr/bin/env ruby
 
 ENV['TZ'] = 'EST5EDT'