fruit_to_lime 0.6.4 → 0.6.5

data/lib/fruit_to_lime/model/tag.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module FruitToLime
     class Tag
     	def serialize_name
@@ -11,7 +12,7 @@ module FruitToLime
     	end
   		def to_xml
   			varn = serialize_name
-            "<#{varn}>#{ @value.to_s.encode(:xml => :text) }</#{varn}>"
+            "<#{varn}>#{ @value.to_s.encode('utf-8').encode(:xml => :text) }</#{varn}>"
   		end
   		def to_s
             return "tag: '#{@value}'"

data/lib/fruit_to_lime/serialize_helper.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module FruitToLime
 module SerializeHelper
 
@@ -32,7 +33,7 @@ module SerializeHelper
                 elsif (varv.is_a?(Array))
                     varv = varv.map { |elem| SerializeHelper::serialize(elem) }.join("\n")
                 else
-                    varv = varv.to_s.encode(:xml => :text).encode('UTF-8')
+                    varv = varv.to_s.encode('UTF-8').encode(:xml => :text)
                 end
                 "<#{varn}>#{ varv }</#{varn}>"
             end.join("\n")

data/spec/helpers/serialize_helper_spec.rb

@@ -15,6 +15,9 @@ describe FruitToLime::SerializeHelper do
         it "should contain start tag" do
             serialized.should match(/<Note>/)
         end
+        it "should be utf-8" do
+            serialized.encoding.should equal Encoding::UTF_8
+        end
     end
     describe "Serialize person" do
         let(:serialized) { 
@@ -24,12 +27,17 @@ describe FruitToLime::SerializeHelper do
             p.last_name = "Anka"
             p.source_ref = FruitToLime::SourceRef.new({:name=>'Go',:id=>"PASE122345"})
             p.postal_address.city = "Ankeborg"
-            p.tags="tag:anka"
+            p.tags="tag:anka,tag:Bj\u{00F6}rk"
             cf = FruitToLime::CustomField.new
             cf.id = "2"
             cf.title = "cf title"
             cf.value = "cf value"
             p.custom_fields.push(cf)
+            cf2 = FruitToLime::CustomField.new
+            cf2.id = "3"
+            cf2.title = "cf title2"
+            cf2.value = "cf Bj\u{00F6}rk"
+            p.custom_fields.push(cf2)
             FruitToLime::SerializeHelper::serialize(p)
         }
         it "should contain first and last name" do
@@ -47,18 +55,32 @@ describe FruitToLime::SerializeHelper do
             serialized.should match(/PASE/)
             serialized.should match(/122345/)
         end
+        it "should handle sv chars in tags" do
+            serialized.should match(/tag:Bj\u{00F6}rk/)
+        end
+        it "should handle sv chars in custom value" do
+            serialized.should match(/cf Bj\u{00F6}rk/)
+        end
+        it "should be utf-8" do
+            serialized.encoding.should equal Encoding::UTF_8
+        end
     end
     describe "Serialize organization" do
         let(:serialized) { 
             o = FruitToLime::Organization.new
             o.name = "Ankeborgs bibliotek"
-            o.tags="tag:bibliotek"
+            o.tags="tag:bibliotek,tag:Bj\u{00F6}rk"
             o.source_ref = FruitToLime::SourceRef.new({:name=>'Go',:id=>"PASE122345"})
             cf = FruitToLime::CustomField.new
             cf.id = "2"
             cf.title = "cf title"
             cf.value = "cf value"
             o.custom_fields.push(cf)
+            cf2 = FruitToLime::CustomField.new
+            cf2.id = "3"
+            cf2.title = "cf title2"
+            cf2.value = "cf Bj\u{00F6}rk"
+            o.custom_fields.push(cf2)
             FruitToLime::SerializeHelper::serialize(o)
         }
         it "should contain name" do 
@@ -77,6 +99,15 @@ describe FruitToLime::SerializeHelper do
             serialized.should match(/PASE/)
             serialized.should match(/122345/)
         end
+        it "should handle sv chars in tags" do
+            serialized.should match(/tag:Bj\u{00F6}rk/)
+        end
+        it "should handle sv chars in custom value" do
+            serialized.should match(/cf Bj\u{00F6}rk/)
+        end
+        it "should be utf-8" do
+            serialized.encoding.should equal Encoding::UTF_8
+        end
     end
 
     describe "Serialize goimport" do
@@ -90,6 +121,9 @@ describe FruitToLime::SerializeHelper do
         it "should contain name" do 
             serialized.should match(/Ankeborgs bibliotek/)
         end
+        it "should be utf-8" do
+            serialized.encoding.should equal Encoding::UTF_8
+        end
     end
     describe "Get import rows" do
         describe "for person" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fruit_to_lime
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors: