redis-objects 1.4.3 → 1.6.0

data/spec/redis_objects_model_spec.rb

@@ -2,6 +2,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 require 'redis/objects'
+Redis::Objects.redis = REDIS_HANDLE
 
 class Roster
   include Redis::Objects
@@ -14,11 +15,15 @@ class Roster
   list :player_stats, :marshal => true
   set :outfielders, :marshal => true
   sorted_set :rank
+  lock :per_field
 
   # global class counters
   counter :total_players_online, :global => true
   set :all_players_online, :global => true
   value :last_player, :global => true
+  lock :nasty_global_mutex, :global => true  # remember it appends "_lock"
+  sorted_set :global_player_leaderboard, :global => true
+  hash_key :global_player_online_status, :global => true
 
   # custom keys
   counter :player_totals, :key => 'players/#{username}/total'
@@ -162,6 +167,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'
@@ -202,6 +215,21 @@ describe Redis::Objects do
      end
   end
 
+  it "should handle obtaining / clearing locks" do
+    # class-level calls for Admin reasons
+    # this is a really weird API and I wonder if anyone actually uses it
+    id = 88
+    roster = Roster.new(id)
+    roster.per_field_lock.exists?.should == false
+    Roster.obtain_lock(:per_field, id) do
+      roster.per_field_lock.exists?.should == true
+    end
+    roster.per_field_lock.exists?.should == false
+
+    Roster.clear_lock(:per_field, id)
+    roster.per_field_lock.exists?.should == false
+  end
+
   it "should support increment/decrement of counters" do
     @roster.available_slots.key.should == 'roster:1:available_slots'
     @roster.available_slots.should == 10
@@ -265,6 +293,26 @@ describe Redis::Objects do
     Roster.get_counter(:total_players_online).should == 111
   end
 
+  it "should support class-level manipulation of global objects" do
+    Roster.nasty_global_mutex_lock.exists?.should == false
+    Roster.nasty_global_mutex_lock do
+      Roster.nasty_global_mutex_lock.exists?.should == true
+    end
+    Roster.nasty_global_mutex_lock.exists?.should == false
+
+    Roster.global_player_leaderboard.exists?.should == false
+    Roster.global_player_leaderboard.add('nate', 22)
+    Roster.global_player_leaderboard.add('jim', 11)
+    Roster.global_player_leaderboard.rank('nate').should == 1 # 0-based
+
+    Roster.global_player_online_status.exists?.should == false
+    Roster.global_player_online_status['nate'] = 'online'
+    Roster.global_player_online_status['jeff'] = 'offline'
+    Roster.global_player_online_status['nate'].should == 'online'
+    Roster.global_player_online_status['jeff'].should == 'offline'
+    Roster.global_player_online_status['bobby'].should.be.nil
+  end
+
   it "should take an atomic block for increment/decrement" do
     a = false
     @roster.available_slots.should == 10
@@ -423,6 +471,13 @@ describe Redis::Objects do
     end
     error.should.be.kind_of(NoMethodError)
 
+    error = nil
+    begin
+      Roster.increment_counter(:available_slots, nil)
+    rescue => error
+    end
+    error.should.be.kind_of(Redis::Objects::MissingID)
+
     error = nil
     begin
       Roster.obtain_lock(:badness, 2){}
@@ -485,6 +540,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 +620,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 +1078,21 @@ 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
+
+  it "should handle per-class connection handles" do
+    redis = Roster.redis
+    Roster.redis = redis
+    Roster.redis.should == redis
   end
 end

data/spec/spec_helper.rb

@@ -9,6 +9,21 @@ if $0 =~ /\brspec$/
   raise "\n===\nThese tests are in bacon, not rspec.  Try: bacon #{ARGV * ' '}\n===\n"
 end
 
+# For the incompatible change from redis.rb
+Redis.exists_returns_integer =  true
+
+# Avoid phantom remote test failures
+RUNNING_LOCALLY = !ENV['TRAVIS']
+
+# Code coverage reports
+require 'simplecov'
+SimpleCov.start
+
+require 'simplecov-cobertura'
+SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
+
+#require "active_support/xml_mini"
+require "active_support"
 require "active_support/testing/time_helpers"
 include ActiveSupport::Testing::TimeHelpers
 
@@ -69,8 +84,6 @@ end
 
 # Grab a global handle
 REDIS_HANDLE = Redis.new(:host => REDIS_HOST, :port => REDIS_PORT)
-#$redis = REDIS_HANDLE
-Redis.current = REDIS_HANDLE
 
 SORT_ORDER = {:order => 'desc alpha'}
 SORT_LIMIT = {:limit => [2, 2]}

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: redis-objects
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.6.0
 platform: ruby
 authors:
 - Nate Wiger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-07 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-cobertura
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Map Redis types directly to Ruby objects. Works with any class or ORM.
 email:
 - nwiger@gmail.com
@@ -140,6 +168,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 +191,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
@@ -184,8 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Map Redis types directly to Ruby objects
@@ -194,6 +223,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