ccp 0.2.6 → 0.2.7

data/lib/ccp/persistent/tsv.rb

@@ -7,15 +7,37 @@ class Ccp::Persistent::Tsv < Ccp::Persistent::Dir
 
   def load_tsv(path)
     hash = {}
+    prev = []
+
     path.readlines.each_with_index do |line, i|
       no = i+1
       key, val = line.split(/\t/,2)
-      unless val
-        $stderr.puts "#{self.class}#load_tsv: value not found. key='#{key}' (line: #{no})"
-        next
+
+      if val
+        # flush previous line
+        if prev.size == 2
+          hash[prev[0]] = decode(prev[1])
+          prev = []
+        end
+
+        # push prev line
+        prev = [key, val]
+
+      else
+        # maybe sequencial lines for one value
+        if prev.size == 2
+          prev[1] = prev[1] + "\n" + key
+
+        else
+          $stderr.puts "#{self.class}#load_tsv: value not found. key='#{key}' (line: #{no})"
+          next
+        end
       end
-      obj = decode(val)
-      hash[key] = obj
+    end
+
+    # flush last line
+    if prev.size == 2
+      hash[prev[0]] = decode(prev[1])
     end
 
     return hash
@@ -33,7 +55,8 @@ class Ccp::Persistent::Tsv < Ccp::Persistent::Dir
       end
 
     keys.each do |key|
-      f.puts "%s\t%s\n" % [key, encode(hash[key])]
+      value = encode(hash[key]).sub(/\n+\Z/m, '') # strip last LF for human-readability
+      f.puts "%s\t%s\n" % [key, value]
     end
   end
 

data/lib/ccp/version.rb

@@ -1,3 +1,3 @@
 module Ccp
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/spec/persistent/tsv_spec.rb

@@ -16,4 +16,37 @@ describe Ccp::Persistent::Tsv do
       kvs.tsv_path_for(:states).should == Pathname(root) + "states.json.tsv"
     end
   end
+
+  context "(with json)" do
+    let(:kvs) { Ccp::Persistent::Tsv.new(root, :json)}
+
+    it "should save and load hash" do
+      kvs["a"] = {"int"=>1, "str"=>"x"}
+      kvs["a"].should == {"int"=>1, "str"=>"x"}
+    end
+
+    it "should save and load complex-valued hash" do
+      kvs["a"] = {"int"=>[1,2], "str"=>["x","y"]}
+      kvs["a"].should == {"int"=>[1,2], "str"=>["x","y"]}
+    end
+  end
+
+  context "(with yaml)" do
+    let(:kvs) { Ccp::Persistent::Tsv.new(root, :yaml) }
+
+    it "should save and load hash" do
+      kvs["a"] = {"int"=>1, "str"=>"x"}
+      kvs["a"].should == {"int"=>1, "str"=>"x"}
+    end
+
+    it "should save and load complex-valued hash" do
+      kvs["a"] = {"int"=>[1,2], "str"=>["x","y"]}
+      kvs["a"].should == {"int"=>[1,2], "str"=>["x","y"]}
+    end
+
+    it "should save and load tab-contained hash" do
+      kvs["a"] = {"str"=>"a\tb"}
+      kvs["a"].should == {"str"=>"a\tb"}
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ccp
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - maiha
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-15 00:00:00 +09:00
+date: 2012-05-22 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency