redis-objects 0.5.1 → 0.5.2

data/CHANGELOG.rdoc

@@ -1,5 +1,11 @@
 = Changelog for Redis::Objects
 
+== 0.5.2 [Development]
+
+* Added Redis::SortedSet#member? method [Karl Varga]
+
+* Added +ttl+ method to CoreCommands [Karl Varga]
+
 == 0.5.1 [Final] (23 May 2011)
 
 * Fixed super class delegation conflicts with Redis Counters vs ActiveRecord [Tim Aßmann]

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.homepage = "http://github.com/nateware/redis-objects"
     gem.authors = ["Nate Wiger"]
     gem.add_development_dependency "bacon", ">= 0"
+    gem.add_development_dependency "redis-namespace", ">= 0"
     gem.requirements << 'redis, v2.1.1 or greater'
     gem.add_dependency('redis', '>= 2.1.1')  # ALSO: update spec/spec_helper.rb
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/redis/counter.rb

@@ -28,6 +28,14 @@ class Redis
       true  # hack for redis-rb regression
     end
 
+    # Reset the counter to its starting value, and return previous value.
+    # Use this to "reap" the counter and save it somewhere else. This is
+    # atomic in that no increments or decrements are lost if you process
+    # the returned value.
+    def getset(to=options[:start])
+      redis.getset(key, to.to_i).to_i
+    end
+
     # Returns the current value of the counter.  Normally just calling the
     # counter will lazily fetch the value, and only update it if increment
     # or decrement is called.  This forces a network call to redis-server

data/lib/redis/helpers/core_commands.rb

@@ -37,7 +37,11 @@ class Redis
       def expireat(unixtime)
         redis.expire key, unixtime
       end
-    
+
+      def ttl
+        redis.ttl(@key).seconds
+      end
+
       def move(dbindex)
         redis.move key, dbindex
       end

data/lib/redis/list.rb

@@ -55,7 +55,8 @@ class Redis
     # a range of values using Redis: LRANGE.
     def [](index, length=nil)
       if index.is_a? Range
-        range(index.first, index.last)
+        last = index.exclude_end? ? (index.last - 1) : index.last
+        range(index.first, last)
       elsif length
         case length <=> 0
         when 1  then range(index, index + length - 1)

data/lib/redis/objects/counters.rb

@@ -79,6 +79,13 @@ class Redis
           redis.set(redis_field_key(name, id), to.to_i)
           true
         end
+
+        # Set a counter to its starting value and return the old value.
+        def getset_counter(name, id=nil, to=nil)
+          verify_counter_defined!(name, id)
+          to = @redis_objects[name][:start] if to.nil?
+          redis.getset(redis_field_key(name, id), to.to_i).to_i
+        end
         
         private
         

data/lib/redis/sorted_set.rb

@@ -168,8 +168,8 @@ class Redis
     alias_method :incrby, :increment
 
     # Convenience to calling increment() with a negative number.
-    def decrement(by=1)
-      redis.zincrby(key, -by).to_i
+    def decrement(member, by=1)
+      redis.zincrby(key, -by, member).to_i
     end
     alias_method :decr, :decrement
     alias_method :decrby, :decrement
@@ -286,6 +286,11 @@ class Redis
       redis.zcount(key, min, max)
     end
 
+    # Return a boolean indicating whether +value+ is a member.
+    def member?(value)
+      !redis.zscore(key, to_redis(value)).nil?
+    end
+
     private
 
     def keys_from_objects(sets)

data/redis-objects.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{redis-objects}
-  s.version = "0.5.1"
+  s.name = "redis-objects"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nate Wiger"]
-  s.date = %q{2011-05-23}
-  s.description = %q{Map Redis types directly to Ruby objects. Works with any class or ORM.}
-  s.email = %q{nate@wiger.org}
+  s.date = "2011-09-20"
+  s.description = "Map Redis types directly to Ruby objects. Works with any class or ORM."
+  s.email = "nate@wiger.org"
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
@@ -46,24 +46,27 @@ Gem::Specification.new do |s|
     "spec/redis_objects_model_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/nateware/redis-objects}
+  s.homepage = "http://github.com/nateware/redis-objects"
   s.require_paths = ["lib"]
   s.requirements = ["redis, v2.1.1 or greater"]
-  s.rubygems_version = %q{1.7.2}
-  s.summary = %q{Map Redis types directly to Ruby objects}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Map Redis types directly to Ruby objects"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<bacon>, [">= 0"])
+      s.add_development_dependency(%q<redis-namespace>, [">= 0"])
       s.add_runtime_dependency(%q<redis>, [">= 2.1.1"])
     else
       s.add_dependency(%q<bacon>, [">= 0"])
+      s.add_dependency(%q<redis-namespace>, [">= 0"])
       s.add_dependency(%q<redis>, [">= 2.1.1"])
     end
   else
     s.add_dependency(%q<bacon>, [">= 0"])
+    s.add_dependency(%q<redis-namespace>, [">= 0"])
     s.add_dependency(%q<redis>, [">= 2.1.1"])
   end
 end

data/spec/redis_objects_active_record_spec.rb

@@ -81,6 +81,10 @@ begin
       @ar2.total.decrement.should == 1
       @ar2.total.reset
       @ar2.total.should == 0
+      @ar2.total.reset(55)
+      @ar2.total.should == 55
+      @ar2.total.getset(12).should == 55
+      @ar2.total.should == 12
       @ar2.destroy
     end
 

data/spec/redis_objects_instance_spec.rb

@@ -147,6 +147,7 @@ describe Redis::List do
       # Test against similar Ruby functionality
       a = @list.values
       @list[0..2].should == a[0..2]
+      @list[0...2].should == a[0...2]
       @list.slice(0..2).should == a.slice(0..2)
       @list[0, 2].should == a[0, 2]
       @list.range(0, 2).should == a[0..2]  # range for Redis works like .. in Ruby
@@ -266,6 +267,8 @@ describe Redis::Counter do
     @counter.should == 0
     @counter.reset(15).should.be.true
     @counter.should == 15
+    @counter.getset(111).should == 15
+    @counter.should == 111
   end
 
   after do

data/spec/redis_objects_model_spec.rb

@@ -193,6 +193,8 @@ describe Redis::Objects do
     Roster.decrement_counter(:available_slots, @roster.id).should == 11
     Roster.reset_counter(:available_slots, @roster.id).should == true
     Roster.get_counter(:available_slots, @roster.id).should == 10
+    Roster.getset_counter(:available_slots, @roster.id, 555).should == 10
+    Roster.get_counter(:available_slots, @roster.id).should == 555
   end
 
   it "should support class-level increment/decrement of global counters" do
@@ -211,6 +213,8 @@ describe Redis::Objects do
     Roster.decrement_counter(:total_players_online).should == 1
     Roster.reset_counter(:total_players_online).should == true
     Roster.get_counter(:total_players_online).should == 0
+    Roster.getset_counter(:total_players_online, nil, 111).should == 0
+    Roster.get_counter(:total_players_online).should == 111
   end
 
   it "should take an atomic block for increment/decrement" do

data/spec/spec_helper.rb

@@ -6,17 +6,33 @@ $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'bacon'
 Bacon.summary_at_exit
 
-$redis = Redis.new(:host => ENV['REDIS_HOST'], :port => ENV['REDIS_PORT'])
-
 UNIONSTORE_KEY = 'test:unionstore'
 INTERSTORE_KEY = 'test:interstore'
 DIFFSTORE_KEY  = 'test:diffstore'
 
+# Start our own redis-server to avoid corrupting any others
+REDIS_BIN  = 'redis-server'
+REDIS_PORT = ENV['REDIS_PORT'] || 9212
+REDIS_HOST = ENV['REDIS_HOST'] || 'localhost'
+REDIS_PID  = File.expand_path 'redis.pid', File.dirname(__FILE__)
+REDIS_DUMP = File.expand_path 'redis.rdb', File.dirname(__FILE__)
+puts "=> Starting redis-server on #{REDIS_HOST}:#{REDIS_PORT}"
+fork_pid = fork do
+  system "(echo port #{REDIS_PORT}; echo logfile /dev/null; echo daemonize yes; echo pidfile #{REDIS_PID}; echo dbfilename #{REDIS_DUMP}) | #{REDIS_BIN} -"
+end
+at_exit do
+  pid = File.read(REDIS_PID).to_i
+  puts "=> Killing #{REDIS_BIN} with pid #{pid}"
+  Process.kill "TERM", pid
+  Process.kill "KILL", pid
+  File.unlink REDIS_PID, REDIS_DUMP
+end
+
+# Grab a global handle
+$redis = Redis.new(:host => REDIS_HOST, :port => REDIS_PORT)
 
 SORT_ORDER = {:order => 'desc alpha'}
 SORT_LIMIT = {:limit => [2, 2]}
 SORT_BY = {:by => 'm_*'}
 SORT_GET = {:get => 'spec/*/sorted'}.merge!(SORT_LIMIT)
 SORT_STORE = {:store => "spec/aftersort"}.merge!(SORT_GET)
-
-

metadata

@@ -2,7 +2,7 @@
 name: redis-objects
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Nate Wiger
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 Z
+date: 2011-09-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bacon
@@ -24,16 +24,27 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: redis
+  name: redis-namespace
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: redis
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 2.1.1
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 description: Map Redis types directly to Ruby objects. Works with any class or ORM.
 email: nate@wiger.org
 executables: []
@@ -95,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - redis, v2.1.1 or greater
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Map Redis types directly to Ruby objects