windows_csv 0.0.6 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.8

data/lib/windows_csv.rb

@@ -1,13 +1,23 @@
 #This class was heavily inspired by the great Dipth! https://github.com/dipth
 class WindowsCsv
-  ENCODING = Encoding::UTF_8
-  
   BOM = "\377\376".force_encoding(Encoding::UTF_16LE) # Byte Order Mark
-  COL_SEP = "\t"
+  COL_SEP = ";"
   QUOTE_CHAR = "\""
   ROW_SEP = "\r\n"
-  ARGS = {:col_sep => COL_SEP, :quote_char => QUOTE_CHAR, :row_sep => ROW_SEP}
   
+  ARGS = {
+    :col_sep => COL_SEP,
+    :quote_char => QUOTE_CHAR,
+    :row_sep => ROW_SEP
+  }
+  
+  REPLACES = {
+    "\r\n" => "\\r\\n",
+    "\r" => "\\r",
+    "\n" => "\\n"
+  }
+  
+  #Loops through a Windows CSV file with leading BOM, tabs as col-sep, quote char " and row sep \r\n
   def self.foreach(path, args = {})
     require "csv"
     
@@ -43,7 +53,7 @@ class WindowsCsv
     @args = args
     
     if @args[:path]
-      fp = File.open(@args[:path], "w", :encoding => ENCODING)
+      fp = File.open(@args[:path], "w", :encoding => Encoding::UTF_8)
       @args[:io] = fp
     end
     
@@ -68,16 +78,28 @@ class WindowsCsv
       end
     end
     
-    @args[:io].puts CSV.generate_line(encoded, ARGS).encode(Encoding::UTF_16LE)
+    @args[:io].write CSV.generate_line(encoded, ARGS).encode(Encoding::UTF_16LE)
     
     return nil
   end
   
   def self.escape(str)
-    return str.to_s.gsub("\n", "\\r\\n")
+    str = str.to_s
+    
+    REPLACES.each do |key, val|
+      str = str.gsub(key, val)
+    end
+    
+    return str
   end
   
   def self.unescape(str)
-    return str.to_s.gsub("\\r\\n", "\r\n")
+    str = str.to_s
+    
+    REPLACES.each do |key, val|
+      str = str.gsub(val, key)
+    end
+    
+    return str
   end
 end

data/spec/windows_csv_spec.rb

@@ -26,7 +26,7 @@ describe "WindowsCsv" do
       if count == 1
         row[:Name2].should eql("Christina")
         row[:Encoding].should eql("æøå")
-        row[:MultiLine].should eql("Multi\r\nLine")
+        row[:MultiLine].should eql("Multi\nLine")
       end
     end
     

data/windows_csv.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "windows_csv"
-  s.version = "0.0.6"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kaspernj"]
-  s.date = "2013-05-02"
+  s.date = "2013-05-03"
   s.description = "A framework to write Windows CSV files."
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [

metadata

@@ -2,14 +2,14 @@
 name: windows_csv
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -649786811259003594
+      hash: 3869959267862217963
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false