modis 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62a6abe9671e399409e452a290c360fcd0aadfbdceccca9aa364d6f232b2df49
-  data.tar.gz: d8468a3f54bf0587f8d89ff2b353a5c48ea0798a4c067bd291ef5ed471448a01
+  metadata.gz: 90338a93da41f45150c96831168e346edc9c408aa587bd7e1d82cb6e735e1b5b
+  data.tar.gz: 87894188fb86b5f4f5f5586990a99744a3c88eedda54e1e1bb5d588df3c33db7
 SHA512:
-  metadata.gz: a382d676431ed8bd7fd79dde5dbff275c19687b42ce9de52980ce35898ea91eb447a1a7349b8f09bc56606841e7f6cada8f882bc23f5eb8d9f5483b109805d61
-  data.tar.gz: 499687970a4a33a573e16ea8f1b70749e85d2650b2092a37ce26cdd9452cc6c3a3c539e9e59dcfa9d5db0ed2d9ccf19c961122e22d0e8dfd3e41afda080c925d
+  metadata.gz: b80e7a9f7d6b546f100a03d0b49f0d6f095832cc97aeaea6fd4edb23428fd741c9851e76e1ad011d785e478f4f0bbd77eea31e77c2c420df447506ec328fc114
+  data.tar.gz: c43be4893954d2826f6f31c39c2a035bce50907f32fe224a475b4f0b71d038a42379c13132192297271ab30ad4922abcabec463db4832f40f9c5c2ac293aedb0

data/.rubocop.yml

@@ -3,23 +3,24 @@ AllCops:
     - modis.gemspec
     - vendor/**/*
     - gemfiles/**/*
+  TargetRubyVersion: 2.3
 
-LineLength:
+Layout/LineLength:
   Enabled: false
 
-StringLiterals:
+Style/StringLiterals:
   Enabled: false
 
-Documentation:
+Style/Documentation:
   Enabled: false
 
-MethodLength:
+Metrics/MethodLength:
   Enabled: false
 
-ClassLength:
+Metrics/ClassLength:
   Enabled: false
 
-CyclomaticComplexity:
+Metrics/CyclomaticComplexity:
   Enabled: false
 
 Style/SignalException:
@@ -42,3 +43,19 @@ Metrics/BlockLength:
 
 Security/YAMLLoad:
   Enabled: false
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+

data/CHANGELOG.md

@@ -1,32 +1,61 @@
-## Unreleased
+# Changelog
 
-## v4.0.0 - 2021-04-28
+## [v4.0.1](https://github.com/rpush/modis/tree/v4.0.1) (2022-03-02)
 
-**Breaking:**
+[Full Changelog](https://github.com/rpush/modis/compare/v4.0.0...v4.0.1)
 
-- Drop support for Rails 4.2, 5.0, 5.1.
-- Removed `hiredis` as a dependency and made it a development dependency.
-  For details, see [#31](https://github.com/rpush/modis/pull/31) by [@fdoxyz](https://github.com/fdoxyz).
+**Merged pull requests:**
 
-## v3.3.0 - 2020-07-07
+- Fix deprectated pipeline calls for Redis 4.6.0 [\#32](https://github.com/rpush/modis/pull/32) ([justinhoward](https://github.com/justinhoward))
 
-- Fix deprecation warnings when using Ruby >= 2.7, `activemodel` >= 6.0.3, or `redis` >= 4.2.0. [#30](https://github.com/rpush/modis/pull/30) by [@rofreg](https://github.com/rofreg).
+## [v4.0.0](https://github.com/rpush/modis/tree/v4.0.0) (2021-04-28)
 
-## v3.2.0 - 2019-12-12
+[Full Changelog](https://github.com/rpush/modis/compare/v3.3.0...v4.0.0)
 
-- Add missing `#update` and `#update!`. [#27](https://github.com/rpush/modis/pull/27) by [@dsantosmerino](https://github.com/dsantosmerino).
+**Merged pull requests:**
 
-## v3.1.0 - 2019-10-18
+- Makes hiredis a development dependency [\#31](https://github.com/rpush/modis/pull/31) ([fdocr](https://github.com/fdocr))
 
-- Test with Rails 6
-- Drop i18n dependency (credit goes to [@jas14](https://github.com/jas14) in [#23](https://github.com/rpush/modis/pull/23))
+## [v3.3.0](https://github.com/rpush/modis/tree/v3.3.0) (2020-07-07)
 
-## v3.0.0 - 2018-12-20
+[Full Changelog](https://github.com/rpush/modis/compare/v3.2.0...v3.3.0)
 
-- Drop support for any Ruby < 2.3 and Rails < 4.2.
-- Add support for Rails 5.2
-- Resolve Rubocop lint violations
-- Test combinations of Ruby and Rails versions in CI
+**Merged pull requests:**
+
+- Fix deprecation warnings [\#30](https://github.com/rpush/modis/pull/30) ([rofreg](https://github.com/rofreg))
+- Test with Ruby 2.7 [\#28](https://github.com/rpush/modis/pull/28) ([aried3r](https://github.com/aried3r))
+
+## [v3.2.0](https://github.com/rpush/modis/tree/v3.2.0) (2019-12-12)
+
+[Full Changelog](https://github.com/rpush/modis/compare/v3.1.0...v3.2.0)
+
+**Merged pull requests:**
+
+- Add missing `\#update` and `\#update!` persistance methods [\#27](https://github.com/rpush/modis/pull/27) ([dsantosmerino](https://github.com/dsantosmerino))
+
+## [v3.1.0](https://github.com/rpush/modis/tree/v3.1.0) (2019-10-18)
+
+[Full Changelog](https://github.com/rpush/modis/compare/3.0.0...v3.1.0)
+
+**Merged pull requests:**
+
+- Remove i18n dependency [\#26](https://github.com/rpush/modis/pull/26) ([aried3r](https://github.com/aried3r))
+- Test with Rails 6, Ubuntu 18.04, Ruby 2.6 [\#25](https://github.com/rpush/modis/pull/25) ([aried3r](https://github.com/aried3r))
+- Fix build status badge [\#22](https://github.com/rpush/modis/pull/22) ([jas14](https://github.com/jas14))
+
+## [3.0.0](https://github.com/rpush/modis/tree/3.0.0) (2018-12-20)
+
+[Full Changelog](https://github.com/rpush/modis/compare/v2.1.0...3.0.0)
+
+**Merged pull requests:**
+
+- Prep 3.0.0 release [\#21](https://github.com/rpush/modis/pull/21) ([garettarrowood](https://github.com/garettarrowood))
+- Lock i18n version [\#20](https://github.com/rpush/modis/pull/20) ([garettarrowood](https://github.com/garettarrowood))
+- Compatability with Rails 5.2's ActiveModel::Dirty [\#19](https://github.com/rpush/modis/pull/19) ([benlangfeld](https://github.com/benlangfeld))
+- Resolve rubocop violations and lock version [\#17](https://github.com/rpush/modis/pull/17) ([garettarrowood](https://github.com/garettarrowood))
+- Fix CI failures by resolving RuboCop offenses [\#12](https://github.com/rpush/modis/pull/12) ([garettarrowood](https://github.com/garettarrowood))
+- get rid of old school rocket syntax [\#11](https://github.com/rpush/modis/pull/11) ([DmytroStepaniuk](https://github.com/DmytroStepaniuk))
+- fix wrong readme example [\#10](https://github.com/rpush/modis/pull/10) ([DmytroStepaniuk](https://github.com/DmytroStepaniuk))
 
 ## v2.1.0
 
@@ -36,3 +65,6 @@
 
 - Support MRI 2.2.2+ and JRuby 9k+ [#5](https://github.com/rpush/modis/pull/5)
 - Remove YAML (de)serialization support [#5](https://github.com/rpush/modis/pull/5)
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    modis (4.0.0)
+    modis (4.0.1)
       activemodel (>= 5.2)
       activesupport (>= 5.2)
       connection_pool (>= 2)
@@ -23,7 +23,7 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    ast (2.4.1)
+    ast (2.4.2)
     cane (3.0.0)
       parallel
     codeclimate-test-reporter (1.0.7)
@@ -38,13 +38,13 @@ GEM
     jaro_winkler (1.5.4)
     minitest (5.14.2)
     msgpack (1.3.3)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    parallel (1.20.1)
+    parser (3.0.1.0)
       ast (~> 2.4.1)
-    powerpack (0.1.2)
     rainbow (3.0.0)
     rake (13.0.1)
-    redis (4.2.1)
+    redis (4.6.0)
+    rexml (3.2.5)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -58,15 +58,15 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.61.1)
+    rubocop (0.81.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    ruby-progressbar (1.11.0)
     simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -75,7 +75,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    unicode-display_width (1.4.1)
+    unicode-display_width (1.7.0)
     zeitwerk (2.4.0)
 
 PLATFORMS
@@ -89,8 +89,8 @@ DEPENDENCIES
   modis!
   rake
   rspec
-  rubocop (= 0.61.1)
+  rubocop (= 0.81.0)
   simplecov
 
 BUNDLED WITH
-   2.1.4
+   2.2.21

data/lib/modis/finder.rb

@@ -20,8 +20,8 @@ module Modis
 
         records = Modis.with_connection do |redis|
           ids = redis.smembers(key_for(:all))
-          redis.pipelined do
-            ids.map { |id| record_for(redis, id) }
+          redis.pipelined do |pipeline|
+            ids.map { |id| record_for(pipeline, id) }
           end
         end
 
@@ -42,8 +42,13 @@ module Modis
         raise RecordNotFound, "Couldn't find #{name} without an ID" if ids.empty?
 
         records = Modis.with_connection do |redis|
-          blk = proc { |id| record_for(redis, id) }
-          ids.count == 1 ? ids.map(&blk) : redis.pipelined { ids.map(&blk) }
+          if ids.count == 1
+            ids.map { |id| record_for(redis, id) }
+          else
+            redis.pipelined do |pipeline|
+              ids.map { |id| record_for(pipeline, id) }
+            end
+          end
         end
 
         models = records_to_models(records)

data/lib/modis/persistence.rb

@@ -135,13 +135,13 @@ module Modis
     def destroy
       self.class.transaction do |redis|
         run_callbacks :destroy do
-          redis.pipelined do
-            remove_from_indexes(redis)
+          redis.pipelined do |pipeline|
+            remove_from_indexes(pipeline)
             if self.class.all_index_enabled?
-              redis.srem(self.class.key_for(:all), id)
-              redis.srem(self.class.sti_base_key_for(:all), id) if self.class.sti_child?
+              pipeline.srem(self.class.key_for(:all), id)
+              pipeline.srem(self.class.sti_base_key_for(:all), id) if self.class.sti_child?
             end
-            redis.del(key)
+            pipeline.del(key)
           end
         end
       end
@@ -210,19 +210,19 @@ module Modis
       self.class.transaction do |redis|
         run_callbacks :save do
           run_callbacks callback do
-            redis.pipelined do
+            redis.pipelined do |pipeline|
               attrs = coerced_attributes
               key = self.class.sti_child? ? self.class.sti_base_key_for(id) : self.class.key_for(id)
-              future = attrs.any? ? redis.hmset(key, attrs) : :unchanged
+              future = attrs.any? ? pipeline.hmset(key, attrs) : :unchanged
 
               if new_record?
                 if self.class.all_index_enabled?
-                  redis.sadd(self.class.key_for(:all), id)
-                  redis.sadd(self.class.sti_base_key_for(:all), id) if self.class.sti_child?
+                  pipeline.sadd(self.class.key_for(:all), id)
+                  pipeline.sadd(self.class.sti_base_key_for(:all), id) if self.class.sti_child?
                 end
-                add_to_indexes(redis)
+                add_to_indexes(pipeline)
               else
-                update_indexes(redis)
+                update_indexes(pipeline)
               end
             end
           end

data/lib/modis/transaction.rb

@@ -8,7 +8,7 @@ module Modis
 
     module ClassMethods
       def transaction
-        Modis.with_connection { |redis| redis.multi { yield(redis) } }
+        Modis.with_connection { |redis| redis.multi { |transaction| yield(transaction) } }
       end
     end
   end

data/lib/modis/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Modis
-  VERSION = '4.0.0'
+  VERSION = '4.0.1'
 end

data/modis.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'codeclimate-test-reporter'
   gem.add_development_dependency 'cane'
-  gem.add_development_dependency 'rubocop', '0.61.1'
+  gem.add_development_dependency 'rubocop', '0.81.0'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'hiredis', '>= 0.5'
 end

data/spec/persistence_spec.rb

@@ -111,8 +111,13 @@ describe Modis::Persistence do
 
   it 'does not track the ID if the underlying Redis command failed' do
     redis = double(hmset: double(value: nil), sadd: nil)
-    expect(model.class).to receive(:transaction).and_yield(redis)
-    expect(redis).to receive(:pipelined).and_yield
+    if Gem::Version.new(Redis::VERSION) > Gem::Version.new('4.6.0')
+      expect(model.class).to receive(:transaction).and_yield(Redis::PipelinedConnection.new(Redis::Pipeline::Multi.new(redis)))
+      expect(redis).to receive(:pipelined).and_yield(Redis::PipelinedConnection.new(Redis::Pipeline.new(redis)))
+    else
+      expect(model.class).to receive(:transaction).and_yield(redis)
+      expect(redis).to receive(:pipelined).and_yield(redis)
+    end
     model.save
     expect { model.class.find(model.id) }.to raise_error(Modis::RecordNotFound)
   end
@@ -135,8 +140,13 @@ describe Modis::Persistence do
       model.age = 11
       redis = double
       expect(redis).to receive(:hmset).with("modis:persistence_spec:mock_model:1", ["age", "\v"]).and_return(double(value: 'OK'))
-      expect(model.class).to receive(:transaction).and_yield(redis)
-      expect(redis).to receive(:pipelined).and_yield
+      if Gem::Version.new(Redis::VERSION) > Gem::Version.new('4.6.0')
+        expect(model.class).to receive(:transaction).and_yield(Redis::PipelinedConnection.new(Redis::Pipeline::Multi.new(redis)))
+        expect(redis).to receive(:pipelined).and_yield(Redis::PipelinedConnection.new(Redis::Pipeline.new(redis)))
+      else
+        expect(model.class).to receive(:transaction).and_yield(redis)
+        expect(redis).to receive(:pipelined).and_yield(redis)
+      end
       model.save!
       expect(model.age).to eq(11)
     end

data/spec/spec_helper.rb

@@ -12,6 +12,8 @@ end
 
 require 'modis'
 
+Redis.raise_deprecations = true if Gem.loaded_specs['redis'].version >= Gem::Version.new('4.6.0')
+
 Modis.configure do |config|
   config.namespace = 'modis'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modis
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Ian Leitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2022-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.61.1
+        version: 0.81.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.61.1
+        version: 0.81.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement