moneta 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 867a31ea01c90748ed86ae701f221d4a628b7c4932c8e0aa6c8b0f13f02a516b
-  data.tar.gz: e3f89ab42ca23c9db8ddbcede6c6c447a8829ab78e01e1eb67edd1a6f2ac402e
+  metadata.gz: 4e697b98dafd89667bc720317d1e740691f4504cf6b7a33939d14251f2841fe3
+  data.tar.gz: 13eede9fc91b2379921f28798b6bac79de69527682f208042345b5fe331bd32d
 SHA512:
-  metadata.gz: 58e3592ad92768341454f0c7b637fc614f3cd3d820566840333b2c229601627ac10ae77509fec769acd9c71a08f602b2c7d059ee0e6c7e2042d814f91201acf2
-  data.tar.gz: 8d9eeb664e800fd1ebff92dea3701fb01aa25a453647f2ba76d54b1a3602e6897899f8cedff823046096ee675f6089355912de240ae5c8e96ed606c41fa5573f
+  metadata.gz: c1c9acbe14d38a5a300a8eb478225c8da317f2c6596b51e2421d5243aa6cd13020639e31594f03a1c43b6c537603402983cd5ca2a6deb900ac34cf5db3b99992
+  data.tar.gz: 614bfcb466639b2d348e8f1bd29d732a1d57489e3a6e4d292ae2f4ab8e3f385c878b0c3f890ae1f2fb4f684e9c969e71ecd2a393d9e848345c63b7d9b0818f8b

data/.rubocop.yml

@@ -0,0 +1,176 @@
+AllCops:
+  TargetRubyVersion: 2.2.2
+  UseCache: true
+  Exclude:
+    - hbase/**/*
+    - script/**/*
+    - vendor/**/*
+
+Layout/AlignArray:
+  Exclude:
+    - lib/moneta/transformer/config.rb
+
+Layout/AlignHash:
+  Exclude:
+    - lib/moneta/transformer/config.rb
+
+Layout/DotPosition:
+  EnforcedStyle: leading
+
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+
+Layout/ExtraSpacing:
+  Exclude:
+    - lib/moneta.rb
+    - lib/moneta/transformer/config.rb
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Layout/MultilineOperationIndentation:
+  EnforcedStyle: indented
+
+Layout/SpaceInsideArrayLiteralBrackets:
+  Exclude:
+    - lib/moneta/transformer/config.rb
+
+Lint/AssignmentInCondition:
+  Enabled: false
+
+Lint/ShadowedException:
+  Enabled: false
+
+Lint/ShadowingOuterLocalVariable:
+  Enabled: false
+
+Lint/UnusedMethodArgument:
+  Enabled: false
+
+Lint/Void:
+  Exclude:
+    - spec/**/*
+
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*
+
+Metrics/LineLength:
+  Max: 160
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Naming/ConstantName:
+  Exclude:
+    - lib/rack/cache/moneta.rb
+
+Naming/RescuedExceptionsVariableName:
+  Enabled: false
+
+Naming/MemoizedInstanceVariableName:
+  Enabled: false
+
+Security/MarshalLoad:
+  Enabled: false
+
+Style/AndOr:
+  Enabled: false
+
+Style/CaseEquality:
+  Enabled: false
+
+Style/CharacterLiteral:
+  Enabled: false
+
+Style/DoubleNegation:
+  Enabled: false
+
+Style/GlobalVars:
+  Exclude:
+    - spec/moneta/adapters/cassandra/helper.rb
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/FormatString:
+  Enabled: false
+
+Style/GuardClause:
+  Enabled: false
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/Lambda:
+  EnforcedStyle: lambda
+
+Style/ModuleFunction:
+  Enabled: false
+
+Style/MultilineIfModifier:
+  Enabled: false
+
+Style/MutableConstant:
+  Exclude:
+    - lib/rack/cache/moneta.rb
+
+Style/NilComparison:
+  EnforcedStyle: comparison
+
+Style/NumericLiterals:
+  Enabled: false
+
+Style/NumericPredicate:
+  EnforcedStyle: comparison
+
+Style/NonNilCheck:
+  Enabled: false
+
+Style/ParallelAssignment:
+  Enabled: false
+
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
+Style/PreferredHashMethods:
+  Enabled: false
+
+Style/RescueStandardError:
+  EnforcedStyle: implicit
+
+Style/RescueModifier:
+  Enabled: false
+
+Style/SafeNavigation:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: false
+
+Style/SymbolArray:
+  Enabled: false
+
+Style/SymbolProc:
+  Enabled: false
+
+Style/YodaCondition:
+  Enabled: false

data/.travis.yml

@@ -1,3 +1,4 @@
+dist: xenial
 language: ruby
 rvm:
   - 2.6
@@ -8,17 +9,33 @@ rvm:
   - jruby-9.2
   - rbx-3
 services:
+  - mysql
   - riak
-  - couchdb
   - redis
   - cassandra
   - memcached
   - mongodb
   - postgresql
 addons:
+  apt:
+    sources:
+      - cassandra
+      - sourceline: "deb https://apache.bintray.com/couchdb-deb xenial main"
+        key_url: https://couchdb.apache.org/repo/bintray-pubkey.asc
+      - sourceline: "deb https://packagecloud.io/basho/riak/ubuntu/ xenial main"
+        key_url: https://packagecloud.io/basho/riak/gpgkey
+    packages:
+      - cassandra
+      - couchdb
+      - libkyotocabinet-dev
+      - libleveldb-dev
+      - liblzo2-dev
+      - libtdb-dev
+      - libtokyocabinet-dev
+      - tokyotyrant
+      - riak
   postgresql: '9.6'
 before_install:
-  - sudo apt-get install -qq libtokyocabinet9 libtokyocabinet-dev libkyotocabinet16 libkyotocabinet-dev liblzo2-dev libtdb-dev libleveldb-dev tokyotyrant
   - script/start-services
 cache:
   bundler: true
@@ -31,10 +48,8 @@ before_script:
   - psql -c 'create extension hstore;' -U postgres moneta1
   - psql -c 'create database moneta2;' -U postgres
 env:
-  global:
-    - secure: "dtM4n7FP8P0UI9Iq+nsvQ7/yfDqsxhfCO9i8zMxm/f9Kxj5Z/4C7jsXsLA+e\n/7FZ9+ld2QjPSPU0LUiDpj/z81bxyZHwqocQ7Nb0DVvO3JRHpr4/iBQQQHd3\n0jvou3mRbu5mBlUjf1/ALaZA+b+vcnsF9fd86UnkY+ChriylGnM="
   matrix:
-    - SCRIPT='parallel-tests ~unstable --
+    - SCRIPT='script/parallel-tests ~unstable --
       test/action_dispatch/session_moneta_store_test.rb
       spec/moneta/adapters/activerecord
       spec/moneta/adapters/localmemcache
@@ -57,7 +72,7 @@ env:
       spec/moneta/adapters/lmdb
       spec/moneta/adapters/yaml
       '
-    - SCRIPT='parallel-tests ~unstable --
+    - SCRIPT='script/parallel-tests ~unstable --
       spec/moneta/adapters/client
       spec/moneta/adapters/memory
       spec/moneta/adapters/cookie
@@ -65,41 +80,60 @@ env:
       spec/moneta/adapters/tdb
       spec/moneta/adapters/kyotocabinet
       '
-    - SCRIPT='parallel-tests ~unstable --
-      spec/moneta/adapters/couch
+    - SCRIPT='script/parallel-tests ~unstable --
+      spec/moneta/adapters/couch/standard_couch_spec.rb
       '
-    - SCRIPT='parallel-tests ~unstable --
+    - SCRIPT='script/parallel-tests ~unstable --
+      spec/moneta/adapters/couch/standard_couch_with_expires_spec.rb
+      '
+    - SCRIPT='script/parallel-tests ~unstable --
       spec/moneta/adapters/memcached/dalli
       '
-    - SCRIPT='parallel-tests ~unstable --
+    - SCRIPT='script/parallel-tests ~unstable --
       spec/moneta/adapters/memcached/native
+      spec/moneta/adapters/couch/adapter_couch_spec.rb
       '
-    - SCRIPT='parallel-tests ~unstable --
+    - SCRIPT='script/parallel-tests ~unstable --
       spec/moneta/adapters/cassandra/adapter_cassandra_spec.rb
       spec/moneta/adapters/cassandra/standard_cassandra_spec.rb
       '
-    - SCRIPT='parallel-tests ~unstable --
+    - SCRIPT='script/parallel-tests ~unstable --
       spec/moneta/adapters/cassandra/adapter_cassandra_with_default_expires_spec.rb
       spec/moneta/adapters/hashfile
       spec/moneta/adapters/sqlite
       spec/moneta/adapters/sequel
       '
-    - SCRIPT='parallel-tests ~unstable --
+    - SCRIPT='script/parallel-tests ~unstable --
       spec/moneta/proxies
       '
-    - SCRIPT='parallel-tests ~unstable --remainder'
-    - SCRIPT='parallel-tests unstable'
-    - SCRIPT='benchmarks uniform_small'
-    - SCRIPT='benchmarks uniform_medium'
-    - SCRIPT='benchmarks uniform_large'
-    - SCRIPT='benchmarks normal_small'
-    - SCRIPT='benchmarks normal_medium'
-    - SCRIPT='benchmarks normal_large'
+    - SCRIPT='script/parallel-tests ~unstable --remainder'
+    - SCRIPT='script/parallel-tests unstable'
+    - SCRIPT='script/benchmarks uniform_small'
+    - SCRIPT='script/benchmarks uniform_medium'
+    - SCRIPT='script/benchmarks uniform_large'
+    - SCRIPT='script/benchmarks normal_small'
+    - SCRIPT='script/benchmarks normal_medium'
+    - SCRIPT='script/benchmarks normal_large'
+    - SCRIPT='rubocop lib'
 matrix:
   allow_failures:
     - rvm: rbx-3
-    - env: SCRIPT='parallel-tests unstable'
-script: "bundle exec script/$SCRIPT"
+    - env: SCRIPT='script/parallel-tests unstable'
+  exclude:
+    - rvm: 2.5
+      env: SCRIPT='rubocop lib'
+    - rvm: 2.4
+      env: SCRIPT='rubocop lib'
+    - rvm: 2.3
+      env: SCRIPT='rubocop lib'
+    - rvm: 2.2
+      env: SCRIPT='rubocop lib'
+    - rvm: jruby-9.2
+      env: SCRIPT='rubocop lib'
+    - rvm: rbx-3
+      env: SCRIPT='rubocop lib'
+
+script: "bundle exec $SCRIPT"
 branches:
   only:
     - master

data/CHANGES

@@ -1,3 +1,15 @@
+1.2.0
+
+* Adapters::Sequel - fix for compatibility with new version of JDBC SQLite
+* Adapters::Couch - refactor of error handling, #clear, #merge!, #slice, rev caching
+* Fallback - add fallback proxy (#162)
+* Pool - rewrite to enable limiting of size, gradual shrinking
+* Enumerable - add proxy providing Enumerable API (using #each_key)
+* Adapters::Couch, Adapters::RestClient - add Faraday :adapter option
+* Adapters::Couch - add :full_commit and :batch options to some operations
+* Adapters::LRUHash - rewrite to take advantage of ordered hashes
+* Adapters::ActiveRecord - recover from deadlock during increment
+
 1.1.1
 
 * Adapters::Sequel - use prepared statements

data/Gemfile

@@ -1,80 +1,105 @@
 source 'https://rubygems.org'
 gemspec
 
-# Testing
-gem 'rspec', '~> 3.0'
-gem 'rspec-retry'
-gem 'rantly', '~> 1.2.0'
-gem 'parallel_tests'
-gem 'timecop'
+# 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
 
-# Serializer used by Transformer
-gem 'tnetstring'
-gem 'bencode'
-gem 'multi_json'
-gem 'bson_ext', platforms: :ruby
-gem 'bson', '>= 2.0.0'
-gem 'ox', platforms: :ruby
-gem 'msgpack', platforms: :ruby
-gem 'msgpack-jruby', platforms: :jruby
-gem 'bert', platforms: :ruby
-gem 'php-serialize'
+# 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
+
+group :bson do
+  gem 'bson', '>= 2.0.0'
+end
+
+group :msgpack do
+  gem 'msgpack', platforms: :ruby
+  gem 'msgpack-jruby', platforms: :jruby
+end
 
 # Compressors used by Transformer
-gem 'rbzip2', '~> 0.3.0'
-gem 'lz4-ruby', platforms: :ruby
-gem 'ruby-lzma', platforms: :ruby
-gem 'lzoruby', platforms: :ruby
-gem 'snappy', platforms: :ruby
-gem 'qlzruby', platforms: :ruby
+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
 
 # Hash transformer library
-gem 'cityhash', platforms: :ruby
+gem 'cityhash', platforms: :ruby, group: :city
 
 # Backends
-gem 'faraday'
-gem 'daybreak'
-gem 'dm-core'
-gem 'dm-migrations'
-gem 'dm-mysql-adapter'
-gem 'fog-aws', '>= 1.11.1'
-gem 'mime-types'
-gem 'activerecord', '~> 5.2'
-gem 'redis', '~> 4.0.0'
-gem 'mongo', '~> 2.1.0'
-gem 'moped', '>= 2.0.0'
-gem 'sequel'
-gem 'dalli'
-gem 'riak-client'
-gem 'cassandra-driver'
-gem 'tokyotyrant'
-#gem 'ruby-tokyotyrant', platforms: :ruby
-gem 'hbaserb'
-gem 'localmemcache', platforms: :ruby
-gem 'tdb', platforms: :ruby
-gem 'leveldb-ruby', platforms: :ruby
-gem 'lmdb', platforms: :mri
-gem 'tokyocabinet', platforms: :ruby
-gem 'kyotocabinet-ruby-reanimated', platforms: :ruby
-gem 'memcached', platforms: :ruby
-gem 'jruby-memcached', platforms: :jruby
-gem 'sqlite3', '~> 1.3.6', platforms: :ruby
-gem 'activerecord-jdbc-adapter', platforms: :jruby
-gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
-gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
-gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
-gem 'activerecord-jdbch2-adapter', platforms: :jruby
-gem 'mysql2', platforms: :ruby
-gem 'ffi-gdbm', platforms: :jruby
-gem 'pg', platforms: :ruby
+gem 'daybreak', group: :daybreak
+gem 'activerecord', '~> 5.2', group: :activerecord
+gem 'redis', '~> 4.0.0', group: :redis
+gem 'mongo', '~> 2.1.0', group: :mongo_official
+gem 'moped', '>= 2.0.0', group: :mongo_moped
+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, 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
+  gem 'dm-core'
+  gem 'dm-migrations'
+  gem 'dm-mysql-adapter'
+end
+
+group :fog do
+  gem 'fog-aws', '>= 1.11.1'
+  gem 'mime-types'
+end
+
+group :mysql do
+  gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
+  gem 'mysql2', platforms: :ruby
+end
+
+group :sqlite do
+  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
+  gem 'sqlite3', '~> 1.3.6', platforms: :ruby
+end
+
+group :postgresql do
+  gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
+  gem 'pg', platforms: :ruby
+end
 
 # Rack integration testing
-gem 'rack'
-gem 'rack-cache'
+group :rack do
+  gem 'rack'
+  gem 'rack-cache'
+end
 
 # Rails integration testing
-gem 'actionpack', '~> 5.0'
-gem 'minitest', '~> 5.0'
+group :rails do
+  gem 'actionpack', '~> 5.0'
+  gem 'minitest', '~> 5.0'
+end
 
 # Used for generating the feature matrix
-gem 'kramdown', '~> 1.17.0', group: :doc
+group :doc, optional: true do
+  gem 'kramdown', '~> 1.17.0'
+  gem 'yard', '~> 0.9.20'
+end