moneta 0.7.4 → 0.7.5

data/.gitignore

@@ -6,6 +6,5 @@ spec/tmp
 *.swp
 *.rdb
 .#*
-benchmarks/*.histogram
-benchmarks/bench.*
+script/benchmarks.tmp
 Gemfile.lock

data/.travis.yml

@@ -1,25 +1,28 @@
+language: ruby
 rvm:
   - 1.8.7
   - 1.9.3
-  - jruby
+  - jruby-18mode
+  - jruby-19mode
   - rbx-18mode
   - rbx-19mode
-services:
-  - riak
-  - couchdb
-  - redis-server
-  - cassandra
-  - memcached
-  - mongodb
 before_install:
+  - script/kill-travis
+  - script/start-services
   - sudo apt-get install -qq libtokyocabinet8 libtokyocabinet-dev liblzo2-dev libtdb-dev
-  - script/install-bundle.rb
+  - script/install-bundle
+  - script/upload-bundle
+install: 'echo "Bundle installed"'
 env:
   global:
-    - secure: "bNtinRuxS/FLP1fKj7KtHweIP/fG94CusdYKH/sBL6P0aqL3mr/dkbC34pSk\nNGkLKs/FAzvLkOo7aIOcCLx1WnL9yaZ12tmHgH8Ztf8ci2S52HSfqYwQw/dE\nq7euNMZVjvWfVu+15+Xpn6+t2XSubSO/TELfymDFGbhivmKAo5M="
-    - secure: "Pv/MUnoaZMbPNB3vx4Hw2ASQBsUO7HIjJsfGHAQa5VbWlX3qEfMdezlYzNbf\nDPdpeabQwEwCUcINT7x10XKH5M4nZn6bBGfpvmNMxvZ8De1Et7mrwvb5/o73\n5EkyvYuUu8FB/LQmjB/4zZcjLQWNCtcfPlYPs7YcADBt0gIwn8M="
+    - secure: "B0vx1g1CB1A6mM3B/iy2ATicfS4OXT80bb2RVe8mSRsPzez1B4q4Q4hJcaMI\nrMARONN8Krtnti+IqvmDnB0Z0AKYMEyIc+zT37zJOCjLdkLJl+x/thuU/MbC\nvlLVwjMf6JE2EUzTfORDRFYc5ycCqfsfgNk1Go0D2CPT6P9u9uQ="
   matrix:
-    - "TASK=test"
+    - "TASK=test TEST_GROUP=1/5"
+    - "TASK=test TEST_GROUP=2/5"
+    - "TASK=test TEST_GROUP=3/5"
+    - "TASK=test TEST_GROUP=4/5"
+    - "TASK=test TEST_GROUP=5/5"
+    - "TASK=test TEST_GROUP=unstable"
     - "TASK=benchmarks CONFIG=uniform_small"
     - "TASK=benchmarks CONFIG=uniform_medium"
     - "TASK=benchmarks CONFIG=uniform_large"
@@ -28,9 +31,13 @@ env:
     - "TASK=benchmarks CONFIG=normal_large"
 matrix:
   allow_failures:
-    - rvm: jruby
+    - rvm: jruby-18mode
+    - rvm: jruby-19mode
     - rvm: rbx-18mode
     - rvm: rbx-19mode
+    - env:
+      - "TASK=test TEST_GROUP=unstable"
+      - secure: "B0vx1g1CB1A6mM3B/iy2ATicfS4OXT80bb2RVe8mSRsPzez1B4q4Q4hJcaMI\nrMARONN8Krtnti+IqvmDnB0Z0AKYMEyIc+zT37zJOCjLdkLJl+x/thuU/MbC\nvlLVwjMf6JE2EUzTfORDRFYc5ycCqfsfgNk1Go0D2CPT6P9u9uQ="
 script: "bundle exec rake $TASK"
 branches:
   only:

data/CHANGES

@@ -1,3 +1,8 @@
+0.7.5
+
+* OptionsSupport#with: Add support to insert additional proxies
+* Builder#adapter: Accepts Moneta store instance now
+
 0.7.4
 
 * Transformer: fix truncate

data/Gemfile

@@ -1,14 +1,6 @@
 source :rubygems
 gemspec
 
-def alternatives(gems)
-  if defined?(JRUBY_VERSION)
-    [gems[:jruby]].flatten.compact.each {|g| gem g }
-  else
-    [gems[:mri]].flatten.compact.each {|g| gem g }
-  end
-end
-
 # Testing
 gem 'rake'
 gem 'rspec'
@@ -17,21 +9,22 @@ gem 'rspec'
 gem 'tnetstring'
 gem 'bencode'
 gem 'multi_json'
-alternatives :mri => 'bson_ext', :jruby => 'bson'
-alternatives :mri => 'ox'
-alternatives :mri => 'msgpack', :jruby => 'msgpack-jruby'
-alternatives :mri => 'bert'
+gem 'bson_ext', :platforms => :ruby
+gem 'bson', :platforms => :jruby
+gem 'ox', :platforms => :ruby
+gem 'msgpack', :platforms => :ruby
+gem 'msgpack-jruby', :platforms => :jruby
+gem 'bert', :platforms => :ruby
 
 # Compressors used by Transformer
-alternatives :mri => 'bzip2-ruby'
-alternatives :mri => 'ruby-lzma'
-alternatives :mri => 'lzoruby'
-alternatives :mri => 'snappy'
-# WARNING: QuickLZ segfaults because of an assertion
-alternatives :mri => 'qlzruby'
+gem 'bzip2-ruby', :platforms => :mri # Only on mri currently
+gem 'ruby-lzma', :platforms => :ruby
+gem 'lzoruby', :platforms => :ruby
+gem 'snappy', :platforms => :ruby
+gem 'qlzruby', :platforms => :ruby
 
 # Backends
-gem 'daybreak', :github => 'propublica/daybreak'
+gem 'daybreak'
 gem 'dm-core'
 gem 'dm-migrations'
 gem 'dm-sqlite-adapter'
@@ -46,12 +39,18 @@ gem 'riak-client'
 gem 'cassandra'
 #gem 'hbaserb'
 #gem 'localmemcache'
-alternatives :mri => 'tdb'
-alternatives :mri => 'leveldb-ruby'
-alternatives :mri => 'tokyocabinet'
-alternatives :mri => 'memcached', :jruby => 'jruby-memcached'
-alternatives :mri => 'sqlite3', :jruby => %w(jdbc-sqlite3 activerecord-jdbc-adapter activerecord-jdbcsqlite3-adapter)
-alternatives :jruby => %w(ffi gdbm) # gdbm for jruby needs ffi
+gem 'tdb', :platforms => :ruby
+gem 'leveldb-ruby', :platforms => :ruby
+gem 'tokyocabinet', :platforms => :ruby
+gem 'memcached', :platforms => :ruby
+gem 'jruby-memcached', :platforms => :jruby
+gem 'sqlite3', :platforms => :ruby
+gem 'jdbc-sqlite3', :platforms => :jruby
+gem 'activerecord-jdbc-adapter', :platforms => :jruby
+gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
+# gdbm for jruby needs ffi
+gem 'ffi', :platforms => :jruby
+gem 'gdbm', :platforms => :jruby
 
 # Rack integration testing
 gem 'rack'

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Yehuda Katz, 2012 Daniel Mendler
+Copyright (c) 2009 - 2013 Daniel Mendler, Yehuda Katz
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -43,7 +43,6 @@ Out of the box, it supports the following backends:
     * LRU hash - prefer this over :Memory! (`:LRUHash`)
     * LocalMemCache (`:LocalMemCache`)
     * Memcached store (`:Memcached`, `:MemcachedNative` and `:MemcachedDalli`)
-    * Daybreak database (`:Daybreak`)
 * Relational Databases:
     * DataMapper (`:DataMapper`)
     * ActiveRecord (`:ActiveRecord`)
@@ -86,20 +85,20 @@ to upgrade to a real key/value store.
 <table>
 <thead style="font-weight:bold"><tr><th>Adapter</th><th>Required gems</th><th>Multi-thread safe<sup>[1]</sup></th><th>Multi-process safe<sup>[2]</sup></th><th>Atomic increment</th><th>Native expires<sup>[3]</sup></th><th>Persistent</th><th>Description</th></tr></thead>
 <tbody>
-<tr><td>ActiveRecord</td><td>activerecord</td><td style="color:blue">?</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>ActiveRecord ORM</td></tr>
+<tr><td>ActiveRecord</td><td>activerecord</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>ActiveRecord ORM</td></tr>
 <tr><td>Cassandra</td><td>cassandra</td><td style="color:blue">?</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:green">✓</td><td>Cassandra distributed database</td></tr>
 <tr><td>Client</td><td>-</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:blue">?<sup>[5]</sup></td><td style="color:blue">?<sup>[5]</sup></td><td style="color:blue">?<sup>[5]</sup></td><td>Moneta client adapter</td></tr>
 <tr><td>Cookie</td><td>-</td><td style="color:red">✗</td><td style="color:blue">(✓)<sup>[6]</sup></td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td>Cookie in memory store</td></tr>
 <tr><td>Couch</td><td>couchrest</td><td style="color:blue">?</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td>CouchDB database</td></tr>
 <tr><td>DataMapper</td><td>dm-core, dm-migrations</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td>DataMapper ORM</td></tr>
-<tr><td>Daybreak</td><td>daybreak</td><td style="color:blue">?</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>Daybreak ruby key/value store</td></tr>
+<tr><td>Daybreak</td><td>daybreak</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>Daybreak ruby key/value store</td></tr>
 <tr><td>DBM</td><td>-</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>Berkeley DB</td></tr>
 <tr><td>File</td><td>-</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>File store</td></tr>
 <tr><td>Fog</td><td>fog</td><td style="color:blue">?</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td>Fog cloud store</td></tr>
 <tr><td>GDBM</td><td>-</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>GDBM database</td></tr>
 <tr><td>HBase</td><td>hbase</td><td style="color:blue">?</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td>HBase database</td></tr>
 <tr><td>LevelDB</td><td>leveldb</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>LevelDB database</td></tr>
-<tr><td>LocalMemCache</td><td>localmemcache</td><td style="color:blue">?</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td>LocalMemCache database</td></tr>
+<tr><td>LocalMemCache</td><td>localmemcache</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td>LocalMemCache database</td></tr>
 <tr><td>LRUHash</td><td>-</td><td style="color:red">✗</td><td style="color:blue">(✓)<sup>[6]</sup></td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td>LRU memory store</td></tr>
 <tr><td>Memcached</td><td>dalli or memcached</td><td style="color:blue">?</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗<sup>[4]</sup></td><td>Memcached database</td></tr>
 <tr><td>MemcachedDalli</td><td>dalli</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗<sup>[4]</sup></td><td>Memcached database</td></tr>
@@ -110,7 +109,7 @@ to upgrade to a real key/value store.
 <tr><td>PStore</td><td>-</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>PStore store</td></tr>
 <tr><td>Redis</td><td>redis</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td>Redis database</td></tr>
 <tr><td>RestClient</td><td>-</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:blue">?<sup>[5]</sup></td><td>Moneta REST client adapter</td></tr>
-<tr><td>Riak</td><td>riak-client</td><td style="color:blue">?</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td>Riak database</td></tr>
+<tr><td>Riak</td><td>riak-client</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td>Riak database</td></tr>
 <tr><td>SDBM</td><td>-</td><td style="color:red">✗</td><td style="color:red">✗</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>SDBM database</td></tr>
 <tr><td>Sequel</td><td>sequel</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>Sequel ORM</td></tr>
 <tr><td>Sqlite</td><td>sqlite3</td><td style="color:blue">?</td><td style="color:green">✓</td><td style="color:green">✓</td><td style="color:red">✗</td><td style="color:green">✓</td><td>Sqlite3 database</td></tr>
@@ -120,7 +119,7 @@ to upgrade to a real key/value store.
 </tbody>
 </table>
 
-* [1]: Make adapters thread-safe by using `Moneta::Lock`, `Moneta::Pool` or by passing the option `:threadsafe => true` to `Moneta#new`.
+* [1]: Make adapters thread-safe by using `Moneta::Lock` or by passing the option `:threadsafe => true` to `Moneta#new`. There is also `Moneta::Pool` which can be used to share a store between multiple threads if the store is multi-process safe.
 * [2]: Share a Moneta store between multiple processes using `Moneta::Shared` (See below).
 * [3]: Add expiration support by using `Moneta::Expires` or by passing the option `:expires => true` to `Moneta#new`.
 * [4]: There are some servers which use the memcached protocol but which are persistent (e.g. MemcacheDB, Kai, IronCache, ...)
@@ -232,7 +231,7 @@ end
 
 ### Expiration
 
-The Cassandra, Memcached, Redis and Mongo backends supports expires values natively.
+The Cassandra, Memcached, Redis and Mongo backends support expiration natively.
 
 ~~~ ruby
 cache = Moneta::Adapters::Memcached.new
@@ -352,11 +351,24 @@ short_lived_store = store.expires(60)
 short_lived_store['key'] = 'value'
 ~~~
 
+### Add proxies to existing store
+
+You can add proxies to an existing store. This is useful if you want to compress only a few values for example.
+
+~~~ ruby
+compressed_store = store.with(:prefix => 'compressed') do
+  use :Transformer, :value => :zlib
+end
+
+store['key'] = 'this value will not be compressed'
+compressed_store['key'] = 'value will be compressed'
+~~~
+
 ## Framework Integration
 
-Inspired by [redis-store](https://github.com/jodosha/redis-store) there exist integration classes for [Rails](http://rubyonrails.org/), [Rack](http://rack.github.com/) and [Rack-Cache](https://github.com/rtomayko/rack-cache). You can also use all the Rack middlewares together with the [Sinatra](http://sinatrarb.com/) framework. There exist the following integration classes:
+Inspired by [redis-store](https://github.com/jodosha/redis-store) there exist integration classes for [Rails](http://rubyonrails.org/), [Rack](http://rack.github.com/) and [Rack-Cache](https://github.com/rtomayko/rack-cache). You can also use all the Rack middlewares together with Rails and the [Sinatra](http://sinatrarb.com/) framework. There exist the following integration classes:
 
-* Rack and Sinatra
+* Rack, Rails and Sinatra
     * `Rack::Session::Moneta` is a Rack middleware to use Moneta for storing sessions
     * `Rack::MonetaStore` is a Rack middleware which places a Moneta store in the environment and enables per-request caching
     * `Rack::MonetaCookies` is a Rack middleware which uses Moneta to store cookies
@@ -366,7 +378,9 @@ Inspired by [redis-store](https://github.com/jodosha/redis-store) there exist in
     * `ActionDispatch::Session::MonetaStore` is a Rails middleware to use Moneta for storing sessions
     * `ActiveSupport::Cache::MonetaStore` is a Rails cache implementation which uses a Moneta store as backend
 
-### Rack session store
+### Rack
+
+#### Session store
 
 You can use Moneta as a [Rack](http://rack.github.com/) session store. Use it in your `config.ru` like this:
 
@@ -386,7 +400,7 @@ use Rack::Session::Moneta do
 end
 ~~~
 
-### Rack Moneta middleware
+#### Moneta middleware
 
 There is a simple middleware which places a Moneta store in the Rack environment at `env['rack.moneta_store']`. It supports per-request
 caching if you add the option `:cache => true`. Use it in your `config.ru` like this:
@@ -410,7 +424,7 @@ run lambda do |env|
 end
 ~~~
 
-### Rack REST server
+#### REST server
 
 If you want to expose your Moneta key/value store via HTTP, you can use the Rack/Moneta REST service. Use it in your `config.ru` like this:
 
@@ -428,7 +442,7 @@ run Rack::MonetaRest.new do
 end
 ~~~
 
-### Rack cache
+#### Rack-Cache
 
 You can use Moneta as a [Rack-Cache](https://github.com/rtomayko/rack-cache) store. Use it in your `config.ru` like this:
 
@@ -449,7 +463,7 @@ use Rack::Cache,
       :entity_store => 'moneta://named_entitystore'
 ~~~
 
-### Rack cookies
+#### Cookies
 
 Use Moneta to store cookies in [Rack](http://rack.github.com/). It uses the `Moneta::Adapters::Cookie`. You might
 wonder what the purpose of this store or Rack middleware is: It makes it possible
@@ -470,7 +484,9 @@ run lambda do |env|
 end
 ~~~
 
-### Rails session store
+### Rails
+
+#### Session store
 
 Add the session store in your application configuration `config/environments/*.rb`.
 
@@ -490,7 +506,7 @@ config.cache_store :moneta_store, :store => Moneta.build do
 end
 ~~~
 
-### Rails cache store
+#### Cache store
 
 Add the cache store in your application configuration `config/environments/*.rb`. Unfortunately the
 Moneta cache store doesn't support matchers. If you need these features use a different server-specific implementation.

data/Rakefile

@@ -16,11 +16,42 @@ rescue Exception => ex
 end
 
 task :test do
-  # memcached and redis specs cannot be used in parallel
-  # because of flushing and namespace lacking in redis
-  specs = Dir['spec/*/*_spec.rb']
+  specs = Dir['spec/*/*_spec.rb'].sort
+
+  # FIXME:
+  #
+  # * QuickLZ segfaults because of an assertion
+  #   QuickLZ is also not maintained on Github, but on Bitbucket
+  #   and I don't know where the issue tracker is.
+  #
+  # * Daybreak leads to a segfault
+  #
+  # * Cassandra and Mongo show spurious failures
+  if ENV['TEST_GROUP']
+    unstable = specs.select {|s| s =~ /quicklz|cassandra|mongo|daybreak/ }
+    specs -= unstable
+  end
+
+  # Memcached and Redis specs cannot be used in parallel
+  # because of flushing and lacking namespaces
   parallel = specs.reject {|s| s =~ /memcached|redis|client|shared|riak/ }
   serial = specs - parallel
+
+  if ENV['TEST_GROUP'] =~ /^(\d+)\/(\d+)$/
+    n = $1.to_i
+    max = $2.to_i
+    if n == max
+      parallel = parallel[(n-1)*(parallel.size/max)..-1]
+      serial = serial[(n-1)*(serial.size/max)..-1]
+    else
+      parallel = parallel[(n-1)*(parallel.size/max), parallel.size/max]
+      serial = serial[(n-1)*(serial.size/max), serial.size/max]
+    end
+  elsif ENV['TEST_GROUP'] == 'unstable'
+    parallel.clear
+    serial = unstable
+  end
+
   threads = []
   failed = false
   parallel.each do |spec|
@@ -32,7 +63,7 @@ task :test do
       end
     end
     sleep 0.1
-    sleep 0.1 while threads.size >= 20
+    sleep 0.1 while threads.size >= 10
   end
   sleep 0.1 until threads.empty?
   serial.each do |spec|
@@ -46,8 +77,7 @@ task :test do
 end
 
 task :benchmarks do
-  Dir.chdir('benchmarks')
-  ruby("run.rb #{ENV['CONFIG']}")
+  ruby("script/benchmarks #{ENV['CONFIG']}")
 end
 
 task :default => :test

data/lib/moneta/builder.rb

@@ -14,8 +14,12 @@ module Moneta
     # @return [Object] Generated Moneta proxy stack
     # @api public
     def build
-      klass, options, block = @proxies.first
-      @proxies[1..-1].inject([klass.new(options, &block)]) do |stores, proxy|
+      adapter = @proxies.first
+      if Array === adapter
+        klass, options, block = adapter
+        adapter = klass.new(options, &block)
+      end
+      @proxies[1..-1].inject([adapter]) do |stores, proxy|
         klass, options, block = proxy
         stores << klass.new(stores.last, options, &block)
       end
@@ -23,7 +27,7 @@ module Moneta
 
     # Add proxy to stack
     #
-    # @param [Symbol or Class] proxy Name of proxy class or proxy class
+    # @param [Symbol/Class] proxy Name of proxy class or proxy class
     # @param [Hash] options Options hash
     # @api public
     def use(proxy, options = {}, &block)
@@ -35,11 +39,21 @@ module Moneta
 
     # Add adapter to stack
     #
-    # @param [Symbol] name Name of adapter class
+    # @param [Symbol/Class/Moneta store] adapter Name of adapter class, adapter class or Moneta store
     # @param [Hash] options Options hash
     # @api public
-    def adapter(name, options = {}, &block)
-      use(Adapters.const_get(name), options, &block)
+    def adapter(adapter, options = {}, &block)
+      case adapter
+      when Symbol
+        use(Adapters.const_get(adapter), options, &block)
+      when Class
+        use(adapter, options, &block)
+      else
+        raise ArgumentError, 'Adapter must be a Moneta store' unless adapter.respond_to?(:load) && adapter.respond_to?(:store)
+        raise ArgumentError, 'No options allowed' unless options.empty?
+        @proxies.unshift adapter
+        nil
+      end
     end
   end
 end

data/lib/moneta/mixins.rb

@@ -1,13 +1,20 @@
 module Moneta
   # @api private
   module OptionSupport
-    # Return Moneta store with default options
+    # Return Moneta store with default options or additional proxies
     #
     # @param [Hash] options Options to merge
-    # @return [OptionMerger]
+    # @return [Moneta store]
+    #
     # @api public
-    def with(options)
-      OptionMerger.new(self, options)
+    def with(options = nil, &block)
+      adapter = self
+      if block
+        builder = Builder.new(&block)
+        builder.adapter(adapter)
+        adapter = builder.build.last
+      end
+      options ? OptionMerger.new(adapter, options) : adapter
     end
 
     # Return Moneta store with default option :raw => true

data/lib/moneta/version.rb

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