moneta 0.7.10 → 0.7.11

data/script/generate-specs

@@ -973,6 +973,19 @@ end},
 it 'compile transformer class' do
   store.should_not be_nil
   Moneta::Transformer::MarshalUuencodeKeyMarshalUuencodeValue.should_not be_nil
+end}
+  },
+  'transformer_marshal_qp' => {
+    :build => %{Moneta.build do
+  use :Transformer, :key => [:marshal, :qp], :value => [:marshal, :qp]
+  adapter :Memory
+end},
+    :specs => STANDARD_SPECS.without_persist,
+    :load_value => '::Marshal.load(value.unpack(\'M\').first)',
+    :tests => %{
+it 'compile transformer class' do
+  store.should_not be_nil
+  Moneta::Transformer::MarshalQpKeyMarshalQpValue.should_not be_nil
 end}
   },
   'transformer_marshal_escape' => {
@@ -1890,7 +1903,7 @@ it 'respects expires in delete', :retry => 3 do
   store.delete('key2').should be_nil
 end
 
-it 'supports the #expires syntactic sugar' do
+it 'supports the #expires syntactic sugar', :retry => 3 do
   store.store('persistent_key', 'persistent_value', :expires => 0)
   store.expires(1).store('key2', 'val2')
   store['key2'].should == 'val2'
@@ -1906,7 +1919,7 @@ it 'supports false as no-expires on store and []' do
   store['key1'].should == 'val1'
 end
 
-it 'does not update the expiration time in key? when not asked to do so' do
+it 'does not update the expiration time in key? when not asked to do so', :retry => 3 do
   store.store('key1', 'val1', :expires => 1)
   store.key?('key1').should be_true
   store.key?('key1', :expires => nil).should be_true
@@ -1914,7 +1927,7 @@ it 'does not update the expiration time in key? when not asked to do so' do
   store.key?('key1').should be_false
 end
 
-it 'does not update the expiration time in fetch when not asked to do so' do
+it 'does not update the expiration time in fetch when not asked to do so', :retry => 3 do
   store.store('key1', 'val1', :expires => 1)
   store.fetch('key1').should == 'val1'
   store.fetch('key1', :expires => nil).should == 'val1'
@@ -1922,7 +1935,7 @@ it 'does not update the expiration time in fetch when not asked to do so' do
   store.fetch('key1').should be_nil
 end
 
-it 'does not update the expiration time in load when not asked to do so' do
+it 'does not update the expiration time in load when not asked to do so', :retry => 3 do
   store.store('key1', 'val1', :expires => 1)
   store.load('key1').should == 'val1'
   store.load('key1', :expires => nil).should == 'val1'
@@ -2274,15 +2287,11 @@ TESTS.each do |name, options|
   opts = options.delete(:options)
   opts = ', ' << opts if opts
 
-  build ||= "Moneta.new(#{store.inspect}#{opts}, :logger => {:out => log})"
+  build ||= "Moneta.new(#{store.inspect}#{opts}, :logger => {:file => File.join(make_tempdir, '#{name}.log')})"
 
   code = %{#{header}require 'helper'
 
 describe_moneta #{name.inspect} do
-  def log
-    @log ||= File.open(File.join(make_tempdir, '#{name}.log'), 'a')
-  end
-
   def features
     #{specs.features.to_a.inspect}
   end

data/script/start-services

@@ -5,5 +5,13 @@ sudo service redis-server start
 sudo service cassandra start
 sudo service memcached start
 sudo service mongodb start
-/usr/sbin/ttserver -dmn
+
+echo 'Starting TokyoTyrant'
+/usr/sbin/ttserver -dmn -pid /tmp/ttserver.pid -log /tmp/ttserver.log -port 1978
+
+# Waiting for servers to start
 sleep 3
+
+echo 'TokyoTyrant status'
+ps aux | grep ttserver
+cat /tmp/ttserver.log

data/spec/moneta/adapter_activerecord_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_activerecord" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_activerecord.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/adapter_cassandra_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_cassandra" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_cassandra.log'), 'a')
-  end
-
   def features
     [:expires]
   end

data/spec/moneta/adapter_cassandra_with_default_expires_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_cassandra_with_default_expires" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_cassandra_with_default_expires.log'), 'a')
-  end
-
   def features
     [:expires]
   end

data/spec/moneta/adapter_client_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_client" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_client.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/adapter_cookie_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_cookie" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_cookie.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/adapter_couch_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_couch" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_couch.log'), 'a')
-  end
-
   def features
     []
   end

data/spec/moneta/adapter_datamapper_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_datamapper" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_datamapper.log'), 'a')
-  end
-
   def features
     [:create]
   end

data/spec/moneta/adapter_daybreak_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_daybreak" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_daybreak.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/adapter_dbm_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_dbm" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_dbm.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/adapter_file_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_file" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_file.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/adapter_fog_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_fog" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_fog.log'), 'a')
-  end
-
   def features
     []
   end

data/spec/moneta/adapter_gdbm_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_gdbm" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_gdbm.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/adapter_hbase_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_hbase" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_hbase.log'), 'a')
-  end
-
   def features
     [:increment]
   end

data/spec/moneta/adapter_kyotocabinet_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_kyotocabinet" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_kyotocabinet.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/adapter_leveldb_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_leveldb" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_leveldb.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/adapter_localmemcache_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_localmemcache" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_localmemcache.log'), 'a')
-  end
-
   def features
     []
   end

data/spec/moneta/adapter_lruhash_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_lruhash" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_lruhash.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/adapter_memcached_dalli_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_memcached_dalli" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_memcached_dalli.log'), 'a')
-  end
-
   def features
     [:create, :expires, :increment]
   end

data/spec/moneta/adapter_memcached_dalli_with_default_expires_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_memcached_dalli_with_default_expires" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_memcached_dalli_with_default_expires.log'), 'a')
-  end
-
   def features
     [:create, :expires, :increment]
   end

data/spec/moneta/adapter_memcached_native_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_memcached_native" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_memcached_native.log'), 'a')
-  end
-
   def features
     [:create, :expires, :increment]
   end

data/spec/moneta/adapter_memcached_native_with_default_expires_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_memcached_native_with_default_expires" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_memcached_native_with_default_expires.log'), 'a')
-  end
-
   def features
     [:create, :expires, :increment]
   end

data/spec/moneta/adapter_memcached_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_memcached" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_memcached.log'), 'a')
-  end
-
   def features
     [:create, :expires, :increment]
   end

data/spec/moneta/adapter_memcached_with_default_expires_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_memcached_with_default_expires" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_memcached_with_default_expires.log'), 'a')
-  end
-
   def features
     [:create, :expires, :increment]
   end

data/spec/moneta/adapter_memory_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_memory" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_memory.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/adapter_mongo_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_mongo" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_mongo.log'), 'a')
-  end
-
   def features
     [:create, :expires, :increment]
   end

data/spec/moneta/adapter_mongo_with_default_expires_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_mongo_with_default_expires" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_mongo_with_default_expires.log'), 'a')
-  end
-
   def features
     [:create, :expires, :increment]
   end

data/spec/moneta/adapter_pstore_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_pstore" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_pstore.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/adapter_redis_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_redis" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_redis.log'), 'a')
-  end
-
   def features
     [:create, :expires, :increment]
   end

data/spec/moneta/adapter_redis_with_default_expires_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_redis_with_default_expires" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_redis_with_default_expires.log'), 'a')
-  end
-
   def features
     [:create, :expires, :increment]
   end

data/spec/moneta/adapter_restclient_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_restclient" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_restclient.log'), 'a')
-  end
-
   def features
     []
   end

data/spec/moneta/adapter_riak_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_riak" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_riak.log'), 'a')
-  end
-
   def features
     []
   end

data/spec/moneta/adapter_sdbm_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_sdbm" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_sdbm.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/adapter_sequel_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_sequel" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_sequel.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/adapter_sqlite_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_sqlite" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_sqlite.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/adapter_tdb_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_tdb" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_tdb.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/adapter_tokyocabinet_bdb_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_tokyocabinet_bdb" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_tokyocabinet_bdb.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/adapter_tokyocabinet_hdb_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_tokyocabinet_hdb" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_tokyocabinet_hdb.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/adapter_tokyotyrant_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_tokyotyrant" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_tokyotyrant.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/adapter_yaml_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "adapter_yaml" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'adapter_yaml.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/cache_file_memory_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "cache_file_memory" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'cache_file_memory.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/cache_memory_null_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "cache_memory_null" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'cache_memory_null.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/expires_file_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "expires_file" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'expires_file.log'), 'a')
-  end
-
   def features
     [:create, :expires, :increment]
   end

data/spec/moneta/expires_memory_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "expires_memory" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'expires_memory.log'), 'a')
-  end
-
   def features
     [:create, :expires, :increment]
   end

data/spec/moneta/expires_memory_with_default_expires_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "expires_memory_with_default_expires" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'expires_memory_with_default_expires.log'), 'a')
-  end
-
   def features
     [:create, :expires, :increment]
   end

data/spec/moneta/lock_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "lock" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'lock.log'), 'a')
-  end
-
   def features
     [:create, :increment]
   end

data/spec/moneta/mutex_spec.rb

@@ -2,16 +2,12 @@
 require 'helper'
 
 describe_moneta "mutex" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'mutex.log'), 'a')
-  end
-
   def features
     []
   end
 
   def new_store
-    Moneta.new(:Memory, :logger => {:out => log})
+    Moneta.new(:Memory, :logger => {:file => File.join(make_tempdir, 'mutex.log')})
   end
 
   def load_value(value)

data/spec/moneta/null_adapter_spec.rb

@@ -2,10 +2,6 @@
 require 'helper'
 
 describe_moneta "null_adapter" do
-  def log
-    @log ||= File.open(File.join(make_tempdir, 'null_adapter.log'), 'a')
-  end
-
   def features
     []
   end