better_csv 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73d4dd59073d34d88c4f1231e95ff418a2708545
-  data.tar.gz: d2011882c778c8b533e38abd9cf6474a788fad95
+  metadata.gz: 78ea9ac04ffb87e0c08555153c9c07e33395474e
+  data.tar.gz: aa956345ae39f51deecd33da3b60a5e24832434a
 SHA512:
-  metadata.gz: b2de90420f81cb1f00ab7fca759bb00f9328eb95936ab7da44c0739c8f413c6d499a57c3cc9bfd5f7954e82785a206e755b67dc9d06551d3c75d0356f2f0bd89
-  data.tar.gz: a6d063c6ed9662de82ce18c2505003dc494afa8999628c8a9cf79153a82cd9c8089ef59ae13b0a3b85b38bc9465d5952c6121853bbdb8d502b921d668b1809a1
+  metadata.gz: 6e7ac40b1d13fd3ce9dc45fa08d6be7014e631e60f36202d3f5ab709ba532508f8ed0ec38b99b4bdf3f2afedede4281d6dfd91ed8231d4b557dc173d65da08ec
+  data.tar.gz: eca4e231629e3c8682f00361621a64b9b02e43f9486e669599e05c0c657716d700bfdca75312338c0450bbec9980ec12d6306175cbe4ce3c532b424a90970417

data/lib/better_csv.rb

@@ -1,15 +1,51 @@
 require "better_csv/version"
 
 module BetterCsv
-  def self.parse(str)
+  OPTIONS = [:split_by_comma]
+
+  def self.escape_row value, options: []
+    case value
+    when Array
+      value.collect{|v| "\"#{v.to_s.gsub(/"/,'\"')}\""}
+    when Hash
+      value.values.collect{|v| "\"#{v.to_s.gsub(/"/,'\"')}\""}
+    else
+      if options.include?(:split_by_comma) and value.to_s.include?(',')
+        escape_row(value.to_s.split(',')) #TODO: split by only non escaped comma.
+      else
+        ["\"#{value.to_s.gsub(/"/,'\"')}\""]
+      end
+    end
+  end
+
+  def self.escape array, options: []
+    case array
+    when Array
+      array.collect{|v| escape_row(v, options: options)}
+    when Hash
+      array.values.collect{|v| escape_row(v, options: options)}
+    else
+      [escape_row(array.to_s, options: options)]
+    end
+  end
+
+  def self.build array, options: []
+    escape(array, options: options).collect{|a| a.join(',')}.join("\n")
+  end
+
+  def self.[] array
+    escape(array).collect{|a| a.join(',')}.join("\n")
+  end
+
+  def self.parse str
     in_literal = false
     csv = Array.new
     
-    line = []
-    token = ""
-    back = ""
+    line    = []
+    token   = ""
+    back    = ""
     current = ""
-    first = true
+    first   = true
     str.each_char do |c|
       current = c
       if first
@@ -35,7 +71,7 @@ module BetterCsv
 
       if current == "\n" and not in_literal
         line << token
-        csv << line
+        csv  << line
         token = ""
         yield(line) if block_given?
         line = Array.new

data/lib/better_csv/version.rb

@@ -1,3 +1,3 @@
 module BetterCsv
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/better_csv_spec.rb

@@ -5,171 +5,214 @@ describe BetterCsv do
     expect(BetterCsv::VERSION).not_to be nil
   end
 
-  context 'on basic csv test' do
-    str = 'a,b,c,d,e,f,g'
-    equal = [['a','b','c','d','e','f','g']]
-
-    describe "sepalated with simply ',' == #{str}  " do
-      it "shuld be #{equal.to_s}" do
-        expect(BetterCsv.parse(str)).to eq(equal)
+  context 'parse' do
+    context 'on basic csv test' do
+      str = 'a,b,c,d,e,f,g'
+      equal = [['a','b','c','d','e','f','g']]
+
+      describe "sepalated with simply ',' == #{str}  " do
+        it "shuld be #{equal.to_s}" do
+          expect(BetterCsv.parse(str)).to eq(equal)
+        end
       end
     end
-  end
 
-  context 'on missing first value csv test' do
-    str = ',b,c,d,e,f,g'
-    equal = [['','b','c','d','e','f','g']]
+    context 'on missing first value csv test' do
+      str = ',b,c,d,e,f,g'
+      equal = [['','b','c','d','e','f','g']]
 
-    describe "sepalated with simply ',' == #{str}  " do
-      it "shuld be #{equal.to_s}" do
-        expect(BetterCsv.parse(str)).to eq(equal)
+      describe "sepalated with simply ',' == #{str}  " do
+        it "shuld be #{equal.to_s}" do
+          expect(BetterCsv.parse(str)).to eq(equal)
+        end
       end
     end
-  end
 
-  context 'on missing last value csv test' do
-    str = 'b,c,d,e,f,g,'
-    equal = [['b','c','d','e','f','g','']]
+    context 'on missing last value csv test' do
+      str = 'b,c,d,e,f,g,'
+      equal = [['b','c','d','e','f','g','']]
 
-    describe "sepalated with simply ',' == #{str}  " do
-      it "shuld be #{equal.to_s}" do
-        expect(BetterCsv.parse(str)).to eq(equal)
+      describe "sepalated with simply ',' == #{str}  " do
+        it "shuld be #{equal.to_s}" do
+          expect(BetterCsv.parse(str)).to eq(equal)
+        end
       end
     end
-  end
 
-  context 'on missing last value csv in more than 1 line csv test' do
-    str = "b,c,d,e,f,g,\nh,i,j,k,l,m,"
-    equal = [['b','c','d','e','f','g',''],['h','i','j','k','l','m','']]
+    context 'on missing last value csv in more than 1 line csv test' do
+      str = "b,c,d,e,f,g,\nh,i,j,k,l,m,"
+      equal = [['b','c','d','e','f','g',''],['h','i','j','k','l','m','']]
 
-    describe "sepalated with simply ',' == #{str}  " do
-      it "shuld be #{equal.to_s}" do
-        expect(BetterCsv.parse(str)).to eq(equal)
+      describe "sepalated with simply ',' == #{str}  " do
+        it "shuld be #{equal.to_s}" do
+          expect(BetterCsv.parse(str)).to eq(equal)
+        end
       end
     end
-  end
 
-  context 'on missing first value in more than 1 line csv test' do
-    str = ",b,c,d,e,f,g\n,h,i,j,k,l,m"
-    equal = [['','b','c','d','e','f','g'],['','h','i','j','k','l','m']]
+    context 'on missing first value in more than 1 line csv test' do
+      str = ",b,c,d,e,f,g\n,h,i,j,k,l,m"
+      equal = [['','b','c','d','e','f','g'],['','h','i','j','k','l','m']]
 
-    describe "sepalated with simply ',' == #{str}  " do
-      it "shuld be #{equal.to_s}" do
-        expect(BetterCsv.parse(str)).to eq(equal)
+      describe "sepalated with simply ',' == #{str}  " do
+        it "shuld be #{equal.to_s}" do
+          expect(BetterCsv.parse(str)).to eq(equal)
+        end
       end
     end
-  end
 
-  context 'on including nil csv test' do
-    str = 'a,b,,,,f,g'
-    equal = [['a','b',"","","",'f','g']]
+    context 'on including nil csv test' do
+      str = 'a,b,,,,f,g'
+      equal = [['a','b',"","","",'f','g']]
 
-    describe "sepalated with simply ',' == #{str}  " do
-      it "shuld be #{equal.to_s}" do
-        expect(BetterCsv.parse(str)).to eq(equal)
+      describe "sepalated with simply ',' == #{str}  " do
+        it "shuld be #{equal.to_s}" do
+          expect(BetterCsv.parse(str)).to eq(equal)
+        end
       end
     end
-  end
 
-  context 'on including "" csv test' do
-    str = 'a,b,,"d",,f,g'
-    equal = [['a','b',"",'d',"",'f','g']]
+    context 'on including "" csv test' do
+      str = 'a,b,,"d",,f,g'
+      equal = [['a','b',"",'d',"",'f','g']]
 
-    describe "sepalated with simply ',' == #{str}  " do
-      it "shuld be #{equal.to_s}" do
-        expect(BetterCsv.parse(str)).to eq(equal)
+      describe "sepalated with simply ',' == #{str}  " do
+        it "shuld be #{equal.to_s}" do
+          expect(BetterCsv.parse(str)).to eq(equal)
+        end
       end
     end
-  end
 
-  context 'on including "" in first csv test' do
-    str = '"a",b,,d,,f,g'
-    equal = [['a','b',"",'d',"",'f','g']]
+    context 'on including "" in first csv test' do
+      str = '"a",b,,d,,f,g'
+      equal = [['a','b',"",'d',"",'f','g']]
 
-    describe "sepalated with simply ',' == #{str}  " do
-      it "shuld be #{equal.to_s}" do
-        expect(BetterCsv.parse(str)).to eq(equal)
+      describe "sepalated with simply ',' == #{str}  " do
+        it "shuld be #{equal.to_s}" do
+          expect(BetterCsv.parse(str)).to eq(equal)
+        end
       end
     end
-  end
 
-  context 'on including "" in last csv test' do
-    str = 'a,b,,d,,f,"g"'
-    equal = [['a','b',"",'d',"",'f','g']]
+    context 'on including "" in last csv test' do
+      str = 'a,b,,d,,f,"g"'
+      equal = [['a','b',"",'d',"",'f','g']]
 
-    describe "sepalated with simply ',' == #{str}  " do
-      it "shuld be #{equal.to_s}" do
-        expect(BetterCsv.parse(str)).to eq(equal)
+      describe "sepalated with simply ',' == #{str}  " do
+        it "shuld be #{equal.to_s}" do
+          expect(BetterCsv.parse(str)).to eq(equal)
+        end
       end
     end
-  end
 
-  context 'on including return in "" csv test' do
-    str = %Q(a,b,,"d1\nd2",,f,g)
-    equal = [['a','b',"","d1\nd2","",'f','g']]
+    context 'on including return in "" csv test' do
+      str = %Q(a,b,,"d1\nd2",,f,g)
+      equal = [['a','b',"","d1\nd2","",'f','g']]
 
-    describe "sepalated with simply ',' == #{str}  " do
-      it "shuld be #{equal.to_s}" do
-        expect(BetterCsv.parse(str)).to eq(equal)
+      describe "sepalated with simply ',' == #{str}  " do
+        it "shuld be #{equal.to_s}" do
+          expect(BetterCsv.parse(str)).to eq(equal)
+        end
       end
-    end
 
-    describe "each value has native return." do
-      it 'shuld be "d1\nd2"' do
-        expect(BetterCsv.parse(str)[0][3]).to eq("d1\nd2")
+      describe "each value has native return." do
+        it 'shuld be "d1\nd2"' do
+          expect(BetterCsv.parse(str)[0][3]).to eq("d1\nd2")
+        end
       end
     end
-  end
 
 
-  context 'on including comma, in "" csv test' do
-    str = %Q(a,b,,"d1,d2",,f,g)
-    equal = [['a','b',"","d1,d2","",'f','g']]
+    context 'on including comma, in "" csv test' do
+      str = %Q(a,b,,"d1,d2",,f,g)
+      equal = [['a','b',"","d1,d2","",'f','g']]
 
-    describe "sepalated with simply ',' == #{str}  " do
-      it "shuld be #{equal.to_s}" do
-        expect(BetterCsv.parse(str)).to eq(equal)
+      describe "sepalated with simply ',' == #{str}  " do
+        it "shuld be #{equal.to_s}" do
+          expect(BetterCsv.parse(str)).to eq(equal)
+        end
       end
     end
-  end
 
-  context 'on including comma, in "" csv on multiple lines' do
-    str = <<-EOS
+    context 'on including comma, in "" csv on multiple lines' do
+      str = <<-EOS
 a,b,,"d1,d2",,f,g
 a,b,,"d1,d2",,f,g
-EOS
-    equal = [['a','b',"","d1,d2","",'f','g'],['a','b',"","d1,d2","",'f','g']]
+  EOS
+      equal = [['a','b',"","d1,d2","",'f','g'],['a','b',"","d1,d2","",'f','g']]
 
-    describe "sepalated with simply ',' == #{str}  " do
-      it "shuld be #{equal.to_s}" do
-        expect(BetterCsv.parse(str)).to eq(equal)
+      describe "sepalated with simply ',' == #{str}  " do
+        it "shuld be #{equal.to_s}" do
+          expect(BetterCsv.parse(str)).to eq(equal)
+        end
       end
     end
-  end
 
-  context 'on including comma, in "" csv on multiple lines with yield block' do
-    str = <<-EOS
+    context 'on including comma, in "" csv on multiple lines with yield block' do
+      str = <<-EOS
 a,b,,"d1,d2",,f,g
 a,b,,"d1,d2",,f,g
-EOS
-    equal = [['a','b',"","d1,d2","",'f','g'],['a','b',"","d1,d2","",'f','g']]
-    describe "sepalated with simply ',' == #{str}  " do
-      it "shuld be raise no error" do
-        expect{
-          BetterCsv.parse(str) do |line|
-            p line
-          end
-        }.to_not raise_error
+  EOS
+      equal = [['a','b',"","d1,d2","",'f','g'],['a','b',"","d1,d2","",'f','g']]
+      describe "sepalated with simply ',' == #{str}  " do
+        it "shuld be raise no error" do
+          expect{
+            BetterCsv.parse(str) do |line|
+              p line
+            end
+          }.to_not raise_error
+        end
+
+        it "shuld be #{equal.to_s}" do
+          expect{
+            BetterCsv.parse(str) do |line|
+              p line
+            end
+          }.to_not raise_error
+        end
       end
+    end
+  end
 
-      it "shuld be #{equal.to_s}" do
-        expect{
-          BetterCsv.parse(str) do |line|
-            p line
-          end
-        }.to_not raise_error
+  context 'build' do
+    context 'on array' do
+      it 'should be 2 rows, and 3 values' do
+        eq_str = '"a","b","c"
+"d","e","f"'
+        expect(BetterCsv[[["a","b","c"],['d','e','f']]]).to eq(eq_str)
+      end
+    end
+
+    context 'on string without any comma' do
+      it 'should be 1 rows, and 1 values' do
+        eq_str = '"abc"'
+        expect(BetterCsv["abc"]).to eq(eq_str)
+      end
+    end
+
+    context 'on string with 2 commas.' do
+      it 'should be 1 rows, and 3 values' do
+        eq_str = '"a","b","c"'
+        expect(BetterCsv.build("a,b,c", options:[:split_by_comma])).to eq(eq_str)
+      end
+    end
+
+    context 'on hash with integer' do
+      it 'should be 3 rows, and 1 each values' do
+        eq_str = '"10"
+"20"
+"30"'
+        expect(BetterCsv[{a: 10, b: 20, c: 30}]).to eq(eq_str)
       end
     end
-  end
 
+    context 'on hash that parcialy including string with comma' do
+      it 'should be 3 rows, and 3,1,1 values' do
+        eq_str = '"a","b","c"
+"20"
+"30"'
+        expect(BetterCsv.build({a: "a,b,c", b: 20, c: 30}, options: [:split_by_comma])).to eq(eq_str)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_csv
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Tatumaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler