@@ -12,7 +12,7 @@ module Waves def store( key, value ) @keys << key - Marshal.dump( value, ::File.new( @directory / key, 'w') ) + ::File.open( @directory / key, 'w') { |f| Marshal.dump( value, f ) } end def delete( key ) lib/caches/file.rb @@ -1,4 +1,3 @@ - module Waves module Caches lib/caches/simple.rb @@ -179,7 +179,6 @@ module Waves log :level => :info, :output => $stderr reloadable [] dependencies [] - cache :dir => 'cache' pid "#{$$}.pid" server Waves::Servers::WEBrick application { lib/runtime/configuration.rb @@ -4,28 +4,27 @@ require 'caches/simple' module SimpleApp ; include Waves::Foundations::Compact ; end -describe "Waves.cache" do - it "Takes a cache object as its argument" do - Waves.cache Waves::Caches::Simple.new - end -end - describe "Waves::Caches::Simple" do + + before do + @cache = Waves::Caches::Simple.new + end + it "can store and fetch, including implementation-wide methods" do - Waves.cache.store :frog, "hopping" - Waves.cache[:ball] = "dropping" + @cache.store :frog, "hopping" + @cache[:ball] = "dropping" - Waves.cache[:frog].should.==("hopping") and Waves.cache.fetch(:ball).should.==("dropping") + @cache[:frog].should.==("hopping") and @cache.fetch(:ball).should.==("dropping") end it "can delete and clear" do - Waves.cache.delete :frog - Waves.cache.fetch(:frog).should == nil + @cache.delete :frog + @cache.fetch(:frog).should == nil - Waves.cache.store :gravy, "bowl" - Waves.cache.fetch(:gravy).should.not.==(nil) and Waves.cache[:ball].should.not.==(nil) + @cache.store :gravy, "bowl" + @cache.fetch(:gravy).should.not.==(nil) and @cache[:ball].should.not.==(nil) - Waves.cache.clear - Waves.cache.fetch(:frog).should.==(nil) and Waves.cache[:ball].should.==(nil) + @cache.clear + @cache.fetch(:frog).should.==(nil) and @cache[:ball].should.==(nil) end end verify/specs/caches/simple.rb @@ -5,35 +5,35 @@ require 'caches/file' module SimpleApp ; include Waves::Foundations::Compact ; end -describe "can assign a Waves::Caches::File object to Waves.cache" do - module SimpleApp - - Waves.cache Waves::Caches::File.new( :directory => '/tmp/testeroni') +describe "Waves::Caches::File" do + + before do + @cache = Waves::Caches::File.new( :directory => '/tmp') end -end - -describe "can store and fetch, including implementation-wide methods" do - module SimpleApp - Waves.cache.store :frog, "hopping" - Waves.cache[:ball] = "dropping" + + it "can store and fetch, including implementation-wide methods" do + @cache.store :frog, "hopping" + @cache[:ball] = "dropping" - Waves.cache[:frog].should.==("hopping") and Waves.cache.fetch(:ball).should.==("dropping") + @cache[:frog].should.==("hopping") + @cache.fetch(:ball).should.==("dropping") end -end -describe "can delete and clear" do - module SimpleApp - Waves.cache.delete :frog - Waves.cache.fetch(:frog).should == nil + it "can delete and clear" do + @cache.store :frog, "hopping" + @cache.delete :frog + @cache.fetch(:frog).should == nil + + @cache.delete(:monkey) - Waves.cache.store :gravy, "bowl" - Waves.cache.fetch(:gravy).should.not.==(nil) and Waves.cache[:ball].should.not.==(nil) + @cache.store :gravy, "bowl" + @cache.fetch(:gravy).should.not.==(nil) and @cache[:ball].should.not.==(nil) - Waves.cache.clear - Waves.cache.fetch(:frog).should.==(nil) and Waves.cache[:ball].should.==(nil) + @cache.clear + @cache.fetch(:frog).should.==(nil) and @cache[:ball].should.==(nil) %w( :frog, :ball, :gravy, 'giving' ).each do |key| - File.exist?('/tmp/testeroni' + key).should == nil + File.exist?('/tmp/testeroni' + key).should == false end end end verify/tests/caches/file.rb 168eb78da2b062ff42ca6618bd226ad8d3dd0563 Matthew King automatthew@gmail.com http://github.com/dyoder/waves/commit/4d1bcbdbb0bb372efe370a2c04c01078ecb56142 4d1bcbdbb0bb372efe370a2c04c01078ecb56142 2008-10-20T11:45:39-07:00 2008-10-20T11:45:39-07:00 using File.open with block for File cache dumping; spec squeezing. d383bfbda3ba154662e600ba537973ae2c86a3d6 Matthew King automatthew@gmail.com