windows_csv 0.0.5 → 0.0.6

data/Gemfile

@@ -3,8 +3,6 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "csv_lazy", :path => "/Users/kaspernj/Dev/Ruby/csv_lazy"
-
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do

data/Gemfile.lock

@@ -1,9 +1,3 @@
-PATH
-  remote: /Users/kaspernj/Dev/Ruby/csv_lazy
-  specs:
-    csv_lazy (0.0.8)
-      string-strtr
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -26,14 +20,12 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    string-strtr (0.0.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (>= 1.0.0)
-  csv_lazy!
   jeweler (~> 1.8.4)
   rdoc (~> 3.12)
   rspec (~> 2.8.0)

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/windows_csv.rb

@@ -5,22 +5,32 @@ class WindowsCsv
   BOM = "\377\376".force_encoding(Encoding::UTF_16LE) # Byte Order Mark
   COL_SEP = "\t"
   QUOTE_CHAR = "\""
+  ROW_SEP = "\r\n"
+  ARGS = {:col_sep => COL_SEP, :quote_char => QUOTE_CHAR, :row_sep => ROW_SEP}
   
   def self.foreach(path, args = {})
-    require "rubygems"
-    require "csv_lazy"
+    require "csv"
     
     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 = ARGS.clone
       csv_args.merge!(args[:csv_args]) if args[:csv_args]
       
-      Csv_lazy.new(csv_args) do |row|
-        real = []
+      CSV.foreach(fp, csv_args) do |row|
+        if csv_args[:headers]
+          real = {}
+        else
+          real = []
+        end
+        
         row.each do |col|
-          real << col
+          if csv_args[:headers]
+            real[col[0].to_sym] = WindowsCsv.unescape(col[1])
+          else
+            real << WindowsCsv.unescape(col)
+          end
         end
         
-        yield row
+        yield real
       end
     end
     
@@ -58,7 +68,7 @@ class WindowsCsv
       end
     end
     
-    @args[:io].puts CSV.generate_line(encoded, :col_sep => COL_SEP, :quote_char => QUOTE_CHAR).encode(Encoding::UTF_16LE)
+    @args[:io].puts CSV.generate_line(encoded, ARGS).encode(Encoding::UTF_16LE)
     
     return nil
   end
@@ -66,4 +76,8 @@ class WindowsCsv
   def self.escape(str)
     return str.to_s.gsub("\n", "\\r\\n")
   end
+  
+  def self.unescape(str)
+    return str.to_s.gsub("\\r\\n", "\r\n")
+  end
 end

data/spec/windows_csv_spec.rb

@@ -13,15 +13,23 @@ describe "WindowsCsv" do
     WindowsCsv.new(:path => tmpfile) do |csv|
       csv << ["Name1", "Name2", "Encoding", "Date", "Time", "DateTime", "MultiLine"]
       csv << ["Kasper", "Christina", "æøå", Date.new, Time.new, DateTime.new, "Multi\nLine"]
+      csv << ["Thomas", "Nikolaj", "læp", nil, nil, nil, nil]
     end
     
-    #puts "Path: #{tmpfile}"
+    puts "Path: #{tmpfile}"
     
+    count = 0
     WindowsCsv.foreach(tmpfile, :csv_args => {:headers => true}) do |row|
-      puts "Row: #{row}"
-      row[:Name2].should eql("Christina")
-      row[:Encoding].should eql("æøå")
-      row[:MultiLine].should eql("Multi\r\nLine")
+      count += 1
+      #puts "Row: #{row}"
+      
+      if count == 1
+        row[:Name2].should eql("Christina")
+        row[:Encoding].should eql("æøå")
+        row[:MultiLine].should eql("Multi\r\nLine")
+      end
     end
+    
+    count.should eql(2)
   end
 end

data/windows_csv.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "windows_csv"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kaspernj"]
@@ -40,20 +40,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<csv_lazy>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
     else
-      s.add_dependency(%q<csv_lazy>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     end
   else
-    s.add_dependency(%q<csv_lazy>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

metadata

@@ -2,7 +2,7 @@
 name: windows_csv
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - kaspernj
@@ -11,22 +11,6 @@ bindir: bin
 cert_chain: []
 date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: csv_lazy
-  type: :runtime
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -125,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 2666403027336268794
+      hash: -649786811259003594
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false