me-redis 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37a1a053c17bc56cc94b551e09527cd6d3a92a88c785988ac503d6241c803b3e
-  data.tar.gz: 588df3069e17bfaf4e017d013d9d76f74359f5768a667ee1e3821d8f5b310e69
+  metadata.gz: fcb807ddbff3ae63c2c4ae0a1bdd2bee8e37202ca0477fc3c86d6b7c58feaa3d
+  data.tar.gz: 9d60ce417f2b0dfbf5e7fdf56ab6057e1a4f3bdb2ecc6793f8a952dc6fa9ed82
 SHA512:
-  metadata.gz: 47e07cc98cf7b884cb5ee2bb68379d2cc98dd5c4635f9c31d4b382ef856f836e7dc0a524a36f72120ab91caad089481cd2a7912dca7c61bad89147c188da0aaa
-  data.tar.gz: 5b3754b0aa7f4e74a233b241f057cb7d17ebf3836a01faeef72e4d137e58a7f19e7c1ee719d91d71b5a67ce63538bc4932030d685ca78c03c0ddaf1ce730a304
+  metadata.gz: 644bb9d176681ad580f7d268e6a3d51e4c06632d2269d00521a318544ed34a5fa50e9cc9035d94a6d823c3bd1e7b1d481406c4d3c82681343cfbb64c464e77b0
+  data.tar.gz: 4440092927b370e803e9d52eeb67477e9304734b178f4d013b4dec13af4d7ff44d9870190316e89f1fd515130cf0b838ab5401534ef089981cf16f6b2f31c41d

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.1.6
+* adapted for ruby 3.1
+
 # 0.1.5
 * keys will return keys after applying me_key transformation to a given pattern   
 * config now is an OpenStruct, not a Struct 

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.5
+FROM ruby:2.7
 
 WORKDIR me-redis
 

data/docker-compose.yml

@@ -9,6 +9,19 @@ services:
     build: .
     image: me-redis-test
     command: bundle exec rake test
+    volumes:
+      - '.:/me-redis'
+    depends_on:
+      - redis
+    environment:
+      REDIS_URL: redis://redis:6379
+
+  test3:
+    build:
+      context: .
+      dockerfile: ruby3.Dockerfile
+    image: me-redis-test-3
+    command: bundle exec rake test
     volumes:
       - '.:/me-redis'
     depends_on:

data/lib/me_redis/me_redis_hot_migrator.rb

@@ -9,17 +9,17 @@ module MeRedisHotMigrator
 
     base.class_eval do
       ZK_FALLBACK_METHODS.each do |method|
-        alias_method "_#{method}", method
+        alias_method "___#{method}", method
       end
 
       include(MeRedis)
 
       def me_get( key )
-        prev_future = _get( key ) unless @client.is_a?(self.class::Client)
+        prev_future = ___get( key ) unless @client.is_a?(self.class::Client)
         newvl = super(key)
 
         newvl.prev_future = prev_future if newvl.is_a?(self.class::Future)
-        newvl || _get( key )
+        newvl || ___get( key )
       end
 
       def me_mget(*keys)
@@ -36,15 +36,15 @@ module MeRedisHotMigrator
   module PrependMethods
     ZK_FALLBACK_METHODS.each do |method|
       define_method(method) do |*args|
-        prev_future = send("_#{method}", *args) unless @client.is_a?(self.class::Client)
+        prev_future = send("___#{method}", *args) unless @client.is_a?(self.class::Client)
         newvl = super(*args)
 
         newvl.prev_future = prev_future if newvl.is_a?(self.class::Future)
 
         if method != :mget
-          newvl || send("_#{method}", *args)
+          newvl || send("___#{method}", *args)
         else
-          newvl.is_a?(Array) ? newvl.zip( send("_#{method}", *args) ).map!{|nvl, oldv| nvl || oldv } : newvl
+          newvl.is_a?(Array) ? newvl.zip( send("___#{method}", *args) ).map!{|nvl, oldv| nvl || oldv } : newvl
         end
 
       end

data/lib/me_redis/version.rb

@@ -1,3 +1,3 @@
 module MeRedis
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/me_redis/zip_keys.rb

@@ -42,7 +42,7 @@ module MeRedis
     def persist(key); super(zip_key(key)) end
 
     def decrby( key, decrement ); super(zip_key(key), decrement) end
-    def set( key, value, options = {} );  super( zip_key(key), value, options ) end
+    def set( key, value, **options );  super( zip_key(key), value, **options ) end
     def ttl(key); super( zip_key(key) ) end
     def mset( *key_values ); super( *key_values.each_slice(2).map{ |k,v| [zip_key(k),v] }.flatten ) end
     def mget( *keys ); super( *keys.map!{ |k| zip_key(k) } ) end

data/lib/me_redis/zip_to_hash.rb

@@ -3,8 +3,8 @@ module MeRedis
   module ZipToHash
 
     module PrependMethods
-      def initialize(*args, &block)
-        super(*args, &block)
+      def initialize(*args, **kwargs, &block)
+        super(*args,**kwargs, &block)
 
         # hash-max-ziplist-entries must be cashed, we can't ask Redis every time we need to zip keys,
         # cause it's less performant and impossible during pipelining.

data/lib/me_redis/zip_values.rb

@@ -98,7 +98,7 @@ module MeRedis
 
     # Redis prepended methods
     def get( key ); unzip_value( super( key ), key) end
-    def set( key, value, options = {} ); super( key, zip_value(value, key), options ) end
+    def set( key, value, **options); super( key, zip_value(value, key), **options ) end
 
     def mget(*args); unzip_arr_or_future(super(*args), args ) end
     def mset(*args); super( *map_msets_arr(args) ) end

data/lib/me_redis.rb

@@ -17,17 +17,16 @@ require 'zlib'
 module MeRedis
   module ClassMethods
 
-    def configure( config = nil )
+    def configure( **config )
       # at start they are nils, but at subsequent calls they may not be nils
       me_config.key_zip_regxp = nil
       me_config.compress_ns_regexp = nil
       @zip_ns_finder = nil
 
-      config.each{ |key,value| me_config.send( "#{key}=", value ) } if config
+      config.each { |key,value| me_config.send( "#{key}=", value ) } if config
 
       yield( me_config ) if block_given?
 
-
       prepare_zip_crumbs
       prepare_compressors
 
@@ -99,6 +98,7 @@ module MeRedis
 
     def zip_ns_finder
       return @zip_ns_finder if @zip_ns_finder
+
       regexps_compress_ns = me_config.compress_namespaces.keys.select{|key| key.is_a?(Regexp) }
       strs_compress_ns = me_config.compress_namespaces.keys.select{|key| !key.is_a?(Regexp) }
 

data/me-redis.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'redis', '>= 3.0'
+  spec.add_dependency 'redis', '>= 3.0', '<= 4.5.1'
   spec.add_dependency 'base62-rb'
   spec.add_dependency "awesome_print"
 

data/ruby3.Dockerfile

@@ -0,0 +1,7 @@
+FROM ruby:3-bullseye
+
+WORKDIR me-redis
+
+ADD . /me-redis/
+RUN gem install bundler
+RUN bundle install

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: me-redis
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - alekseyl
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 4.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 4.5.1
 - !ruby/object:Gem::Dependency
   name: base62-rb
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +143,7 @@ files:
 - lib/me_redis/zip_to_hash.rb
 - lib/me_redis/zip_values.rb
 - me-redis.gemspec
+- ruby3.Dockerfile
 homepage: https://github.com/alekseyl/me-redis
 licenses:
 - MIT
@@ -157,8 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Memory efficient redis extention