moneta 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 642e4643f1753537b4510ce0a47cbdbdfb65ebf2
-  data.tar.gz: 807acd8640b3ae0a78ae725062a6412a2e82b188
+  metadata.gz: 1ffd0417515470f90fc239f70af5f5f5c1458343
+  data.tar.gz: 1d20edcf756595fbf503741b41f4cc4ca4d6243a
 SHA512:
-  metadata.gz: 043562b273cffcb3d165412bc9fb20524a88f05b7c39e3dc26e1982a3ad3f63c8583564ceeb169b553bd33979b821183f40edd1a5ce66a9840533655e84445ea
-  data.tar.gz: 8d47b90c541c2917a4a05aa5ee896140052d94119aabdea1ba87d88865ed531d11488b8fbcf2efef11f88d5b805f6e5024be8ea58ce05233a0d25f11e0a0ff55
+  metadata.gz: 5ab6f8072a7800d0c1313a7e2bb17988b8f1f301dc48d6ba8b7749c13e00effad24beca9ac711d173c837fc2d392e654c12b5d1e65fc977360329b958c2cd598
+  data.tar.gz: 7a58e5765b1eca76c1d65863732c74b4d46d88fe1eb49dd67b482a028b071ef13ce8a0607509b9173d67fbafe7aba437152b4de32e31c7d3f51a556d43bb7267

data/.travis.yml

@@ -5,14 +5,19 @@ rvm:
   - 1.9.3
   - jruby-19mode
   - rbx-19mode
+services:
+  - riak
+  - couchdb
+  - redis
+  - cassandra
+  - memcached
+  - mongodb
 before_install:
+  - gem install bundler -v '~> 1.10'
   #- script/install-kyotocabinet
   - 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"'
+cache: bundler
 before_script:
   - mysql -e 'create database moneta;'
   - mysql -e 'create database moneta_activerecord1;'

data/CHANGES

@@ -1,3 +1,18 @@
+0.8.1
+
+* Adapters::TokyoTyrant - more consistent error handling
+* Adapters::MongoMoped - support for moped gem v2.0
+* Adapters::MongoOfficial - support for mongo gem versions 2-4
+* Adapters::File - fix a bug in #load (#74)
+* Adapters::LRUHash - allow to disable the limits by passing nil for max_size, max_count
+* Transformer - don't use OpenSSL::Digest::Digest namespace
+* Adapters::Sequel - fix issue with unknown "blob" type
+* Rack::Cache - fix deprecated require paths
+* Adapters::MemcachedNative - properly close connections
+* Transformer - support bson gem versions 2-4
+* Transformer - switch to rbzip2 gem for bzip2 support
+* Adapters::MemcachedDalli - #create returns a boolean
+
 0.8.0
 
 * Rename Moneta::Adapters::Mongo to Moneta::Adapters::MongoOfficial

data/CONTRIBUTORS

@@ -1,6 +1,9 @@
 Adrian Madrid <aemadrid@gmail.com>
+Alastair Pharo <asppsa@gmail.com>
 Alejandro Crosa <acrosa@sharing.local>
+Alessio Signorini <alessio@signorini.us>
 Anthony Eden <anthonyeden@gmail.com>
+Atoxhybrid <atoxhybrid@gmail.com>
 AtoxIO <atoxhybrid@gmail.com>
 Benjamin Yu <benjaminlyu@gmail.com>
 Ben Schwarz <ben.schwarz@gmail.com>
@@ -12,9 +15,12 @@ Hampton Catlin <hcatlin@gmail.com>
 Hannes Georg <hannes.georg@googlemail.com>
 Hendrik Beskow <hendrik-github@beskow.de>
 Jari Bakken <jari.bakken@gmail.com>
+Jay Mitchell <jaybmitchell@gmail.com>
 Jeremy Voorhis <jvoorhis@gmail.com>
 Jon Crosby <jon@joncrosby.me>
 lakshan <lakshan@web2media.net>
+Mal McKay <mal.mckay@gmail.com>
+Nathaniel Bibler <git@nathanielbibler.com>
 Piotr Murach <pmurach@gmail.com>
 Potapov Sergey <blake131313@gmail.com>
 Quin Hoxie <quin@aboutus.org>

data/Gemfile

@@ -2,15 +2,15 @@ source 'https://rubygems.org'
 gemspec
 
 # Testing
-gem 'rspec'
-gem 'rspec-retry'
+gem 'rspec', '~> 2.0'
+gem 'rspec-retry', '0.4.4' # 0.4.5 does not work with rspec 2
 
 # Serializer used by Transformer
 gem 'tnetstring'
 gem 'bencode'
 gem 'multi_json'
 gem 'bson_ext', platforms: :ruby
-gem 'bson', platforms: :jruby
+gem 'bson', '>= 2.0.0'
 gem 'ox', platforms: :ruby
 gem 'msgpack', platforms: :ruby
 gem 'msgpack-jruby', platforms: :jruby
@@ -18,9 +18,7 @@ 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
-end
+gem 'rbzip2'
 gem 'lz4-ruby', platforms: :ruby
 gem 'ruby-lzma', platforms: :ruby
 gem 'lzoruby', platforms: :ruby
@@ -36,20 +34,29 @@ gem 'daybreak'
 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', '>= 3.2.11'
+if RUBY_VERSION < '2.0'
+  gem 'fog', '~> 1.12'
+  gem 'mime-types', '~> 2.0'
+  gem 'addressable', '~> 2.4.0'
+else
+  gem 'fog', '>= 1.11.1'
+  gem 'mime-types'
+end
+gem 'activerecord', '~> 4.0.0'
 gem 'redis'
-gem 'mongo'
-gem 'moped'
+gem 'mongo', '~> 2.1.0'
+gem 'moped', '>= 2.0.0'
 gem 'sequel'
 gem 'dalli'
 gem 'riak-client'
 gem 'cassandra'
+if RUBY_VERSION < '2.0'
+  gem 'json', '~> 1.0'
+end
 gem 'tokyotyrant'
 #gem 'ruby-tokyotyrant', platforms: :ruby
 #gem 'hbaserb'
-#gem 'localmemcache'
+gem 'localmemcache'
 gem 'tdb', platforms: :ruby
 gem 'leveldb-ruby', platforms: :ruby
 gem 'lmdb', platforms: :mri
@@ -66,7 +73,7 @@ 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 'mysql2', '~> 0.3.12b5', platforms: :ruby
 # gdbm for jruby needs ffi
 gem 'ffi', platforms: :jruby
 gem 'gdbm', platforms: :jruby
@@ -76,5 +83,5 @@ gem 'rack'
 gem 'rack-cache'
 
 # Rails integration testing
-gem 'actionpack', '>= 3.2.11'
+gem 'actionpack', '~> 4.0.0'
 gem 'minitest', '~> 4.7.4'

data/README.md

@@ -717,7 +717,7 @@ run lambda { |env|
 Add the session store in your application configuration `config/environments/*.rb`.
 
 ~~~ ruby
-require 'moneta'
+require 'action_dispatch/middleware/session/moneta_store'
 
 # Only by adapter name
 config.cache_store :moneta_store, store: :Memory
@@ -738,7 +738,7 @@ Add the cache store in your application configuration `config/environments/*.rb`
 Moneta cache store doesn't support matchers. If you need these features use a different server-specific implementation.
 
 ~~~ ruby
-require 'moneta'
+require 'active_support/cache/moneta_store'
 
 # Only by adapter name
 config.cache_store :moneta_store, store: :Memory

data/lib/moneta/adapters/file.rb

@@ -23,7 +23,7 @@ module Moneta
 
       # (see Proxy#load)
       def load(key, options = {})
-        ::File.read(store_path(key))
+        ::File.read(store_path(key), mode: 'rb')
       rescue Errno::ENOENT
       end
 
@@ -69,6 +69,7 @@ module Moneta
           content = f.read
           amount += Utils.to_int(content) unless content.empty?
           content = amount.to_s
+          f.binmode
           f.pos = 0
           f.write(content)
           f.truncate(content.bytesize)

data/lib/moneta/adapters/lruhash.rb

@@ -10,14 +10,17 @@ module Moneta
       include IncrementSupport
       include CreateSupport
 
+      DEFAULT_MAX_SIZE = 1024000
+      DEFAULT_MAX_COUNT = 10240
+
       # @param [Hash] options
-      # @option options [Integer] :max_size (1024000) Maximum byte size of all values
-      # @option options [Integer] :max_value (options[:max_size]) Maximum byte size of one value
-      # @option options [Integer] :max_count (10240) Maximum number of values
+      # @option options [Integer] :max_size (1024000) Maximum byte size of all values, nil disables the limit
+      # @option options [Integer] :max_value (options[:max_size]) Maximum byte size of one value, nil disables the limit
+      # @option options [Integer] :max_count (10240) Maximum number of values, nil disables the limit
       def initialize(options = {})
-        @max_size = options[:max_size] || 1024000
-        @max_count = options[:max_count] || 10240
-        @max_value = options[:max_value] || @max_size
+        @max_size = options.fetch(:max_size) { DEFAULT_MAX_SIZE }
+        @max_count = options.fetch(:max_count) { DEFAULT_MAX_COUNT }
+        @max_value = [options[:max_value], @max_size].compact.min
         clear
       end
 
@@ -36,19 +39,19 @@ module Moneta
 
       # (see Proxy#store)
       def store(key, value, options = {})
-        if value.bytesize > @max_value
+        if @max_value && value.bytesize > @max_value
           delete(key)
         else
           if entry = @entry[key]
-            @size -= entry.value.bytesize
+            @size -= entry.value.bytesize if @max_size
           else
             @entry[key] = entry = Entry.new
             entry.key = key
           end
           entry.value = value
-          @size += entry.value.bytesize
+          @size += entry.value.bytesize if @max_size
           entry.insert_after(@list)
-          delete(@list.prev.key) while @list.next != @list.prev && (@size > @max_size || @entry.size > @max_count)
+          delete(@list.prev.key) while @list.next != @list.prev && (@max_size && @size > @max_size || @max_count && @entry.size > @max_count)
         end
         value
       end
@@ -56,7 +59,7 @@ module Moneta
       # (see Proxy#delete)
       def delete(key, options = {})
         if entry = @entry.delete(key)
-          @size -= entry.value.bytesize
+          @size -= entry.value.bytesize if @max_size
           entry.unlink
           entry.value
         end

data/lib/moneta/adapters/memcached/dalli.rb

@@ -76,7 +76,7 @@ module Moneta
 
       # (see Defaults#create)
       def create(key, value, options = {})
-        @backend.add(key, value, expires_value(options) || nil, raw: true)
+        !!@backend.add(key, value, expires_value(options) || nil, raw: true)
       end
 
       # (see Proxy#close)

data/lib/moneta/adapters/memcached/native.rb

@@ -85,6 +85,12 @@ module Moneta
         @backend.flush
         self
       end
+
+      # (see Proxy#close)
+      def close
+        @backend.reset
+        nil
+      end
     end
   end
 end

data/lib/moneta/adapters/mongo/base.rb

@@ -1,3 +1,5 @@
+require 'bson'
+
 module Moneta
   module Adapters
     # @api private
@@ -30,7 +32,12 @@ module Moneta
         when 'Number'
           doc[@value_field]
         else
-          doc[@value_field].to_s
+          # In ruby_bson version 2 (and probably up), #to_s no longer returns the binary data
+          if doc[@value_field].is_a? ::BSON::Binary and defined? ::BSON::VERSION and ::BSON::VERSION[0].to_i >= 2
+            doc[@value_field].data
+          else
+            doc[@value_field].to_s
+          end
         end
       end
 
@@ -58,6 +65,14 @@ module Moneta
           raise ArgumentError, "Invalid value type: #{value.class}"
         end
       end
+
+      # BSON will use String#force_encoding to make the string 8-bit
+      # ASCII.  This could break unicode text so we should dup in this
+      # case, and it also fails with frozen strings.
+      def to_binary(s)
+        s = s.dup if s.frozen? || s.encoding != Encoding::ASCII_8BIT
+        ::BSON::Binary.new(s)
+      end
     end
   end
 end

data/lib/moneta/adapters/mongo/moped.rb

@@ -38,7 +38,7 @@ module Moneta
         @backend = options[:backend] ||
           begin
             host = options.delete(:host) || '127.0.0.1'
-            port = options.delete(:port) || 27017
+            port = options.delete(:port) || DEFAULT_PORT
             ::Moped::Session.new(["#{host}:#{port}"])
           end
         @backend.use(db)
@@ -99,15 +99,9 @@ module Moneta
 
       # (see Proxy#clear)
       def clear(options = {})
-        @collection.drop
+        @collection.find.remove_all
         self
       end
-
-      protected
-
-      def to_binary(s)
-        ::Moped::BSON::Binary.new(:generic, s)
-      end
     end
   end
 end

data/lib/moneta/adapters/mongo/official.rb

@@ -27,25 +27,25 @@ module Moneta
       # @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 [::Mongo::Client] :backend Use existing backend instance
       # @option options Other options passed to `Mongo::MongoClient#new`
       def initialize(options = {})
         super(options)
         collection = options.delete(:collection) || 'moneta'
         db = options.delete(:db) || 'moneta'
-        user = options.delete(:user)
-        password = options.delete(:password)
         @backend = options[:backend] ||
           begin
             host = options.delete(:host) || '127.0.0.1'
-            port = options.delete(:port) || ::Mongo::MongoClient::DEFAULT_PORT
-            ::Mongo::MongoClient.new(host, port, options)
+            port = options.delete(:port) || DEFAULT_PORT
+            options[:logger] ||= ::Logger.new(STDERR).tap do |logger|
+              logger.level = ::Logger::ERROR
+            end
+            ::Mongo::Client.new(["#{host}:#{port}"], options)
           end
-        db = @backend.db(db)
-        db.authenticate(user, password, true) if user && password
-        @collection = db.collection(collection)
-        if @backend.server_version >= '2.2'
-          @collection.ensure_index([[@expires_field, ::Mongo::ASCENDING]], expireAfterSeconds: 0)
+        @backend.use(db)
+        @collection = @backend[collection]
+        if @backend.command(buildinfo: 1).documents.first['version'] >= '2.2'
+          @collection.indexes.create_one({@expires_field => 1}, expire_after: 0)
         else
           warn 'Moneta::Adapters::Mongo - You are using MongoDB version < 2.2, expired documents will not be deleted'
         end
@@ -54,12 +54,12 @@ module Moneta
       # (see Proxy#load)
       def load(key, options = {})
         key = to_binary(key)
-        doc = @collection.find_one('_id' => key)
+        doc = @collection.find(_id: key).limit(1).first
         if doc && (!doc[@expires_field] || doc[@expires_field] >= Time.now)
           expires = expires_at(options, nil)
-          @collection.update({ '_id' => key },
-                             # @expires_field must be a Time object (BSON date datatype)
-                             { '$set' => { @expires_field => expires || nil } }) if expires != nil
+          # @expires_field must be a Time object (BSON date datatype)
+          @collection.update_one({ _id: key },
+                                 '$set' => { @expires_field => expires }) unless expires.nil?
           doc_to_value(doc)
         end
       end
@@ -67,40 +67,43 @@ module Moneta
       # (see Proxy#store)
       def store(key, value, options = {})
         key = to_binary(key)
-        @collection.update({ '_id' => key },
-                           value_to_doc(key, value, options),
-                           { upsert: true })
+        @collection.replace_one({ _id: key },
+                                value_to_doc(key, value, options),
+                                upsert: true)
         value
       end
 
       # (see Proxy#delete)
       def delete(key, options = {})
-        value = load(key, options)
-        @collection.remove('_id' => to_binary(key)) if value
-        value
+        key = to_binary(key)
+        if doc = @collection.find(_id: key).find_one_and_delete and
+          !doc[@expires_field] || doc[@expires_field] >= Time.now
+        then
+          doc_to_value(doc)
+        end
       end
 
       # (see Proxy#increment)
       def increment(key, amount = 1, options = {})
-        @collection.find_and_modify(query: { '_id' => to_binary(key) },
-                                    update: { '$inc' => { @value_field => amount } },
-                                    new: true,
-                                    upsert: true)[@value_field]
+        @collection.find_one_and_update({ _id: to_binary(key) },
+                                        { '$inc' => { @value_field => amount } },
+                                        :return_document => :after,
+                                        :upsert => true)[@value_field]
       end
 
       # (see Proxy#create)
       def create(key, value, options = {})
         key = to_binary(key)
-        @collection.insert(value_to_doc(key, value, options))
+        @collection.insert_one(value_to_doc(key, value, options))
         true
-      rescue ::Mongo::OperationFailure => ex
-        raise if ex.error_code != 11000 # duplicate key error
+      rescue ::Mongo::Error::OperationFailure => ex
+        raise unless ex.message =~ /^E11000 / # duplicate key error
         false
       end
 
       # (see Proxy#clear)
       def clear(options = {})
-        @collection.remove
+        @collection.delete_many
         self
       end
 
@@ -109,13 +112,6 @@ module Moneta
         @backend.close
         nil
       end
-
-      protected
-
-      def to_binary(s)
-        s = s.dup if s.frozen? # HACK: BSON::Binary needs unfrozen string
-        ::BSON::Binary.new(s)
-      end
     end
   end
 end