moneta 0.7.1 → 0.7.2

data/spec/helper.rb

@@ -41,12 +41,6 @@ class Value
   end
 end
 
-def safe_load_value(value)
-  load_value(value)
-rescue Exception => ex
-  value
-end
-
 def start_server(*args)
   server = Moneta::Server.new(*args)
   Thread.new { server.run }

data/spec/moneta/adapter_cassandra_spec.rb

@@ -17,7 +17,7 @@ describe_moneta "adapter_cassandra" do
   it_should_behave_like 'persist_stringkey_stringvalue'
   it_should_behave_like 'returndifferent_stringkey_stringvalue'
   it_should_behave_like 'store_stringkey_stringvalue'
-  it 'should support default expiration time' do
+  it 'supports default expiration time' do
     store = Moneta::Adapters::Cassandra.new(:expires => 2, :keyspace => 'adapter_cassandra')
     store.store('key1', 'val1')
     store.store('key2', 'val2', :expires => 60)
@@ -25,7 +25,7 @@ describe_moneta "adapter_cassandra" do
     sleep 1
     store.load('key1').should == 'val1'
     sleep 2
-    store.load('key1').should == nil
+    store.load('key1').should be_nil
     store['key2'].should == 'val2'
   end
 end

data/spec/moneta/adapter_datamapper_spec.rb

@@ -43,7 +43,7 @@ describe_moneta "adapter_datamapper" do
     second['key'] = 'value2'
 
     first.delete('key').should == 'value'
-    first.key?('key').should == false
+    first.key?('key').should be_false
     second['key'].should == 'value2'
   end
 

data/spec/moneta/adapter_lruhash_spec.rb

@@ -16,7 +16,7 @@ describe_moneta "adapter_lruhash" do
   it_should_behave_like 'null_stringkey_stringvalue'
   it_should_behave_like 'returndifferent_stringkey_stringvalue'
   it_should_behave_like 'store_stringkey_stringvalue'
-  it 'should delete oldest' do
+  it 'deletes oldest' do
     store = Moneta::Adapters::LRUHash.new(:max_size => 10)
     store[0]  = 'y'
     (1..1000).each do |i|

data/spec/moneta/adapter_memcached_dalli_spec.rb

@@ -17,7 +17,7 @@ describe_moneta "adapter_memcached_dalli" do
   it_should_behave_like 'persist_stringkey_stringvalue'
   it_should_behave_like 'returndifferent_stringkey_stringvalue'
   it_should_behave_like 'store_stringkey_stringvalue'
-  it 'should support default expiration time' do
+  it 'supports default expiration time' do
     store = Moneta::Adapters::MemcachedDalli.new(:expires => 2, :namespace => "adapter_memcached_dalli")
     store.store('key1', 'val1')
     store.store('key2', 'val2', :expires => 60)
@@ -25,7 +25,7 @@ describe_moneta "adapter_memcached_dalli" do
     sleep 1
     store.load('key1').should == 'val1'
     sleep 2
-    store.load('key1').should == nil
+    store.load('key1').should be_nil
     store['key2'].should == 'val2'
   end
 end

data/spec/moneta/adapter_memcached_native_spec.rb

@@ -17,7 +17,7 @@ describe_moneta "adapter_memcached_native" do
   it_should_behave_like 'persist_stringkey_stringvalue'
   it_should_behave_like 'returndifferent_stringkey_stringvalue'
   it_should_behave_like 'store_stringkey_stringvalue'
-  it 'should support default expiration time' do
+  it 'supports default expiration time' do
     store = Moneta::Adapters::MemcachedNative.new(:expires => 2, :namespace => "adapter_memcached_native")
     store.store('key1', 'val1')
     store.store('key2', 'val2', :expires => 60)
@@ -25,7 +25,7 @@ describe_moneta "adapter_memcached_native" do
     sleep 1
     store.load('key1').should == 'val1'
     sleep 2
-    store.load('key1').should == nil
+    store.load('key1').should be_nil
     store['key2'].should == 'val2'
   end
 

data/spec/moneta/adapter_memcached_spec.rb

@@ -17,7 +17,7 @@ describe_moneta "adapter_memcached" do
   it_should_behave_like 'persist_stringkey_stringvalue'
   it_should_behave_like 'returndifferent_stringkey_stringvalue'
   it_should_behave_like 'store_stringkey_stringvalue'
-  it 'should support default expiration time' do
+  it 'supports default expiration time' do
     store = Moneta::Adapters::Memcached.new(:expires => 2, :namespace => "adapter_memcached")
     store.store('key1', 'val1')
     store.store('key2', 'val2', :expires => 60)
@@ -25,7 +25,7 @@ describe_moneta "adapter_memcached" do
     sleep 1
     store.load('key1').should == 'val1'
     sleep 2
-    store.load('key1').should == nil
+    store.load('key1').should be_nil
     store['key2'].should == 'val2'
   end
 end

data/spec/moneta/adapter_redis_spec.rb

@@ -17,7 +17,7 @@ describe_moneta "adapter_redis" do
   it_should_behave_like 'persist_stringkey_stringvalue'
   it_should_behave_like 'returndifferent_stringkey_stringvalue'
   it_should_behave_like 'store_stringkey_stringvalue'
-  it 'should support default expiration time' do
+  it 'supports default expiration time' do
     store = Moneta::Adapters::Redis.new(:expires => 2)
     store.store('key1', 'val1')
     store.store('key2', 'val2', :expires => 60)
@@ -25,7 +25,7 @@ describe_moneta "adapter_redis" do
     sleep 1
     store.load('key1').should == 'val1'
     sleep 2
-    store.load('key1').should == nil
+    store.load('key1').should be_nil
     store['key2'].should == 'val2'
   end
 end

data/spec/moneta/cache_file_memory_spec.rb

@@ -21,15 +21,15 @@ describe_moneta "cache_file_memory" do
   it_should_behave_like 'persist_stringkey_stringvalue'
   it_should_behave_like 'returndifferent_stringkey_stringvalue'
   it_should_behave_like 'store_stringkey_stringvalue'
-  it 'should store loaded values in cache' do
+  it 'stores loaded values in cache' do
     store.backend['foo'] = 'bar'
-    store.cache['foo'].should == nil
+    store.cache['foo'].should be_nil
     store['foo'].should == 'bar'
     store.cache['foo'].should == 'bar'
     store.backend.delete('foo')
     store['foo'].should == 'bar'
     store.delete('foo')
-    store['foo'].should == nil
+    store['foo'].should be_nil
   end
 
 end

data/spec/moneta/expires_file_spec.rb

@@ -44,15 +44,15 @@ describe_moneta "expires_file" do
   it_should_behave_like 'store_nilkey_stringvalue'
   it_should_behave_like 'store_integerkey_stringvalue'
   it_should_behave_like 'transform_value_with_expires'
-  it 'should delete expired value in underlying file storage' do
+  it 'deletes expired value in underlying file storage' do
     store.store('foo', 'bar', :expires => 2)
     store['foo'].should == 'bar'
     sleep 1
     store['foo'].should == 'bar'
     sleep 2
-    store['foo'].should == nil
-    store.adapter['foo'].should == nil
-    store.adapter.adapter['foo'].should == nil
+    store['foo'].should be_nil
+    store.adapter['foo'].should be_nil
+    store.adapter.adapter['foo'].should be_nil
   end
 
 end

data/spec/moneta/expires_memory_spec.rb

@@ -107,7 +107,7 @@ describe_moneta "expires_memory" do
   it_should_behave_like 'store_integerkey_booleanvalue'
   it_should_behave_like 'store_integerkey_nilvalue'
   it_should_behave_like 'store_integerkey_integervalue'
-  it 'should support default expiration time' do
+  it 'supports default expiration time' do
     store = Moneta.new(:Memory, :expires => 2)
     store.store('key1', 'val1')
     store.store('key2', 'val2', :expires => 60)
@@ -115,7 +115,7 @@ describe_moneta "expires_memory" do
     sleep 1
     store.load('key1').should == 'val1'
     sleep 2
-    store.load('key1').should == nil
+    store.load('key1').should be_nil
     store['key2'].should == 'val2'
   end
 end

data/spec/moneta/optionmerger_spec.rb

@@ -18,7 +18,7 @@ describe_moneta "optionmerger" do
     merger.should be_instance_of(Moneta::OptionMerger)
   end
 
-  it 'should save default options' do
+  it 'saves default options' do
     options = {:optionname => :optionvalue}
     merger = store.with(options)
     Moneta::OptionMerger::METHODS.each do |method|
@@ -28,14 +28,14 @@ describe_moneta "optionmerger" do
 
   PREFIX = [['alpha', nil], ['beta', nil], ['alpha', 'beta']]
 
-  it 'should merge options' do
+  it 'merges options' do
     merger = store.with(:opt1 => :val1, :opt2 => :val2).with(:opt2 => :overwrite, :opt3 => :val3)
     Moneta::OptionMerger::METHODS.each do |method|
       merger.default_options[method].should == {:opt1 => :val1, :opt2 => :overwrite, :opt3 => :val3}
     end
   end
 
-  it 'should merge options only for some methods' do
+  it 'merges options only for some methods' do
     PREFIX.each do |(alpha,beta)|
       options = {:opt1 => :val1, :opt2 => :val2, :prefix => alpha}
       merger = store.with(options).with(:opt2 => :overwrite, :opt3 => :val3, :prefix => beta, :only => :clear)
@@ -53,7 +53,7 @@ describe_moneta "optionmerger" do
     end
   end
 
-  it 'should merge options except for some methods' do
+  it 'merges options except for some methods' do
     PREFIX.each do |(alpha,beta)|
       options = {:opt1 => :val1, :opt2 => :val2, :prefix => alpha}
       merger = store.with(options).with(:opt2 => :overwrite, :opt3 => :val3, :except => :clear, :prefix => beta)
@@ -71,12 +71,12 @@ describe_moneta "optionmerger" do
     end
   end
 
-  it 'should have method #raw' do
+  it 'has method #raw' do
     store.raw.default_options.should == {:store=>{:raw=>true},:load=>{:raw=>true},:delete=>{:raw=>true}}
     store.raw.should equal(store.raw.raw)
   end
 
-  it 'should have method #prefix' do
+  it 'has method #prefix' do
     store.prefix('a').default_options.should == {:store=>{:prefix=>'a'},:load=>{:prefix=>'a'},
                                                  :delete=>{:prefix=>'a'},:key? => {:prefix=>'a'},:increment=>{:prefix=>'a'}}
 

data/spec/moneta/shared_spec.rb

@@ -20,7 +20,7 @@ describe_moneta "shared" do
   it_should_behave_like 'null_stringkey_stringvalue'
   it_should_behave_like 'returndifferent_stringkey_stringvalue'
   it_should_behave_like 'store_stringkey_stringvalue'
-  it 'should share values' do
+  it 'shares values' do
     store['shared_key'] = 'shared_value'
     second = new_store
     second.key?('shared_key').should be_true

data/spec/moneta/simple_client_tcp_spec.rb

@@ -142,7 +142,7 @@ describe_moneta "simple_client_tcp" do
   it_should_behave_like 'store_integerkey_nilvalue'
   it_should_behave_like 'store_integerkey_integervalue'
   it_should_behave_like 'transform_value'
-  it 'should support multiple clients' do
+  it 'supports multiple clients' do
     client = Moneta.new(:Client)
     client['shared_key'] = 'shared_val'
     (1..100).each do |i|

data/spec/moneta/transformer_key_marshal_spec.rb

@@ -0,0 +1,109 @@
+# Generated by generate.rb
+require 'helper'
+
+describe_moneta "transformer_key_marshal" do
+  def new_store
+    Moneta.build do
+      use :Transformer, :key => :marshal
+      adapter :Memory
+    end
+  end
+
+  def load_value(value)
+    value
+  end
+
+  include_context 'setup_store'
+  it_should_behave_like 'increment'
+  it_should_behave_like 'null_objectkey_objectvalue'
+  it_should_behave_like 'null_objectkey_stringvalue'
+  it_should_behave_like 'null_objectkey_hashvalue'
+  it_should_behave_like 'null_objectkey_booleanvalue'
+  it_should_behave_like 'null_objectkey_nilvalue'
+  it_should_behave_like 'null_objectkey_integervalue'
+  it_should_behave_like 'null_stringkey_objectvalue'
+  it_should_behave_like 'null_stringkey_stringvalue'
+  it_should_behave_like 'null_stringkey_hashvalue'
+  it_should_behave_like 'null_stringkey_booleanvalue'
+  it_should_behave_like 'null_stringkey_nilvalue'
+  it_should_behave_like 'null_stringkey_integervalue'
+  it_should_behave_like 'null_hashkey_objectvalue'
+  it_should_behave_like 'null_hashkey_stringvalue'
+  it_should_behave_like 'null_hashkey_hashvalue'
+  it_should_behave_like 'null_hashkey_booleanvalue'
+  it_should_behave_like 'null_hashkey_nilvalue'
+  it_should_behave_like 'null_hashkey_integervalue'
+  it_should_behave_like 'null_booleankey_objectvalue'
+  it_should_behave_like 'null_booleankey_stringvalue'
+  it_should_behave_like 'null_booleankey_hashvalue'
+  it_should_behave_like 'null_booleankey_booleanvalue'
+  it_should_behave_like 'null_booleankey_nilvalue'
+  it_should_behave_like 'null_booleankey_integervalue'
+  it_should_behave_like 'null_nilkey_objectvalue'
+  it_should_behave_like 'null_nilkey_stringvalue'
+  it_should_behave_like 'null_nilkey_hashvalue'
+  it_should_behave_like 'null_nilkey_booleanvalue'
+  it_should_behave_like 'null_nilkey_nilvalue'
+  it_should_behave_like 'null_nilkey_integervalue'
+  it_should_behave_like 'null_integerkey_objectvalue'
+  it_should_behave_like 'null_integerkey_stringvalue'
+  it_should_behave_like 'null_integerkey_hashvalue'
+  it_should_behave_like 'null_integerkey_booleanvalue'
+  it_should_behave_like 'null_integerkey_nilvalue'
+  it_should_behave_like 'null_integerkey_integervalue'
+  it_should_behave_like 'returndifferent_objectkey_objectvalue'
+  it_should_behave_like 'returndifferent_objectkey_stringvalue'
+  it_should_behave_like 'returndifferent_objectkey_hashvalue'
+  it_should_behave_like 'returndifferent_stringkey_objectvalue'
+  it_should_behave_like 'returndifferent_stringkey_stringvalue'
+  it_should_behave_like 'returndifferent_stringkey_hashvalue'
+  it_should_behave_like 'returndifferent_hashkey_objectvalue'
+  it_should_behave_like 'returndifferent_hashkey_stringvalue'
+  it_should_behave_like 'returndifferent_hashkey_hashvalue'
+  it_should_behave_like 'returndifferent_booleankey_objectvalue'
+  it_should_behave_like 'returndifferent_booleankey_stringvalue'
+  it_should_behave_like 'returndifferent_booleankey_hashvalue'
+  it_should_behave_like 'returndifferent_nilkey_objectvalue'
+  it_should_behave_like 'returndifferent_nilkey_stringvalue'
+  it_should_behave_like 'returndifferent_nilkey_hashvalue'
+  it_should_behave_like 'returndifferent_integerkey_objectvalue'
+  it_should_behave_like 'returndifferent_integerkey_stringvalue'
+  it_should_behave_like 'returndifferent_integerkey_hashvalue'
+  it_should_behave_like 'store_objectkey_objectvalue'
+  it_should_behave_like 'store_objectkey_stringvalue'
+  it_should_behave_like 'store_objectkey_hashvalue'
+  it_should_behave_like 'store_objectkey_booleanvalue'
+  it_should_behave_like 'store_objectkey_nilvalue'
+  it_should_behave_like 'store_objectkey_integervalue'
+  it_should_behave_like 'store_stringkey_objectvalue'
+  it_should_behave_like 'store_stringkey_stringvalue'
+  it_should_behave_like 'store_stringkey_hashvalue'
+  it_should_behave_like 'store_stringkey_booleanvalue'
+  it_should_behave_like 'store_stringkey_nilvalue'
+  it_should_behave_like 'store_stringkey_integervalue'
+  it_should_behave_like 'store_hashkey_objectvalue'
+  it_should_behave_like 'store_hashkey_stringvalue'
+  it_should_behave_like 'store_hashkey_hashvalue'
+  it_should_behave_like 'store_hashkey_booleanvalue'
+  it_should_behave_like 'store_hashkey_nilvalue'
+  it_should_behave_like 'store_hashkey_integervalue'
+  it_should_behave_like 'store_booleankey_objectvalue'
+  it_should_behave_like 'store_booleankey_stringvalue'
+  it_should_behave_like 'store_booleankey_hashvalue'
+  it_should_behave_like 'store_booleankey_booleanvalue'
+  it_should_behave_like 'store_booleankey_nilvalue'
+  it_should_behave_like 'store_booleankey_integervalue'
+  it_should_behave_like 'store_nilkey_objectvalue'
+  it_should_behave_like 'store_nilkey_stringvalue'
+  it_should_behave_like 'store_nilkey_hashvalue'
+  it_should_behave_like 'store_nilkey_booleanvalue'
+  it_should_behave_like 'store_nilkey_nilvalue'
+  it_should_behave_like 'store_nilkey_integervalue'
+  it_should_behave_like 'store_integerkey_objectvalue'
+  it_should_behave_like 'store_integerkey_stringvalue'
+  it_should_behave_like 'store_integerkey_hashvalue'
+  it_should_behave_like 'store_integerkey_booleanvalue'
+  it_should_behave_like 'store_integerkey_nilvalue'
+  it_should_behave_like 'store_integerkey_integervalue'
+  it_should_behave_like 'transform_value'
+end

data/spec/moneta/transformer_key_yaml_spec.rb

@@ -0,0 +1,109 @@
+# Generated by generate.rb
+require 'helper'
+
+describe_moneta "transformer_key_yaml" do
+  def new_store
+    Moneta.build do
+      use :Transformer, :key => :yaml
+      adapter :Memory
+    end
+  end
+
+  def load_value(value)
+    value
+  end
+
+  include_context 'setup_store'
+  it_should_behave_like 'increment'
+  it_should_behave_like 'null_objectkey_objectvalue'
+  it_should_behave_like 'null_objectkey_stringvalue'
+  it_should_behave_like 'null_objectkey_hashvalue'
+  it_should_behave_like 'null_objectkey_booleanvalue'
+  it_should_behave_like 'null_objectkey_nilvalue'
+  it_should_behave_like 'null_objectkey_integervalue'
+  it_should_behave_like 'null_stringkey_objectvalue'
+  it_should_behave_like 'null_stringkey_stringvalue'
+  it_should_behave_like 'null_stringkey_hashvalue'
+  it_should_behave_like 'null_stringkey_booleanvalue'
+  it_should_behave_like 'null_stringkey_nilvalue'
+  it_should_behave_like 'null_stringkey_integervalue'
+  it_should_behave_like 'null_hashkey_objectvalue'
+  it_should_behave_like 'null_hashkey_stringvalue'
+  it_should_behave_like 'null_hashkey_hashvalue'
+  it_should_behave_like 'null_hashkey_booleanvalue'
+  it_should_behave_like 'null_hashkey_nilvalue'
+  it_should_behave_like 'null_hashkey_integervalue'
+  it_should_behave_like 'null_booleankey_objectvalue'
+  it_should_behave_like 'null_booleankey_stringvalue'
+  it_should_behave_like 'null_booleankey_hashvalue'
+  it_should_behave_like 'null_booleankey_booleanvalue'
+  it_should_behave_like 'null_booleankey_nilvalue'
+  it_should_behave_like 'null_booleankey_integervalue'
+  it_should_behave_like 'null_nilkey_objectvalue'
+  it_should_behave_like 'null_nilkey_stringvalue'
+  it_should_behave_like 'null_nilkey_hashvalue'
+  it_should_behave_like 'null_nilkey_booleanvalue'
+  it_should_behave_like 'null_nilkey_nilvalue'
+  it_should_behave_like 'null_nilkey_integervalue'
+  it_should_behave_like 'null_integerkey_objectvalue'
+  it_should_behave_like 'null_integerkey_stringvalue'
+  it_should_behave_like 'null_integerkey_hashvalue'
+  it_should_behave_like 'null_integerkey_booleanvalue'
+  it_should_behave_like 'null_integerkey_nilvalue'
+  it_should_behave_like 'null_integerkey_integervalue'
+  it_should_behave_like 'returndifferent_objectkey_objectvalue'
+  it_should_behave_like 'returndifferent_objectkey_stringvalue'
+  it_should_behave_like 'returndifferent_objectkey_hashvalue'
+  it_should_behave_like 'returndifferent_stringkey_objectvalue'
+  it_should_behave_like 'returndifferent_stringkey_stringvalue'
+  it_should_behave_like 'returndifferent_stringkey_hashvalue'
+  it_should_behave_like 'returndifferent_hashkey_objectvalue'
+  it_should_behave_like 'returndifferent_hashkey_stringvalue'
+  it_should_behave_like 'returndifferent_hashkey_hashvalue'
+  it_should_behave_like 'returndifferent_booleankey_objectvalue'
+  it_should_behave_like 'returndifferent_booleankey_stringvalue'
+  it_should_behave_like 'returndifferent_booleankey_hashvalue'
+  it_should_behave_like 'returndifferent_nilkey_objectvalue'
+  it_should_behave_like 'returndifferent_nilkey_stringvalue'
+  it_should_behave_like 'returndifferent_nilkey_hashvalue'
+  it_should_behave_like 'returndifferent_integerkey_objectvalue'
+  it_should_behave_like 'returndifferent_integerkey_stringvalue'
+  it_should_behave_like 'returndifferent_integerkey_hashvalue'
+  it_should_behave_like 'store_objectkey_objectvalue'
+  it_should_behave_like 'store_objectkey_stringvalue'
+  it_should_behave_like 'store_objectkey_hashvalue'
+  it_should_behave_like 'store_objectkey_booleanvalue'
+  it_should_behave_like 'store_objectkey_nilvalue'
+  it_should_behave_like 'store_objectkey_integervalue'
+  it_should_behave_like 'store_stringkey_objectvalue'
+  it_should_behave_like 'store_stringkey_stringvalue'
+  it_should_behave_like 'store_stringkey_hashvalue'
+  it_should_behave_like 'store_stringkey_booleanvalue'
+  it_should_behave_like 'store_stringkey_nilvalue'
+  it_should_behave_like 'store_stringkey_integervalue'
+  it_should_behave_like 'store_hashkey_objectvalue'
+  it_should_behave_like 'store_hashkey_stringvalue'
+  it_should_behave_like 'store_hashkey_hashvalue'
+  it_should_behave_like 'store_hashkey_booleanvalue'
+  it_should_behave_like 'store_hashkey_nilvalue'
+  it_should_behave_like 'store_hashkey_integervalue'
+  it_should_behave_like 'store_booleankey_objectvalue'
+  it_should_behave_like 'store_booleankey_stringvalue'
+  it_should_behave_like 'store_booleankey_hashvalue'
+  it_should_behave_like 'store_booleankey_booleanvalue'
+  it_should_behave_like 'store_booleankey_nilvalue'
+  it_should_behave_like 'store_booleankey_integervalue'
+  it_should_behave_like 'store_nilkey_objectvalue'
+  it_should_behave_like 'store_nilkey_stringvalue'
+  it_should_behave_like 'store_nilkey_hashvalue'
+  it_should_behave_like 'store_nilkey_booleanvalue'
+  it_should_behave_like 'store_nilkey_nilvalue'
+  it_should_behave_like 'store_nilkey_integervalue'
+  it_should_behave_like 'store_integerkey_objectvalue'
+  it_should_behave_like 'store_integerkey_stringvalue'
+  it_should_behave_like 'store_integerkey_hashvalue'
+  it_should_behave_like 'store_integerkey_booleanvalue'
+  it_should_behave_like 'store_integerkey_nilvalue'
+  it_should_behave_like 'store_integerkey_integervalue'
+  it_should_behave_like 'transform_value'
+end