moneta 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 667e187cf3e0d0ce7e721e07036f70e0b65f1b52818fc09eb87311872896ce95
-  data.tar.gz: 7e9063dfa4ea6f1bfbe4bee54821c75e9a82d0f54f3f820c6e396fafeeba006a
+  metadata.gz: f7e5d10abbde662c609b4dad3e16871e4cb3c8571777dae41e07c9a9501d3afe
+  data.tar.gz: 6752b78a6a0aa701695d896e207250783d88a7835c5293f3e1a50e059b45259e
 SHA512:
-  metadata.gz: 5e2d3880c0d3fed1ee66cb57f5ebba13a83dd7e4447ec1e99e601a85ff9bc454cf7bf4e9d62c8672324faddf9f396e4488c08400a08e1c1dd0181056655142b5
-  data.tar.gz: 4be30ddd9249b7222c2354984815efde88ca3c8cfe65db26c13df1585bd80425cc8f55f68b869d07016183be29b4ae8495a3408fe3b67e0f27d21ef2f6de6a83
+  metadata.gz: 63e33a297973f0b5ee15b62d4322534d871e55ae97249865d7cce7103fee1e9cce398190ee102b72ce1179b6ac044587c544ba3c6d07a6ce0906012c717fe6fc
+  data.tar.gz: dd53487e54f56c8faccef18d122e1f28300fd89d5e436c338c5c6688454bf79a0025b1b05d3e3621260e0fbc134e65564239afcdc22ce487a88de61a732cedf0

data/CHANGES

@@ -1,3 +1,8 @@
+1.4.1
+
+* Adapters::Mongo - deprecate :db option, document :database option (#194)
+* Adapters::Mongo - add retries to increment operation
+
 1.4.0
 
 * Adapters::Mongo - drop support for moped gem (#182)

data/Gemfile

@@ -99,7 +99,7 @@ end
 
 # Used for generating the feature matrix
 group :doc, optional: true do
-  gem 'kramdown', '~> 1.17.0'
+  gem 'kramdown', '~> 2.3.0'
   gem 'yard', '~> 0.9.20'
 end
 

data/lib/moneta/adapters/mongo.rb

@@ -29,7 +29,7 @@ module Moneta
       # @option options [String] :user Username used to authenticate
       # @option options [String] :password Password used to authenticate
       # @option options [Integer] :port (MongoDB default port) MongoDB server port
-      # @option options [String] :db ('moneta') MongoDB database
+      # @option options [String] :database ('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
@@ -43,8 +43,12 @@ module Moneta
         @type_field = options.delete(:type_field) || 'type'
 
         collection = options.delete(:collection) || 'moneta'
-        db = options.delete(:db) || 'moneta'
-        @backend = options[:backend] ||
+
+        if options.key?(:db)
+          warn('Moneta::Adapters::Mongo - the :db option is deprecated and will be removed in a future version. Use :database instead')
+        end
+        database = options.delete(:database) || options.delete(:db) || 'moneta'
+        backend = options[:backend] ||
           begin
             host = options.delete(:host) || '127.0.0.1'
             port = options.delete(:port) || DEFAULT_PORT
@@ -53,7 +57,8 @@ module Moneta
             end
             ::Mongo::Client.new(["#{host}:#{port}"], options)
           end
-        @backend.use(db)
+
+        @backend = backend.use(database)
         @collection = @backend[collection]
         if @backend.command(buildinfo: 1).documents.first['version'] >= '2.2'
           @collection.indexes.create_one({ @expires_field => 1 }, expire_after: 0)
@@ -111,6 +116,9 @@ module Moneta
                                         { :$inc => { @value_field => amount } },
                                         return_document: :after,
                                         upsert: true)[@value_field]
+      rescue ::Mongo::Error::OperationFailure
+        tries ||= 0
+        (tries += 1) < 3 ? retry : raise
       end
 
       # (see Proxy#create)

data/lib/moneta/version.rb

@@ -1,5 +1,5 @@
 module Moneta
   # Moneta version number
   # @api public
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.4.1'.freeze
 end

data/spec/helper.rb

@@ -10,7 +10,6 @@ require 'rantly'
 require 'rantly/rspec_extensions'
 # rantly/shrinks
 require 'timecop'
-require_relative 'support/mongo_helper'
 
 class MonetaParallelFormatter < RSpec::Core::Formatters::BaseTextFormatter
   def start(*args)
@@ -366,7 +365,6 @@ RSpec.configure do |config|
 
   config.extend MonetaHelpers::ClassMethods
   config.include MonetaHelpers::InstanceMethods
-  config.include MongoHelper, adapter: :Mongo
 end
 
 # FIXME: Get rid of this once raise_error expectations no longer generate

data/spec/moneta/adapters/mongo/adapter_mongo_spec.rb

@@ -2,11 +2,13 @@ describe 'adapter_mongo', adapter: :Mongo do
   let(:t_res) { 0.125 }
   let(:min_ttl) { t_res }
 
+  let(:database) { File.basename(__FILE__, '.rb') }
+
   moneta_build do
-    Moneta::Adapters::Mongo.new(mongo_config(
-      db: File.basename(__FILE__, '.rb'),
+    Moneta::Adapters::Mongo.new(
+      database: database,
       collection: 'adapter_mongo'
-    ))
+    )
   end
 
   moneta_specs ADAPTER_SPECS.with_each_key.with_native_expires.simplevalues_only
@@ -24,4 +26,16 @@ describe 'adapter_mongo', adapter: :Mongo do
     i.should be > 0 # Indicates that it took at least one sleep to expire
     query.count.should == 0
   end
+
+  it 'uses the database specified via the :database option' do
+    expect(store.backend.database.name).to eq database
+  end
+
+  it 'uses the database specified via the :db option' do
+    store = Moneta::Adapters::Mongo.new(
+      db: database,
+      collection: 'adapter_mongo'
+    )
+    expect(store.backend.database.name).to eq database
+  end
 end

data/spec/moneta/adapters/mongo/adapter_mongo_with_default_expires_spec.rb

@@ -3,11 +3,11 @@ describe 'adapter_mongo_with_default_expires', isolate: true, adapter: :Mongo do
   let(:min_ttl) { t_res }
 
   moneta_build do
-    Moneta::Adapters::Mongo.new(mongo_config(
-    	db: File.basename(__FILE__, '.rb'),
+    Moneta::Adapters::Mongo.new(
+    	database: File.basename(__FILE__, '.rb'),
       collection: 'adapter_mongo_with_default_expires',
       expires: min_ttl
-    ))
+    )
   end
 
   moneta_specs ADAPTER_SPECS.with_each_key.with_expires.with_default_expires.simplevalues_only

data/spec/moneta/adapters/mongo/standard_mongo_spec.rb

@@ -2,6 +2,6 @@ describe 'standard_mongo', adapter: :Mongo do
   let(:t_res) { 0.125 }
   let(:min_ttl) { t_res }
 
-  moneta_store :Mongo, MongoHelper::mongo_config(db: File.basename(__FILE__, '.rb'), collection: 'standard_mongo')
+  moneta_store :Mongo, {database: File.basename(__FILE__, '.rb'), collection: 'standard_mongo'}
   moneta_specs STANDARD_SPECS.with_native_expires.with_each_key
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moneta
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Daniel Mendler
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-23 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel_tests
@@ -426,7 +426,6 @@ files:
 - spec/rack/moneta_store_spec.rb
 - spec/rack/session_moneta_spec.rb
 - spec/restserver.rb
-- spec/support/mongo_helper.rb
 - test/action_dispatch/fixtures/session_autoload_test/foo.rb
 - test/action_dispatch/session_moneta_store_test.rb
 homepage: https://github.com/moneta-rb/moneta
@@ -434,9 +433,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/moneta-rb/moneta/issues
-  changelog_uri: https://github.com/moneta-rb/moneta/blob/v1.4.0/CHANGES
-  documentation_uri: https://www.rubydoc.info/gems/moneta/1.4.0
-  source_code_uri: https://github.com/moneta-rb/moneta/tree/v1.4.0
+  changelog_uri: https://github.com/moneta-rb/moneta/blob/v1.4.1/CHANGES
+  documentation_uri: https://www.rubydoc.info/gems/moneta/1.4.1
+  source_code_uri: https://github.com/moneta-rb/moneta/tree/v1.4.1
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -673,6 +672,5 @@ test_files:
 - spec/rack/moneta_store_spec.rb
 - spec/rack/session_moneta_spec.rb
 - spec/restserver.rb
-- spec/support/mongo_helper.rb
 - test/action_dispatch/fixtures/session_autoload_test/foo.rb
 - test/action_dispatch/session_moneta_store_test.rb

data/spec/support/mongo_helper.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module MongoHelper
-  def mongo_config(opts = {})
-    prefix = ENV.fetch('TEST_ENV_NUMBER', '')
-    opts.merge(collection: "#{prefix}#{opts[:collection]}")
-  end
-
-  def self.mongo_config(args)
-    Class.include(MongoHelper).new.mongo_config(args)
-  end
-end