moneta 0.7.17 → 0.7.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0fbb029ab09dd2b73f2b41c9019956b0dee395e
-  data.tar.gz: 7f5c47a13a9957dc1508b2b95d4aee866809c8b9
+  metadata.gz: 40e5bf4f97796468cef521c2b103f72d7be29811
+  data.tar.gz: d9ab4368e38146049f4e92a0cf2337b2148fcf10
 SHA512:
-  metadata.gz: 4fa4a788c787c8750b824c28229757abf3f7cbedabea7e117108bdce6b0f4d540c7f5a61c51b4bfd2195d92c06b43d390695bac8a41192434ae65fb62b0b3984
-  data.tar.gz: 2b3a44cb243a4e82764727461cec52597b3a0d71be81fd637042bbebcc6efc810502a0d8328bb13e0ab78293dab56d3eb10fdb738ae6c246f067f94ad2650c27
+  metadata.gz: 2fadbaee29f91f2259b44cf7140d64e3ab12196ee2e29c6c9ccc5db2518b0a06a4db0d81f654e7625dceaa3ead6a7636aeb2240d9cff0bd17161b2f1865a6f19
+  data.tar.gz: f1751faff2cef9302fa0b3125e421e6632fa580978ab548fb13afd53f7dc37fe0e586821a657b3c79298a44b9ba66ccf68edacbf6efcc89e3b134176dfa2b7c9

data/.gitignore

@@ -9,3 +9,4 @@ spec/tmp
 script/benchmarks.tmp
 Gemfile.lock
 logs
+secure

data/.travis.yml

@@ -5,15 +5,16 @@ rvm:
   - 1.8.7
   - jruby-19mode
   - jruby-18mode
-#  - rbx-19mode
-#  - rbx-18mode
+  - rbx-19mode
+  - rbx-18mode
 before_install:
   - script/kill-travis
   #- script/install-kyotocabinet
-  - sudo apt-get install -qq libtokyocabinet8 libtokyocabinet-dev liblzo2-dev libtdb-dev tokyotyrant
+  - sudo apt-get install -qq libtokyocabinet8 libtokyocabinet-dev liblzo2-dev libtdb-dev libleveldb-dev tokyotyrant
   - script/start-services
   - script/install-bundle
   - script/upload-bundle
+  - script/wait-services
 install: 'echo "Bundle installed"'
 before_script:
   - mysql -e 'create database moneta;'
@@ -21,13 +22,18 @@ before_script:
   - mysql -e 'create database moneta_activerecord2;'
 env:
   global:
-    - secure: "B0vx1g1CB1A6mM3B/iy2ATicfS4OXT80bb2RVe8mSRsPzez1B4q4Q4hJcaMI\nrMARONN8Krtnti+IqvmDnB0Z0AKYMEyIc+zT37zJOCjLdkLJl+x/thuU/MbC\nvlLVwjMf6JE2EUzTfORDRFYc5ycCqfsfgNk1Go0D2CPT6P9u9uQ="
+    - secure: "dtM4n7FP8P0UI9Iq+nsvQ7/yfDqsxhfCO9i8zMxm/f9Kxj5Z/4C7jsXsLA+e\n/7FZ9+ld2QjPSPU0LUiDpj/z81bxyZHwqocQ7Nb0DVvO3JRHpr4/iBQQQHd3\n0jvou3mRbu5mBlUjf1/ALaZA+b+vcnsF9fd86UnkY+ChriylGnM="
   matrix:
-    - "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=1/10"
+    - "TASK=test TEST_GROUP=2/10"
+    - "TASK=test TEST_GROUP=3/10"
+    - "TASK=test TEST_GROUP=4/10"
+    - "TASK=test TEST_GROUP=5/10"
+    - "TASK=test TEST_GROUP=6/10"
+    - "TASK=test TEST_GROUP=7/10"
+    - "TASK=test TEST_GROUP=8/10"
+    - "TASK=test TEST_GROUP=9/10"
+    - "TASK=test TEST_GROUP=10/10"
     - "TASK=test TEST_GROUP=unstable"
     - "TASK=benchmarks CONFIG=uniform_small"
     - "TASK=benchmarks CONFIG=uniform_medium"

data/CHANGES

@@ -1,4 +1,15 @@
-master
+0.7.18
+
+* Adapters::File#increment and #create fixed on JRuby
+* Adapters::Couch and Adapters::Mongo can store hashes directly as documents.
+  It is not necessary to serialize values as strings anymore.
+* Adapters::Couch#create added
+* Pool thread safety improved
+* Transformer: Add CityHash
+
+0.7.17
+
+* Transformer: LZ4 compression added
 
 0.7.16
 

data/CONTRIBUTORS

@@ -1,7 +1,6 @@
 Adrian Madrid <aemadrid@gmail.com>
 Alejandro Crosa <acrosa@sharing.local>
 Anthony Eden <anthonyeden@gmail.com>
-Hendrik Beskow <hendrik-github@beskow.de>
 Benjamin Yu <benjaminlyu@gmail.com>
 Ben Schwarz <ben.schwarz@gmail.com>
 Daniel Mendler <mail@daniel-mendler.de>
@@ -9,7 +8,7 @@ Derek Kastner <dkastner@gmail.com>
 Dylan Egan <me@dylanegan.com>
 Hampton Catlin <hcatlin@gmail.com>
 Hannes Georg <hannes.georg@googlemail.com>
-Scott Wadden <scott.wadden@gmail.com>
+Hendrik Beskow <hendrik-github@beskow.de>
 Jari Bakken <jari.bakken@gmail.com>
 Jeremy Voorhis <jvoorhis@gmail.com>
 Jon Crosby <jon@joncrosby.me>
@@ -17,6 +16,7 @@ lakshan <lakshan@web2media.net>
 Piotr Murach <pmurach@gmail.com>
 Potapov Sergey <blake131313@gmail.com>
 Quin Hoxie <quin@aboutus.org>
+Scott Wadden <scott.wadden@gmail.com>
 Tom Meier <ozmeier@yahoo.co.uk>
 Xavier Shay <xavier@rhnh.net>
 Yehuda Katz <wycats@gmail.com>

data/Gemfile

@@ -27,6 +27,9 @@ gem 'lzoruby', :platforms => :ruby
 gem 'snappy', :platforms => :ruby
 gem 'qlzruby', :platforms => :ruby
 
+# Hash transformer library
+gem 'cityhash', :platforms => :ruby
+
 # Backends
 gem 'faraday'
 gem 'daybreak'

data/README.md

@@ -2,7 +2,10 @@
 
 [![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)
 
-Moneta provides a standard interface for interacting with various kinds of key/value stores. A short overview of the features:
+Moneta provides a standard interface for interacting with various kinds of key/value stores. Moneta supports the well-known
+NoSQL and document based stores.
+
+A short overview of the features:
 
 * Supports a lot of backends with consistent behaviour (See below)
 * Allows a full configuration of the serialization -> compression -> adapter stack using proxies (Similar to [Rack middlewares](http://rack.github.com/))
@@ -170,14 +173,14 @@ __NOTE:__ <a name="backend-matrix">The backend matrix</a> is much more readable
 
 <tr><td>DataMapper</td><td>dm-core, dm-migrations</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:#5F5">✓</td><td><a href="http://datamapper.org/">DataMapper</a> ORM</td></tr>
 
+<tr><td>Couch</td><td>faraday, multi_json</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:#5F5">✓</td><td style="text-align:center;background:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://couchdb.apache.org/">CouchDB</a> database</td></tr>
+
 <tr><td>HBase</td><td>hbaserb</td><td style="text-align:center;background:#55F">?</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><a href="http://hbase.apache.org/">HBase</a> database</td></tr>
 
 <tr><td>Cassandra</td><td>cassandra</td><td style="text-align:center;background:#55F">?</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><a href="http://cassandra.apache.org/">Cassandra</a> distributed database</td></tr>
 
 <tr><td>LocalMemCache</td><td>localmemcache</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:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://localmemcache.rubyforge.org/">LocalMemCache</a> database</td></tr>
 
-<tr><td>Couch</td><td>faraday, multi_json</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:#5F5">✓</td><td><a href="http://couchdb.apache.org/">CouchDB</a> database</td></tr>
-
 <tr><td>Fog</td><td>fog</td><td style="text-align:center;background:#55F">?</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><a href="http://fog.io/">Fog</a> cloud store</td></tr>
 
 <tr><td>Riak</td><td>riak-client</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:#5F5">✓</td><td><a href="http://docs.basho.com/">Riak</a> database</td></tr>
@@ -258,7 +261,7 @@ Supported value compressors:
 
 Special transformers:
 
-* Digests (MD5, Shas, ...)
+* Digests (MD5, Shas, CityHash, ...)
 * Add prefix to keys (`:prefix`)
 * HMAC to verify values (`:hmac`, useful for `Rack::MonetaCookies`)
 
@@ -312,10 +315,16 @@ Moneta does not support iteration or partial matches.
 
 ### Creating a Store
 
-There is a simple interface to create a store using `Moneta.new`:
+There is a simple interface to create a store using `Moneta.new`. You will
+get automatic key and value serialization which is provided by `Moneta::Transformer`.
+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['key'] = 'value'
+store['hash_key'] = {:a => 1, :b => 2}
+store['object_key'] = MarshallableRubyObject.new
 ~~~
 
 If you want to have control over the proxies, you have to use `Moneta.build`:
@@ -335,6 +344,22 @@ store = Moneta.build do
 end
 ~~~
 
+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
+
+# 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 = Moneta::Adapters::Mongo.new
+db['key'] = {:a => 1, :b => 2}
+~~~
+
 ### Expiration
 
 The Cassandra, Memcached, Redis and Mongo backends support expiration natively.

data/Rakefile

@@ -82,7 +82,7 @@ task :test do
       end
     end
     sleep 0.1
-    sleep 0.1 while threads.size >= 10
+    sleep 0.1 while threads.size >= 5
   end
   sleep 0.1 until threads.empty?
   if failed

data/lib/active_support/cache/moneta_store.rb

@@ -10,18 +10,21 @@ module ActiveSupport
       end
 
       def increment(key, amount = 1, options = nil)
+        options = merged_options(options)
         instrument(:increment, key, :amount => amount) do
-          @store.increment(key, amount, moneta_options(options))
+          @store.increment(namespaced_key(key, options), amount, moneta_options(options))
         end
       end
 
       def decrement(key, amount = 1, options = nil)
+        options = merged_options(options)
         instrument(:decrement, key, :amount => amount) do
-          @store.increment(key, -amount, moneta_options(options))
+          @store.increment(namespaced_key(key, options), -amount, moneta_options(options))
         end
       end
 
       def clear(options = nil)
+        options = merged_options(options)
         instrument(:clear, nil, nil) do
           @store.clear(moneta_options(options))
         end

data/lib/moneta/adapters/couch.rb

@@ -4,18 +4,31 @@ require 'multi_json'
 module Moneta
   module Adapters
     # CouchDB backend
+    #
+    # You can store hashes directly using this adapter.
+    #
+    # @example Store hashes
+    #     db = Moneta::Adapters::Mongo.new
+    #     db['key'] = {a: 1, b: 2}
+    #
     # @api public
     class Couch
       include Defaults
 
       attr_reader :backend
 
+      supports :create
+
       # @param [Hash] options
       # @option options [String] :host ('127.0.0.1') Couch host
       # @option options [String] :port (5984) Couch port
       # @option options [String] :db ('moneta') Couch database
+      # @option options [String] :value_field ('value') Document field to store value
+      # @option options [String] :type_field ('type') Document field to store value type
       # @option options [Faraday connection] :backend Use existing backend instance
       def initialize(options = {})
+        @value_field = options[:value_field] || 'value'
+        @type_field = options[:type_field] || 'type'
         url = "http://#{options[:host] || '127.0.0.1'}:#{options[:port] || 5984}/#{options[:db] || 'moneta'}"
         @backend = options[:backend] || ::Faraday.new(:url => url)
         create_db
@@ -29,15 +42,14 @@ module Moneta
       # (see Proxy#load)
       def load(key, options = {})
         response = @backend.get(key)
-        response.status == 200 ? MultiJson.load(response.body)['value'] : nil
+        response.status == 200 ? body_to_value(response.body) : nil
       end
 
       # (see Proxy#store)
       def store(key, value, options = {})
         response = @backend.head(key)
-        doc = { 'value' => value }
-        doc['_rev'] = response['etag'][1..-2] if response.status == 200
-        response = @backend.put(key, MultiJson.dump(doc), 'Content-Type' => 'application/json')
+        body = value_to_body(value, response.status == 200 && response['etag'][1..-2])
+        response = @backend.put(key, body, 'Content-Type' => 'application/json')
         raise "HTTP error #{response.status}" unless response.status == 201
         value
       rescue
@@ -49,7 +61,7 @@ module Moneta
       def delete(key, options = {})
         response = @backend.get(key)
         if response.status == 200
-          value = MultiJson.load(response.body)['value']
+          value = body_to_value(response.body)
           response = @backend.delete("#{key}?rev=#{response['etag'][1..-2]}")
           raise "HTTP error #{response.status}" unless response.status == 200
           value
@@ -66,8 +78,54 @@ module Moneta
         self
       end
 
+      # (see Proxy#create)
+      def create(key, value, options = {})
+        body = value_to_body(value, nil)
+        response = @backend.put(key, body, 'Content-Type' => 'application/json')
+        case response.status
+        when 201
+          true
+        when 409
+          false
+        else
+          raise "HTTP error #{response.status}"
+        end
+      rescue
+        tries ||= 0
+        (tries += 1) < 10 ? retry : raise
+      end
+
       private
 
+      def body_to_value(body)
+        doc = MultiJson.load(body)
+        case doc[@type_field]
+        when 'Hash'
+          doc = doc.dup
+          doc.delete('_id')
+          doc.delete('_rev')
+          doc.delete(@type_field)
+          doc
+        else
+          doc[@value_field]
+        end
+      end
+
+      def value_to_body(value, rev)
+        case value
+        when Hash
+          doc = value.merge(@type_field => 'Hash')
+        when String
+          doc = { @value_field => value, @type_field => 'String' }
+        when Float, Fixnum
+          doc = { @value_field => value, @type_field => 'Number' }
+        else
+          raise ArgumentError, "Invalid value type: #{value.class}"
+        end
+        doc['_rev'] = rev if rev
+        MultiJson.dump(doc)
+      end
+
       def create_db
         response = @backend.put '', ''
         raise "HTTP error #{response.status}" unless response.status == 201 || response.status == 412

data/lib/moneta/adapters/file.rb

@@ -66,24 +66,41 @@ module Moneta
         FileUtils.mkpath(::File.dirname(path))
         ::File.open(path, ::File::RDWR | ::File::CREAT) do |f|
           Thread.pass until f.flock(::File::LOCK_EX)
-          content = ::File.read(path)
+          content = f.read
           amount += Utils.to_int(content) unless content.empty?
-          ::File.open(path, 'wb') {|o| o.write(amount.to_s) }
+          content = amount.to_s
+          f.pos = 0
+          f.write(content)
+          f.truncate(content.bytesize)
           amount
         end
       end
 
-      # (see Proxy#create)
-      def create(key, value, options = {})
-        path = store_path(key)
-        FileUtils.mkpath(::File.dirname(path))
-        ::File.open(path, ::File::WRONLY | ::File::CREAT | ::File::EXCL) do |f|
-          f.binmode
-          f.write(value)
+      # HACK: The implementation using File::EXCL is not atomic under JRuby 1.7.4
+      # See https://github.com/jruby/jruby/issues/827
+      if defined?(JRUBY_VERSION)
+        # (see Proxy#create)
+        def create(key, value, options = {})
+          path = store_path(key)
+          FileUtils.mkpath(::File.dirname(path))
+          # Call native java.io.File#createNewFile
+          return false unless ::Java::JavaIo::File.new(path).createNewFile
+          ::File.open(path, 'wb+') {|f| f.write(value) }
+          true
+        end
+      else
+        # (see Proxy#create)
+        def create(key, value, options = {})
+          path = store_path(key)
+          FileUtils.mkpath(::File.dirname(path))
+          ::File.open(path, ::File::WRONLY | ::File::CREAT | ::File::EXCL) do |f|
+            f.binmode
+            f.write(value)
+          end
+          true
+        rescue Errno::EEXIST
+          false
         end
-        true
-      rescue Errno::EEXIST
-        false
       end
 
       protected

data/lib/moneta/adapters/fog.rb

@@ -41,6 +41,7 @@ module Moneta
 
       # (see Proxy#store)
       def store(key, value, options = {})
+        value = value.dup if value.frozen? # HACK: Fog needs unfrozen string
         @directory.files.create(options.merge(:key => key, :body => value))
         value
       end

data/lib/moneta/adapters/mongo.rb

@@ -7,6 +7,12 @@ module Moneta
     # Supports expiration, documents will be automatically removed starting
     # with mongodb >= 2.2 (see {http://docs.mongodb.org/manual/tutorial/expire-data/}).
     #
+    # You can store hashes directly using this adapter.
+    #
+    # @example Store hashes
+    #     db = Moneta::Adapters::Mongo.new
+    #     db['key'] = {a: 1, b: 2}
+    #
     # @api public
     class Mongo
       include Defaults
@@ -23,11 +29,18 @@ module Moneta
       # @option options [Integer] :port (MongoDB default port) MongoDB server port
       # @option options [String] :db ('moneta') MongoDB database
       # @option options [Integer] :expires Default expiration time
+      # @option options [String] :expires_field ('expiresAt') Document field to store expiration time
+      # @option options [String] :value_field ('value') Document field to store value
+      # @option options [String] :type_field ('type') Document field to store value type
       # @option options [::Mongo::MongoClient] :backend Use existing backend instance
+      # @option options Other options passed to `Mongo::MongoClient#new`
       def initialize(options = {})
         self.default_expires = options.delete(:expires)
         collection = options.delete(:collection) || 'moneta'
         db = options.delete(:db) || 'moneta'
+        @expires_field = options.delete(:expires_field) || 'expiresAt'
+        @value_field = options.delete(:value_field) || 'value'
+        @type_field = options.delete(:type_field) || 'type'
         @backend = options[:backend] ||
           begin
             host = options.delete(:host) || '127.0.0.1'
@@ -40,7 +53,7 @@ module Moneta
         db.authenticate(user, password, true) if user && password
         @collection = db.collection(collection)
         if @backend.server_version >= '2.2'
-          @collection.ensure_index([['expiresAt', ::Mongo::ASCENDING]], :expireAfterSeconds => 0)
+          @collection.ensure_index([[@expires_field, ::Mongo::ASCENDING]], :expireAfterSeconds => 0)
         else
           warn 'Moneta::Adapters::Mongo - You are using MongoDB version < 2.2, expired documents will not be deleted'
         end
@@ -48,26 +61,22 @@ module Moneta
 
       # (see Proxy#load)
       def load(key, options = {})
-        key = ::BSON::Binary.new(key)
+        key = to_binary(key)
         doc = @collection.find_one('_id' => key)
-        if doc && (!doc['expiresAt'] || doc['expiresAt'] >= Time.now)
+        if doc && (!doc[@expires_field] || doc[@expires_field] >= Time.now)
           expires = expires_at(options, nil)
           @collection.update({ '_id' => key },
-                             # expiresAt must be a Time object (BSON date datatype)
-                             { '$set' => { 'expiresAt' => expires || nil } }) if expires != nil
-          doc['value'].to_s
+                             # @expires_field must be a Time object (BSON date datatype)
+                             { '$set' => { @expires_field => expires || nil } }) if expires != nil
+          doc_to_value(doc)
         end
       end
 
       # (see Proxy#store)
       def store(key, value, options = {})
-        key = ::BSON::Binary.new(key)
-        intvalue = value.to_i
+        key = to_binary(key)
         @collection.update({ '_id' => key },
-                           { '_id' => key,
-                             'value' => intvalue.to_s == value ? intvalue : ::BSON::Binary.new(value),
-                             # expiresAt must be a Time object (BSON date datatype)
-                             'expiresAt' => expires_at(options) || nil },
+                           value_to_doc(key, value, options),
                            { :upsert => true })
         value
       end
@@ -75,26 +84,22 @@ module Moneta
       # (see Proxy#delete)
       def delete(key, options = {})
         value = load(key, options)
-        @collection.remove('_id' => ::BSON::Binary.new(key)) if value
+        @collection.remove('_id' => to_binary(key)) if value
         value
       end
 
       # (see Proxy#increment)
       def increment(key, amount = 1, options = {})
-        @collection.find_and_modify(:query => { '_id' => ::BSON::Binary.new(key) },
-                                    :update => { '$inc' => { 'value' => amount } },
+        @collection.find_and_modify(:query => { '_id' => to_binary(key) },
+                                    :update => { '$inc' => { @value_field => amount } },
                                     :new => true,
-                                    :upsert => true)['value']
+                                    :upsert => true)[@value_field]
       end
 
       # (see Proxy#create)
       def create(key, value, options = {})
-        key = ::BSON::Binary.new(key)
-        intvalue = value.to_i
-        @collection.insert('_id' => key,
-                           'value' => intvalue.to_s == value ? intvalue : ::BSON::Binary.new(value),
-                           # expiresAt must be a Time object (BSON date datatype)
-                           'expiresAt' => expires_at(options) || nil)
+        key = to_binary(key)
+        @collection.insert(value_to_doc(key, value, options))
         true
       rescue ::Mongo::OperationFailure
         # FIXME: This catches too many errors
@@ -113,6 +118,53 @@ module Moneta
         @backend.close
         nil
       end
+
+      protected
+
+      def doc_to_value(doc)
+        case doc[@type_field]
+        when 'Hash'
+          doc = doc.dup
+          doc.delete('_id')
+          doc.delete(@type_field)
+          doc.delete(@expires_field)
+          doc
+        when 'Number'
+          doc[@value_field]
+        else
+          doc[@value_field].to_s
+        end
+      end
+
+      def value_to_doc(key, value, options)
+        case value
+        when Hash
+          value.merge('_id' => key,
+                      @type_field => 'Hash',
+                      # @expires_field must be a Time object (BSON date datatype)
+                      @expires_field => expires_at(options) || nil)
+        when Float, Fixnum
+          { '_id' => key,
+            @type_field => 'Number',
+            @value_field => value,
+            # @expires_field must be a Time object (BSON date datatype)
+            @expires_field => expires_at(options) || nil }
+        when String
+          intvalue = value.to_i
+          { '_id' => key,
+            @type_field => 'String',
+            @value_field => intvalue.to_s == value ? intvalue : to_binary(value),
+            # @expires_field must be a Time object (BSON date datatype)
+            @expires_field => expires_at(options) || nil }
+        else
+          raise ArgumentError, "Invalid value type: #{value.class}"
+        end
+      end
+
+      def to_binary(s)
+        s = s.dup if s.frozen? # HACK: BSON::Binary needs unfrozen string
+        ::BSON::Binary.new(s)
+      end
     end
   end
 end