moneta 0.7.10 → 0.7.11

data/.travis.yml

@@ -4,8 +4,8 @@ rvm:
   - 1.9.3
   - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
+#  - rbx-18mode
+#  - rbx-19mode
 before_install:
   - script/kill-travis
   - script/install-kyotocabinet

data/CHANGES

@@ -1,3 +1,11 @@
+0.7.11
+
+* Logger: Add option :file
+* Adapters::TokyoTyrant supports both native (ruby-tokyotyrant) and pure-ruby tokyotyrant gems
+* Adapters::Couch use Faraday directly instead of buggy CouchRest
+* Adapters::RestClient use Faraday
+* Transformer: add quoted printable encoding (:qp)
+
 0.7.10
 
 * Adapters::TokyoTyrant added

data/Gemfile

@@ -25,6 +25,7 @@ gem 'snappy', :platforms => :ruby
 gem 'qlzruby', :platforms => :ruby
 
 # Backends
+gem 'faraday'
 gem 'daybreak'
 gem 'dm-core'
 gem 'dm-migrations'
@@ -33,18 +34,22 @@ gem 'fog'
 gem 'activerecord', '>= 3.2.9'
 gem 'redis'
 gem 'mongo'
-gem 'couchrest'
 gem 'sequel'
 gem 'dalli'
 gem 'riak-client'
 gem 'cassandra'
 gem 'tokyotyrant'
+#gem 'ruby-tokyotyrant', :platforms => :ruby
 #gem 'hbaserb'
 #gem 'localmemcache'
 gem 'tdb', :platforms => :ruby
 gem 'leveldb-ruby', :platforms => :ruby
 gem 'tokyocabinet', :platforms => :ruby
-gem 'kyotocabinet-ruby', :platforms => :ruby, :github => 'minad/kyotocabinet-ruby'
+unless 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'
+end
 gem 'memcached', :platforms => :ruby
 gem 'jruby-memcached', :platforms => :jruby
 gem 'sqlite3', :platforms => :ruby

data/README.md

@@ -148,7 +148,7 @@ __NOTE:__ <a name="backend-matrix">The backend matrix</a> is much more readable
 
 <tr><td>PStore</td><td>-</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:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://ruby-doc.org/stdlib/libdoc/pstore/rdoc/PStore.html">PStore</a> store</td></tr>
 
-<tr><td>TokyoTyrant</td><td>tokoytyrant</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:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://fallabs.com/tokyotyrant/">TokyoTyrant</a> database</td></tr>
+<tr><td>TokyoTyrant</td><td>tokyotyrant or ruby-tokyotyrant</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:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://fallabs.com/tokyotyrant/">TokyoTyrant</a> database</td></tr>
 
 <tr><td>YAML</td><td>-</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:#F44">✗</td><td style="text-align:center;background:#5F5">✓</td><td><a href="http://www.ruby-doc.org/stdlib/libdoc/yaml/rdoc/YAML/Store.html">YAML</a> store</td></tr>
 
@@ -164,22 +164,22 @@ __NOTE:__ <a name="backend-matrix">The backend matrix</a> is much more readable
 
 <tr><td>TDB</td><td>tdb</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><a href="http://tdb.samba.org/">TDB</a> database</td></tr>
 
-<tr><td>KyotoCabinet</td><td>tokoycabinet</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><a href="http://fallabs.com/kyotocabinet/">KyotoCabinet</a> database</td></tr>
+<tr><td>KyotoCabinet</td><td>kyotocabinet</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><a href="http://fallabs.com/kyotocabinet/">KyotoCabinet</a> database</td></tr>
 
-<tr><td>TokyoCabinet</td><td>tokoycabinet</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><a href="http://fallabs.com/tokyocabinet/">TokyoCabinet</a> database</td></tr>
+<tr><td>TokyoCabinet</td><td>tokyocabinet</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><a href="http://fallabs.com/tokyocabinet/">TokyoCabinet</a> database</td></tr>
 
 <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>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>couchrest</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://couchdb.apache.org/">CouchDB</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>HBase</td><td>hbase</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://hbase.apache.org/">HBase</a> database</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>
 
 <tr><th colspan="2">Non persistent stores</th><th colspan="7"></th></tr>
@@ -200,7 +200,7 @@ __NOTE:__ <a name="backend-matrix">The backend matrix</a> is much more readable
 
 <tr><td>Client</td><td>-</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>[5]</sup></td><td style="text-align:center;background:#55F">?<sup>[5]</sup></td><td style="text-align:center;background:#55F">?<sup>[5]</sup></td><td style="text-align:center;background:#55F">?<sup>[5]</sup></td><td>Moneta client adapter</td></tr>
 
-<tr><td>RestClient</td><td>-</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>[5]</sup></td><td>Moneta REST client adapter</td></tr>
+<tr><td>RestClient</td><td>faraday</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>[5]</sup></td><td>Moneta REST client adapter</td></tr>
 
 </table>
 

data/Rakefile

@@ -18,53 +18,60 @@ end
 task :test do
   specs = Dir['spec/*/*_spec.rb'].sort
 
+  # Shuffle specs to ensure equal distribution over the test groups
+  # We have to shuffle with the same seed every time because rake is started
+  # multiple times!
+  old_seed = srand(42)
+  specs.shuffle!
+  srand(old_seed)
+
+  group = ENV['TEST_GROUP'] || '1/1'
+
   # 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.
   #
-  # * Cassandra show spurious failures
-  #
   # * action_dispatch cannot be required for an unknown reason
-  if ENV['TEST_GROUP']
-    # Shuffle specs to ensure equal distribution over the test groups
-    # We have to shuffle with the same seed every time because rake is started
-    # multiple times!
-    old_seed = srand(42)
-    specs.shuffle!
-    srand(old_seed)
-
-    unstable = specs.select {|s| s =~ /quicklz|action_dispatch/ }
-    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|tokyotyrant|couch|cassandra/ }
-  serial = specs - parallel
+  unstable = specs.select {|s| s =~ /quicklz|action_dispatch/ }
+  specs -= unstable
 
-  if ENV['TEST_GROUP'] =~ /^(\d+)\/(\d+)$/
+  if 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]
+      specs = specs[(n-1)*(specs.size/max)..-1]
     else
-      parallel = parallel[(n-1)*(parallel.size/max), parallel.size/max]
-      serial = serial[(n-1)*(serial.size/max), serial.size/max]
+      specs = specs[(n-1)*(specs.size/max), specs.size/max]
     end
-  elsif ENV['TEST_GROUP'] == 'unstable'
-    parallel.clear
-    serial = unstable
+  elsif group == 'unstable'
+    specs = unstable
+  else
+    puts "Invalid test group #{group}"
+    exit 1
   end
 
+  # Memcached and Redis specs cannot be used in parallel
+  # because of flushing and lacking namespaces
+  parallel = []
+  %w(memcached redis client shared riak tokyotyrant couch cassandra).each do |name|
+    serial = specs.select { |s| s.include?(name) }
+    unless serial.empty?
+      specs -= serial
+      parallel << serial
+    end
+  end
+  parallel += specs.map {|s| [s] }
+
   threads = []
   failed = false
-  parallel.each do |spec|
+  parallel.each do |serial|
     threads << Thread.new do
       begin
-        failed = true unless rspec(spec)
+        serial.each do |spec|
+          failed = true unless rspec(spec)
+        end
       ensure
         threads.delete Thread.current
       end
@@ -73,9 +80,6 @@ task :test do
     sleep 0.1 while threads.size >= 10
   end
   sleep 0.1 until threads.empty?
-  serial.each do |spec|
-    failed = true unless rspec(spec)
-  end
   if failed
     fail "\e[31m########## MONETA TESTSUITE FAILED ##########\e[0m"
   else

data/lib/moneta/adapters/cassandra.rb

@@ -74,6 +74,10 @@ module Moneta
       def store(key, value, options = {})
         @backend.insert(@cf, key, {'value' => value}, :ttl => expires_value(options) || nil)
         value
+      rescue
+        # FIXME: We get spurious cassandra transport exceptions
+        tries ||= 0
+        (tries += 1) < 10 ? retry : raise
       end
 
       # (see Proxy#delete)

data/lib/moneta/adapters/couch.rb

@@ -1,4 +1,5 @@
-require 'couchrest'
+require 'faraday'
+require 'multi_json'
 
 module Moneta
   module Adapters
@@ -10,56 +11,67 @@ module Moneta
       attr_reader :backend
 
       # @param [Hash] options
-      # @option options [String] :host ('http://127.0.0.1:5984') Couch host
+      # @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 [::CouchRest] :backend Use existing backend instance
+      # @option options [Faraday connection] :backend Use existing backend instance
       def initialize(options = {})
-        @backend = options[:backend] || CouchRest.new(options[:host] || '127.0.0.1:5984')
-        @db = @backend.database!(options[:db] || 'moneta')
+        url = "http://#{options[:host] || '127.0.0.1'}:#{options[:port] || 5984}/#{options[:db] || 'moneta'}"
+        @backend = options[:backend] || ::Faraday.new(:url => url)
+        create_db
       end
 
       # (see Proxy#key?)
       def key?(key, options = {})
-        @db.get(key) != nil
-      rescue ::RestClient::ResourceNotFound
-        false
+        @backend.head(key).status == 200
       end
 
       # (see Proxy#load)
       def load(key, options = {})
-        @db.get(key)['value']
-      rescue ::RestClient::ResourceNotFound
-        nil
+        response = @backend.get(key)
+        response.status == 200 ? MultiJson.load(response.body)['value'] : nil
       end
 
       # (see Proxy#store)
       def store(key, value, options = {})
-        doc = {'_id' => key, 'value' => value}
-        begin
-          doc['_rev'] = @db.get(key)['_rev']
-        rescue ::RestClient::ResourceNotFound
-        end
-        @db.save_doc(doc)
+        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')
+        raise "HTTP error #{response.status}" unless response.status == 201
         value
-      rescue ::RestClient::RequestFailed
+      rescue
         tries ||= 0
         (tries += 1) < 10 ? retry : raise
       end
 
       # (see Proxy#delete)
       def delete(key, options = {})
-        value = @db.get(key)
-        @db.delete_doc('_id' => value['_id'], '_rev' => value['_rev'])
-        value['value']
-      rescue ::RestClient::ResourceNotFound
-        nil
+        response = @backend.get(key)
+        if response.status == 200
+          value = MultiJson.load(response.body)['value']
+          response = @backend.delete("#{key}?rev=#{response['etag'][1..-2]}")
+          raise "HTTP error #{response.status}" unless response.status == 200
+          value
+        end
+      rescue
+        tries ||= 0
+        (tries += 1) < 10 ? retry : raise
       end
 
       # (see Proxy#clear)
       def clear(options = {})
-        @db.recreate!
+        @backend.delete ''
+        create_db
         self
       end
+
+      private
+
+      def create_db
+        response = @backend.put '', ''
+        raise "HTTP error #{response.status}" unless response.status == 201 || response.status == 412
+      end
     end
   end
 end

data/lib/moneta/adapters/hbase.rb

@@ -9,6 +9,11 @@ module Moneta
 
       attr_reader :backend
 
+      # TODO: Add create support using checkAndPut if added to thrift api
+      # https://issues.apache.org/jira/browse/HBASE-3307
+      # https://github.com/bmuller/hbaserb/issues/2
+      supports :increment
+
       # @param [Hash] options
       # @option options [String] :host ('127.0.0.1') Server host name
       # @option options [Integer] :port (9090) Server port

data/lib/moneta/adapters/restclient.rb

@@ -1,4 +1,4 @@
-require 'net/http'
+require 'faraday'
 
 module Moneta
   module Adapters
@@ -11,49 +11,41 @@ module Moneta
 
       # @param [Hash] options
       # @option options [String] :url URL
-      # @option options [::Net::HTTP] :backend Use existing backend instance
+      # @option options [Faraday connection] :backend Use existing backend instance
       def initialize(options = {})
         raise ArgumentError, 'Option :url is required' unless url = options[:url]
-        url = URI(url)
-        @path = url.path
-        @backend = options[:backend] || ::Net::HTTP.start(url.host, url.port)
+        @backend = options[:backend] || ::Faraday.new(:url => url)
       end
 
       # (see Proxy#key?)
       def key?(key, options = {})
-        response = @backend.request_head(@path + key)
-        response.code == '200'
+        @backend.head(key).status == 200
       end
 
       # (see Proxy#load)
       def load(key, options = {})
-        response = @backend.request_get(@path + key)
-        response.code == '200' ? response.body : nil
+        response = @backend.get(key)
+        response.status == 200 ? response.body : nil
       end
 
       # (see Proxy#store)
       def store(key, value, options = {})
-        response = @backend.request_post(@path + key, value)
-        raise "HTTP error #{response.code}" unless response.code == '200'
+        response = @backend.post(key, value)
+        raise "HTTP error #{response.status}" unless response.status == 200
         value
       end
 
       # (see Proxy#delete)
       def delete(key, options = {})
-        response = @backend.request(::Net::HTTP::Delete.new(@path + key))
-        response.code == '200' ? response.body : nil
+        response = @backend.delete(key)
+        response.status == 200 ? response.body : nil
       end
 
       # (see Proxy#clear)
       def clear(options = {})
-        @backend.request(::Net::HTTP::Delete.new(@path))
+        @backend.delete ''
         self
       end
-
-      def close
-        @backend.finish
-        nil
-      end
     end
   end
 end

data/lib/moneta/adapters/tokyotyrant.rb

@@ -1,4 +1,10 @@
-require 'tokyotyrant'
+begin
+  # Native client
+  require 'tokyo_tyrant'
+rescue LoadError
+  # Ruby client
+  require 'tokyotyrant'
+end
 
 module Moneta
   module Adapters
@@ -6,6 +12,7 @@ module Moneta
     # @api public
     class TokyoTyrant
       include Defaults
+      include HashAdapter
 
       supports :create, :increment
       attr_reader :backend
@@ -15,24 +22,25 @@ module Moneta
       # @option options [Integer] :port (1978) Server port
       # @option options [::TokyoTyrant::RDB] :backend Use existing backend instance
       def initialize(options = {})
+        options[:host] ||= '127.0.0.1'
+        options[:port] ||= 1978
         if options[:backend]
           @backend = options[:backend]
-        else
+        elsif defined?(::TokyoTyrant::RDB)
+          # Use ruby client
           @backend = ::TokyoTyrant::RDB.new
-          @backend.open(options[:host] || '127.0.0.1',
-                        options[:port] || 1978) or raise @backend.errmsg(@backend.ecode)
+          @backend.open(options[:host], options[:port]) or raise @backend.errmsg(@backend.ecode)
+        else
+          # Use native client
+          @backend = ::TokyoTyrant::DB.new(options[:host], options[:port])
         end
+        @native = @backend.class.name != 'TokyoTyrant::RDB'
         probe = '__tokyotyrant_endianness_probe'
         @backend.delete(probe)
         @backend.addint(probe, 1)
         @pack = @backend.delete(probe) == [1].pack('l>') ? 'l>' : 'l<'
       end
 
-      # (see Proxy#key?)
-      def key?(key, options = {})
-        @backend.has_key?(key)
-      end
-
       # (see Proxy#load)
       def load(key, options = {})
         value = @backend[key]
@@ -61,13 +69,16 @@ module Moneta
 
       # (see Proxy#create)
       def create(key, value, options = {})
-        @backend.putkeep(key, pack(value))
-      end
-
-      # (see Proxy#clear)
-      def clear(options = {})
-        @backend.clear
-        self
+        if @native
+          begin
+            # Native client throws an exception
+            @backend.putkeep(key, pack(value))
+          rescue TokyoTyrantError
+            false
+          end
+        else
+          @backend.putkeep(key, pack(value))
+        end
       end
 
       # (see Proxy#close)

data/lib/moneta/logger.rb

@@ -7,13 +7,23 @@ module Moneta
     class Format
       def initialize(options)
         @prefix = options[:prefix] || 'Moneta '
-        @out = options[:out] || STDOUT
+        if options[:file]
+          @close = true
+          @out = File.open(options[:file], 'a')
+        else
+          @close = options[:close]
+          @out = options[:out] || STDOUT
+        end
       end
 
-      def call(entry)
+      def log(entry)
         @out.write(format(entry))
       end
 
+      def close
+        @out.close if @close
+      end
+
       protected
 
       def format(entry)
@@ -35,22 +45,29 @@ module Moneta
 
     # @param [Moneta store] adapter The underlying store
     # @param [Hash] options
-    # @option options [Object] :logger (Moneta::Logger::Format) Callable logger object
-    # @option options [String] :logprefix ('Moneta ') Prefix string
-    # @option options [IO] :logout (STDOUT) Output
+    # @option options [Object] :logger (Moneta::Logger::Format) Logger object
+    # @option options [String] :prefix ('Moneta ') Prefix string
+    # @option options [File] :file Log file
+    # @option options [IO] :out (STDOUT) Output
     def initialize(adapter, options = {})
       super
       @logger = options[:logger] || Format.new(options)
     end
 
+    def close
+      super
+      @logger.close
+      nil
+    end
+
     protected
 
     def wrap(method, *args)
       ret = yield
-      @logger.call(:method => method, :args => args, :return => (method == :clear ? 'self' : ret))
+      @logger.log(:method => method, :args => args, :return => (method == :clear ? 'self' : ret))
       ret
     rescue Exception => error
-      @logger.call(:method => method, :args => args, :error => error)
+      @logger.log(:method => method, :args => args, :error => error)
       raise
     end
   end

data/lib/moneta/transformer/config.rb

@@ -18,6 +18,7 @@ module Moneta
       :snappy   => [ :compress,  '::Snappy.inflate(%s)',         '::Snappy.deflate(%s)',           'snappy'        ],
       :quicklz  => [ :compress,  '::QuickLZ.decompress(%s)',     '::QuickLZ.compress(%s)',         'qlzruby'       ],
       :zlib     => [ :compress,  '::Zlib::Inflate.inflate(%s)',  '::Zlib::Deflate.deflate(%s)',    'zlib'          ],
+      :qp       => [ :encode,    "%s.unpack('M').first",         "[%s].pack('M').strip"                            ],
       :uuencode => [ :encode,    "%s.unpack('u').first",         "[%s].pack('u').strip"                            ],
       :base64   => RUBY_VERSION > '1.9' ?
                    [ :encode,    "%s.unpack('m0').first",        "[%s].pack('m0')"                                 ] :

data/lib/moneta/version.rb

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

data/lib/rack/moneta_rest.rb

@@ -28,7 +28,7 @@ module Rack
     end
 
     def call(env)
-      key = env['PATH_INFO'][1..-1]
+      key = env['PATH_INFO'][1..-1].to_s
       case env['REQUEST_METHOD']
       when 'HEAD'
         if key.empty?

data/script/benchmarks

@@ -31,10 +31,9 @@ class MonetaBenchmarks
   FileUtils.mkpath(DIR)
 
   STORES = {
-    # SDBM is unstable, the rest is too slow
+    # SDBM is unstable, YAML is too slow
     # :SDBM => { :file => "#{DIR}/sdbm" },
     # :YAML => { :file => "#{DIR}/yaml" },
-    # :RestClient => { :url => 'http://localhost:8808/' },
     :ActiveRecord => { :connection => { :adapter  => 'sqlite3', :database => ':memory:' } },
     :Cassandra => {},
     :Client => {},
@@ -56,6 +55,7 @@ class MonetaBenchmarks
     :Mongo => {},
     :PStore => { :file => "#{DIR}/pstore" },
     :Redis => {},
+    :RestClient => { :url => 'http://localhost:8808/' },
     :Riak => {},
     :Sequel => { :db => 'sqlite:/' },
     :Sqlite => { :file => ':memory:' },
@@ -188,31 +188,31 @@ class MonetaBenchmarks
       end
     end
 
-    # parallel do
-    #   begin
-    #     require 'rack'
-    #     require 'webrick'
-    #     require 'rack/moneta_rest'
-
-    #     # Keep webrick quiet
-    #     ::WEBrick::HTTPServer.class_eval do
-    #       def access_log(config, req, res); end
-    #     end
-    #     ::WEBrick::BasicLog.class_eval do
-    #       def log(level, data); end
-    #     end
-
-    #     Rack::Server.start(:app => Rack::Builder.app do
-    #                          use Rack::Lint
-    #                          run Rack::MonetaRest.new(:store => :Memory)
-    #                        end,
-    #                        :environment => :none,
-    #                        :server => :webrick,
-    #                        :Port => 8808)
-    #   rescue Exception => ex
-    #     puts "\e[31mFailed to start Rack server - #{ex.message}\e[0m"
-    #   end
-    # end
+    parallel do
+      begin
+        require 'rack'
+        require 'webrick'
+        require 'rack/moneta_rest'
+
+        # Keep webrick quiet
+        ::WEBrick::HTTPServer.class_eval do
+          def access_log(config, req, res); end
+        end
+        ::WEBrick::BasicLog.class_eval do
+          def log(level, data); end
+        end
+
+        Rack::Server.start(:app => Rack::Builder.app do
+                             use Rack::Lint
+                             run Rack::MonetaRest.new(:store => :Memory)
+                           end,
+                           :environment => :none,
+                           :server => :webrick,
+                           :Port => 8808)
+      rescue Exception => ex
+        puts "\e[31mFailed to start Rack server - #{ex.message}\e[0m"
+      end
+    end
 
     sleep 1 # Wait for servers
   end