redis-objects 2.0.0.alpha → 2.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22b6b39234249ccd4c9485061bb918a211c539b3612d1a916a56eab0e13e031f
-  data.tar.gz: 9465be0b72fb8d160421eae75cf5cc5996a2aaa6b507bac6492f6a0b66fad788
+  metadata.gz: 3962b1b4d04b8b94a6d130f2323fe1f93a74cce5546285b011ccbb85293afa5d
+  data.tar.gz: cfba25072de6ac2801100f2a11aa0588dc872e0826d88c070327c3be688a9260
 SHA512:
-  metadata.gz: ff4f516b5618e2a010c32ee0360dbfdbc172d400d3570cae3e5078aff845188171f3900849bdbb9c9c8cc869cc419d1995c9162b79e09a2a7d750d05b0591987
-  data.tar.gz: 75677a0da407ad97925c69ea51a55d51d4fc3b7a036768e4c5cb2457adbeefdeb924160d3ec8656949b4d2369785c8de4a272a4284ccc12f379eb89b3a7496b3
+  metadata.gz: 64a0743cbe2f89145510e00877f2954f6734bdd472c0b272ac165912dffb4ef9d03b395ee7c63bf6a5c06504f6340cf761e69cca0f9fdf5285895b3a544e38b3
+  data.tar.gz: eb7cc427ed879586363b84ed1b509052a23e5bf56d7ef8621d5b9fc6d8c4fea3ec20672a1569d018f45530ac131f9e68772213192c6c42baf50beaa7cec977a5

data/CHANGELOG.rdoc

@@ -1,5 +1,13 @@
 = Changelog for Redis::Objects
 
+== 2.0.0.beta (30 Mar 2023)
+
+* Updated internal calls to match `redis-rb`
+
+* INCOMPAT: `Redis.current` is no longer allowed due to changes in `redis-rb`
+
+* INCOMPAT: The order of items popped off a list by the rarely-used command `list.pop(n)` to specify multiple elements is now reversed to match redis.
+
 == 1.7.0 (29 Apr 2022)
 
 * Bumped version to 1.7.0 to revert redis-rb version lock [Nate Wiger]

data/README.md

@@ -6,19 +6,19 @@ Redis::Objects - Map Redis types directly to Ruby objects
 [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MJF7JU5M7F8VL)
 
 Important 2.0 changes
----------------------
+=====================
 Redis::Objects 2.0 introduces several important backwards incompatible changes.
 Currently 2.0 can be installed with `gem install redis-objects --pre` or by listing it
 explicitly in your Gemfile:
 ~~~ruby
 # Gemfile
-gem 'redis-objects', '>= 2.0.0.alpha'
+gem 'redis-objects', '>= 2.0.0.beta'
 ~~~
 You're encouraged to try it out in test code (not production) to ensure it works for you.
-Official release is expected later in 2022.
+Official release is expected later in 2023.
 
 Key Naming Changes
-==================
+------------------
 The internal key naming scheme has changed for `Nested::Class::Namespaces` to fix a longstanding bug.
 **This means your existing data in Redis will not be accessible until you call `migrate_redis_legacy_keys`.**
 
@@ -39,8 +39,8 @@ handle a high number of keys. For large data sets, it could take a while.
 
 For more details on the issue and fix refer to [#213](https://github.com/nateware/redis-objects/issues/231).
 
-Rename of `lock` Method
-=======================
+Renaming of `lock` Method
+-------------------------
 The `lock` method that collided with `ActiveRecord::Base` has been renamed `redis_lock`.
 This means your classes need to be updated to call `redis_lock` instead:
 
@@ -51,7 +51,7 @@ class YouClassNameHere < ActiveRecord::Base
 end 
 ~~~
 
-For more details on the issue and fix refer to [#213](https://github.com/nateware/redis-objects/issues/231).
+For more details on the issue and fix refer to [#196](https://github.com/nateware/redis-objects/issues/196).
 
 Overview
 --------

data/lib/redis/list.rb

@@ -31,11 +31,7 @@ class Redis
     # Remove a member from the end of the list. Redis: RPOP
     def pop(n=nil)
       if n
-        result, = redis.multi do
-          redis.lrange(key, -n, -1)
-          redis.ltrim(key, 0, -n - 1)
-        end
-        unmarshal result
+        unmarshal redis.rpop(key, n)
       else
         unmarshal redis.rpop(key)
       end
@@ -65,11 +61,7 @@ class Redis
     # Remove a member from the start of the list. Redis: LPOP
     def shift(n=nil)
       if n
-        result, = redis.multi do
-          redis.lrange(key, 0, n - 1)
-          redis.ltrim(key, n, -1)
-        end
-        unmarshal result
+        unmarshal redis.lpop(key, n)
       else
         unmarshal redis.lpop(key)
       end

data/lib/redis/objects/version.rb

@@ -1,5 +1,5 @@
 class Redis
   module Objects
-    VERSION = "2.0.0.alpha"
+    VERSION = "2.0.0.beta"
   end
 end

data/lib/redis/objects.rb

@@ -62,7 +62,7 @@ class Redis
         @redis = Objects::ConnectionPoolProxy.proxy_if_needed(conn)
       end
       def redis
-        @redis || $redis || Redis.current ||
+        @redis || $redis ||
           raise(NotConnected, "Redis::Objects.redis not set to a Redis.new connection")
       end
 
@@ -148,11 +148,11 @@ class Redis
           legacy = redis_legacy_prefix(klass)
           if modern != legacy
             warn <<EOW
-WARNING: In redis-objects 2.0.0, key naming will change to fix longstanding bugs.
-Your class #{klass.name.to_s} will be affected by this change!
-Current key prefix: #{legacy.inspect}
-Future  key prefix: #{modern.inspect}
-Read more at https://github.com/nateware/redis-objects/issues/231
+[redis-objects] WARNING: In redis-objects 2.0.0, key naming will change to fix longstanding bugs.
+[redis-objects] Your class #{klass.name.to_s} will be affected by this change!
+[redis-objects] Current key prefix: #{legacy.inspect}
+[redis-objects] Future  key prefix: #{modern.inspect}
+[redis-objects] Read more at https://github.com/nateware/redis-objects/issues/231
 EOW
           end
         end
@@ -165,7 +165,7 @@ EOW
         if legacy == redis_prefix
           raise "Failed to migrate keys for #{self.name.to_s} as legacy and new redis_prefix are the same (#{redis_prefix})"
         end
-        warn "Migrating keys from #{legacy} prefix to #{redis_prefix}"
+        warn "[redis-objects] Migrating keys from #{legacy} prefix to #{redis_prefix}"
 
         loop do
           cursor, keys = redis.scan(cursor, :match => "#{legacy}:*")
@@ -178,14 +178,14 @@ EOW
             new_key = redis_field_key(name, id=id, context=self)
 
             # Rename the key
-            warn "Rename '#{key}', '#{new_key}'"
+            warn "[redis-objects] Rename '#{key}', '#{new_key}'"
             ok = redis.rename(key, new_key)
-            warn "Warning: Rename '#{key}', '#{new_key}' failed: #{ok}" if ok != 'OK'
+            warn "[redis-objects] Warning: Rename '#{key}', '#{new_key}' failed: #{ok}" if ok != 'OK'
           end
           break if cursor == "0"
         end
 
-        warn "Migrated #{total_keys} total number of redis keys"
+        warn "[redis-objects] Migrated #{total_keys} total number of redis keys"
       end
 
       def redis_options(name)

data/lib/redis/set.rb

@@ -15,7 +15,8 @@ class Redis
     # Redis: SADD
     def add(value)
       allow_expiration do
-        redis.sadd(key, marshal(value)) if value.nil? || !Array(value).empty?
+        value = '' if value.nil?
+        redis.sadd(key, marshal(value)) if !Array(value).empty? # allow empty adds
       end
     end
 

data/lib/redis/sorted_set.rb

@@ -211,7 +211,7 @@ class Redis
         result = redis.zrange(temp_key, 0, -1)
       end
 
-      result.value
+      result
     end
     alias_method :intersect, :intersection
     alias_method :inter, :intersection
@@ -248,7 +248,7 @@ class Redis
         result = redis.zrange(temp_key, 0, -1)
       end
 
-      result.value
+      result
     end
     alias_method :|, :union
     alias_method :+, :union

data/redis-objects.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Only fix this one version or else tests break
-  spec.add_dependency "redis"
+  spec.add_dependency "redis", '~> 5.0'
 
   # Ignore gemspec warnings on these.  Trying to fix them to versions breaks TravisCI
   spec.add_development_dependency "bundler"

data/spec/redis_objects_conn_spec.rb

@@ -96,14 +96,9 @@ describe 'Connection tests' do
   end
 
   it "should support local handles with a vanilla redis connection" do
-    # Redis.current = nil  # reset from other tests
     Redis::Objects.redis = nil
     @redis_handle = Redis.new(:host => REDIS_HOST, :port => REDIS_PORT)
-
-    # Redis.current is lazily auto-populated to touch 6379
-    # This why we choose the weird 9212 port to avoid
-    # Redis.current.inspect.should == Redis.new.inspect
-    Redis::Objects.redis.inspect.should == Redis.new.inspect
+    raises_exception{ Redis::Objects.redis.inspect } # NotConnected
 
     v = Redis::Value.new('conn/value', @redis_handle)
     v.clear
@@ -141,14 +136,9 @@ describe 'Connection tests' do
   end
 
   it "should support local handles with a connection_pool" do
-    # Redis.current = nil  # reset from other tests
     Redis::Objects.redis = nil
     @redis_handle = ConnectionPool.new { Redis.new(:host => REDIS_HOST, :port => REDIS_PORT) }
-
-    # Redis.current is lazily auto-populated to touch 6379
-    # This why we choose the weird 9212 port to avoid
-    # Redis.current.inspect.should == Redis.new.inspect
-    Redis::Objects.redis.inspect.should == Redis.new.inspect
+    raises_exception{ Redis::Objects.redis.inspect } # NotConnected
 
     v = Redis::Value.new('conn/value', @redis_handle)
     v.clear

data/spec/redis_objects_instance_spec.rb

@@ -148,7 +148,7 @@ describe Redis::Value do
       end
 
       it "#{meth} should set expiration when expireat option assigned" do
-        @value = Redis::Value.new('spec/value', :expireat => Time.now + 10.seconds)
+        @value = Redis::Value.new('spec/value', :expireat => Time.now + 10)
         @value.send(meth, 'monkey')
         @value.ttl.should > 0
       end
@@ -286,18 +286,28 @@ describe Redis::List do
       @list.get.should == ['a','c','f','j','h','i','a']
     end
 
-    it "should support popping & shifting multiple values" do
+    it "should support popping and shifting multiple values" do
       @list.should.be.empty
 
-      @list << 'a' << 'b' << 'c'
-      @list.shift(2).should == ['a', 'b']
-      @list.shift(2).should == ['c']
-      @list.shift(2).should == []
+      @list << 'a' << 'b' << 'c' << 'd'
+      @list.should == ['a', 'b', 'c', 'd']
+      @list.shift
+      @list.should == ['b', 'c', 'd']
+      @list.shift(2).should == ['b', 'c']
+      @list.should == ['d']
+      @list.shift(2).should == ['d']
+      @list.shift(2).should == nil
 
-      @list << 'a' << 'b' << 'c'
-      @list.pop(2).should == ['b', 'c']
-      @list.pop(2).should == ['a']
-      @list.pop(2).should == []
+      @list << 'e' << 'f' << 'g'
+
+      # Old behavior
+      # @list.pop(2).should == ['f', 'g']
+
+      # New behavior
+      @list.pop(2).should == ['g', 'f']
+
+      @list.pop(2).should == ['e']
+      @list.pop(2).should == nil
     end
 
     it "should handle rpoplpush" do
@@ -412,7 +422,7 @@ describe Redis::List do
       end
 
       it "#{meth} expireat: option" do
-        @list = Redis::List.new('spec/list_exp', :expireat => Time.now + 10.seconds)
+        @list = Redis::List.new('spec/list_exp', :expireat => Time.now + 10)
         @list.clear
         @list.send(meth, 'val')
         @list.ttl.should > 0
@@ -430,7 +440,7 @@ describe Redis::List do
     end
 
     it "[]= expireat: option" do
-      @list = Redis::List.new('spec/list_exp', :expireat => Time.now + 10.seconds)
+      @list = Redis::List.new('spec/list_exp', :expireat => Time.now + 10)
       @list.clear
       @list.redis.rpush(@list.key, 'hello')
       @list[0] = 'world'
@@ -448,7 +458,7 @@ describe Redis::List do
     end
 
     it "insert expireat: option" do
-      @list = Redis::List.new('spec/list_exp', :expireat => Time.now + 10.seconds)
+      @list = Redis::List.new('spec/list_exp', :expireat => Time.now + 10)
       @list.clear
       @list.redis.rpush(@list.key, 'hello')
       @list.insert 'BEFORE', 'hello', 'world'
@@ -586,7 +596,7 @@ describe Redis::Counter do
           @counter.ttl.should <= 10
         end
         it "expireat: option" do
-          @counter = Redis::Counter.new('spec/counter_exp', :expireat => Time.now + 10.seconds)
+          @counter = Redis::Counter.new('spec/counter_exp', :expireat => Time.now + 10)
           @counter.send(meth)
           @counter.ttl.should > 0
           @counter.ttl.should <= 10
@@ -600,14 +610,14 @@ describe Redis::Counter do
    [:set, :value=].each do |meth|
       describe meth do
         it "expiration: option" do
-          @counter = Redis::Counter.new('spec/counter_exp', :expireat => Time.now + 10.seconds)
+          @counter = Redis::Counter.new('spec/counter_exp', :expireat => Time.now + 10)
           @counter.send(meth, 99)
           @counter.should == 99
           @counter.ttl.should > 0
           @counter.ttl.should <= 10
         end
         it "expireat: option" do
-          @counter = Redis::Counter.new('spec/counter_exp', :expireat => Time.now + 10.seconds)
+          @counter = Redis::Counter.new('spec/counter_exp', :expireat => Time.now + 10)
           @counter.send(meth, 99)
           @counter.should == 99
           @counter.ttl.should > 0
@@ -805,22 +815,25 @@ end
 describe Redis::HashKey do
   describe "With Marshal" do
     before do
-      @hash = Redis::HashKey.new('test_hash', {:marshal_keys=>{'created_at'=>true}})
+      @hash = Redis::HashKey.new('test_hash', {:marshal_keys=>{'created_at' => true}})
       @hash.clear
     end
 
     it "should marshal specified keys" do
-      @hash['created_at'] = Time.now
+      time = Time.now
+      @hash['created_at'] = time
+      @hash['created_at'].should == time
       @hash['created_at'].class.should == Time
     end
 
     it "should not marshal unless required" do
-      @hash['updated_at'] = Time.now
+      @hash['updated_at'] = 10
+      @hash['updated_at'].should == "10"
       @hash['updated_at'].class.should == String
     end
 
     it "should marshall appropriate key with bulk set and get" do
-      @hash.bulk_set({'created_at'=>Time.now, 'updated_at'=>Time.now})
+      @hash.bulk_set({'created_at' => Time.now, 'updated_at' => 11})
 
       @hash['created_at'].class.should == Time
       @hash['updated_at'].class.should == String
@@ -849,7 +862,7 @@ describe Redis::HashKey do
     # no marshaling
     @hash.options[:marshal] = false
     v = {:json => 'data'}
-    @hash['abc'] = v
+    @hash['abc'] = v.to_s
     @hash['abc'].should == v.to_s
 
     @hash.options[:marshal] = true
@@ -1075,7 +1088,7 @@ describe Redis::HashKey do
       end
 
       it "#{meth} expireat: option" do
-        @hash = Redis::HashKey.new('spec/hash_expireat', :expireat => Time.now + 10.seconds)
+        @hash = Redis::HashKey.new('spec/hash_expireat', :expireat => Time.now + 10)
         @hash.clear
         @hash.send(meth, *args)
         @hash.ttl.should > 0
@@ -1294,7 +1307,7 @@ describe Redis::Set do
       end
 
       it "should set expiration when expireat option assigned" do
-        @set = Redis::Set.new('spec/set', :expireat => Time.now + 10.seconds)
+        @set = Redis::Set.new('spec/set', :expireat => Time.now + 10)
         @set.send(meth, 'val')
         @set.ttl.should > 0
         @set.ttl.should <= 10
@@ -1558,7 +1571,7 @@ describe Redis::SortedSet do
   end
 
   it 'should set expiration when expireat option assigned' do
-    @set = Redis::SortedSet.new('spec/zset', :expireat => Time.now + 10.seconds)
+    @set = Redis::SortedSet.new('spec/zset', :expireat => Time.now + 10)
     @set['val'] = 1
     @set.ttl.should > 0
     @set.ttl.should <= 10
@@ -1590,7 +1603,7 @@ describe Redis::SortedSet do
         @set.ttl.should <= 10
       end
       it "#{meth} expireat: option" do
-        @set = Redis::SortedSet.new('spec/zset_exp', :expireat => Time.now + 10.seconds)
+        @set = Redis::SortedSet.new('spec/zset_exp', :expireat => Time.now + 10)
         @set.clear
         @set.send(meth, 'somekey', 12)
         @set.ttl.should > 0
@@ -1607,7 +1620,7 @@ describe Redis::SortedSet do
         @set.ttl.should <= 10
       end
       it "#{meth} expireat: option" do
-        @set = Redis::SortedSet.new('spec/zset_exp', :expireat => Time.now + 10.seconds)
+        @set = Redis::SortedSet.new('spec/zset_exp', :expireat => Time.now + 10)
         @set.clear
         @set.send(meth, 'somekey' => 12)
         @set.ttl.should > 0
@@ -1626,7 +1639,7 @@ describe Redis::SortedSet do
       end
 
       it "#{meth} expireat: option" do
-        @set = Redis::SortedSet.new('spec/zset_exp', :expireat => Time.now + 10.seconds)
+        @set = Redis::SortedSet.new('spec/zset_exp', :expireat => Time.now + 10)
         @set.clear
         @set.redis.zadd(@set.key, 1, "1")
         @set.send(meth, 'sets', Redis::SortedSet.new('other'))
@@ -1646,7 +1659,7 @@ describe Redis::SortedSet do
     end
 
     it "delete expireat: option" do
-      @set = Redis::SortedSet.new('spec/zset_exp', :expireat => Time.now + 10.seconds)
+      @set = Redis::SortedSet.new('spec/zset_exp', :expireat => Time.now + 10)
       @set.clear
       @set.redis.zadd(@set.key, 1, "1")
       @set.redis.zadd(@set.key, 2, "2")

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ if $0 =~ /\brspec$/
 end
 
 # For the incompatible change from redis.rb
-Redis.exists_returns_integer =  true
+# Redis.exists_returns_integer =  true
 
 # Avoid phantom remote test failures
 RUNNING_LOCALLY = !ENV['TRAVIS']
@@ -61,7 +61,7 @@ def kill_redis
   Process.kill "TERM", pid
   Process.kill "KILL", pid
   File.unlink pidfile
-  File.unlink rdbfile if File.exists? rdbfile
+  File.unlink rdbfile if File.exist? rdbfile
 end
 
 # Start redis-server except under JRuby

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: redis-objects
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha
+  version: 2.0.0.beta
 platform: ruby
 authors:
 - Nate Wiger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-23 00:00:00.000000000 Z
+date: 2023-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Map Redis types directly to Ruby objects