moneta 1.1.0 → 1.4.0

data/README.md

@@ -1,6 +1,9 @@
 # Moneta: A unified interface for key/value stores
 
-[![Gem Version](https://badge.fury.io/rb/moneta.svg)](http://rubygems.org/gems/moneta) [![Build Status](https://secure.travis-ci.org/moneta-rb/moneta.svg?branch=master)](http://travis-ci.org/moneta-rb/moneta) [![Code Climate](https://codeclimate.com/github/moneta-rb/moneta.svg)](https://codeclimate.com/github/moneta-rb/moneta) [![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/moneta-rb/moneta&title=Moneta&language=&tags=github&category=software)
+[![Gem Version](https://badge.fury.io/rb/moneta.svg)](http://rubygems.org/gems/moneta)
+[![Build Status](https://secure.travis-ci.org/moneta-rb/moneta.svg?branch=master)](http://travis-ci.org/moneta-rb/moneta)
+[![Code Climate](https://codeclimate.com/github/moneta-rb/moneta.svg)](https://codeclimate.com/github/moneta-rb/moneta)
+[![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/moneta-rb/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.
@@ -75,6 +78,9 @@ store.close
 * API documentation:
     * Latest Gem: <http://rubydoc.info/gems/moneta/frames>
     * GitHub master: <http://rubydoc.info/github/moneta-rb/moneta/master/frames>
+* Changelog: <https://github.com/moneta-rb/moneta/blob/master/CHANGES>
+
+In case you are wondering, Moneta uses [Semantic Versioning](https://semver.org/) since v1.0.0.
 
 ------
 
@@ -114,7 +120,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`, `:MongoOffical` or `:MongoMoped`)
+    * [MongoDB](http://www.mongodb.org/) (`:Mongo`)
 * Moneta network protocols:
     * Moneta key/value client (`:Client` works with `Moneta::Server`)
     * Moneta HTTP/REST client (`:RestClient` works with `Rack::MonetaRest`)
@@ -136,11 +142,7 @@ __NOTE:__ <a name="backend-matrix"></a>The backend matrix is much more readable
 
 <tr><th colspan="2">Persistent stores</th><th colspan="12"></th></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 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 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 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</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 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 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>
 
@@ -164,7 +166,7 @@ __NOTE:__ <a name="backend-matrix"></a>The backend matrix is much more readable
 
 <tr><td>DBM</td><td>-</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</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.ruby-doc.org/stdlib/libdoc/dbm/rdoc/DBM.html">Berkeley DB using DBM interface or NDBM (Depends on Ruby environment)</a></td></tr>
 
-<tr><td>GDBM</td><td>-</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</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.ruby-doc.org/stdlib/libdoc/gdbm/rdoc/GDBM.html">GDBM</a> database</td></tr>
+<tr><td>GDBM</td><td>ffi-gdbm on JRuby</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</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.ruby-doc.org/stdlib/libdoc/gdbm/rdoc/GDBM.html">GDBM</a> database</td></tr>
 
 <tr><td>LevelDB</td><td>leveldb</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</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://code.google.com/p/leveldb/">LevelDB</a> database</td></tr>
 
@@ -208,7 +210,7 @@ __NOTE:__ <a name="backend-matrix"></a>The backend matrix is much more readable
 
 <tr><th colspan="2">Network clients</th><th colspan="12"></th></tr>
 
-<tr><td>Client</td><td>-</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#55F">?<sup>13</sup></td><td style="text-align:center;background:#55F">?<sup>13</sup></td><td style="text-align:center;background:#55F">?<sup>13</sup></td><td style="text-align:center;background:#55F">?<sup>13</sup></td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#F44">✗</td><td>Moneta client adapter</td></tr>
+<tr><td>Client</td><td>-</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#55F">?<sup>13</sup></td><td style="text-align:center;background:#55F">?<sup>13</sup></td><td style="text-align:center;background:#55F">?<sup>13</sup></td><td style="text-align:center;background:#55F">?<sup>13</sup></td><td style="text-align:center;background:#55F">?<sup>13</sup></td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#F44">✗</td><td>Moneta client adapter</td></tr>
 
 <tr><td>RestClient</td><td>-</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#55F">?<sup>13</sup></td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#F44">✗</td><td>Moneta REST client adapter</td></tr>
 
@@ -235,17 +237,37 @@ __NOTE:__ <a name="backend-matrix"></a>The backend matrix is much more readable
 In addition it supports proxies (Similar to [Rack middlewares](http://rack.github.com/)) which
 add additional features to storage backends:
 
-* `Moneta::Proxy` and `Moneta::Wrapper` proxy base classes
-* `Moneta::Expires` to add expiration support to stores which don't support it natively. Add it in the builder using `use :Expires`.
-* `Moneta::Stack` to stack multiple stores (Read returns result from first where the key is found, writes go to all stores). Add it in the builder using `use(:Stack) {}`.
-* `Moneta::Transformer` transforms keys and values (Marshal, YAML, JSON, Base64, MD5, ...). Add it in the builder using `use :Transformer`.
-* `Moneta::Cache` combine two stores, one as backend and one as cache (e.g. `Moneta::Adapters::File` + `Moneta::Adapters::LRUHash`). Add it in the builder using `use(:Cache) {}`.
-* `Moneta::Lock` to make store thread safe. Add it in the builder using `use :Lock`.
-* `Moneta::Pool` to create a pool of stores as a means of making the store thread safe. Add it in the builder using `use(:Pool) {}`.
-* `Moneta::Logger` to log database accesses. Add it in the builder using `use :Logger`.
-* `Moneta::Shared` to share a store between multiple processes. Add it in the builder using `use(:Shared) {}`.
-* `Moneta::WeakIncrement` and `Moneta::WeakCreate` to add `#create` and `#increment` support without atomicity (weak) to stores which don't support it.
-* `Moneta::WeakEachKey` to add key traversal to stores that don't support it, with the important caveat that only those keys previously seen by this proxy will be traversed.
+* `Moneta::Proxy` and `Moneta::Wrapper` are the proxy base classes.
+* `Moneta::Cache` combine two stores, one as backend and one as cache (e.g.
+  `Moneta::Adapters::File` + `Moneta::Adapters::LRUHash`). Add it in the
+  builder using `use(:Cache) {}`.
+* `Moneta::Expires` to add expiration support to stores which don't support it
+  natively. Add it in the builder using `use :Expires`.
+* `Moneta::Fallback` use a store as a fallback when exceptions occur (by default the
+  `:Null` adapter is used so that an error results in a no-op). Add it to the
+  builder using `use(:Fallback, rescue: IOError)`
+* `Moneta::Lock` to make store thread safe. Add it in the builder using `use
+  :Lock`.
+* `Moneta::Logger` to log database accesses. Add it in the builder using `use
+  :Logger`.
+* `Moneta::Pool` to create a pool of stores as a means of making the store
+  thread safe. Add it in the builder using `use(:Pool, min: 2, max: 4, ttl: 60,
+  timeout: 5) {}`.
+* `Moneta::Shared` to share a store between multiple processes. Add it in the
+  builder using `use(:Shared) {}`.
+* `Moneta::Stack` to stack multiple stores (Read returns result from first
+  where the key is found, writes go to all stores). Add it in the builder using
+  `use(:Stack) {}`.
+* `Moneta::Transformer` transforms keys and values (Marshal, YAML, JSON,
+  Base64, MD5, ...). Add it in the builder using `use :Transformer`.
+* `Moneta::WeakIncrement` and `Moneta::WeakCreate` to add `#create` and
+  `#increment` support without atomicity (weak) to stores which don't support
+  it.
+* `Moneta::WeakEachKey` to add key traversal to stores that don't support it,
+  with the important caveat that only those keys previously seen by this proxy
+  will be traversed.
+
+Check the YARD documentation for more information and examples.
 
 ### Serializers and compressors (`Moneta::Transformer`)
 
@@ -887,12 +909,15 @@ Person.adapter :memory, Moneta.new(:Redis)
 
 ## Testing and Benchmarks
 
-Testing is done using [Travis-CI](http://travis-ci.org/moneta-rb/moneta). Currently we support Ruby >= 1.9.3.
+Testing is done using [Travis-CI](http://travis-ci.org/moneta-rb/moneta).
+Currently we support MRI Ruby >= 2.3.0 and the JRuby >= 9.2.9.0.
 
-Benchmarks for each store are done on [Travis-CI](http://travis-ci.org/moneta-rb/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.
-Feel free to add your own configurations! The impact of Moneta should be minimal since it is only a thin layer
-on top of the different stores.
+Benchmarks for each store are done on
+[Travis-CI](http://travis-ci.org/moneta-rb/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.  Feel free to add your own
+configurations! The impact of Moneta should be minimal since it is only a thin
+layer on top of the different stores.
 
 
 ------

data/feature_matrix.yaml

@@ -8,20 +8,10 @@ notes:
     server if you want multiprocess concurrency!
 backends:
   - adapter: Mongo
-    platforms: [ MRI, JRuby ]
-    gems: mongo or moped
-    features: [ threadsafe, multiprocess, increment, create, expires, each_key, bulk_read, bulk_write ]
-    description: "[MongoDB](http://www.mongodb.org/) database"
-  - adapter: MongoOfficial
     platforms: [ MRI, JRuby ]
     gems: mongo
     features: [ threadsafe, multiprocess, increment, create, expires, each_key, bulk_read, bulk_write ]
     description: "[MongoDB](http://www.mongodb.org/) database"
-  - adapter: MongoMoped
-    platforms: [ MRI, JRuby ]
-    gems: moped
-    features: [ threadsafe, multiprocess, increment, create, expires, each_key, bulk_read, bulk_write ]
-    description: "[MongoDB](http://www.mongodb.org/) database"
   - adapter: Redis
     platforms: [ MRI, JRuby ]
     gems: redis
@@ -82,6 +72,7 @@ backends:
     description: "[Berkeley DB using DBM interface or NDBM (Depends on Ruby environment)](http://www.ruby-doc.org/stdlib/libdoc/dbm/rdoc/DBM.html)"
   - adapter: GDBM
     platforms: [ MRI, JRuby ]
+    gems: ffi-gdbm on JRuby
     features: [ increment, create, each_key, bulk_read, bulk_write ]
     description: "[GDBM](http://www.ruby-doc.org/stdlib/libdoc/gdbm/rdoc/GDBM.html) database"
   - adapter: LevelDB
@@ -219,13 +210,14 @@ backends:
   - adapter: Client
     platforms: [ MRI, JRuby ]
     features: [multiprocess]
-    unknown: [ increment, create, expires, persist ]
+    unknown: [ increment, create, expires, persist, each_key ]
     description: "Moneta client adapter"
     notes:
       increment: depends on server
       create: depends on server
       expires: depends on server
       persist: depends on server
+      each_key: depends on server
   - adapter: RestClient
     platforms: [ MRI, JRuby ]
     features: [ multiprocess ]

data/lib/action_dispatch/middleware/session/moneta_store.rb

@@ -3,6 +3,7 @@ require 'action_dispatch/middleware/session/abstract_store'
 
 module ActionDispatch
   module Session
+    # A Rails cache backed by any Moneta store
     class MonetaStore < Rack::Session::Moneta
       include Compatibility
       include StaleSessionCheck

data/lib/active_support/cache/moneta_store.rb

@@ -79,7 +79,7 @@ module ActiveSupport
         def write_multi(hash, options = nil)
           options = merged_options(options)
 
-          instrument :write_multi, hash, options do |payload|
+          instrument :write_multi, hash, options do
             entries = hash.each_with_object({}) do |(name, value), memo|
               memo[normalize_key(name, options)] = \
                 Entry.new(value, options.merge(version: normalize_version(name, options)))
@@ -118,12 +118,12 @@ module ActiveSupport
 
       def read_multi_entries(names, options)
         keys = names.map { |name| normalize_key(name, options) }
-        entries = @store.
-          values_at(*keys, **moneta_options(options, false)).
-          map(&method(:make_entry))
+        entries = @store
+          .values_at(*keys, **moneta_options(options, false))
+          .map(&method(:make_entry))
 
         names.zip(keys, entries).map do |name, key, entry|
-          next if entry.nil?
+          next if entry == nil
           delete_entry(key, options) if entry.expired?
           next if entry.expired? || entry.mismatched?(normalize_version(name, options))
 

data/lib/moneta.rb

@@ -1,18 +1,26 @@
+# Provides two methods for constructing stores:
+#
+# * {Moneta.new}
+# * {Moneta.build}
 module Moneta
   autoload :Builder,           'moneta/builder'
   autoload :Cache,             'moneta/cache'
-  autoload :CreateSupport,     'moneta/mixins'
-  autoload :Defaults,          'moneta/mixins'
-  autoload :EachKeySupport,    'moneta/mixins'
-  autoload :ExpiresSupport,    'moneta/mixins'
+  autoload :CreateSupport,     'moneta/create_support'
+  autoload :DBMAdapter,        'moneta/dbm_adapter'
+  autoload :Defaults,          'moneta/defaults'
+  autoload :EachKeySupport,    'moneta/each_key_support'
+  autoload :Enumerable,        'moneta/enumerable'
+  autoload :ExpiresSupport,    'moneta/expires_support'
   autoload :Expires,           'moneta/expires'
-  autoload :HashAdapter,       'moneta/mixins'
-  autoload :IncrementSupport,  'moneta/mixins'
+  autoload :Fallback,          'moneta/fallback'
+  autoload :HashAdapter,       'moneta/hash_adapter'
+  autoload :IncrementSupport,  'moneta/increment_support'
   autoload :Lock,              'moneta/lock'
   autoload :Logger,            'moneta/logger'
   autoload :Mutex,             'moneta/synchronize'
+  autoload :NilValues,         'moneta/nil_values'
   autoload :OptionMerger,      'moneta/optionmerger'
-  autoload :OptionSupport,     'moneta/mixins'
+  autoload :OptionSupport,     'moneta/option_support'
   autoload :Pool,              'moneta/pool'
   autoload :Proxy,             'moneta/proxy'
   autoload :Semaphore,         'moneta/synchronize'
@@ -26,9 +34,11 @@ module Moneta
   autoload :WeakIncrement,     'moneta/weak'
   autoload :Wrapper,           'moneta/wrapper'
 
+  # Adapters are classes which wrap databases, services etc., as described in
+  # {file:SPEC.md The Moneta Specification}.
   module Adapters
     autoload :ActiveRecord,    'moneta/adapters/activerecord'
-    autoload :ActiveSupportCache,'moneta/adapters/activesupportcache'
+    autoload :ActiveSupportCache, 'moneta/adapters/activesupportcache'
     autoload :Cassandra,       'moneta/adapters/cassandra'
     autoload :Client,          'moneta/adapters/client'
     autoload :Cookie,          'moneta/adapters/cookie'
@@ -50,8 +60,6 @@ module Moneta
     autoload :MemcachedNative, 'moneta/adapters/memcached/native'
     autoload :Memory,          'moneta/adapters/memory'
     autoload :Mongo,           'moneta/adapters/mongo'
-    autoload :MongoMoped,      'moneta/adapters/mongo/moped'
-    autoload :MongoOfficial,   'moneta/adapters/mongo/official'
     autoload :Null,            'moneta/adapters/null'
     autoload :PStore,          'moneta/adapters/pstore'
     autoload :Redis,           'moneta/adapters/redis'
@@ -110,6 +118,8 @@ module Moneta
     when :Sequel
       # Sequel accept only base64 keys
       transformer[:key] << :base64
+      # If using HStore, binary data is not allowed
+      transformer[:value] << :base64 if options[:hstore]
     when :ActiveRecord, :DataMapper
       # DataMapper and AR accept only base64 keys and values
       transformer[:key] << :base64

data/lib/moneta/adapters/activerecord.rb

@@ -40,7 +40,8 @@ module Moneta
       # @param [Hash] options
       # @option options [Object]               :backend A class object inheriting from ActiveRecord::Base to use as a table
       # @option options [String]               :table ('moneta') Table name
-      # @option options [Hash/String/Symbol]   :connection ActiveRecord connection configuration (`Hash` or `String`), or symbol giving the name of a Rails connection (e.g. :production)
+      # @option options [Hash/String/Symbol]   :connection ActiveRecord connection configuration (`Hash` or `String`), or
+      #   symbol giving the name of a Rails connection (e.g. :production)
       # @option options [Proc, Boolean]        :create_table Proc called with a connection if table
       #   needs to be created.  Pass false to skip the create table check all together.
       # @option options [Symbol]               :key_column (:k) The name of the column to use for keys
@@ -87,7 +88,7 @@ module Moneta
 
           table_name = (options.delete(:table) || :moneta).to_sym
           create_table_proc = options.delete(:create_table)
-          if create_table_proc.nil?
+          if create_table_proc == nil
             create_table(table_name)
           elsif create_table_proc
             with_connection(&create_table_proc)
@@ -164,10 +165,11 @@ module Moneta
             end
           end
         end
-      rescue ::ActiveRecord::RecordNotUnique
-        # This handles the "no row updated" issue, above
+      rescue ::ActiveRecord::RecordNotUnique, ::ActiveRecord::Deadlocked
+        # This handles the "no row updated" issue, above, as well as deadlocks
+        # which may occur on some adapters
         tries ||= 0
-        if (tries += 1) <= 3; retry else raise end
+        (tries += 1) <= 3 ? retry : raise
       end
 
       # (see Proxy#create)
@@ -197,14 +199,32 @@ module Moneta
       # (see Proxy#slice)
       def slice(*keys, lock: false, **options)
         with_connection do |conn|
-          sel = arel_slice(keys).project(table[key_column], table[value_column])
-          sel = sel.lock if lock
-          result = conn.select_all(sel)
+          conn.create_table(:slice_keys, temporary: true) do |t|
+            t.string :key, null: false
+          end
 
-          k = key_column.to_s
-          v = value_column.to_s
-          result.map do |row|
-            [row[k], decode(conn, row[v])]
+          begin
+            temp_table = ::Arel::Table.new(:slice_keys)
+            keys.each do |key|
+              conn.insert ::Arel::InsertManager.new
+                .into(temp_table)
+                .insert([[temp_table[:key], key]])
+            end
+
+            sel = arel_sel
+              .join(temp_table)
+              .on(table[key_column].eq(temp_table[:key]))
+              .project(table[key_column], table[value_column])
+            sel = sel.lock if lock
+            result = conn.select_all(sel)
+
+            k = key_column.to_s
+            v = value_column.to_s
+            result.map do |row|
+              [row[k], decode(conn, row[v])]
+            end
+          ensure
+            conn.drop_table(:slice_keys)
           end
         end
       end
@@ -255,7 +275,7 @@ module Moneta
         self.class.retrieve_or_establish_connection_pool(@spec)
       end
 
-      def create_table table_name
+      def create_table(table_name)
         with_connection do |conn|
           return if conn.table_exists?(table_name)
 
@@ -287,10 +307,6 @@ module Moneta
         arel_sel.where(table[key_column].eq(key))
       end
 
-      def arel_slice(keys)
-        arel_sel.where(table[key_column].eq_any(keys))
-      end
-
       def conn_ins(conn, key, value)
         ins = ::Arel::InsertManager.new.into(table)
         ins.insert([[table[key_column], key], [table[value_column], value]])
@@ -311,7 +327,7 @@ module Moneta
         elsif conn.respond_to?(:escape_bytea)
           conn.escape_bytea(value)
         elsif defined?(::ActiveRecord::ConnectionAdapters::SQLite3Adapter) &&
-              conn.is_a?(::ActiveRecord::ConnectionAdapters::SQLite3Adapter)
+            conn.is_a?(::ActiveRecord::ConnectionAdapters::SQLite3Adapter)
           Arel::Nodes::SqlLiteral.new("X'#{value.unpack('H*').first}'")
         else
           value
@@ -322,7 +338,7 @@ module Moneta
         if value == nil
           nil
         elsif defined?(::ActiveModel::Type::Binary::Data) &&
-          value.is_a?(::ActiveModel::Type::Binary::Data)
+            value.is_a?(::ActiveModel::Type::Binary::Data)
           value.to_s
         elsif conn.respond_to?(:unescape_bytea)
           conn.unescape_bytea(value)

data/lib/moneta/adapters/activesupportcache.rb

@@ -25,7 +25,7 @@ module Moneta
       # (see Proxy#key?)
       def key?(key, options = {})
         @backend.exist?(key).tap do |exists|
-          if exists && !(expires = expires_value(options, nil)).nil?
+          if exists && (expires = expires_value(options, nil)) != nil
             value = @backend.read(key, options)
             @backend.write(key, value, options.merge(expires_in: expires ? expires.seconds : nil))
           end
@@ -36,14 +36,10 @@ module Moneta
       def load(key, options = {})
         expires = expires_value(options, nil)
         value = @backend.read(key, options)
-        if value and !expires.nil?
+        if value and expires != nil
           @backend.write(key, value, options.merge(expires_in: expires ? expires.seconds : nil))
         end
-        if options[:raw]
-          value && value.to_s
-        else
-          value
-        end
+        value
       end
 
       # (see Proxy#store)

data/lib/moneta/adapters/cassandra.rb

@@ -83,10 +83,14 @@ module Moneta
           # and then re-set it in order to update the TTL.
           return false unless
             row = @backend.execute(@load, options.merge(consistency: rc, arguments: [key])).first and
-            row[@expired_column] != nil
-          @backend.execute(@update_expires, options.merge(consistency: wc, arguments: [
-            (expires || 0).to_i, timestamp, row[@value_column], key, row[@updated_column]
-          ]))
+              row[@expired_column] != nil
+          @backend.execute(@update_expires,
+                           options.merge(consistency: wc,
+                                         arguments: [(expires || 0).to_i,
+                                                     timestamp,
+                                                     row[@value_column],
+                                                     key,
+                                                     row[@updated_column]]))
           true
         elsif row = @backend.execute(@key, options.merge(consistency: rc, arguments: [key])).first
           row[@expired_column] != nil
@@ -100,9 +104,13 @@ module Moneta
         rc, wc = consistency(options)
         if row = @backend.execute(@load, options.merge(consistency: rc, arguments: [key])).first and row[@expired_column] != nil
           if (expires = expires_value(options, nil)) != nil
-            @backend.execute(@update_expires, options.merge(consistency: wc, arguments: [
-              (expires || 0).to_i, timestamp, row[@value_column], key, row[@updated_column]
-            ]))
+            @backend.execute(@update_expires,
+                             options.merge(consistency: wc,
+                                           arguments: [(expires || 0).to_i,
+                                                       timestamp,
+                                                       row[@value_column],
+                                                       key,
+                                                       row[@updated_column]]))
           end
           row[@value_column]
         end
@@ -150,7 +158,7 @@ module Moneta
 
       # (see Proxy#each_key)
       def each_key
-        rc, _ = consistency
+        rc, = consistency
         return enum_for(:each_key) unless block_given?
         result = @backend.execute(@each_key, consistency: rc, page_size: 100)
         loop do
@@ -229,7 +237,7 @@ module Moneta
           end
         end
 
-        rc, wc = consistency(options)
+        _rc, wc = consistency(options)
         expires = expires_value(options)
         t = timestamp
         batch = @backend.batch do |batch|
@@ -270,16 +278,16 @@ module Moneta
         # but use single quotes instead of double-quotes.
         require 'multi_json'
         option_str = options.map do |key, value|
-          key.to_s + ' = ' +  MultiJson.dump(value).gsub('"', "'")
+          key.to_s + ' = ' + MultiJson.dump(value).tr(?", ?')
         end.join(' AND ')
 
-        @backend.execute "CREATE KEYSPACE IF NOT EXISTS %s WITH %s" % [
-          keyspace,
-          option_str
-        ]
+        @backend.execute "CREATE KEYSPACE IF NOT EXISTS %<keyspace>s WITH %<options>s" % {
+          keyspace: keyspace,
+          options: option_str
+        }
       rescue ::Cassandra::Errors::TimeoutError
         tries ||= 0
-        if (tries += 1) <= 3; retry else raise end
+        (tries += 1) <= 3 ? retry : raise
       end
 
       def prepare_statements
@@ -338,7 +346,7 @@ module Moneta
         CQL
       end
 
-      def consistency(options={})
+      def consistency(options = {})
         [
           options[:read_consistency] || @read_consistency,
           options[:write_consistency] || @write_consistency