ri_cal 0.5.1 → 0.5.2

data/History.txt

@@ -1,3 +1,6 @@
+=== 0.5.2
+ * Fixed http://rick_denatale.lighthouseapp.com/projects/30941/tickets/11
+   Export folding is not UTF-8 Safe
 === 0.5.1
  * Fixed README to acknowledge release on RubyForge
 === 0.5.0 rubyforge release candidate Tue May 26 10:26:43 2009 -0400

data/lib/ri_cal.rb

@@ -11,7 +11,7 @@ module RiCal
   autoload :OccurrenceEnumerator, "#{my_dir}/ri_cal/occurrence_enumerator.rb"
   
   # :stopdoc:
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
 

data/lib/ri_cal/component/calendar.rb

@@ -172,13 +172,32 @@ module RiCal
         def string #:nodoc:
           stream.string
         end
+        
+        def valid_utf8?(string)
+          string.unpack("U") rescue nil
+        end
+
+        def utf8_safe_split(string, n)
+          if string.length <= n
+            [string, nil]
+          else
+            before = string[0, n]
+            after = string[n..-1]
+            until valid_utf8?(after)
+              n = n - 1
+              before = string[0, n]
+              after = string[n..-1]
+            end      
+            [before, after.empty? ? nil : after]
+          end
+        end
 
         def fold(string) #:nodoc:
-          stream.puts(string[0,73])
-          string = string[73..-1]
-          while string
-            stream.puts " #{string[0, 72]}"
-            string = string[72..-1]
+          line, remainder = *utf8_safe_split(string, 73)
+          stream.puts(line)
+          while remainder
+            line, remainder = *utf8_safe_split(remainder, 72)
+            stream.puts(" #{line}")
           end
         end
 

data/ri_cal.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ri_cal}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["author=Rick DeNatale"]
-  s.date = %q{2009-05-26}
+  s.date = %q{2009-05-28}
   s.default_executable = %q{ri_cal}
   s.description = %q{A new Ruby implementation of RFC2445 iCalendar.
 

data/spec/ri_cal/component/calendar_spec.rb

@@ -51,4 +51,37 @@ describe RiCal::Component::Calendar do
       @it.export.should_not match(%r{X-RICAL-TZSOURCE=TZINFO:})
     end
   end
+  
+  describe RiCal::Component::Calendar::FoldingStream do
+    before(:each) do
+      @it = RiCal::Component::Calendar::FoldingStream.new(nil)
+    end
+    
+    describe "#utf_safe_split" do
+      it "should properly split an ascii string" do
+        @it.utf8_safe_split("abcdef", 3).should == ["abc", "def"]
+      end
+      
+      it "should return a nil remainder if the string has less than n characters" do
+        @it.utf8_safe_split("a",2).should == ["a", nil]
+      end
+      
+      it "should return a nil remainder if the string has exactly n characters" do
+        @it.utf8_safe_split("ab",2).should == ["ab", nil]
+      end
+      
+      it "should not split a 2-byte utf character" do
+        @it.utf8_safe_split("Café", 3).should == ["Caf", "é"]
+        @it.utf8_safe_split("Café", 4).should == ["Caf", "é"]
+        @it.utf8_safe_split("Café", 5).should == ["Café", nil]
+      end
+      
+      it "should not split a 3-byte utf character" do
+        @it.utf8_safe_split("Prix €200", 5).should == ["Prix ", "€200"]
+        @it.utf8_safe_split("Prix €200", 6).should == ["Prix ", "€200"]
+        @it.utf8_safe_split("Prix €200", 7).should == ["Prix ", "€200"]
+        @it.utf8_safe_split("Prix €200", 8).should == ["Prix €", "200"]
+      end
+    end
+  end
 end

data/spec/ri_cal/component/event_spec.rb

@@ -460,6 +460,13 @@ describe RiCal::Component::Event do
       export_string.should match(%r(^  following Michael's suggestion\\, let's meet at the food court at Crossr$))
       export_string.should match(%r(^ oads:\\nhttp://www\.shopcrossroadsplaza.c\.\.\.\\n$))
     end
+
+    it "should properly fold on export when the description contains multi-byte UTF-8 Characters" do
+      @it.description = "Juin 2009 <<Alliance Francaise Reunion>> lieu Café périferôl"
+      export_string = @it.export
+      export_string.should match(%r(^DESCRIPTION:Juin 2009 <<Alliance Francaise Reunion>> lieu Café périfer$))
+      export_string.should match(%r(^ ôl$))
+    end
   end
 
   if RiCal::TimeWithZone

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ri_cal
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - author=Rick DeNatale
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-26 00:00:00 -04:00
+date: 2009-05-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency