moneta 0.7.20 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d992dc7597746374044079fd618a13b1e988766a
-  data.tar.gz: fec8939551039410e2412294f2fa19755413edfe
+  metadata.gz: 642e4643f1753537b4510ce0a47cbdbdfb65ebf2
+  data.tar.gz: 807acd8640b3ae0a78ae725062a6412a2e82b188
 SHA512:
-  metadata.gz: 13fa047663d93ec878871a9aaac054589dbc3135994bb320575b2c55185d88a3b395658350b2d140052ca9217a2b5558d17513f1354a409759fb9e8b399778ab
-  data.tar.gz: a93d886f2b8ca3ddb1ab258603ba3b3b9ceb318d814b99022c107e9aa138041ccd564f679e90ea0e18b440ef4421a46f405b578f854388f5fcf0503881b7cdb6
+  metadata.gz: 043562b273cffcb3d165412bc9fb20524a88f05b7c39e3dc26e1982a3ad3f63c8583564ceeb169b553bd33979b821183f40edd1a5ce66a9840533655e84445ea
+  data.tar.gz: 8d47b90c541c2917a4a05aa5ee896140052d94119aabdea1ba87d88865ed531d11488b8fbcf2efef11f88d5b805f6e5024be8ea58ce05233a0d25f11e0a0ff55

data/.travis.yml

@@ -1,12 +1,10 @@
 language: ruby
 rvm:
+  - 2.1.0
   - 2.0.0
   - 1.9.3
-  - 1.8.7
   - jruby-19mode
-  - jruby-18mode
   - rbx-19mode
-  - rbx-18mode
 before_install:
   #- script/install-kyotocabinet
   - sudo apt-get install -qq libtokyocabinet8 libtokyocabinet-dev liblzo2-dev libtdb-dev libleveldb-dev tokyotyrant
@@ -42,9 +40,7 @@ env:
     - "SCRIPT='benchmarks normal_large'"
 matrix:
   allow_failures:
-    - rvm: jruby-18mode
     - rvm: jruby-19mode
-    - rvm: rbx-18mode
     - rvm: rbx-19mode
     - env: "SCRIPT='parallel-tests unstable'"
 script: "eval bundle exec ruby script/$SCRIPT"

data/CHANGES

@@ -1,3 +1,9 @@
+0.8.0
+
+* Rename Moneta::Adapters::Mongo to Moneta::Adapters::MongoOfficial
+* Add Moneta::Adapters::MongoMoped
+* Drop Ruby 1.8 support
+
 0.7.20
 
 * Adapters::LRUHash: add option :max_value

data/CONTRIBUTORS

@@ -1,9 +1,11 @@
 Adrian Madrid <aemadrid@gmail.com>
 Alejandro Crosa <acrosa@sharing.local>
 Anthony Eden <anthonyeden@gmail.com>
+AtoxIO <atoxhybrid@gmail.com>
 Benjamin Yu <benjaminlyu@gmail.com>
 Ben Schwarz <ben.schwarz@gmail.com>
 Daniel Mendler <mail@daniel-mendler.de>
+Denis Defreyne <denis.defreyne@stoneship.org>
 Derek Kastner <dkastner@gmail.com>
 Dylan Egan <me@dylanegan.com>
 Hampton Catlin <hcatlin@gmail.com>

data/Gemfile

@@ -1,10 +1,3 @@
-# Rails 4 requires Ruby >= 1.9
-def rails_version
-  v = ['>= 3.2.11']
-  v << '< 4.0.0' unless RUBY_VERSION >= '1.9'
-  v
-end
-
 source 'https://rubygems.org'
 gemspec
 
@@ -16,26 +9,26 @@ gem 'rspec-retry'
 gem 'tnetstring'
 gem 'bencode'
 gem 'multi_json'
-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
+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
 gem 'php_serialize'
 
 # Compressors used by Transformer
 if RUBY_VERSION < '2.0'
-  gem 'bzip2-ruby', :platforms => :mri # Only on mri currently
+  gem 'bzip2-ruby', platforms: :mri # Only on mri currently
 end
-gem 'lz4-ruby', :platforms => :ruby
-gem 'ruby-lzma', :platforms => :ruby
-gem 'lzoruby', :platforms => :ruby
-gem 'snappy', :platforms => :ruby
-gem 'qlzruby', :platforms => :ruby
+gem 'lz4-ruby', platforms: :ruby
+gem 'ruby-lzma', platforms: :ruby
+gem 'lzoruby', platforms: :ruby
+gem 'snappy', platforms: :ruby
+gem 'qlzruby', platforms: :ruby
 
 # Hash transformer library
-gem 'cityhash', :platforms => :ruby
+gem 'cityhash', platforms: :ruby
 
 # Backends
 gem 'faraday'
@@ -44,50 +37,44 @@ gem 'dm-core'
 gem 'dm-migrations'
 gem 'dm-mysql-adapter'
 # FIXME: Use fog master because of failing tests, fixed after 1.11.1
-gem 'fog', :github => 'fog/fog'
-gem 'activerecord', *rails_version
+gem 'fog', github: 'fog/fog'
+gem 'activerecord', '>= 3.2.11'
 gem 'redis'
 gem 'mongo'
+gem 'moped'
 gem 'sequel'
 gem 'dalli'
 gem 'riak-client'
 gem 'cassandra'
 gem 'tokyotyrant'
-#gem 'ruby-tokyotyrant', :platforms => :ruby
+#gem 'ruby-tokyotyrant', platforms: :ruby
 #gem 'hbaserb'
 #gem 'localmemcache'
-gem 'tdb', :platforms => :ruby
-gem 'leveldb-ruby', :platforms => :ruby
-if RUBY_VERSION >= '1.9'
-  gem 'lmdb', :platforms => :mri
-end
+gem 'tdb', platforms: :ruby
+gem 'leveldb-ruby', platforms: :ruby
+gem 'lmdb', platforms: :mri
 if RUBY_VERSION < '2.0'
-  gem 'tokyocabinet', :platforms => :ruby
+  gem 'tokyocabinet', platforms: :ruby
 end
 #if RUBY_VERSION < '2.0' && !defined?(JRUBY_VERSION)
   # FIXME: We have to check manually for jruby
   # otherwise bundle install --deployment doesn't work
-#  gem 'kyotocabinet-ruby', :github => 'minad/kyotocabinet-ruby'
+#  gem 'kyotocabinet-ruby', github: 'minad/kyotocabinet-ruby'
 #end
-gem 'memcached', :platforms => :ruby
-gem 'jruby-memcached', :platforms => :jruby
-gem 'sqlite3', :platforms => :ruby
-gem 'activerecord-jdbc-adapter', :platforms => :jruby
-gem 'activerecord-jdbcmysql-adapter', :platforms => :jruby
-gem 'mysql2', '>= 0.3.12b5', :platforms => :ruby
+gem 'memcached', platforms: :ruby
+gem 'jruby-memcached', platforms: :jruby
+gem 'sqlite3', platforms: :ruby
+gem 'activerecord-jdbc-adapter', platforms: :jruby
+gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
+gem 'mysql2', '>= 0.3.12b5', platforms: :ruby
 # gdbm for jruby needs ffi
-gem 'ffi', :platforms => :jruby
-gem 'gdbm', :platforms => :jruby
+gem 'ffi', platforms: :jruby
+gem 'gdbm', platforms: :jruby
 
 # Rack integration testing
 gem 'rack'
 gem 'rack-cache'
 
 # Rails integration testing
-gem 'actionpack', *rails_version
+gem 'actionpack', '>= 3.2.11'
 gem 'minitest', '~> 4.7.4'
-
-# Fix versions for old ruby 1.8
-if RUBY_VERSION < '1.9'
-  gem 'nokogiri', '< 1.6'
-end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 - 2013 Daniel Mendler, Yehuda Katz
+Copyright (c) 2009 - 2014 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

@@ -1,6 +1,7 @@
 # Moneta: A unified interface for key/value stores
 
-[![Gem Version](https://badge.fury.io/rb/moneta.png)](http://rubygems.org/gems/moneta) [![Build Status](https://secure.travis-ci.org/minad/moneta.png?branch=master)](http://travis-ci.org/minad/moneta) [![Dependency Status](https://gemnasium.com/minad/moneta.png?travis)](https://gemnasium.com/minad/moneta) [![Code Climate](https://codeclimate.com/github/minad/moneta.png)](https://codeclimate.com/github/minad/moneta)
+[![Gem Version](https://badge.fury.io/rb/moneta.png)](http://rubygems.org/gems/moneta) [![Build Status](https://secure.travis-ci.org/minad/moneta.png?branch=master)](http://travis-ci.org/minad/moneta) [![Dependency Status](https://gemnasium.com/minad/moneta.png?travis)](https://gemnasium.com/minad/moneta) [![Code Climate](https://codeclimate.com/github/minad/moneta.png)](https://codeclimate.com/github/minad/moneta) [![Gittip donate button](http://img.shields.io/gittip/bevry.png)](https://www.gittip.com/min4d/ "Donate weekly to this project using Gittip")
+[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=min4d&url=https://github.com/minad/moneta&title=Moneta&language=&tags=github&category=software)
 
 Moneta provides a standard interface for interacting with various kinds of key/value stores. Moneta supports the well-known
 NoSQL and document based stores.
@@ -18,7 +19,7 @@ A short overview of the features:
     * Atomic creation of entries (Method `#create`)
     * Shared/distributed database-wide synchronization primitives `Moneta::Mutex` and `Moneta::Semaphore`
 * Includes a simple pure-ruby key/value server (`Moneta::Server`) and client (`Moneta::Adapters::Client`)
-* Integration with [Rails](http://rubyonrails.org/), [Rack](http://rack.github.com/)/[Rack-Cache](https://github.com/rtomayko/rack-cache), [Sinatra](http://sinatrarb.com/) and [Ramaze](http://ramaze.net/).
+* Integration with [Rails](http://rubyonrails.org/), [Rack](http://rack.github.com/)/[Rack-Cache](https://github.com/rtomayko/rack-cache), [Sinatra](http://sinatrarb.com/), [Padrino](http://padrinorb.com) and [Ramaze](http://ramaze.net/).
 
 If you are not yet convinced, you might ask why? What are the goals of the project?
 
@@ -28,7 +29,6 @@ same for template languages.
 * To hide a lot of different and maybe complex APIs behind one well-designed and simple Moneta API
 * Give people a starting point or example code to start working with their favourite key/value store. Feel free to copy code, please mention Moneta then :)
 * Create a reusable piece of code, since similar things are solved over and over again ([Rails](http://rubyonrails.org/) brings its own cache stores, and many frameworks do the same...)
-* See also http://yehudakatz.com/2009/02/12/whats-the-point/
 
 Moneta is tested thoroughly using [Travis-CI](http://travis-ci.org/minad/moneta).
 
@@ -54,7 +54,7 @@ Now you are ready to go:
 require 'moneta'
 
 # Create a simple file store
-store = Moneta.new(:File, :dir => 'moneta')
+store = Moneta.new(:File, dir: 'moneta')
 
 # Store some entries
 store['key'] = 'value'
@@ -115,7 +115,7 @@ Out of the box, it supports the following backends. Use the backend name symbol
     * [Simple Samba database TDB](http://tdb.samba.org/) (`:TDB`)
 * Document databases:
     * [CouchDB](http://couchdb.apache.org/) (`:Couch`)
-    * [MongoDB](http://www.mongodb.org/) (`:Mongo`)
+    * [MongoDB](http://www.mongodb.org/) (`:Mongo`, `:MongoOffical` or `:MongoMoped`)
 * Moneta network protocols:
     * Moneta key/value client (`:Client` works with `Moneta::Server`)
     * Moneta HTTP/REST client (`:RestClient` works with `Rack::MonetaRest`)
@@ -130,7 +130,7 @@ to upgrade to a real key/value store.
 
 ### Backend feature matrix
 
-__NOTE:__ <a name="backend-matrix">The backend matrix</a> is much more readable on rubydoc.info than on github. [Go there!](http://rubydoc.info/github/minad/moneta/master/file/README.md#backend-matrix)
+__NOTE:__ <a name="backend-matrix"></a>The backend matrix is much more readable on rubydoc.info than on github. [Go there!](http://rubydoc.info/github/minad/moneta/master/file/README.md#backend-matrix)
 
 <table>
 
@@ -138,7 +138,11 @@ __NOTE:__ <a name="backend-matrix">The backend matrix</a> is much more readable
 
 <tr><th colspan="2">Persistent stores</th><th colspan="7"></th></tr>
 
-<tr><td>Mongo</td><td>mongo</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://www.mongodb.org/">MongoDB</a> database</td></tr>
+<tr><td>Mongo</td><td>mongo or moped</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://www.mongodb.org/">MongoDB</a> database</td></tr>
+
+<tr><td>MongoOfficial</td><td>mongo</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://www.mongodb.org/">MongoDB</a> database</td></tr>
+
+<tr><td>MongoMoped</td><td>moped</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://www.mongodb.org/">MongoDB</a> database</td></tr>
 
 <tr><td>Redis</td><td>redis</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://redis.io/">Redis</a> database</td></tr>
 
@@ -210,9 +214,9 @@ __NOTE:__ <a name="backend-matrix">The backend matrix</a> is much more readable
 
 </table>
 
-* [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. I recommend to add the option `:threadsafe` to ensure thread-safety since for example under JRuby and Rubinius even the basic datastructures are not thread safe due to the lack of a global interpreter lock (GIL). This differs from MRI where some adapters might appear thread safe already but only due to the GIL.
+* [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. I recommend to add the option `:threadsafe` to ensure thread-safety since for example under JRuby and Rubinius even the basic datastructures are not thread safe due to the lack of a global interpreter lock (GIL). This differs from MRI where some adapters might appear thread safe already but only due to the GIL.
 * [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`.
+* [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](http://memcachedb.org/), [Kai](http://sourceforge.net/apps/mediawiki/kai), [IronCache](http://dev.iron.io/cache/reference/memcache/), [Roma](https://github.com/roma/roma/tree), [Flare](http://labs.gree.jp/Top/OpenSource/Flare-en.html) and [Kumofs](https://github.com/etolabo/kumofs))
 * [5]: Depends on server
 * [6]: Store is multi-process safe because it is an in-memory store, values are not shared between multiple processes
@@ -334,9 +338,9 @@ This allows you to store arbitrary Ruby objects. You can tune some options
 when you call `Moneta.new`. However for very fine tuning use `Moneta.build`.
 
 ~~~ ruby
-store = Moneta.new(:Memcached, :server => 'localhost:11211')
+store = Moneta.new(:Memcached, server: 'localhost:11211')
 store['key'] = 'value'
-store['hash_key'] = {:a => 1, :b => 2}
+store['hash_key'] = {a: 1, b: 2}
 store['object_key'] = MarshallableRubyObject.new
 ~~~
 
@@ -348,7 +352,7 @@ store = Moneta.build do
   use :Expires
 
   # Transform key using Marshal and Base64 and value using Marshal
-  use :Transformer, :key => [:marshal, :base64], :value => :marshal
+  use :Transformer, key: [:marshal, :base64], value: :marshal
 
   # IMPORTANT: adapter must be defined last for the builder to function properly.
 
@@ -361,16 +365,16 @@ You can also directly access the underlying adapters if you don't want
 to use the Moneta stack.
 
 ~~~ ruby
-db = Moneta::Adapters::File.new(:dir => 'directory')
-db['key'] = {:a => 1, :b => 2} # This will fail since you can only store Strings
+db = Moneta::Adapters::File.new(dir: 'directory')
+db['key'] = {a: 1, b: 2} # This will fail since you can only store Strings
 
 # However for Mongo and Couch this works
 # The hash will be mapped directly to a Mongo/Couch document.
 db = Moneta::Adapters::Couch.new
-db['key'] = {:a => 1, :b => 2}
+db['key'] = {a: 1, b: 2}
 
 db = Moneta::Adapters::Mongo.new
-db['key'] = {:a => 1, :b => 2}
+db['key'] = {a: 1, b: 2}
 ~~~
 
 ### Expiration
@@ -386,19 +390,19 @@ cache = Moneta.build do
 end
 
 # Expires in 60 seconds
-cache.store(key, value, :expires => 60)
+cache.store(key, value, expires: 60)
 
 # Never expire
-cache.store(key, value, :expires => 0)
-cache.store(key, value, :expires => false)
+cache.store(key, value, expires: 0)
+cache.store(key, value, expires: false)
 
 # Update expires time if value is found
-cache.load(key, :expires => 30)
-cache.key?(key, :expires => 30)
+cache.load(key, expires: 30)
+cache.key?(key, expires: 30)
 
 # Or remove the expiration if found
-cache.load(key, :expires => false)
-cache.key?(key, :expires => 0)
+cache.load(key, expires: false)
+cache.key?(key, expires: 0)
 ~~~
 
 You can add the expires feature to other backends using the `Moneta::Expires` proxy. But be aware
@@ -406,15 +410,15 @@ that expired values are not deleted automatically if they are not looked up.
 
 ~~~ ruby
 # Using the :expires option
-cache = Moneta.new(:File, :dir => '...', :expires => true)
+cache = Moneta.new(:File, dir: '...', expires: true)
 
 # or manually by using the proxy...
-cache = Moneta::Expires.new(Moneta::Adapters::File.new(:dir => '...'))
+cache = Moneta::Expires.new(Moneta::Adapters::File.new(dir: '...'))
 
 # or using the builder...
 cache = Moneta.build do
   use :Expires
-  adapter :File, :dir => '...'
+  adapter :File, dir: '...'
 end
 ~~~
 
@@ -441,9 +445,9 @@ if you have a `Moneta::Transformer` somewhere in your proxy stack which transfor
 
 ~~~ ruby
 store.increment('counter')          # returns 1, counter created
-store.load('counter', :raw => true) # returns 1
+store.load('counter', raw: true) # returns 1
 
-store.store('counter', '10', :raw => true)
+store.store('counter', '10', raw: true)
 store.increment('counter') # returns 11
 ~~~
 
@@ -540,11 +544,11 @@ For raw data access as described before the class `Moneta::OptionMerger` is used
 
 ~~~ ruby
 # All methods after 'with' get the options passed
-store.with(:raw => true).load('key')
+store.with(raw: true).load('key')
 
 # You can also specify the methods
-store.with(:raw => true, :only => :load).load('key')
-store.with(:raw => true, :except => [:key?, :increment]).load('key')
+store.with(raw: true, only: :load).load('key')
+store.with(raw: true, except: [:key?, :increment]).load('key')
 
 # Syntactic sugar for raw access
 store.raw.load('key')
@@ -565,8 +569,8 @@ short_lived_store['key'] = 'value'
 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
+compressed_store = store.with(prefix: 'compressed') do
+  use :Transformer, value: :zlib
 end
 
 store['key'] = 'this value will not be compressed'
@@ -579,18 +583,19 @@ compressed_store['key'] = 'value will be compressed'
 
 Inspired by [redis-store](https://github.com/jodosha/redis-store) there exist integration classes for [Rails](http://rubyonrails.org/) and [Rack](http://rack.github.com/)/[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, Rails and Sinatra
+* [Rack](http://rack.github.com/), [Rails](http://rubyonrails.org/) and [Sinatra](http://sinatrarb.com/)
     * `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
     * `Rack::MonetaRest` is a Rack application which exposes a Moneta store via REST/HTTP
     * `Rack::Cache::Moneta` provides meta and entity stores for Rack-Cache
-* Rails
+* [Rails](http://rubyonrails.org/)
     * `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
-* Ramaze
-    * `Ramaze::Cache::Moneta` is integrated into the [Ramaze](http://ramaze.net/) project and allows Ramaze to use
+* [Ramaze](http://ramaze.net/)
+    * `Ramaze::Cache::Moneta` is integrated into the Ramaze project and allows Ramaze to use
       Moneta as caching store
+* [Padrino](http://padrinorb.com) adopted Moneta to replace their cache stores in padrino-cache.
 
 ### Rack
 
@@ -602,10 +607,17 @@ You can use Moneta as a [Rack](http://rack.github.com/) session store. Use it in
 require 'rack/session/moneta'
 
 # Use only the adapter name
-use Rack::Session::Moneta, :store => :Redis
+use Rack::Session::Moneta, store: :Redis
 
 # Use Moneta.new
-use Rack::Session::Moneta, :store => Moneta.new(:Memory, :expires => true)
+use Rack::Session::Moneta, store: Moneta.new(:Memory, expires: true)
+
+# Set rack options
+use Rack::Session::Moneta, key: 'rack.session',
+domain: 'foo.com',
+path: '/',
+expire_after: 2592000,
+store: Moneta.new(:Memory, expires: true)
 
 # Use the Moneta builder
 use Rack::Session::Moneta do
@@ -617,11 +629,11 @@ end
 #### 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:
+caching if you add the option `cache: true`. Use it in your `config.ru` like this:
 
 ~~~ ruby
 # Add Rack::MonetaStore somewhere in your rack stack
-use Rack::MonetaStore, :Memory, :cache => true
+use Rack::MonetaStore, :Memory, cache: true
 
 run lambda { |env|
   env['rack.moneta_store'] # is a Moneta store with per-request caching
@@ -629,7 +641,7 @@ run lambda { |env|
 
 # Pass it a block like the one passed to Moneta.build
 use Rack::MonetaStore do
-  use :Transformer, :value => :zlib
+  use :Transformer, value: :zlib
   adapter :Cookie
 end
 
@@ -651,7 +663,7 @@ end
 
 # Or pass it a block like the one passed to Moneta.build
 run Rack::MonetaRest.new do
-  use :Transformer, :value => :zlib
+  use :Transformer, value: :zlib
   adapter :Memory
 end
 ~~~
@@ -664,8 +676,8 @@ You can use Moneta as a [Rack-Cache](https://github.com/rtomayko/rack-cache) sto
 require 'rack/cache/moneta'
 
 use Rack::Cache,
-      :metastore   => 'moneta://Memory?expires=true',
-      :entitystore => 'moneta://Memory?expires=true'
+      metastore:   'moneta://Memory?expires=true',
+      entitystore: 'moneta://Memory?expires=true'
 
 # Or used named Moneta stores
 Rack::Cache::Moneta['named_metastore'] = Moneta.build do
@@ -673,8 +685,8 @@ Rack::Cache::Moneta['named_metastore'] = Moneta.build do
   adapter :Memory
 end
 use Rack::Cache,
-      :metastore => 'moneta://named_metastore',
-      :entity_store => 'moneta://named_entitystore'
+      metastore: 'moneta://named_metastore',
+      entity_store: 'moneta://named_entitystore'
 ~~~
 
 #### Cookies
@@ -686,7 +698,7 @@ to use all the transformers on the cookies (e.g. `:prefix`, `:marshal` and `:hma
 ~~~ ruby
 require 'rack/moneta_cookies'
 
-use Rack::MonetaCookies, :domain => 'example.com', :path => '/path'
+use Rack::MonetaCookies, domain: 'example.com', path: '/path'
 run lambda { |env|
   req = Rack::Request.new(env)
   req.cookies #=> is now a Moneta store!
@@ -708,13 +720,13 @@ Add the session store in your application configuration `config/environments/*.r
 require 'moneta'
 
 # Only by adapter name
-config.cache_store :moneta_store, :store => :Memory
+config.cache_store :moneta_store, store: :Memory
 
 # Use Moneta.new
-config.cache_store :moneta_store, :store => Moneta.new(:Memory)
+config.cache_store :moneta_store, store: Moneta.new(:Memory)
 
 # Use the Moneta builder
-config.cache_store :moneta_store, :store => Moneta.build do
+config.cache_store :moneta_store, store: Moneta.build do
   use :Expires
   adapter :Memory
 end
@@ -729,19 +741,31 @@ Moneta cache store doesn't support matchers. If you need these features use a di
 require 'moneta'
 
 # Only by adapter name
-config.cache_store :moneta_store, :store => :Memory
+config.cache_store :moneta_store, store: :Memory
 
 # Use Moneta.new
-config.cache_store :moneta_store, :store => Moneta.new(:Memory)
+config.cache_store :moneta_store, store: Moneta.new(:Memory)
 
 # Use the Moneta builder
-config.cache_store :moneta_store, :store => Moneta.build do
+config.cache_store :moneta_store, store: Moneta.build do
   use :Expires
   adapter :Memory
 end
 ~~~
 
-------
+### Padrino
+
+[Padrino](http://padrinorb.com/) adopted Moneta to replace their cache stores in padrino-cache. You use it like this
+
+~~~ ruby
+# Global Padrino caching
+# Don't forget the expires: [true, Integer] if you want expiration support!
+Padrino.cache = Moneta.new(:Memory, expires: true)
+
+# Application caching
+# Don't forget the expires: [true, Integer] if you want expiration support!
+set :cache, Moneta.new(:Memory, expires: true)
+~~~
 
 ## Advanced
 
@@ -755,14 +779,14 @@ they will share the same data which will also be persistet in the database `shar
 require 'moneta'
 
 store = Moneta.build do
-  use :Transformer, :key => :marshal, :value => :marshal
+  use :Transformer, key: :marshal, value: :marshal
   use :Shared do
     use :Cache do
       cache do
         adapter :LRUHash
       end
       backend do
-        adapter :GDBM, :file => 'shared.db'
+        adapter :GDBM, file: 'shared.db'
       end
     end
   end
@@ -794,7 +818,7 @@ Person.adapter :memory, Moneta.new(:Redis)
 
 ## Testing and Benchmarks
 
-Testing is done using [Travis-CI](http://travis-ci.org/minad/moneta). Currently we support Ruby 1.8.7 and 1.9.3.
+Testing is done using [Travis-CI](http://travis-ci.org/minad/moneta). Currently we support Ruby >= 1.9.3.
 
 Benchmarks for each store are done on [Travis-CI](http://travis-ci.org/minad/moneta) for each build. Take a look there
 to compare the speed of the different key value stores for different key/value sizes and size distributions.
@@ -834,7 +858,6 @@ Don't forget to edit the README.md and the CHANGES.
 
 * [Horcrux](https://github.com/technoweenie/horcrux): Used at github, supports batch operations but only Memcached backend
 * [ActiveSupport::Cache::Store](http://api.rubyonrails.org/classes/ActiveSupport/Cache/Store.html): The Rails cache store abstraction
-* [Padrino::Cache::Store](http://www.padrinorb.com/api/Padrino/Cache/Store.html): The Padrino cache store abstraction. Padrino is currently considering switching to Moneta, see https://github.com/padrino/padrino-framework/pull/1018
 * [ToyStore](https://github.com/jnunemaker/toystore): ORM mapper for key/value stores
 * [ToyStore Adapter](https://github.com/jnunemaker/adapter): Adapter to key/value stores used by ToyStore, Moneta can be used directly with the ToyStore Memory adapter
 * [Cache](https://github.com/seamusabshere/cache): Rubygem cache wraps Memcached and Redis