moneta 0.7.19 → 0.7.20

data/lib/moneta/utils.rb

@@ -4,6 +4,7 @@ module Moneta
     extend self
 
     def without(hash, *keys)
+      return hash if hash.empty?
       if keys.any? {|k| hash.include?(k) }
         hash = hash.dup
         keys.each {|k| hash.delete(k) }
@@ -11,6 +12,13 @@ module Moneta
       hash
     end
 
+    def only(hash, *keys)
+      return hash if hash.empty?
+      ret = {}
+      keys.each {|k| ret[k] = hash[k] }
+      ret
+    end
+
     def to_int(value)
       intvalue = value.to_i
       raise "#{value.inspect} is not an integer value" unless value == nil || intvalue.to_s == value.to_s

data/lib/moneta/version.rb

@@ -1,5 +1,5 @@
 module Moneta
   # Moneta version number
   # @api public
-  VERSION = '0.7.19'
+  VERSION = '0.7.20'
 end

data/script/benchmarks

@@ -49,6 +49,7 @@ class MonetaBenchmarks
     :LRUHash => {},
     :LevelDB => { :dir => "#{DIR}/leveldb" },
     :LocalMemCache => { :file => "#{DIR}/lmc" },
+    :LMDB => { :dir => "#{DIR}/lmdb" },
     :MemcachedDalli => {},
     :MemcachedNative => {},
     :Memory => {},

data/script/generate-specs

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 
 PATH = File.expand_path(File.join(__FILE__, '..', '..', 'spec'))
 
@@ -7,8 +8,8 @@ class Specs
 
   def initialize(options = {})
     @specs = options.delete(:specs).to_a
-    @key = options.delete(:key)     || %w(object string hash boolean nil integer number)
-    @value = options.delete(:value) || %w(object string hash boolean nil integer number)
+    @key = options.delete(:key)     || %w(object string binary hash boolean nil integer number)
+    @value = options.delete(:value) || %w(object string binary hash boolean nil integer number)
     @features = []
     [:expires, :expires_native, :increment, :create].each do |feature|
       @features << feature if @specs.include?(feature)
@@ -21,8 +22,8 @@ class Specs
     Specs.new({:specs => specs, :key => key, :value => value}.merge(options))
   end
 
-  def simplestringkeys_only
-    new(:key => %w(simplestring))
+  def without_path
+    new(:key => key - %w(path))
   end
 
   def stringvalues_only
@@ -107,14 +108,14 @@ class Specs
   end
 end
 
-ADAPTER_SPECS = Specs.new(:specs => [:null, :store, :returndifferent, :increment, :concurrent_increment, :concurrent_create, :persist, :multiprocess, :create, :features, :store_large], :key => %w(string), :value => %w(string))
+ADAPTER_SPECS = Specs.new(:specs => [:null, :store, :returndifferent, :increment, :concurrent_increment, :concurrent_create, :persist, :multiprocess, :create, :features, :store_large], :key => %w(string path), :value => %w(string path))
 STANDARD_SPECS = Specs.new(:specs => [:null, :store, :returndifferent, :marshallable_key, :marshallable_value, :transform_value, :increment, :concurrent_increment, :concurrent_create, :persist, :multiprocess, :create, :features, :store_large])
 TRANSFORMER_SPECS = Specs.new(:specs => [:null, :store, :returndifferent, :transform_value, :increment, :create, :features, :store_large])
 
-header = "# Generated by #{File.basename(__FILE__)}\n"
+header = "# coding: binary\n# Generated by #{File.basename(__FILE__)}\n"
 
 TESTS = {
-  'simple_client_tcp' => {
+  'standard_client_tcp' => {
     :preamble => "start_server(Moneta::Adapters::Memory.new)\n",
     :store => :Client,
     :specs => STANDARD_SPECS,
@@ -135,289 +136,299 @@ it 'supports multiple clients' do
 end
 }
   },
-  'simple_client_unix' => {
-    :preamble => "start_server(Moneta::Adapters::Memory.new, :socket => File.join(make_tempdir, 'simple_client_unix'))\n",
+  'standard_client_unix' => {
+    :preamble => "start_server(Moneta::Adapters::Memory.new, :socket => File.join(make_tempdir, 'standard_client_unix'))\n",
     :store => :Client,
-    :options => ":socket => File.join(make_tempdir, 'simple_client_unix')",
+    :options => ":socket => File.join(make_tempdir, 'standard_client_unix')",
     :specs => STANDARD_SPECS
   },
-  'simple_restclient' => {
+  'standard_restclient' => {
     :preamble => "start_restserver\n",
     :store => :RestClient,
     :options => ":url => 'http://localhost:8808/moneta/'",
     :specs => STANDARD_SPECS.without_increment.without_create
   },
-  'simple_memory' => {
+  'standard_memory' => {
     :store => :Memory,
     :specs => STANDARD_SPECS.without_persist
   },
-  'simple_memory_with_expires' => {
+  'standard_memory_with_expires' => {
     :store => :Memory,
     :options => ':expires => true',
     :specs => STANDARD_SPECS.with_expires.without_persist
   },
-  'simple_memory_with_compress' => {
+  'standard_memory_with_compress' => {
     :store => :Memory,
     :options => ':compress => true',
     :load_value => 'Marshal.load(::Zlib::Inflate.inflate(value))',
     :specs => STANDARD_SPECS.without_persist
   },
-  'simple_memory_with_prefix' => {
+  'standard_memory_with_prefix' => {
     :store => :Memory,
     :options => ':prefix => "moneta"',
     :specs => STANDARD_SPECS.without_persist
   },
-  'simple_memory_with_json_serializer' => {
+  'standard_memory_with_json_serializer' => {
     :store => :Memory,
     :options => ':serializer => :json',
-    :load_value => '::MultiJson.load(value).first',
+    :load_value => '::MultiJson.load(value)',
     :specs => STANDARD_SPECS.without_marshallable.simplekeys_only.simplevalues_only.without_persist
   },
-  'simple_memory_with_json_key_serializer' => {
+  'standard_memory_with_json_key_serializer' => {
     :store => :Memory,
     :options => ':key_serializer => :json',
     :specs => STANDARD_SPECS.without_marshallable_key.simplekeys_only.without_persist,
   },
-  'simple_memory_with_json_value_serializer' => {
+  'standard_memory_with_json_value_serializer' => {
     :store => :Memory,
     :options => ':value_serializer => :json',
     :specs => STANDARD_SPECS.without_marshallable_value.simplevalues_only.without_persist,
-    :load_value => '::MultiJson.load(value).first'
+    :load_value => '::MultiJson.load(value)'
   },
-  'simple_memory_with_snappy_compress' => {
+  'standard_memory_with_snappy_compress' => {
     :store => :Memory,
     :options => ':compress => :snappy',
     :load_value => 'Marshal.load(::Snappy.inflate(value))',
     :specs => STANDARD_SPECS.without_persist
   },
-  'simple_lruhash' => {
+  'standard_lruhash' => {
     :store => :LRUHash,
     :specs => STANDARD_SPECS.without_persist
   },
-  'simple_lruhash_with_expires' => {
+  'standard_lruhash_with_expires' => {
     :store => :LRUHash,
     :options => ':expires => true',
     :specs => STANDARD_SPECS.with_expires.without_persist,
   },
-  'simple_file' => {
+  'standard_file' => {
     :store => :File,
     :options => ':dir => File.join(make_tempdir, "simple_file")',
     :specs => STANDARD_SPECS
   },
-  'simple_file_with_expires' => {
+  'standard_file_with_expires' => {
     :store => :File,
     :options => ':dir => File.join(make_tempdir, "simple_file_with_expires"), :expires => true',
     :specs => STANDARD_SPECS.with_expires
   },
-  'simple_hashfile' => {
+  'standard_hashfile' => {
     :store => :HashFile,
     :options => ':dir => File.join(make_tempdir, "simple_hashfile")',
     :specs => STANDARD_SPECS
   },
-  'simple_hashfile_with_expires' => {
+  'standard_hashfile_with_expires' => {
     :store => :HashFile,
     :options => ':dir => File.join(make_tempdir, "simple_hashfile_with_expires"), :expires => true',
     :specs => STANDARD_SPECS.with_expires
   },
-  'simple_cassandra' => {
+  'standard_cassandra' => {
     :store => :Cassandra,
     :options => ':keyspace => "simple_cassandra"',
     :specs => STANDARD_SPECS.without_increment.without_create.with_native_expires,
   },
-  'simple_hbase' => {
+  'standard_hbase' => {
     :store => :HBase,
     :options => ':table => "simple_hbase"',
     :specs => STANDARD_SPECS.without_create
   },
-  'simple_hbase_with_expires' => {
+  'standard_hbase_with_expires' => {
     :store => :HBase,
     :options => ':table => "simple_hbase", :expires => true',
     :specs => STANDARD_SPECS.with_expires,
   },
-  'simple_dbm' => {
+  'standard_dbm' => {
     :store => :DBM,
     :options => ':file => File.join(make_tempdir, "simple_dbm")',
     :specs => STANDARD_SPECS.without_multiprocess
   },
-  'simple_dbm_with_expires' => {
+  'standard_dbm_with_expires' => {
     :store => :DBM,
     :options => ':file => File.join(make_tempdir, "simple_dbm_with_expires"), :expires => true',
     :specs => STANDARD_SPECS.without_multiprocess.with_expires
   },
-  'simple_tdb' => {
+  'standard_tdb' => {
     :store => :TDB,
     :options => ':file => File.join(make_tempdir, "simple_tdb")',
     :specs => STANDARD_SPECS.without_multiprocess
   },
-  'simple_tdb_with_expires' => {
+  'standard_tdb_with_expires' => {
     :store => :TDB,
     :options => ':file => File.join(make_tempdir, "simple_tdb_with_expires"), :expires => true',
     :specs => STANDARD_SPECS.without_multiprocess.with_expires
   },
-  'simple_daybreak' => {
+  'standard_daybreak' => {
     :store => :Daybreak,
     :options => ':file => File.join(make_tempdir, "simple_daybreak")',
     :specs => STANDARD_SPECS.without_multiprocess
   },
-  'simple_daybreak_with_expires' => {
+  'standard_daybreak_with_expires' => {
     :store => :Daybreak,
     :options => ':file => File.join(make_tempdir, "simple_daybreak_with_expires"), :expires => true',
     :specs => STANDARD_SPECS.without_multiprocess.with_expires
   },
-  'simple_gdbm' => {
+  'standard_gdbm' => {
     :store => :GDBM,
     :options => ':file => File.join(make_tempdir, "simple_gdbm")',
     :specs => STANDARD_SPECS.without_multiprocess
   },
-  'simple_gdbm_with_expires' => {
+  'standard_gdbm_with_expires' => {
     :store => :GDBM,
     :options => ':file => File.join(make_tempdir, "simple_gdbm_with_expires"), :expires => true',
     :specs => STANDARD_SPECS.without_multiprocess.with_expires
   },
-  'simple_sdbm' => {
+  'standard_sdbm' => {
     :store => :SDBM,
     :options => ':file => File.join(make_tempdir, "simple_sdbm")',
     :specs => STANDARD_SPECS.without_multiprocess.without_large
   },
-  'simple_sdbm_with_expires' => {
+  'standard_sdbm_with_expires' => {
     :store => :SDBM,
     :options => ':file => File.join(make_tempdir, "simple_sdbm_with_expires"), :expires => true',
     :specs => STANDARD_SPECS.without_multiprocess.with_expires.without_large
   },
-  'simple_leveldb' => {
+  'standard_leveldb' => {
     :store => :LevelDB,
     :options => ':dir => File.join(make_tempdir, "simple_leveldb")',
     :specs => STANDARD_SPECS.without_multiprocess
   },
-  'simple_leveldb_with_expires' => {
+  'standard_leveldb_with_expires' => {
     :store => :LevelDB,
     :options => ':dir => File.join(make_tempdir, "simple_leveldb_with_expires"), :expires => true',
     :specs => STANDARD_SPECS.without_multiprocess.with_expires
   },
-  'simple_pstore' => {
+  'standard_lmdb' => {
+    :store => :LMDB,
+    :options => ':dir => File.join(make_tempdir, "simple_lmdb")',
+    :specs => STANDARD_SPECS.without_concurrent
+  },
+  'standard_lmdb_with_expires' => {
+    :store => :LMDB,
+    :options => ':dir => File.join(make_tempdir, "simple_lmdb_with_expires"), :expires => true',
+    :specs => STANDARD_SPECS.without_concurrent.with_expires
+  },
+  'standard_pstore' => {
     :store => :PStore,
     :options => ':file => File.join(make_tempdir, "simple_pstore")',
     :load_value => 'value',
     :specs => STANDARD_SPECS
   },
-  'simple_pstore_with_expires' => {
+  'standard_pstore_with_expires' => {
     :store => :PStore,
     :options => ':file => File.join(make_tempdir, "simple_pstore_with_expires"), :expires => true',
     :load_value => 'value',
     :specs => STANDARD_SPECS.with_expires
   },
-  'simple_yaml' => {
+  'standard_yaml' => {
     :store => :YAML,
     :options => ':file => File.join(make_tempdir, "simple_yaml")',
     :specs => STANDARD_SPECS.without_marshallable_value.without_concurrent,
     :load_value => 'value'
   },
-  'simple_yaml_with_expires' => {
+  'standard_yaml_with_expires' => {
     :store => :YAML,
     :options => ':file => File.join(make_tempdir, "simple_yaml_with_expires"), :expires => true',
     :specs => STANDARD_SPECS.without_marshallable_value.with_expires.without_concurrent,
     :load_value => 'value'
   },
-  'simple_localmemcache' => {
+  'standard_localmemcache' => {
     :store => :LocalMemCache,
     :options => ':file => File.join(make_tempdir, "simple_localmemcache")',
     :specs => STANDARD_SPECS.without_increment.without_create
   },
-  'simple_localmemcache_with_expires' => {
+  'standard_localmemcache_with_expires' => {
     :store => :LocalMemCache,
     :options => ':file => File.join(make_tempdir, "simple_localmemcache_with_expires"), :expires => true',
     :specs => STANDARD_SPECS.without_increment.without_create.with_expires
   },
-  'simple_tokyocabinet' => {
+  'standard_tokyocabinet' => {
     :store => :TokyoCabinet,
     :options => ':file => File.join(make_tempdir, "simple_tokyocabinet")',
     :specs => STANDARD_SPECS.without_multiprocess
   },
-  'simple_tokyocabinet_with_expires' => {
+  'standard_tokyocabinet_with_expires' => {
     :store => :TokyoCabinet,
     :options => ':file => File.join(make_tempdir, "simple_tokyocabinet_with_expires"), :expires => true',
     :specs => STANDARD_SPECS.without_multiprocess.with_expires
   },
-  'simple_tokyotyrant' => {
+  'standard_tokyotyrant' => {
     :store => :TokyoTyrant,
     :specs => STANDARD_SPECS
   },
-  'simple_tokyotyrant_with_expires' => {
+  'standard_tokyotyrant_with_expires' => {
     :store => :TokyoTyrant,
     :options => ':expires => true',
     :specs => STANDARD_SPECS.with_expires
   },
-  'simple_kyotocabinet' => {
+  'standard_kyotocabinet' => {
     :store => :KyotoCabinet,
     :options => ':file => File.join(make_tempdir, "simple_kyotocabinet.kch")',
     :specs => STANDARD_SPECS.without_multiprocess
   },
-  'simple_kyotocabinet_with_expires' => {
+  'standard_kyotocabinet_with_expires' => {
     :store => :KyotoCabinet,
     :options => ':file => File.join(make_tempdir, "simple_kyotocabinet_with_expires.kch"), :expires => true',
     :specs => STANDARD_SPECS.without_multiprocess.with_expires
   },
-  'simple_sqlite' => {
+  'standard_sqlite' => {
     :store => :Sqlite,
     :options => ':file => File.join(make_tempdir, "simple_sqlite")',
     :specs => STANDARD_SPECS.without_concurrent
   },
-  'simple_sqlite_with_expires' => {
+  'standard_sqlite_with_expires' => {
     :store => :Sqlite,
     :options => ':file => File.join(make_tempdir, "simple_sqlite_with_expires"), :expires => true',
     :specs => STANDARD_SPECS.with_expires.without_concurrent
   },
-  'simple_redis' => {
+  'standard_redis' => {
     :store => :Redis,
     :specs => STANDARD_SPECS.with_native_expires,
   },
-  'simple_memcached' => {
+  'standard_memcached' => {
     :store => :Memcached,
     :specs => STANDARD_SPECS.with_native_expires,
     :options => ':namespace => "simple_memcached"'
   },
-  'simple_memcached_dalli' => {
+  'standard_memcached_dalli' => {
     :store => :MemcachedDalli,
     :specs => STANDARD_SPECS.with_native_expires,
     :options => ':namespace => "simple_memcached_dalli"'
   },
-  'simple_memcached_native' => {
+  'standard_memcached_native' => {
     :store => :MemcachedNative,
     :specs => STANDARD_SPECS.with_native_expires,
     :options => ':namespace => "simple_memcached_native"'
   },
-  'simple_riak' => {
+  'standard_riak' => {
     :store => :Riak,
-    :options => ":bucket => 'simple_riak'",
+    :options => ":bucket => 'standard_riak'",
     # We don't want Riak warnings in tests
     :preamble => "require 'riak'\n\nRiak.disable_list_keys_warnings = true\n\n",
     :specs => STANDARD_SPECS.without_increment.without_create
   },
-  'simple_riak_with_expires' => {
+  'standard_riak_with_expires' => {
     :store => :Riak,
-    :options => ":bucket => 'simple_riak_with_expires', :expires => true",
+    :options => ":bucket => 'standard_riak_with_expires', :expires => true",
     # We don't want Riak warnings in tests
     :preamble => "require 'riak'\n\nRiak.disable_list_keys_warnings = true\n\n",
     :specs => STANDARD_SPECS.without_increment.with_expires.without_create
   },
-  'simple_couch' => {
+  'standard_couch' => {
     :store => :Couch,
-    :options => ":db => 'simple_couch'",
+    :options => ":db => 'standard_couch'",
     :load_value => '::Marshal.load(value.unpack(\'m\').first)',
     :specs => STANDARD_SPECS.without_increment
   },
-  'simple_couch_with_expires' => {
+  'standard_couch_with_expires' => {
     :store => :Couch,
-    :options => ":db => 'simple_couch_with_expires', :expires => true",
+    :options => ":db => 'standard_couch_with_expires', :expires => true",
     :specs => STANDARD_SPECS.without_increment.with_expires,
     :load_value => '::Marshal.load(value.unpack(\'m\').first)'
   },
-  'simple_mongo' => {
+  'standard_mongo' => {
     :store => :Mongo,
-    :options => ":db => 'simple_mongo'",
+    :options => ":db => 'standard_mongo'",
     :specs => STANDARD_SPECS.with_native_expires
   },
-  'simple_null' => {
+  'standard_null' => {
     :store => :Null,
     :specs => STANDARD_SPECS.without_increment.without_create.without_store.without_persist
   },
@@ -425,19 +436,19 @@ end
     :build => 'Moneta::Adapters::Null.new',
     :specs => Specs.new(:specs => [:null, :not_increment, :not_create, :not_persist])
   },
-  'simple_sequel' => {
+  'standard_sequel' => {
     :store => :Sequel,
     :options => ':db => (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root" : "mysql2://root:@localhost/moneta"), :table => "simple_sequel"',
-    :load_value => '::Marshal.load(value.unpack(\'m\').first)',
+    :load_value => '::Marshal.load(value)',
     :specs => STANDARD_SPECS
   },
-  'simple_sequel_with_expires' => {
+  'standard_sequel_with_expires' => {
     :store => :Sequel,
     :options => ':db => (defined?(JRUBY_VERSION) ? "jdbc:mysql://localhost/moneta?user=root" : "mysql2://root:@localhost/moneta"), :table => "simple_sequel_with_expires", :expires => true',
     :specs => STANDARD_SPECS.with_expires,
-    :load_value => '::Marshal.load(value.unpack(\'m\').first)'
+    :load_value => '::Marshal.load(value)'
   },
-  'simple_datamapper' => {
+  'standard_datamapper' => {
     :store => :DataMapper,
     :specs => STANDARD_SPECS.without_increment,
     :options => ':setup => "mysql://root:@localhost/moneta", :table => "simple_datamapper"',
@@ -445,7 +456,7 @@ end
     :preamble => "require 'dm-core'\nDataMapper.setup(:default, :adapter => :in_memory)\n",
     :load_value => '::Marshal.load(value.unpack(\'m\').first)'
   },
-  'simple_datamapper_with_expires' => {
+  'standard_datamapper_with_expires' => {
     :store => :DataMapper,
     :options => ':setup => "mysql://root:@localhost/moneta", :table => "simple_datamapper_with_expires", :expires => true',
     # DataMapper needs default repository to be setup
@@ -453,7 +464,7 @@ end
     :specs => STANDARD_SPECS.without_increment.with_expires,
     :load_value => '::Marshal.load(value.unpack(\'m\').first)'
   },
-  'simple_datamapper_with_repository' => {
+  'standard_datamapper_with_repository' => {
     :store => :DataMapper,
     :specs => STANDARD_SPECS.without_increment,
     :options => ':repository => :repo, :setup => "mysql://root:@localhost/moneta", :table => "simple_datamapper_with_repository"',
@@ -461,34 +472,34 @@ end
     :preamble => "require 'dm-core'\nDataMapper.setup(:default, :adapter => :in_memory)\n",
     :load_value => '::Marshal.load(value.unpack(\'m\').first)'
   },
-  'simple_activerecord' => {
+  'standard_activerecord' => {
     :store => :ActiveRecord,
     :specs => STANDARD_SPECS,
-    :options => ":table => 'simple_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root' }",
+    :options => ":table => 'standard_activerecord', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root' }",
     :load_value => '::Marshal.load(value.unpack(\'m\').first)'
   },
-  'simple_activerecord_with_expires' => {
+  'standard_activerecord_with_expires' => {
     :store => :ActiveRecord,
-    :options => ":table => 'simple_activerecord_with_expires', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root' }, :expires => true",
+    :options => ":table => 'standard_activerecord_with_expires', :connection => { :adapter => (defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql2'), :database => 'moneta', :username => 'root' }, :expires => true",
     :specs => STANDARD_SPECS.with_expires,
     :load_value => '::Marshal.load(value.unpack(\'m\').first)'
   },
-  'simple_fog' => {
+  'standard_fog' => {
     :store                  => :Fog,
     :specs                  => STANDARD_SPECS.without_increment.without_create,
     :options => ":aws_access_key_id => 'fake_access_key_id',
     :aws_secret_access_key  => 'fake_secret_access_key',
     :provider               => 'AWS',
-    :dir                    => 'simple_fog'",
+    :dir                    => 'standard_fog'",
     # Put Fog into testing mode
     :preamble               => "require 'fog'\nFog.mock!\n"
   },
-  'simple_fog_with_expires' => {
+  'standard_fog_with_expires' => {
     :store                  => :Fog,
     :options => ":aws_access_key_id => 'fake_access_key_id',
     :aws_secret_access_key  => 'fake_secret_access_key',
     :provider               => 'AWS',
-    :dir                    => 'simple_fog_with_expires',
+    :dir                    => 'standard_fog_with_expires',
     :expires                => true",
     # Put Fog into testing mode
     :preamble               => "require 'fog'\nFog.mock!\n",
@@ -767,7 +778,7 @@ end}
   adapter :Memory
 end},
     :specs => TRANSFORMER_SPECS.simplekeys_only.simplevalues_only,
-    :load_value => '::MultiJson.load(value).first',
+    :load_value => '::MultiJson.load(value)',
     :tests => %{
 it 'compile transformer class' do
   store.should_not be_nil
@@ -825,6 +836,19 @@ end},
 it 'compile transformer class' do
   store.should_not be_nil
   Moneta::Transformer::OxKeyOxValue.should_not be_nil
+end}
+  },
+  'transformer_php' => {
+    :build => %{Moneta.build do
+  use :Transformer, :key => :php, :value => :php
+  adapter :Memory
+end},
+    :specs => TRANSFORMER_SPECS.simplekeys_only.simplevalues_only,
+    :load_value => '::PHP.unserialize(value)',
+    :tests => %{
+it 'compile transformer class' do
+  store.should_not be_nil
+  Moneta::Transformer::PhpKeyPhpValue.should_not be_nil
 end}
   },
   'transformer_tnet' => {
@@ -981,6 +1005,19 @@ end},
 it 'compile transformer class' do
   store.should_not be_nil
   Moneta::Transformer::MarshalBase64KeyMarshalBase64Value.should_not be_nil
+end}
+  },
+  'transformer_marshal_hex' => {
+    :build => %{Moneta.build do
+  use :Transformer, :key => [:marshal, :hex], :value => [:marshal, :hex]
+  adapter :Memory
+end},
+    :specs => STANDARD_SPECS.without_persist,
+    :load_value => '::Marshal.load([value].pack(\'H*\'))',
+    :tests => %{
+it 'compile transformer class' do
+  store.should_not be_nil
+  Moneta::Transformer::MarshalHexKeyMarshalHexValue.should_not be_nil
 end}
   },
   'transformer_marshal_prefix' => {
@@ -1234,7 +1271,7 @@ end}
   },
   'adapter_couch' => {
     :build => "Moneta::Adapters::Couch.new(:db => 'adapter_couch')",
-    :specs => ADAPTER_SPECS.without_increment.simplevalues_only.simplestringkeys_only
+    :specs => ADAPTER_SPECS.without_increment.simplevalues_only.without_path
   },
   'adapter_datamapper' => {
     :build => 'Moneta::Adapters::DataMapper.new(:setup => "mysql://root:@localhost/moneta", :table => "adapter_datamapper")',
@@ -1390,6 +1427,14 @@ end}
     :build => 'Moneta::Adapters::SDBM.new(:file => File.join(make_tempdir, "adapter_sdbm"))',
     :specs => ADAPTER_SPECS.without_multiprocess.without_large
   },
+  'adapter_lmdb' => {
+    :build => 'Moneta::Adapters::LMDB.new(:dir => File.join(make_tempdir, "adapter_lmdb"))',
+    :specs => ADAPTER_SPECS.without_concurrent
+  },
+  'adapter_lmdb_with_db' => {
+    :build => 'Moneta::Adapters::LMDB.new(:dir => File.join(make_tempdir, "adapter_lmdb"), :db => "adapter_lmdb_with_db")',
+    :specs => ADAPTER_SPECS.without_concurrent
+  },
   'adapter_leveldb' => {
     :build => 'Moneta::Adapters::LevelDB.new(:dir => File.join(make_tempdir, "adapter_leveldb"))',
     :specs => ADAPTER_SPECS.without_multiprocess
@@ -1651,22 +1696,24 @@ end}
 SPECS = {}
 
 KEYS = {
-  'nil' => [0, 'nil'],
+  'nil' => ['nil', 0],
   'integer' => [-10, 42],
   'number' => [0.5, -0.3, 1<<127, 99],
   'boolean' => [true, false],
-  'string' => %w(strkey1 strkey2 foo/bar bar/foo/baz).map(&:inspect),
-  'simplestring' => %w(strkey1 strkey2).map(&:inspect),
+  'string' => %w(strkey1 strkey2).map(&:inspect),
+  'path' => %w(bar/foo/baz foo/bar).map(&:inspect),
+  'binary' => ["\xC3\xBCber", "\xAA\xBB\xCC"].map(&:inspect),
   'object' => ['Value.new(:objkey1)', 'Value.new(:objkey2)'],
   'hash' => [{'hashkey1' => 'hashkey2'}, {'hashkey3' => 'hashkey4'}].map(&:inspect)
 }
 
 VALUES = {
-  'nil' => [0, 'nil'],
+  'nil' => ["''", 'nil', 0, false],
   'integer' => [41, -12],
   'number' => [123.456, -98.7, 1<<128, 33],
   'boolean' => [true, false],
   'string' => %w(strval1 strval2).map(&:inspect),
+  'binary' => ["\xC3\xBCber", "\xAA\xBB\xCC"].map(&:inspect),
   'hash' => [{'hashval1' => ['array1', 1]}, {'hashval3' => ['array2', {'hashval4' => 42}]}].map(&:inspect),
   'object' => ['Value.new(:objval1)', 'Value.new(:objval2)'],
 }