redis-objects 2.0.0.alpha → 2.0.0.beta2

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/redis_objects_model_spec.rb

@@ -6,6 +6,7 @@ Redis::Objects.redis = REDIS_HANDLE
 
 class Roster
   include Redis::Objects
+
   counter :available_slots, :start => 10
   counter :pitchers, :limit => :max_pitchers
   counter :basic
@@ -35,7 +36,7 @@ class Roster
   def self.jimmyhat; 350; end
   value :weird_key, :key => 'players:weird_key:#{jimmyhat}', :global => true
 
-  #callable as key
+  # callable as key
   counter :daily, :global => true, :key => Proc.new { |roster| "#{roster.name}:#{Time.now.strftime('%Y-%m-%dT%H')}:daily" }
 
   # set default expiration
@@ -61,16 +62,31 @@ class Roster
 end
 
 class VanillaRoster < Roster
-  # No explicit Redis::Objects
+  # inherits Redis::Objects
+  # No explicit RedisAccessors (but they are inherited)
 end
 
 class CustomRoster < Roster
-  include Redis::Objects
+  # inherits Redis::Objects
 
   counter :basic # Override
   counter :special # New
 end
 
+class UidRoster < Roster
+  # inherits Redis::Objects
+
+  attr_accessor :uid
+  def initialize(uid=123) @uid = uid end
+end
+
+class CustomIdFieldRoster < UidRoster
+  # inherits Redis::Objects
+  redis_id_field :uid
+
+  counter :basic
+end
+
 class MethodRoster
   def increment(attribute, by=1)
     42
@@ -87,18 +103,24 @@ class CustomMethodRoster < MethodRoster
   counter :basic
 end
 
-class UidRoster < Roster
-  attr_accessor :uid
-  def initialize(uid=123) @uid = uid end
-end
 
-class CustomIdFieldRoster < UidRoster
-  redis_id_field :uid
-  include Redis::Objects
-  counter :basic
-end
+# TODO: @redis_objects is un-initialized in subclasses. It only picks up accessors declared within the subclass itself.
+#       but all the accessors continue to work as expected.
+=begin
+puts "Roster.redis_objects.length: #{Roster.redis_objects.length} (expected: 35)" # got 35
+VanillaRoster.total_players_online.increment(5)
+VanillaRoster.global_player_leaderboard.add('nate', 22)
+puts "VanillaRoster.redis_objects.length: #{VanillaRoster.redis_objects.length} (expected: 35)" # got 0
+puts "VanillaRoster: total_players_online: #{VanillaRoster.total_players_online} global_player_leaderboard: #{VanillaRoster.global_player_leaderboard}" # got 5 & nate
+puts "CustomRoster.redis_objects.length: #{CustomRoster.redis_objects.length} (expected: 36)" # got 2
+puts "UidRoster.redis_objects.length: #{UidRoster.redis_objects.length} (expected: 35)" # got 0
+puts "CustomIdFieldRoster.redis_objects.length: #{CustomIdFieldRoster.redis_objects.length} (expected: 35)" # got 1
+#puts "MethodRoster.redis_objects.length: #{MethodRoster.redis_objects.length}"
+puts "CustomMethodRoster.redis_objects.length: #{CustomMethodRoster.redis_objects.length} (expected: 1)" # got 1
+=end
 
 describe Redis::Objects do
+  # Before each
   before do
     @roster  = Roster.new
     @roster2 = Roster.new

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']
@@ -24,8 +24,9 @@ SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
 
 #require "active_support/xml_mini"
 require "active_support"
+require "active_support/core_ext/integer/time" # needed for 1.second 1.minute etc durations to function
 require "active_support/testing/time_helpers"
-include ActiveSupport::Testing::TimeHelpers
+include ActiveSupport::Testing::TimeHelpers # needed by one line in redis_objects_model_spec.rb
 
 REDIS_CLASS_NAMES = [:Counter, :HashKey, :List, :Lock, :Set, :SortedSet, :Value]
 
@@ -61,7 +62,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,28 @@
 --- !ruby/object:Gem::Specification
 name: redis-objects
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Nate Wiger
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-23 00:00:00.000000000 Z
+date: 1980-01-02 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
@@ -188,7 +187,7 @@ files:
 - lib/redis/value.rb
 - redis-objects.gemspec
 - spec/redis_autoload_objects_spec.rb
-- spec/redis_legacy_key_naming_spec.rb
+- spec/redis_key_naming_spec.rb
 - spec/redis_namespace_compat_spec.rb
 - spec/redis_objects_active_record_spec.rb
 - spec/redis_objects_conn_spec.rb
@@ -200,7 +199,6 @@ homepage: http://github.com/nateware/redis-objects
 licenses:
 - Artistic-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -211,17 +209,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Map Redis types directly to Ruby objects
 test_files:
 - spec/redis_autoload_objects_spec.rb
-- spec/redis_legacy_key_naming_spec.rb
+- spec/redis_key_naming_spec.rb
 - spec/redis_namespace_compat_spec.rb
 - spec/redis_objects_active_record_spec.rb
 - spec/redis_objects_conn_spec.rb