moneta 1.3.0 → 1.4.0

data/spec/helper.rb

@@ -286,23 +286,9 @@ module MonetaHelpers
       end
     end
 
-    # Used to test time-dependent specs (e.g. expiry at different positions
-    # within a second). Once close to the start of the second, and once close
-    # to the end.
-    def usecs
-      [1e4, 99e4].map(&:to_i)
-    end
-
-    def at_each_usec(&block)
-      usecs.each do |usec|
-        context "at #{usec} microseconds", isolate: true do
-          include_examples :at_usec, usec, &block
-        end
-      end
-    end
-
     def use_timecop
-      before{ @timecop = true }
+      before { @timecop = true }
+      after { Timecop.return }
     end
   end
 
@@ -351,6 +337,20 @@ module MonetaHelpers
         sleep seconds
       end
     end
+
+    def time_till_next(tick)
+      now = Time.now.to_f
+      tick - (now % tick)
+    end
+
+    # advance to the moment just after a tick. 1e-2 is needed in some
+    # environments (JRuby) to be able to pass the "not in earlier half" test.
+    def advance_next_tick
+      tick = t_res
+      offset = time_till_next(tick) + 1e-2
+      advance offset
+      raise "not in earlier half of tick" unless Time.now.to_f % tick < tick / 2.0
+    end
   end
 end
 
@@ -419,7 +419,6 @@ RSpec.shared_context :setup_moneta_store do |builder|
   end
 
   after do
-    RSpec::Mocks.space.proxy_for(@store).reset
     if @store
       @store.close.should == nil
       @store = nil
@@ -433,20 +432,4 @@ RSpec.shared_context :setup_moneta_store do |builder|
   end
 end
 
-RSpec.shared_examples :at_usec do |usec|
-  before do
-    now = Time.now
-    # 1000us is a rough guess at how many microseconds this code will take to run
-    if now.usec + 1000 > usec
-      advance(1 - 1e-6 * (now.usec - usec))
-    else
-      advance(1e-6 * (usec - now.usec))
-    end
-  end
-
-  after do
-    Timecop.return if @timecop
-  end
-end
-
 Dir['./spec/features/*.rb'].each{ |rb| require rb }

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

@@ -4,9 +4,24 @@ describe 'adapter_mongo', adapter: :Mongo do
 
   moneta_build do
     Moneta::Adapters::Mongo.new(mongo_config(
-      db: File.basename(__FILE__, '.rb'), collection: 'default'
+      db: File.basename(__FILE__, '.rb'),
+      collection: 'adapter_mongo'
     ))
   end
 
   moneta_specs ADAPTER_SPECS.with_each_key.with_native_expires.simplevalues_only
+
+  it 'automatically deletes expired document' do
+    store.store('key', 'val', expires: 5)
+
+    i = 0
+    query = store.instance_variable_get(:@collection).find(_id: ::BSON::Binary.new('key'))
+    while i < 70 && query.first
+      i += 1
+      sleep 1 # Mongo needs up to 60 seconds
+    end
+
+    i.should be > 0 # Indicates that it took at least one sleep to expire
+    query.count.should == 0
+  end
 end

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

@@ -5,7 +5,7 @@ describe 'adapter_mongo_with_default_expires', isolate: true, adapter: :Mongo do
   moneta_build do
     Moneta::Adapters::Mongo.new(mongo_config(
     	db: File.basename(__FILE__, '.rb'),
-      collection: 'with_default_expires',
+      collection: 'adapter_mongo_with_default_expires',
       expires: min_ttl
     ))
   end

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: 'default')
+  moneta_store :Mongo, MongoHelper::mongo_config(db: File.basename(__FILE__, '.rb'), collection: 'standard_mongo')
   moneta_specs STANDARD_SPECS.with_native_expires.with_each_key
 end

data/spec/moneta/adapters/sequel/adapter_sequel_spec.rb

@@ -1,17 +1,13 @@
 require_relative './helper.rb'
 
 describe ':Sequel adapter', adapter: :Sequel do
+  include_context :sequel
+
   specs = ADAPTER_SPECS.with_each_key.with_values(:nil)
 
   context 'with MySQL backend' do
     moneta_build do
-      Moneta::Adapters::Sequel.new(opts.merge(
-        db: if defined?(JRUBY_VERSION)
-              "jdbc:mysql://localhost/#{mysql_database1}?user=#{mysql_username}"
-            else
-              "mysql2://#{mysql_username}:@localhost/#{mysql_database1}"
-            end
-        ))
+      Moneta::Adapters::Sequel.new(opts.merge(db: mysql_uri))
     end
 
     include_examples :adapter_sequel, specs
@@ -19,8 +15,7 @@ describe ':Sequel adapter', adapter: :Sequel do
 
   context "with SQLite backend" do
     moneta_build do
-      Moneta::Adapters::Sequel.new(opts.merge(
-        db: "#{defined?(JRUBY_VERSION) && 'jdbc:'}sqlite://" + File.join(tempdir, 'adapter_sequel.db')))
+      Moneta::Adapters::Sequel.new(opts.merge(db: sqlite_uri('adapter_sequel.db')))
     end
 
     include_examples :adapter_sequel, specs.without_concurrent
@@ -28,16 +23,7 @@ describe ':Sequel adapter', adapter: :Sequel do
 
   context "with Postgres backend" do
     moneta_build do
-      Moneta::Adapters::Sequel.new(opts.merge(
-        if defined?(JRUBY_VERSION)
-          {db: "jdbc:postgresql://localhost/#{postgres_database1}?user=#{postgres_username}"}
-        else
-          {
-            db: "postgres://localhost/#{postgres_database1}",
-            user: postgres_username
-          }
-        end
-      ))
+      Moneta::Adapters::Sequel.new(opts.merge(postgres_options))
     end
 
     include_examples :adapter_sequel, specs
@@ -45,8 +31,7 @@ describe ':Sequel adapter', adapter: :Sequel do
 
   context "with H2 backend", unsupported: !defined?(JRUBY_VERSION) do
     moneta_build do
-      Moneta::Adapters::Sequel.new(opts.merge(
-        db: "jdbc:h2:" + tempdir))
+      Moneta::Adapters::Sequel.new(opts.merge(db: h2_uri))
     end
 
     include_examples :adapter_sequel, specs, optimize: false
@@ -54,19 +39,7 @@ describe ':Sequel adapter', adapter: :Sequel do
 
   context "with Postgres HStore backend" do
     moneta_build do
-      Moneta::Adapters::Sequel.new(
-        if defined?(JRUBY_VERSION)
-          {db: "jdbc:postgresql://localhost/#{postgres_database1}?user=#{postgres_username}"}
-        else
-          {
-            db: "postgres://localhost/#{postgres_database1}",
-            user: postgres_username
-          }
-        end.merge(
-          table: 'hstore_table1',
-          hstore: 'row'
-        )
-      )
+      Moneta::Adapters::Sequel.new(postgres_hstore_options)
     end
 
     # Concurrency is too slow, and binary values cannot be stored in an hstore

data/spec/moneta/adapters/sequel/helper.rb

@@ -1,3 +1,40 @@
+RSpec.shared_context :sequel do
+  def mysql_uri database=nil
+    database ||= mysql_database1
+    if defined?(JRUBY_VERSION)
+      "jdbc:mysql://localhost/#{database}?user=#{mysql_username}&useSSL=false"
+    else
+      "mysql2://#{mysql_username}:@localhost/#{database}"
+    end
+  end
+
+  def sqlite_uri file_name
+    "#{defined?(JRUBY_VERSION) && 'jdbc:'}sqlite://" + File.join(tempdir, file_name)
+  end
+
+  def postgres_options database=nil
+    database ||= postgres_database1
+    if defined?(JRUBY_VERSION)
+      {db: "jdbc:postgresql://localhost/#{database}?user=#{postgres_username}"}
+    else
+      {
+        db: "postgres://localhost/#{database}",
+        user: postgres_username
+      }
+    end
+  end
+
+  def postgres_hstore_options database=nil
+    postgres_options(database).merge \
+      table: 'hstore_table1',
+      hstore: 'row'
+  end
+
+  def h2_uri
+    "jdbc:h2:" + tempdir
+  end
+end 
+
 RSpec.shared_examples :adapter_sequel do |specs, optimize: true|
   shared_examples :each_key_server do
     context "with each_key server" do

data/spec/moneta/adapters/sequel/standard_sequel_spec.rb

@@ -1,14 +1,8 @@
+require_relative './helper.rb'
+
 describe 'standard_sequel', adapter: :Sequel do
-  moneta_store :Sequel do
-    {
-      db: if defined?(JRUBY_VERSION)
-            "jdbc:mysql://localhost/#{mysql_database1}?user=#{mysql_username}"
-          else
-            "mysql2://#{mysql_username}:@localhost/#{mysql_database1}"
-          end,
-      table: "simple_sequel"
-    }
-  end
+  include_context :sequel
 
+  moneta_store(:Sequel) { postgres_options.merge(table: "standard_sequel") }
   moneta_specs STANDARD_SPECS.with_each_key
 end

data/spec/moneta/adapters/sequel/standard_sequel_with_expires_spec.rb

@@ -1,18 +1,17 @@
+require_relative './helper.rb'
+
 describe 'standard_sequel_with_expires', adapter: :Sequel do
+  include_context :sequel
+
   let(:t_res) { 0.125 }
   let(:min_ttl) { t_res }
   use_timecop
 
   moneta_store :Sequel do
-    {
-      db: if defined?(JRUBY_VERSION)
-            "jdbc:mysql://localhost/#{mysql_database1}?user=#{mysql_username}"
-          else
-            "mysql2://#{mysql_username}:@localhost/#{mysql_database1}"
-          end,
-      table: "simple_sequel_with_expires",
+    postgres_options.merge(
+      table: "standard_sequel_with_expires",
       expires: true
-    }
+    )
   end
 
   moneta_specs STANDARD_SPECS.with_expires.with_each_key

data/spec/moneta/proxies/shared/shared_unix_spec.rb

@@ -21,6 +21,11 @@ describe "shared_unix", proxy: :Shared do
   end
 
   context "runnning as the server" do
+    before do
+      store.load('dummy')
+      expect(store.server?).to be true
+    end
+
     include_examples :shared_unix
 
     it "has the underlying adapter" do
@@ -34,6 +39,11 @@ describe "shared_unix", proxy: :Shared do
       new_store.tap { |store| store.load('dummy') } # Makes a connection
     end
 
+    before do
+      store.load('dummy')
+      expect(store.server?).to be false
+    end
+
     after do
       server_store.close
     end

data/spec/restserver.rb

@@ -1,3 +1,4 @@
+require 'faraday'
 require 'rack'
 require 'rack/moneta_rest'
 
@@ -31,6 +32,20 @@ def start_restserver(port)
   )
 
   Thread.start { server.start }
+
+  begin
+    Faraday.get("http://127.0.0.1:#{port}")
+  rescue Faraday::ConnectionFailed
+    tries ||= 5
+    tries -= 1
+    if tries > 0
+      sleep 0.1
+      retry
+    else
+      raise
+    end
+  end
+
   server
 end
 

metadata

@@ -1,46 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: moneta
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Daniel Mendler
 - Yehuda Katz
 - Hannes Georg
 - Alastair Pharo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2020-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-retry
+  name: parallel_tests
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 2.29.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 2.29.2
 - !ruby/object:Gem::Dependency
   name: rantly
   requirement: !ruby/object:Gem::Requirement
@@ -56,67 +42,67 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: parallel_tests
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.29.2
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.29.2
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: rspec-retry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.67.2
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.67.2
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
-  name: irb
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 0.9.1
 description: A unified interface to key/value stores
 email:
 - mail@daniel-mendler.de
 - wycats@gmail.com
 - hannes.georg@googlemail.com
-- asppsa@gmail.com
+- me@asph.dev
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -162,9 +148,6 @@ files:
 - lib/moneta/adapters/memcached/native.rb
 - lib/moneta/adapters/memory.rb
 - lib/moneta/adapters/mongo.rb
-- lib/moneta/adapters/mongo/base.rb
-- lib/moneta/adapters/mongo/moped.rb
-- lib/moneta/adapters/mongo/official.rb
 - lib/moneta/adapters/null.rb
 - lib/moneta/adapters/pstore.rb
 - lib/moneta/adapters/redis.rb
@@ -172,6 +155,10 @@ files:
 - lib/moneta/adapters/riak.rb
 - lib/moneta/adapters/sdbm.rb
 - lib/moneta/adapters/sequel.rb
+- lib/moneta/adapters/sequel/mysql.rb
+- lib/moneta/adapters/sequel/postgres.rb
+- lib/moneta/adapters/sequel/postgres_hstore.rb
+- lib/moneta/adapters/sequel/sqlite.rb
 - lib/moneta/adapters/sqlite.rb
 - lib/moneta/adapters/tdb.rb
 - lib/moneta/adapters/tokyocabinet.rb
@@ -179,12 +166,20 @@ files:
 - lib/moneta/adapters/yaml.rb
 - lib/moneta/builder.rb
 - lib/moneta/cache.rb
+- lib/moneta/create_support.rb
+- lib/moneta/dbm_adapter.rb
+- lib/moneta/defaults.rb
+- lib/moneta/each_key_support.rb
 - lib/moneta/enumerable.rb
 - lib/moneta/expires.rb
+- lib/moneta/expires_support.rb
 - lib/moneta/fallback.rb
+- lib/moneta/hash_adapter.rb
+- lib/moneta/increment_support.rb
 - lib/moneta/lock.rb
 - lib/moneta/logger.rb
-- lib/moneta/mixins.rb
+- lib/moneta/nil_values.rb
+- lib/moneta/option_support.rb
 - lib/moneta/optionmerger.rb
 - lib/moneta/pool.rb
 - lib/moneta/proxy.rb
@@ -320,14 +315,8 @@ files:
 - spec/moneta/adapters/memory/standard_memory_with_json_value_serializer_spec.rb
 - spec/moneta/adapters/memory/standard_memory_with_prefix_spec.rb
 - spec/moneta/adapters/memory/standard_memory_with_snappy_compress_spec.rb
-- spec/moneta/adapters/mongo/adapter_mongo_moped_spec.rb
-- spec/moneta/adapters/mongo/adapter_mongo_moped_with_default_expires_spec.rb
-- spec/moneta/adapters/mongo/adapter_mongo_official_spec.rb
-- spec/moneta/adapters/mongo/adapter_mongo_official_with_default_expires_spec.rb
 - spec/moneta/adapters/mongo/adapter_mongo_spec.rb
 - spec/moneta/adapters/mongo/adapter_mongo_with_default_expires_spec.rb
-- spec/moneta/adapters/mongo/standard_mongo_moped_spec.rb
-- spec/moneta/adapters/mongo/standard_mongo_official_spec.rb
 - spec/moneta/adapters/mongo/standard_mongo_spec.rb
 - spec/moneta/adapters/null/null_adapter_spec.rb
 - spec/moneta/adapters/null/standard_null_spec.rb
@@ -432,7 +421,6 @@ files:
 - spec/moneta/semaphore_spec.rb
 - spec/moneta/stack_file_memory_spec.rb
 - spec/moneta/stack_memory_file_spec.rb
-- spec/quality_spec.rb
 - spec/rack/cache_moneta_spec.rb
 - spec/rack/moneta_cookies_spec.rb
 - spec/rack/moneta_store_spec.rb
@@ -446,10 +434,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/moneta-rb/moneta/issues
-  changelog_uri: https://github.com/moneta-rb/moneta/blob/v1.3.0/CHANGES
-  documentation_uri: https://www.rubydoc.info/gems/moneta/1.3.0
-  source_code_uri: https://github.com/moneta-rb/moneta/tree/v1.3.0
-post_install_message: 
+  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
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -464,8 +452,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A unified interface to key/value stores, including Redis, Memcached, TokyoCabinet,
   ActiveRecord and many more
@@ -574,14 +562,8 @@ test_files:
 - spec/moneta/adapters/memory/standard_memory_with_json_value_serializer_spec.rb
 - spec/moneta/adapters/memory/standard_memory_with_prefix_spec.rb
 - spec/moneta/adapters/memory/standard_memory_with_snappy_compress_spec.rb
-- spec/moneta/adapters/mongo/adapter_mongo_moped_spec.rb
-- spec/moneta/adapters/mongo/adapter_mongo_moped_with_default_expires_spec.rb
-- spec/moneta/adapters/mongo/adapter_mongo_official_spec.rb
-- spec/moneta/adapters/mongo/adapter_mongo_official_with_default_expires_spec.rb
 - spec/moneta/adapters/mongo/adapter_mongo_spec.rb
 - spec/moneta/adapters/mongo/adapter_mongo_with_default_expires_spec.rb
-- spec/moneta/adapters/mongo/standard_mongo_moped_spec.rb
-- spec/moneta/adapters/mongo/standard_mongo_official_spec.rb
 - spec/moneta/adapters/mongo/standard_mongo_spec.rb
 - spec/moneta/adapters/null/null_adapter_spec.rb
 - spec/moneta/adapters/null/standard_null_spec.rb
@@ -686,7 +668,6 @@ test_files:
 - spec/moneta/semaphore_spec.rb
 - spec/moneta/stack_file_memory_spec.rb
 - spec/moneta/stack_memory_file_spec.rb
-- spec/quality_spec.rb
 - spec/rack/cache_moneta_spec.rb
 - spec/rack/moneta_cookies_spec.rb
 - spec/rack/moneta_store_spec.rb