ccp 0.2.3 → 0.2.4

data/lib/ccp/persistent/base.rb

@@ -48,7 +48,7 @@ class Ccp::Persistent::Base
   end
 
   def read!
-    keys.inject({}) {|h,k| h[k] = v; h}
+    keys.inject({}) {|h,k| h[k] = self[k]; h}
   end
 
   def keys

data/lib/ccp/persistent/dir.rb

@@ -29,7 +29,7 @@ class Ccp::Persistent::Dir < Ccp::Persistent::Base
   end
 
   def keys
-    Dir["#{path}/*.#{ext}"].map{|i| File.basename(i, ".*")}.sort
+    Dir["#{path!}/*.#{ext}"].map{|i| File.basename(i, ".*")}.sort
   end
 
   def truncate
@@ -41,6 +41,14 @@ class Ccp::Persistent::Dir < Ccp::Persistent::Base
   end
 
   private
+    def path!
+      if path.exist?
+        path
+      else
+        raise Ccp::Persistent::NotFound, path.to_s
+      end
+    end
+
     def path_for(key, mkdir = true)
       path.mkpath if mkdir
       path + "#{key}.#{ext}"

data/lib/ccp/persistent/file.rb

@@ -36,7 +36,7 @@ class Ccp::Persistent::File < Ccp::Persistent::Base
   end
 
   def keys
-    read.keys.sort
+    read!.keys.sort
   end
 
   def truncate

data/lib/ccp/version.rb

@@ -1,3 +1,3 @@
 module Ccp
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/persistent/dir_spec.rb

@@ -76,6 +76,36 @@ describe Ccp::Persistent::Dir do
     end
   end
 
+  describe "#read" do
+    it "should fetch all data if exists" do
+      (root + "foo.json").open("w+"){|f| f.print "1"}
+      (root + "bar.json").open("w+"){|f| f.print "2"}
+      kvs = Ccp::Persistent::Dir.new(root, :json)
+      kvs.read.should == {"foo"=>1, "bar"=>2}
+    end
+
+    it "should return {} if the path doesn't exist" do
+      kvs = Ccp::Persistent::Dir.new(root + "no-such-path", :json)
+      kvs.read.should == {}
+    end
+  end
+
+  describe "#read!" do
+    it "should fetch all data if exists" do
+      (root + "foo.json").open("w+"){|f| f.print "1"}
+      (root + "bar.json").open("w+"){|f| f.print "2"}
+      kvs = Ccp::Persistent::Dir.new(root, :json)
+      kvs.read!.should == {"foo"=>1, "bar"=>2}
+    end
+
+    it "should raise NotFound if the path doesn't exist" do
+      kvs = Ccp::Persistent::Dir.new(root + "no-such-path", :json)
+      lambda {
+        kvs.read!
+      }.should raise_error(Ccp::Persistent::NotFound)
+    end
+  end
+
   describe "#keys" do
     it "should return a sorted array of key names filtered by given ext" do
       ["1.json", "2.yaml", "3.json"].each do |i|
@@ -85,6 +115,13 @@ describe Ccp::Persistent::Dir do
       kvs = Ccp::Persistent::Dir.new(root, :json)
       kvs.keys.should == ["1","3"]
     end
+
+    it "should raise NotFound if the path doesn't exist" do
+      kvs = Ccp::Persistent::Dir.new(root + "no-such-path", :json)
+      lambda {
+        kvs.keys
+      }.should raise_error(Ccp::Persistent::NotFound)
+    end
   end
 
   describe "#truncate" do

data/spec/persistent/file_spec.rb

@@ -103,12 +103,47 @@ describe Ccp::Persistent::File do
     end
   end
 
+  describe "#read" do
+    it "should fetch all data if exists" do
+      db.open("w+"){|f| f.print(JSON.dump({"foo" => 1, "bar" => 2}))}
+      kvs = Ccp::Persistent::File.new(db, :json)
+      kvs.read.should == {"foo" =>1, "bar" =>2}
+    end
+
+    it "should raise NotFound if the path doesn't exist" do
+      kvs = Ccp::Persistent::File.new(db + "no-such-file", :json)
+      kvs.read.should == {}
+    end
+  end
+
+  describe "#read!" do
+    it "should fetch all data if exists" do
+      db.open("w+"){|f| f.print(JSON.dump({"foo" => 1, "bar" => 2}))}
+      kvs = Ccp::Persistent::File.new(db, :json)
+      kvs.read!.should == {"foo" =>1, "bar" =>2}
+    end
+
+    it "should raise NotFound if the path doesn't exist" do
+      kvs = Ccp::Persistent::File.new(db + "no-such-file", :json)
+      lambda {
+        kvs.read!
+      }.should raise_error(Ccp::Persistent::NotFound)
+    end
+  end
+
   describe "#keys" do
     it "should return a sorted array of key names filtered by given ext" do
       db.open("w+"){|f| f.print(JSON.dump({"foo" => 1, "bar" => "xxx"}))}
       kvs = Ccp::Persistent::File.new(db, :json)
       kvs.keys.should == ["bar", "foo"]
     end
+
+    it "should raise NotFound if the path doesn't exist" do
+      kvs = Ccp::Persistent::File.new(db + "no-such-file", :json)
+      lambda {
+        kvs.keys
+      }.should raise_error(Ccp::Persistent::NotFound)
+    end
   end
 
   describe "#truncate" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ccp
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - maiha
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-10 00:00:00 +09:00
+date: 2012-05-11 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency