moneta 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 667e187cf3e0d0ce7e721e07036f70e0b65f1b52818fc09eb87311872896ce95
-  data.tar.gz: 7e9063dfa4ea6f1bfbe4bee54821c75e9a82d0f54f3f820c6e396fafeeba006a
+  metadata.gz: 67e7a85926fad89dd255f180a3455b67c923d0194d447a8fe82cca0dbb546bbe
+  data.tar.gz: 51e15e0e3e1bafd312ee62d807afb72836e4f5c3cc036dc8c1ee0dcb8d51f80a
 SHA512:
-  metadata.gz: 5e2d3880c0d3fed1ee66cb57f5ebba13a83dd7e4447ec1e99e601a85ff9bc454cf7bf4e9d62c8672324faddf9f396e4488c08400a08e1c1dd0181056655142b5
-  data.tar.gz: 4be30ddd9249b7222c2354984815efde88ca3c8cfe65db26c13df1585bd80425cc8f55f68b869d07016183be29b4ae8495a3408fe3b67e0f27d21ef2f6de6a83
+  metadata.gz: cc4340a0c94ce262108361a3ed49116980cc0ee94838810babe5015bb43d3084875fa3e76f232b182470dda6a5ab9ac7e09fe9917a97082047ec9d0b7112a02a
+  data.tar.gz: a0f1c197e3222848e246bf0535805b4dd47bf8dbf9b3a383c619e187cb9b6d64ac6de4f711190630b4befac1e820061fd66a04d83a529a01bee519fbcde4af23

data/.github/workflows/ruby.yml

@@ -0,0 +1,415 @@
+name: Ruby CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  adapters:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        ruby-version: [2.7, 2.6, 2.5, 2.4, jruby]
+        adapter:
+          - Client
+          - Cookie
+          - Daybreak
+          #- dbm
+          - File
+          - Fog
+          - GDBM
+          - HashFile
+          #- HBase
+          - KyotoCabinet
+          - LevelDB
+          - LMDB
+          - LocalMemCache
+          - LRUHash
+          - Memory
+          - 'Null'
+          - PStore
+          - RestClient
+          #- riak
+          - SDBM
+          - TDB
+          - TokyoCabinet
+          - TokyoTyrant
+          - YAML
+
+    env:
+      BUNDLE_WITH: ${{ matrix.adapter }} snappy
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Apt update
+      run: sudo apt-get update
+
+    - name: Apt install dependencies
+      run: sudo apt-get install -y libkyotocabinet-dev libleveldb-dev libtdb-dev libtokyocabinet-dev tokyotyrant libgdbm-dev
+
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler: latest
+        bundler-cache: true
+
+    - name: Rspec
+      run: bundle exec rspec -t ~unstable -t adapter:${{ matrix.adapter }} -- spec/moneta
+
+  couch:
+    name: "Couch adapter"
+    runs-on: ubuntu-latest
+
+    services:
+      couch:
+        image: couchdb
+        env:
+          COUCHDB_USER: admin
+          COUCHDB_PASSWORD: password
+        options: >-
+          --health-cmd "curl -s http://127.0.0.1:5984/"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5984:5984
+
+    strategy:
+      matrix:
+        ruby-version: [2.7, 2.4, jruby]
+
+    env:
+      BUNDLE_WITH: RestClient
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler: latest
+        bundler-cache: true
+
+    - name: Rspec
+      run: bundle exec rspec -t adapter:Couch -- spec/moneta
+
+  cassandra:
+    name: "Cassandra adapter"
+    runs-on: ubuntu-latest
+
+    services:
+      cassandra:
+        image: cassandra
+        options: >-
+          --health-cmd "cqlsh -e \"SELECT cql_version FROM system.local\""
+          --health-interval 10s
+          --health-timeout 10s
+          --health-retries 10
+        ports:
+          - 9042:9042
+
+    strategy:
+      matrix:
+        ruby-version: [2.7, 2.4, jruby]
+
+    env:
+      BUNDLE_WITH: Cassandra
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler: latest
+        bundler-cache: true
+
+    - name: Rspec
+      run: bundle exec rspec -t adapter:Cassandra -- spec/moneta
+
+  mysql-adapters:
+    name: "MySQL adapters"
+    runs-on: ubuntu-latest
+
+    services:
+      mysql:
+        image: mysql
+        env:
+          MYSQL_ROOT_PASSWORD: moneta
+        options: >-
+          --health-cmd "mysqladmin ping -h 127.0.0.1 --silent"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 3306:3306
+
+    strategy:
+      matrix:
+        ruby-version: [2.7, 2.4, jruby]
+
+    env:
+      BUNDLE_WITH: ActiveRecord Sequel DataMapper mysql
+      MYSQL_HOST: 127.0.0.1
+      MONETA_MYSQL_PASSWORD: moneta
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Apt update
+      run: sudo apt-get update
+
+    - name: Apt install mysql packages
+      run: sudo apt-get install -y libmysqlclient-dev
+
+    - name: Create Database moneta
+      run: mysqladmin -h 127.0.0.1 -u root create moneta
+      env:
+        MYSQL_PWD: moneta
+
+    - name: Create Database moneta2
+      run: mysqladmin -h 127.0.0.1 -u root create moneta2
+      env:
+        MYSQL_PWD: moneta
+
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler: latest
+        bundler-cache: true
+
+    - name: Rspec
+      run: bundle exec rspec -t mysql -- spec/moneta
+
+  postgres-adapters:
+    name: "Postgres adapters"
+    runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres:13.6
+        env:
+          POSTGRES_PASSWORD: moneta
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+
+    strategy:
+      matrix:
+        ruby-version: [2.7, 2.4, jruby]
+
+    env:
+      BUNDLE_WITH: ActiveRecord Sequel DataMapper postgresql
+      PGHOST: localhost
+      PGUSER: postgres
+      PGPASSWORD: moneta
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Create Database moneta1
+      run: createdb moneta1
+
+    - name: Create Database moneta2
+      run: createdb moneta2
+
+    - name: Add hstore support to moneta1
+      run: psql -c 'create extension hstore;' moneta1
+
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler: latest
+        bundler-cache: true
+
+    - name: Rspec
+      run: bundle exec rspec -t postgres -- spec/moneta
+
+  sqlite-adapters:
+    name: "SQLite adapters"
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: [2.7, 2.4, jruby]
+
+    env:
+      BUNDLE_WITH: ActiveRecord Sequel DataMapper sqlite
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler: latest
+        bundler-cache: true
+
+    - name: Rspec
+      run: bundle exec rspec -t sqlite -- spec/moneta
+
+  redis:
+    name: "Redis adapters"
+    runs-on: ubuntu-latest
+
+    services:
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
+
+    strategy:
+      matrix:
+        ruby-version: [2.7, 2.4, jruby]
+
+    env:
+      BUNDLE_WITH: Redis
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler: latest
+        bundler-cache: true
+
+    - name: Rspec
+      run: bundle exec rspec -t adapter:Redis -t redis -- spec/moneta
+
+  memcached:
+    name: "Memcached adapters"
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: [2.7, 2.4, jruby]
+
+    env:
+      BUNDLE_WITH: Memcached
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Apt update
+      run: sudo apt-get update
+
+    - name: Apt install memcached
+      run: sudo apt-get install -y memcached libsasl2-dev
+
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler: latest
+        bundler-cache: true
+
+    - name: Rspec
+      run: bundle exec rspec -t ~unstable -t adapter:Memcached -t memcached -- spec/moneta
+
+  mongo:
+    name: "Mongo adapter"
+    runs-on: ubuntu-latest
+
+    services:
+      mongo:
+        image: mongo
+        options: >-
+          --health-cmd "mongo --eval db"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 27017:27017
+
+    strategy:
+      matrix:
+        ruby-version: [2.7, 2.4] #, jruby] - FIXME reenable once https://github.com/mongodb/mongo-ruby-driver/pull/2143 is released
+
+    env:
+      BUNDLE_WITH: Mongo
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler: latest
+        bundler-cache: true
+
+    - name: Rspec
+      run: bundle exec rspec -t adapter:Mongo -- spec/moneta
+
+  residual-specs:
+    name: "Proxies and other specs"
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: [2.7, 2.4, jruby]
+
+    env:
+      BUNDLE_WITH: transformers GDBM Fog
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Apt update
+      run: sudo apt-get update
+
+    - name: Apt install dependencies
+      run: sudo apt-get install -y libgdbm-dev liblzo2-dev
+
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler: latest
+        bundler-cache: true
+
+    - name: Rspec
+      run: bundle exec rspec -t ~unstable --exclude-pattern "./spec/{moneta/adapters/**/*,active_support/**/*}"
+
+    - name: Minitest
+      run: bundle exec ruby test/action_dispatch/session_moneta_store_test.rb
+
+  rubocop:
+    name: "Rubocop"
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+        bundler: latest
+        bundler-cache: true
+
+    - name: Rubocop
+      run: bundle exec rubocop lib

data/CHANGES

@@ -1,3 +1,21 @@
+1.5.0
+
+* Adapters - internally, most (all?) adapters now inherit from a base Adapter class
+* Adapters - adapter configuration is now accessed via a `config` method on
+             each adapter - see the code for examples.  This shouldn't affect
+             users unless they were directly modifying adapters' attributes.
+* Redis - fix deprecation warnings for Redis 4.6+ multi/pipelined handling (#215)
+* Mongo - slight improvement to error handling
+
+1.4.2
+
+* Pool - fix busy-loop issue (#197)
+
+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/CONTRIBUTORS

@@ -3,6 +3,7 @@ Alastair Pharo <me@asph.dev>
 Alejandro Crosa <acrosa@sharing.local>
 Alessio Signorini <alessio@signorini.us>
 Anthony Eden <anthonyeden@gmail.com>
+Antonio Terceiro <terceiro@debian.org>
 Atoxhybrid <atoxhybrid@gmail.com>
 AtoxIO <atoxhybrid@gmail.com>
 Ben Schwarz <ben.schwarz@gmail.com>
@@ -32,6 +33,7 @@ Potapov Sergey <blake131313@gmail.com>
 Quin Hoxie <quin@aboutus.org>
 Ryan T. Hosford <tad.hosford@gmail.com>
 Scott Wadden <scott.wadden@gmail.com>
+Sven Riedel <sr@gimp.org>
 Timo Goebel <timo.goebel@dm.de>
 Tom Meier <ozmeier@yahoo.co.uk>
 Tony Han <h.bing612@gmail.com>

data/Gemfile

@@ -1,86 +1,174 @@
 source 'https://rubygems.org'
 gemspec
 
-# Used by multiple backends / transformers
-gem 'multi_json', groups: %i{json couch cassandra}
-gem 'faraday', groups: %i{couch restclient}
-gem 'manticore', groups: %i{couch restclient}, platforms: :jruby
+group :transformers, optional: true do
+  group :tnet, optional: true do
+    gem 'tnetstring'
+  end
+
+  group :bencode, optional: true do
+    gem 'bencode'
+  end
+
+  group :ox, optional: true do
+    gem 'ox', platforms: :ruby
+  end
+
+  group :bert, optional: true do
+    gem 'bert', platforms: :ruby
+  end
+
+  group :php, optional: true do
+    gem 'php-serialize'
+  end
+
+  group :bson, optional: true do
+    gem 'bson', '>= 4.0.0'
+  end
+
+  group :msgpack, optional: true do
+    gem 'msgpack', platforms: :ruby
+    gem 'msgpack-jruby', platforms: :jruby
+  end
+
+  # Compressors used by Transformer
+  group :bzip2, optional: true do
+    gem 'rbzip2', '>= 0.3.0'
+  end
+
+  group :lz4, optional: true do
+    gem 'lz4-ruby', platforms: :ruby
+  end
+
+  group :lzma, optional: true do
+    gem 'ruby-lzma', platforms: :ruby
+  end
+
+  group :lzo, optional: true do
+    gem 'lzoruby', platforms: :ruby
+  end
+
+  group :snappy, optional: true do
+    gem 'snappy', platforms: :ruby
+  end
+
+  group :quicklz, optional: true do
+    gem 'qlzruby', platforms: :ruby
+  end
+
+  # Hash transformer library
+  group :city, optional: true do
+    gem 'cityhash', platforms: :ruby
+  end
+end
 
-# Serializers used by Transformer
-gem 'tnetstring', group: :tnet
-gem 'bencode', group: :bencode
-gem 'ox', platforms: :ruby, group: :ox
-gem 'bert', platforms: :ruby, group: :bert
-gem 'php-serialize', group: :php
+# Backends
+group :Daybreak, optional: true do
+  gem 'daybreak'
+end
 
-group :bson do
-  gem 'bson', '>= 4.0.0'
+group :ActiveRecord, optional: true do
+  gem 'activerecord', '~> 5.2'
 end
 
-group :msgpack do
-  gem 'msgpack', platforms: :ruby
-  gem 'msgpack-jruby', platforms: :jruby
+group :Redis, optional: true do
+  gem 'redis', '~> 4.2'
 end
 
-# Compressors used by Transformer
-gem 'rbzip2', '>= 0.3.0', group: :bzip2
-gem 'lz4-ruby', platforms: :ruby, group: :lz4
-gem 'ruby-lzma', platforms: :ruby, group: :lzma
-gem 'lzoruby', platforms: :ruby, group: :lzo
-gem 'snappy', platforms: :ruby, group: :snappy
-gem 'qlzruby', platforms: :ruby, group: :quicklz
+group :Mongo, optional: true do
+  gem 'mongo', '>= 2'
+end
 
-# Hash transformer library
-gem 'cityhash', platforms: :ruby, group: :city
+group :Sequel, optional: true do
+  gem 'sequel', '5.52.0'
+end
 
-# Backends
-gem 'daybreak', group: :daybreak
-gem 'activerecord', '~> 5.2', group: :activerecord
-gem 'redis', '~> 4.0.0', group: :redis
-gem 'mongo', '>= 2', group: :mongo_official
-gem 'sequel', group: :sequel
-gem 'dalli', group: :memcached_dalli
-gem 'riak-client', group: :riak
-gem 'cassandra-driver', group: :cassandra
-gem 'tokyotyrant', group: :tokyotyrant
-gem 'hbaserb', group: :hbase
-gem 'localmemcache', platforms: :ruby, group: :localmemcache
-gem 'tdb', platforms: :ruby, group: :tdb
-gem 'leveldb-ruby', platforms: :ruby, group: :leveldb
-gem 'lmdb', platforms: :mri, group: :lmdb
-gem 'tokyocabinet', platforms: :ruby, group: :tokyocabinet
-gem 'kyotocabinet-ruby-reanimated', platforms: [:ruby_23, :ruby_24, :ruby_25, :ruby_26], group: :kyotocabinet
-gem 'memcached', platforms: :ruby, group: :memcached_native
-gem 'jruby-memcached', platforms: :jruby, group: :memcached_native
-gem 'activerecord-jdbch2-adapter', platforms: :jruby, group: :h2, github: 'jruby/activerecord-jdbc-adapter', glob: 'activerecord-jdbch2-adapter/*.gemspec', branch: '52-stable'
-gem 'ffi-gdbm', platforms: :jruby, group: :gdbm
-group :restclient do
-  gem 'fishwife', platforms: :jruby
-  gem 'rjack-logback', platforms: :jruby
-end
-
-group :datamapper do
+group :Memcached, optional: true do
+  group :MemcachedDalli, optional: true do
+    gem 'dalli', '~> 2.7.11'
+  end
+
+  group :MemcachedNative, optional: true do
+    gem 'memcached', platforms: :ruby
+    gem 'jruby-memcached', platforms: :jruby
+  end
+end
+
+group :Riak, optional: true do
+  gem 'riak-client'
+end
+
+group :Cassandra, optional: true do
+  gem 'cassandra-driver'
+end
+
+group :TokyoTyrant, optional: true do
+  gem 'tokyotyrant'
+end
+
+group :HBase, optional: true do
+  gem 'hbaserb'
+end
+
+group :LocalMemCache, optional: true do
+  gem 'localmemcache', platforms: :ruby
+end
+
+group :TDB, optional: true do
+  gem 'tdb', platforms: :ruby
+end
+
+group :LevelDB, optional: true do
+  gem 'leveldb-ruby', platforms: :ruby
+end
+
+group :LMDB, optional: true do
+  gem 'lmdb', platforms: :mri
+end
+
+group :TokyoCabinet, optional: true do
+  gem 'tokyocabinet', platforms: :ruby
+end
+
+group :KyotoCabinet, optional: true do
+  gem 'kyotocabinet-ruby-reanimated', platforms: [:ruby_23, :ruby_24, :ruby_25, :ruby_26]
+end
+
+group :H2, optional: true do
+  gem 'activerecord-jdbch2-adapter', platforms: :jruby, github: 'jruby/activerecord-jdbc-adapter', glob: 'activerecord-jdbch2-adapter/*.gemspec', branch: '52-stable'
+end
+
+group :GDBM, optional: true do
+  gem 'ffi-gdbm', platforms: :jruby
+end
+
+group :RestClient do
+  gem 'faraday'
+  gem 'webrick'
+end
+
+group :DataMapper, optional: true do
   gem 'dm-core'
   gem 'dm-migrations'
   gem 'dm-mysql-adapter'
 end
 
-group :fog do
+group :Fog, optional: true do
   gem 'fog-aws', '>= 1.11.1'
   gem 'mime-types'
 end
 
-group :mysql do
+group :mysql, optional: true do
   gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
   gem 'mysql2', platforms: :ruby
 end
 
-group :sqlite do
+group :sqlite, optional: true do
   gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
   gem 'sqlite3', '~> 1.3.6', platforms: :ruby
 end
 
-group :postgresql do
+group :postgresql, optional: true do
   gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
   gem 'pg', platforms: :ruby
 end
@@ -99,7 +187,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