windows_csv 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/windows_csv.rb

@@ -1,6 +1,7 @@
 class WindowsCsv
-  ENCODING = Encoding::UTF_16LE
-  BOM = "\377\376".force_encoding(ENCODING) # Byte Order Mark
+  ENCODING = Encoding::UTF_8
+  
+  BOM = "\377\376".force_encoding(Encoding::UTF_16LE) # Byte Order Mark
   COL_SEP = "\t"
   QUOTE_CHAR = "\""
   
@@ -8,9 +9,7 @@ class WindowsCsv
     require "rubygems"
     require "csv_lazy"
     
-    File.open(path, "r", :encoding => "UTF-8") do |fp|
-      fp.sysread(2)
-      
+    File.open(path, "rb:bom|utf-16le") do |fp|
       csv_args = {:debug => false, :io => fp, :col_sep => COL_SEP, :quote_char => QUOTE_CHAR}
       csv_args.merge!(args[:csv_args]) if args[:csv_args]
       
@@ -39,11 +38,7 @@ class WindowsCsv
     
     begin
       @args[:io].write(BOM)
-      
-      ::CSV.open(@args[:io], "w", :col_sep => COL_SEP, :quote_char => QUOTE_CHAR, :force_quotes => true) do |csv|
-        @csv = csv
-        yield self
-      end
+      yield self
     ensure
       fp.close if fp
     end
@@ -62,7 +57,7 @@ class WindowsCsv
       end
     end
     
-    @csv << encoded
+    @args[:io].puts CSV.generate_line(encoded, :col_sep => COL_SEP, :quote_char => QUOTE_CHAR, :force_quotes => true).encode(Encoding::UTF_16LE)
     
     return nil
   end

data/spec/windows_csv_spec.rb

@@ -18,7 +18,7 @@ describe "WindowsCsv" do
     #puts "Path: #{tmpfile}"
     
     WindowsCsv.foreach(tmpfile, :csv_args => {:headers => true}) do |row|
-      #puts "Row: #{row}"
+      puts "Row: #{row}"
       row[:Name2].should eql("Christina")
       row[:Encoding].should eql("æøå")
       row[:MultiLine].should eql("Multi\r\nLine")

data/windows_csv.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "windows_csv"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kaspernj"]

metadata

@@ -2,7 +2,7 @@
 name: windows_csv
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - kaspernj
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 2642998020291054997
+      hash: 1699321643464917244
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false