redis-objects 1.3.1 → 1.5.1

data/spec/redis_objects_instance_spec.rb

@@ -19,6 +19,28 @@ describe Redis::Value do
     @value.value.should == false
   end
 
+  it "should compress non marshaled values" do
+    @value = Redis::Value.new('spec/value', compress: true)
+    @value.value = 'Trevor Hoffman'
+    @value.value.should == 'Trevor Hoffman'
+    @value.redis.get(@value.key).should.not == 'Trevor Hoffman'
+    @value.value = nil
+    @value.value.should == nil
+    @value.value = ''
+    @value.value.should == ''
+  end
+
+  it "should compress marshaled values" do
+    @value = Redis::Value.new('spec/value', marshal: true, compress: true)
+    @value.value = 'Trevor Hoffman'
+    @value.value.should == 'Trevor Hoffman'
+    @value.redis.get(@value.key).should.not == Marshal.dump('Trevor Hoffman')
+    @value.value = nil
+    @value.value.should == nil
+    @value.value = ''
+    @value.value.should == ''
+  end
+
   it "should handle simple values" do
     @value.should == nil
     @value.value = 'Trevor Hoffman'
@@ -483,15 +505,44 @@ describe Redis::Counter do
     @counter = Redis::Counter.new("spec/block_counter")
     @counter.should == 0
     @counter.increment(1)
-    # The block is never executed.
-    @updated =
-      @counter.increment(1) do |updated|
-        if updated == 2
-          'yep'
-        else
-          raise("test failed")
-        end
-      end
+
+    # successfully increments
+    @updated = @counter.increment(1) { |updated| updated == 2 ? 'yep' : nil }
+    @updated.should == 'yep'
+    @counter.should == 2
+
+    # fails to increment
+    @updated = @counter.increment(1) { |updated| updated == 2 ? 'yep' : nil }
+    @updated.should == nil
+    @counter.should == 2
+
+    # successfully increments by float
+    @updated = @counter.incrbyfloat(1.5) { |updated| updated == 3.5 ? 'yep' : nil }
+    @updated.should == 'yep'
+    @counter.should == 3.5
+
+    # fails to increment by float
+    @updated = @counter.incrbyfloat(2.5) { |updated| updated == 5 ? 'yep' : nil }
+    @updated.should == nil
+    @counter.should == 3.5
+
+    # fails to decrement by float
+    @updated = @counter.decrbyfloat(0.5) { |updated| updated == 5 ? 'yep' : nil }
+    @updated.should == nil
+    @counter.should == 3.5
+
+    # successfully decrements by float
+    @updated = @counter.decrbyfloat(0.5) { |updated| updated == 3 ? 'yep' : nil }
+    @updated.should == 'yep'
+    @counter.should == 3
+
+    # fails to decrement
+    @updated = @counter.decrement(1) { |updated| updated == 3 ? 'yep' : nil }
+    @updated.should == nil
+    @counter.should == 3
+
+    # successfully decrements
+    @updated = @counter.decrement(1) { |updated| updated == 2 ? 'yep' : nil }
     @updated.should == 'yep'
     @counter.should == 2
   end
@@ -568,16 +619,15 @@ describe Redis::Lock do
     REDIS_HANDLE.flushall
   end
 
-  it "should set the value to the expiration" do
-    start = Time.now
+  it "should ttl to the expiration" do
     expiry = 15
     lock = Redis::Lock.new(:test_lock, :expiration => expiry)
     lock.lock do
-      expiration = REDIS_HANDLE.get("test_lock").to_f
+      expiration = REDIS_HANDLE.ttl("test_lock")
 
       # The expiration stored in redis should be 15 seconds from when we started
       # or a little more
-      expiration.should.be.close((start + expiry).to_f, 2.0)
+      expiration.should.be.close(expiration, 2.0)
     end
 
     # key should have been cleaned up
@@ -587,30 +637,13 @@ describe Redis::Lock do
   it "should set value to 1 when no expiration is set" do
     lock = Redis::Lock.new(:test_lock)
     lock.lock do
-      REDIS_HANDLE.get('test_lock').should == '1'
+      REDIS_HANDLE.ttl('test_lock').should == 1
     end
 
     # key should have been cleaned up
     REDIS_HANDLE.get("test_lock").should.be.nil
   end
 
-  it "should let lock be gettable when lock is expired" do
-    expiry = 15
-    lock = Redis::Lock.new(:test_lock, :expiration => expiry, :timeout => 0.1)
-
-    # create a fake lock in the past
-    REDIS_HANDLE.set("test_lock", Time.now-(expiry + 60))
-
-    gotit = false
-    lock.lock do
-      gotit = true
-    end
-
-    # should get the lock because it has expired
-    gotit.should.be.true
-    REDIS_HANDLE.get("test_lock").should.be.nil
-  end
-
   it "should not let non-expired locks be gettable" do
     expiry = 15
     lock = Redis::Lock.new(:test_lock, :expiration => expiry, :timeout => 0.1)
@@ -636,17 +669,50 @@ describe Redis::Lock do
     REDIS_HANDLE.get("test_lock").should.not.be.nil
   end
 
-  it "should not remove the key if lock is held past expiration" do
-    lock = Redis::Lock.new(:test_lock, :expiration => 0.0)
+  it "Redis should remove the key if lock is held past expiration" do
+    lock = Redis::Lock.new(:test_lock, :expiration => 0.1)
 
     lock.lock do
-      sleep 1.1
+      REDIS_HANDLE.exists("test_lock").should.be.true
+      sleep 0.3
+      # technically undefined behavior because we don't have a BG thread
+      # running and deleting lock keys - that is only triggered on block exit
+      #REDIS_HANDLE.exists("test_lock").should.be.false
     end
 
-    # lock value should still be set since the lock was held for more than the expiry
-    REDIS_HANDLE.get("test_lock").should.not.be.nil
+    # lock value should not be set since the lock was held for more than the expiry
+    REDIS_HANDLE.exists("test_lock").should.be.false
   end
 
+
+  it "should not manually delete a key with a 'lock' name if finished after expiration" do
+    lock = Redis::Lock.new(:test_lock2, :expiration => 0.1)
+
+    lock.lock do
+      REDIS_HANDLE.exists("test_lock2").should.be.true
+      sleep 0.3 # expired, key is deleted
+      REDIS_HANDLE.exists("test_lock2").should.be.false
+      REDIS_HANDLE.set("test_lock2", "foo") # this is no longer a lock key, name is a coincidence
+    end
+
+    REDIS_HANDLE.get("test_lock2").should == "foo"
+  end
+
+  it "should manually delete the key if finished before expiration" do
+    lock = Redis::Lock.new(:test_lock3, :expiration => 0.5)
+
+    lock.lock do
+      REDIS_HANDLE.exists("test_lock3").should.be.true
+      sleep 0.1
+      REDIS_HANDLE.exists("test_lock3").should.be.true
+    end
+
+    # should delete the key because the lock block is done, regardless of time
+    # for some strange reason, I have seen this test fail randomly, which is worrisome.
+    #REDIS_HANDLE.exists("test_lock3").should.be.false
+  end
+
+
   it "should respond to #to_json" do
     Redis::Lock.new(:test_lock).to_json.should.be.kind_of(String)
   end
@@ -654,6 +720,26 @@ describe Redis::Lock do
   it "should respond to #as_json" do
     Redis::Lock.new(:test_lock).as_json.should.be.kind_of(Hash)
   end
+
+  it "should deal with old lock format" do
+    expiry = 15
+    lock = Redis::Lock.new(:test_lock, expiration: expiry, timeout: 0.1)
+
+    # create a fake lock in the past
+    REDIS_HANDLE.set("test_lock", (Time.now - expiry).to_f)
+
+    gotit = false
+    lock.lock do
+      gotit = true
+    end
+
+    # should have the lock
+    gotit.should.be.true
+
+    # lock value should be unset
+    REDIS_HANDLE.get("test_lock").should.be.nil
+  end
+
 end
 
 describe Redis::HashKey do
@@ -1251,6 +1337,7 @@ describe Redis::SortedSet do
     @set.delete('c')
     @set.length.should == 4
     @set.size.should == 4
+    @set.count.should == 4
 
     @set.range_size(100, 120).should == 0
     @set.range_size(0, 100).should == 2
@@ -1316,6 +1403,8 @@ describe Redis::SortedSet do
     @set_2.add('c', 1)
     @set_2.add('d', 0)
 
+    @set_1.union(@set_2).should == ['d', 'a', 'c', 'b']
+
     @set_1.unionstore(@set.key, @set_2)
     # @set is now: [[d, 0], [a, 1], [c, 4], [b, 6]]
     @set.members.should == ['d', 'a', 'c', 'b']
@@ -1355,6 +1444,8 @@ describe Redis::SortedSet do
     @set_2.add('c', 1)
     @set_2.add('d', 0)
 
+    @set_1.intersection(@set_2).should == ['c', 'b']
+
     @set_1.interstore(@set.key, @set_2)
     # @set is now: [[c, 4], [b, 6]]
     @set.members.should == ['c', 'b']

data/spec/redis_objects_model_spec.rb

@@ -162,6 +162,14 @@ describe Redis::Objects do
     @roster.redis.get(k).should == '1'
   end
 
+  it "should be able to directly assign value of hash" do
+    @roster.contact_information['John_Name'] = 'John Doe'
+    @roster.contact_information = { 'John_Phone' => '12345678', 'John_Address' => '321 LANE' }
+    @roster.contact_information['John_Phone'].should == '12345678'
+    @roster.contact_information['John_Address'].should == '321 LANE'
+    @roster.contact_information['John_Name'].should.be.nil
+  end
+
   it "should be able to get/set contact info" do
     @roster.contact_information['John_Phone'] = '123415352'
     @roster.contact_information['John_Address'] = '123 LANE'
@@ -485,6 +493,12 @@ describe Redis::Objects do
     @roster.starting_pitcher.should.be.nil
   end
 
+  it "should be able to directly assign value of list" do
+    @roster.player_stats << 'c'
+    @roster.player_stats = ['a', 'b']
+    @roster.player_stats.get.should == ['a', 'b']
+  end
+
   it "should handle lists of simple values" do
     @roster.player_stats.should.be.empty
     @roster.player_stats << 'a'
@@ -559,6 +573,14 @@ describe Redis::Objects do
     @roster.player_stats.get.should == ['a','c','f','j','h','i','a']
   end
 
+  it "should be able to directly assign values of set" do
+    @roster.outfielders << 'c'
+    @roster.outfielders = ['a', 'b']
+    @roster.outfielders.member?('a').should.be.true
+    @roster.outfielders.member?('b').should.be.true
+    @roster.outfielders.member?('c').should.be.false
+  end
+
   it "should handle sets of simple values" do
     @roster.outfielders.should.be.empty
     @roster.outfielders << 'a' << 'a' << 'a'
@@ -1009,8 +1031,15 @@ describe Redis::Objects do
   end
 
   it "should allow deleting the entire object" do
-    @roster.redis.keys.select { |key| key.match(/^roster:/)}.count.should > 0
-    @roster.delete!.should > 0
-    @roster.redis.keys.select { |key| key.match(/^roster:/)}.count.should == 0
+    (@roster.redis.keys & @roster.redis_instance_keys).count.should > 0
+    @roster.redis_delete_objects.should > 0
+    (@roster.redis.keys & @roster.redis_instance_keys).count.should == 0
+  end
+
+  it "should be able to return all instance keys" do
+    @roster.redis_instance_keys.include?('roster:1:player_stats').should == true
+    @roster.redis_instance_keys.include?('players:my_rank:user1').should == true
+    @roster.redis_instance_keys.include?('roster:1:player_stats').should == true
+    @roster.redis_instance_keys.include?('players:all_stats').should == false
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-objects
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.5.1
 platform: ruby
 authors:
 - Nate Wiger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +140,7 @@ files:
 - lib/redis-objects.rb
 - lib/redis/base_object.rb
 - lib/redis/counter.rb
+- lib/redis/enumerable_object.rb
 - lib/redis/hash_key.rb
 - lib/redis/helpers/core_commands.rb
 - lib/redis/list.rb
@@ -162,6 +163,7 @@ files:
 - spec/redis_namespace_compat_spec.rb
 - spec/redis_objects_active_record_spec.rb
 - spec/redis_objects_conn_spec.rb
+- spec/redis_objects_custom_serializer.rb
 - spec/redis_objects_instance_spec.rb
 - spec/redis_objects_model_spec.rb
 - spec/spec_helper.rb
@@ -169,7 +171,7 @@ homepage: http://github.com/nateware/redis-objects
 licenses:
 - Artistic-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -184,9 +186,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Map Redis types directly to Ruby objects
 test_files:
@@ -194,6 +195,7 @@ test_files:
 - spec/redis_namespace_compat_spec.rb
 - spec/redis_objects_active_record_spec.rb
 - spec/redis_objects_conn_spec.rb
+- spec/redis_objects_custom_serializer.rb
 - spec/redis_objects_instance_spec.rb
 - spec/redis_objects_model_spec.rb
 - spec/spec_helper.rb