redis-objects 0.5.3 → 0.6.0

data/CHANGELOG.rdoc

@@ -1,12 +1,36 @@
 = Changelog for Redis::Objects
 
-== 0.5.2 [Development]
+== 0.6.0 (24 October 2012)
+
+* Add +@set.merge()+ method to add multiple members at once [hfwang] 
+
+* Add +insert+ method to Redis::List instances [giglemad]
+
+* Updated APIs for recent redis-server sort API compat [nateware]
+
+* Add HashKey#bulk_values for fetching values in the same order than the given keys [aspgems]
+
+* Lists now handle the insert command 
+
+* Changed +@sset.score+ method on SortedSet to return nil for invalid members [hkarthik]
+
+* Test using redis-objects counters and fix when AR passes a string
+
+* Add LSET to lists [neonlex]
+
+* Fix interstore/unionstore for redis 2.6 [david]
+
+* Redis-rb 3.0.0 support [seomoz]
+
+* group_set_with_scores is no longer needed.
+
+== 0.5.2 (13 June 2012)
 
 * Added Redis::SortedSet#member? method [Karl Varga]
 
 * Added +ttl+ method to CoreCommands [Karl Varga]
 
-== 0.5.1 [Final] (23 May 2011)
+== 0.5.1 (23 May 2011)
 
 * Fixed super class delegation conflicts with Redis Counters vs ActiveRecord [Tim Aßmann]
 
@@ -16,7 +40,7 @@
 
 * Updated URLs to reflect new redis.io website [Jérémy Lecour]
 
-== 0.5.0 [Final] (8 November 2010)
+== 0.5.0 (8 November 2010)
 
 * Incompatible change: Had to rename Redis::Hash to Redis::HashKey due to internal conflicts with Redis lib and Ruby [Nate Wiger]
 
@@ -30,7 +54,7 @@
 
 * Updated Redis DEL semantics per API change [Gabe da Silveira]
 
-== 0.4.1 [Final] (23 August 2010)
+== 0.4.1 (23 August 2010)
 
 * Fixes for Ruby 1.8 failures due to missing flatten() [Gabe da Silveira]
 
@@ -40,7 +64,7 @@
 
 * Fixed a typo in delete_if and added missing test coverage [Julio Capote, Nate Wiger]
 
-== 0.4.0 [Final] (11 August 2010)
+== 0.4.0 (11 August 2010)
 
 * Full support for redis hashes via new Redis::Hash class [Julio Capote, Nate Wiger]
 
@@ -54,7 +78,7 @@
 
 * Renamed :withscores option to :with_scores for consistency with redis-rb 2.0, but kept backwards compat [Tom Stuart, Nate Wiger]
 
-== 0.3.2 [Final] (21 July 2010)
+== 0.3.2 (21 July 2010)
 
 * New "maxlength" option to Redis::List can create length-limited lists (eg, like a ring buffer) from dbalatero [David Balatero]
 
@@ -62,21 +86,21 @@
 
 * Switched from rspec to bacon for tests
 
-== 0.3.1 [Final] (1 June 2010)
+== 0.3.1 (1 June 2010)
 
 * Integrated fixes for sorted_set deletions from capotej [Julio Capote]
 
-== 0.3.0 [Final] (14 April 2010)
+== 0.3.0 (14 April 2010)
 
 * Due to Ruby 1.9 bugs and performance considerations, marshaling of data types is now OFF by default.  You must say :marshal => true for any objects that you want serialization enabled on. [Nate Wiger]
 
 * Sorted Set class changed slightly due to feedback. You can now get an individual element back via @set['item'] since it acts like a Hash.
 
-== 0.2.4 [Final] (9 April 2010)*
+== 0.2.4 (9 April 2010)
 
 * Added sorted set support via Redis::SortedSet [Nate Wiger]
 
-== 0.2.3 [Final] (18 February 2010)*
+== 0.2.3 (18 February 2010)
 
 * Added lock expiration to Redis::Lock [Ben VandenBos]
 
@@ -84,7 +108,7 @@
 
 * Added lock tests and test helpers [Ben VandenBos]
 
-== 0.2.2 [Final] (14 December 2009)*
+== 0.2.2 (14 December 2009)
 
 * Added @set.diff(@set2) with "^" and "-" synonyms (oversight). [Nate Wiger]
 
@@ -94,7 +118,7 @@
 
 * More spec coverage. [Nate Wiger]
 
-== 0.2.1 [Final] (27 November 2009)*
+== 0.2.1 (27 November 2009)
 
 * First worthwhile public release, with good spec coverage and functionality. [Nate Wiger]
 

data/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gem 'redis', '>= 3.0.2'
+gem 'redis-namespace'
+gem 'bacon'
+gem 'jeweler'
+gem 'activerecord'

data/Gemfile.lock

@@ -0,0 +1,43 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    bacon (1.1.0)
+    builder (3.0.4)
+    git (1.2.5)
+    i18n (0.6.1)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.7.5)
+    multi_json (1.3.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    redis (3.0.2)
+    redis-namespace (1.2.1)
+      redis (~> 3.0.0)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord
+  bacon
+  jeweler
+  redis (>= 3.0.2)
+  redis-namespace

data/Rakefile

@@ -11,9 +11,9 @@ 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.add_development_dependency "redis-namespace", ">= 1.2.0"
+    gem.requirements << 'redis, v3.0.2 or greater'
+    gem.add_dependency('redis', '>= 3.0.2')  # ALSO: update spec/spec_helper.rb
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -21,7 +21,7 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-# require 'rake/testtask'
+# require 'rdoc/task'
 # Rake::TestTask.new(:spec) do |spec|
 #   spec.libs << 'lib' << 'spec'
 #   spec.pattern = 'spec/**/*_spec.rb'
@@ -30,7 +30,7 @@ end
 
 desc "run all the specs"
 task :test do
-  sh "bacon spec/*_spec.rb"
+  sh "bundle exec bacon spec/*_spec.rb"
 end
 
 
@@ -51,7 +51,7 @@ task :spec => :check_dependencies
 
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.6.0

data/lib/redis/hash_key.rb

@@ -135,6 +135,13 @@ class Redis
       hsh
     end
 
+    # Get values in bulk, takes an array of keys as arguments.
+    # Values are returned in a collection in the same order than their keys in *keys Redis: HMGET
+    def bulk_values(*keys)
+      res = redis.hmget(key, *keys.flatten)
+      keys.inject([]){|collection, k| collection << from_redis(res.shift)}
+    end
+
     # Increment value by integer at field. Redis: HINCRBY
     def incrby(field, val = 1)
       ret = redis.hincrby(key, field, val)

data/lib/redis/helpers/core_commands.rb

@@ -51,7 +51,7 @@ class Redis
       end
 
       def sort(options={})
-        options[:order] ||= "asc alpha"
+        options[:order] = "asc alpha" if options.keys.count == 0  # compat with Ruby
         redis.sort(key, options)
       end
     end

data/lib/redis/list.rb

@@ -20,6 +20,11 @@ class Redis
       push(value)
       self  # for << 'a' << 'b'
     end
+	
+		# Add a member before or after pivot in the list. Redis: LINSERT
+		def insert(where,pivot,value)
+			redis.linsert(key,where,to_redis(pivot),to_redis(value))
+		end
 
     # Add a member to the end of the list. Redis: RPUSH
     def push(value)
@@ -81,6 +86,11 @@ class Redis
     end
     alias_method :slice, :[]
 
+    # Same functionality as Ruby arrays.
+    def []=(index, value)
+      redis.lset(key, index, value)
+    end
+
     # Delete the element(s) from the list that match name. If count is specified,
     # only the first-N (if positive) or last-N (if negative) will be removed.
     # Use .del to completely delete the entire key.

data/lib/redis/objects/counters.rb

@@ -55,6 +55,7 @@ class Redis
         # Increment a counter with the specified name and id.  Accepts a block
         # like the instance method.  See Redis::Objects::Counter for details.
         def increment_counter(name, id=nil, by=1, &block)
+          name = name.to_sym
           return super(name, id) unless counter_defined?(name)
           verify_counter_defined!(name, id)
           initialize_counter!(name, id)
@@ -65,6 +66,7 @@ class Redis
         # Decrement a counter with the specified name and id.  Accepts a block
         # like the instance method.  See Redis::Objects::Counter for details.
         def decrement_counter(name, id=nil, by=1, &block)
+          name = name.to_sym
           return super(name, id) unless counter_defined?(name)
           verify_counter_defined!(name, id)
           initialize_counter!(name, id)
@@ -86,20 +88,20 @@ class Redis
           to = @redis_objects[name][:start] if to.nil?
           redis.getset(redis_field_key(name, id), to.to_i).to_i
         end
-        
+
         private
-        
+
         def verify_counter_defined!(name, id) #:nodoc:
           raise NoMethodError, "Undefined counter :#{name} for class #{self.name}" unless counter_defined?(name)
           if id.nil? and !@redis_objects[name][:global]
             raise Redis::Objects::MissingID, "Missing ID for non-global counter #{self.name}##{name}"
           end
         end
-        
+
         def counter_defined?(name) #:nodoc:
           @redis_objects && @redis_objects.has_key?(name)
         end
-        
+
         def initialize_counter!(name, id) #:nodoc:
           key = redis_field_key(name, id)
           unless @initialized_counters[key]
@@ -107,7 +109,7 @@ class Redis
           end
           @initialized_counters[key] = true
         end
-        
+
         # Implements increment/decrement blocks on a class level
         def rewindable_block(rewind, name, id, value, &block) #:nodoc:
           # Unfortunately this is almost exactly duplicated from Redis::Counter

data/lib/redis/set.rb

@@ -26,11 +26,17 @@ class Redis
       redis.sadd(key, to_redis(value))
     end
 
-    # Remove and return a random member.  Redis:SPOP
+    # Remove and return a random member.  Redis: SPOP
     def pop
       from_redis redis.spop(key)
     end
 
+    # Adds the specified values to the set. Only works on redis > 2.4
+    # Redis: SADD
+    def merge(*values)
+      redis.sadd(key, values.flatten.map{|v| to_redis(v)})
+    end
+
     # Return all members in the set.  Redis: SMEMBERS
     def members
       v = from_redis redis.smembers(key)

data/lib/redis/sorted_set.rb

@@ -41,7 +41,7 @@ class Redis
         when -1 then nil  # Ruby does this (a bit weird)
         end
       else
-        score(index)
+        result = score(index) || 0 # handles a nil score
       end
     end
     alias_method :slice, :[]
@@ -50,7 +50,9 @@ class Redis
     # specified element does not exist in the sorted set, or the key does not exist
     # at all, nil is returned. Redis: ZSCORE.
     def score(member)
-      redis.zscore(key, to_redis(member)).to_f
+      result = redis.zscore(key, to_redis(member))
+
+      result.to_f unless result.nil?
     end
 
     # Return the rank of the member in the sorted set, with scores ordered from
@@ -84,8 +86,7 @@ class Redis
     # the familiar list[start,end] Ruby syntax. Redis: ZRANGE
     def range(start_index, end_index, options={})
       if options[:withscores] || options[:with_scores]
-        val = from_redis redis.zrange(key, start_index, end_index, :with_scores => true)
-        group_set_with_scores(val)
+        from_redis redis.zrange(key, start_index, end_index, :with_scores => true)
       else
         from_redis redis.zrange(key, start_index, end_index)
       end
@@ -94,8 +95,7 @@ class Redis
     # Return a range of values from +start_index+ to +end_index+ in reverse order. Redis: ZREVRANGE
     def revrange(start_index, end_index, options={})
       if options[:withscores] || options[:with_scores]
-        val = from_redis redis.zrevrange(key, start_index, end_index, :with_scores => true)
-        group_set_with_scores(val)
+        from_redis redis.zrevrange(key, start_index, end_index, :with_scores => true)
       else
         from_redis redis.zrevrange(key, start_index, end_index)
       end
@@ -112,12 +112,7 @@ class Redis
                 options[:offset] || options[:limit] || options[:count]
       args[:with_scores] = true if options[:withscores] || options[:with_scores]
 
-      if args[:with_scores]
-        val = from_redis redis.zrangebyscore(key, min, max, args)
-        group_set_with_scores(val)
-      else
-        from_redis redis.zrangebyscore(key, min, max, args)
-      end
+      from_redis redis.zrangebyscore(key, min, max, args)
     end
 
     # Forwards compat (not yet implemented in Redis)
@@ -127,12 +122,7 @@ class Redis
                 options[:offset] || options[:limit] || options[:count]
       args[:with_scores] = true if options[:withscores] || options[:with_scores]
 
-      if args[:with_scores]
-        val = from_redis redis.zrevrangebyscore(key, min, max, args)
-        group_set_with_scores(val)
-      else
-        from_redis redis.zrevrangebyscore(key, min, max, args)
-      end
+      from_redis redis.zrevrangebyscore(key, min, max, args)
     end
 
     # Remove all elements in the sorted set at key with rank between start and end. Start and end are
@@ -203,7 +193,7 @@ class Redis
     # Calculate the intersection and store it in Redis as +name+. Returns the number
     # of elements in the stored intersection. Redis: SUNIONSTORE
     def interstore(name, *sets)
-      redis.zinterstore(name, key, *keys_from_objects(sets))
+      redis.zinterstore(name, keys_from_objects([self] + sets))
     end
 
     # Return the union with another set.  Can pass it either another set
@@ -226,7 +216,7 @@ class Redis
     # Calculate the union and store it in Redis as +name+. Returns the number
     # of elements in the stored union. Redis: SUNIONSTORE
     def unionstore(name, *sets)
-      redis.zunionstore(name, key, *keys_from_objects(sets))
+      redis.zunionstore(name, keys_from_objects([self] + sets))
     end
 
     # Return the difference vs another set.  Can pass it either another set
@@ -288,7 +278,7 @@ class Redis
       redis.zcard(key)
     end
     alias_method :size, :length
-    
+
     # The number of members within a range of scores. Redis: ZCOUNT
     def range_size(min, max)
       redis.zcount(key, min, max)
@@ -305,13 +295,5 @@ class Redis
       raise ArgumentError, "Must pass in one or more set names" if sets.empty?
       sets.collect{|set| set.is_a?(Redis::SortedSet) ? set.key : set}
     end
-
-    def group_set_with_scores(set_with_scores)
-      ret = []
-      while k = set_with_scores.shift and v = set_with_scores.shift
-        ret << [k, v.to_f]
-      end
-      ret
-    end
   end
 end

data/redis-objects.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "redis-objects"
-  s.version = "0.5.3"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nate Wiger"]
-  s.date = "2012-06-13"
+  s.date = "2012-10-24"
   s.description = "Map Redis types directly to Ruby objects. Works with any class or ORM."
   s.email = "nate@wiger.org"
   s.extra_rdoc_files = [
@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
   s.files = [
     "ATOMICITY.rdoc",
     "CHANGELOG.rdoc",
+    "Gemfile",
+    "Gemfile.lock",
     "README.rdoc",
     "Rakefile",
     "VERSION",
@@ -48,26 +50,41 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/nateware/redis-objects"
   s.require_paths = ["lib"]
-  s.requirements = ["redis, v2.1.1 or greater"]
-  s.rubygems_version = "1.8.10"
+  s.requirements = ["redis, v3.0.2 or greater"]
+  s.rubygems_version = "1.8.24"
   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_runtime_dependency(%q<redis>, [">= 3.0.2"])
+      s.add_runtime_dependency(%q<redis-namespace>, [">= 0"])
+      s.add_runtime_dependency(%q<bacon>, [">= 0"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
       s.add_development_dependency(%q<bacon>, [">= 0"])
-      s.add_development_dependency(%q<redis-namespace>, [">= 0"])
-      s.add_runtime_dependency(%q<redis>, [">= 2.1.1"])
+      s.add_development_dependency(%q<redis-namespace>, [">= 1.2.0"])
+      s.add_runtime_dependency(%q<redis>, [">= 3.0.2"])
     else
-      s.add_dependency(%q<bacon>, [">= 0"])
+      s.add_dependency(%q<redis>, [">= 3.0.2"])
       s.add_dependency(%q<redis-namespace>, [">= 0"])
-      s.add_dependency(%q<redis>, [">= 2.1.1"])
+      s.add_dependency(%q<bacon>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<bacon>, [">= 0"])
+      s.add_dependency(%q<redis-namespace>, [">= 1.2.0"])
+      s.add_dependency(%q<redis>, [">= 3.0.2"])
     end
   else
-    s.add_dependency(%q<bacon>, [">= 0"])
+    s.add_dependency(%q<redis>, [">= 3.0.2"])
     s.add_dependency(%q<redis-namespace>, [">= 0"])
-    s.add_dependency(%q<redis>, [">= 2.1.1"])
+    s.add_dependency(%q<bacon>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<bacon>, [">= 0"])
+    s.add_dependency(%q<redis-namespace>, [">= 1.2.0"])
+    s.add_dependency(%q<redis>, [">= 3.0.2"])
   end
 end
 

data/spec/redis_objects_active_record_spec.rb

@@ -49,16 +49,37 @@ begin
   class Post < ActiveRecord::Base
     include Redis::Objects
     counter :total
+    counter :comments_count
     belongs_to :blog, :counter_cache => true
   end
 
+  class CreateComments < ActiveRecord::Migration
+    def self.up
+      create_table :comments do |t|
+        t.string :body
+        t.integer :post_id
+        t.timestamps
+      end
+    end
+
+    def self.down
+      drop_table :comments
+    end
+  end
+
+  class Comment < ActiveRecord::Base
+    include Redis::Objects
+    belongs_to :post, :counter_cache => true
+  end
 
   describe Redis::Objects do
     before do
+      CreateComments.up
       CreatePosts.up
       CreateBlogs.up
     end
     after do
+      CreateComments.down
       CreatePosts.down
       CreateBlogs.down
     end
@@ -88,6 +109,15 @@ begin
       @ar2.destroy
     end
 
+    it "uses the redis objects counter cache when present" do
+      post = Post.create
+      post.comments_count.should == 0
+      comment = Comment.create :post => post
+      post.reload.comments_count.should == 1
+      comment.destroy
+      post.reload.comments_count.should == 0
+    end
+
     it "falls back to ActiveRecord if redis counter is not defined" do
       blog = Blog.create
       blog.reload.posts_count.should == 0

data/spec/redis_objects_instance_spec.rb

@@ -230,6 +230,15 @@ describe Redis::List do
       list2.should == ["b"]
     end
 
+		it "should handle insert" do
+			@list << 'b' << 'd'
+			@list.insert(:before,'b','a')
+			@list.insert(:after,'b','c')
+			@list.insert("before",'a','z')
+			@list.insert("after",'d','e')
+			@list.should == ['z','a','b','c','d','e']
+		end
+
     it "should handle lists of complex data types" do
       @list.options[:marshal] = true
       v1 = {:json => 'data'}
@@ -596,18 +605,18 @@ describe Redis::Set do
     @set.should.be.empty
     @set << 'a' << 'a' << 'a'
     @set.should == ['a']
+    @set.to_s.should == 'a'
     @set.get.should == ['a']
     @set << 'b' << 'b'
-    @set.to_s.should == 'a, b'
-    @set.should == ['a','b']
-    @set.members.should == ['a','b']
-    @set.members.reverse.should == ['b','a']  # common question
-    @set.get.should == ['a','b']
+    @set.sort.should == ['a','b']
+    @set.members.sort.should == ['a','b']
+    @set.members.sort.reverse.should == ['b','a']  # common question
+    @set.get.sort.should == ['a','b']
     @set << 'c'
     @set.sort.should == ['a','b','c']
     @set.get.sort.should == ['a','b','c']
     @set.delete('c')
-    @set.should == ['a','b']
+    @set.sort.should == ['a','b']
     @set.get.sort.should == ['a','b']
     @set.length.should == 2
     @set.size.should == 2
@@ -623,10 +632,10 @@ describe Redis::Set do
     end
     i.should == @set.length
 
-    coll = @set.collect{|st| st}
+    coll = @set.sort.collect{|st| st}
     coll.should == ['a','b']
-    @set.should == ['a','b']
-    @set.get.should == ['a','b']
+    @set.sort.should == ['a','b']
+    @set.get.sort.should == ['a','b']
 
     @set << 'c'
     @set.member?('c').should.be.true
@@ -694,17 +703,27 @@ describe Redis::Set do
     @set.redis.del('spec/set2')
   end
 
+  it "should handle variadic sadd operations" do
+     @set.should.be.empty
+     @set << 'a'
+     @set.merge('b', 'c')
+     @set.members.sort.should == ['a', 'b', 'c']
+     @set.merge(['d','c','e'])
+     @set.members.sort.should == ['a', 'b', 'c', 'd', 'e']
+  end
+
   it "should support sorting" do
-    @set_1 << 'a' << 'b' << 'c' << 'd' << 'e'
-    @set_2 << 1 << 2 << 3 << 4 << 5
-    @set_3 << 'm_1' << 'm_2'
+    @set_1 << 'c' << 'b' << 'a' << 'e' << 'd'
     @set_1.sort.should == %w(a b c d e)
-    @set_2.sort.should == %w(1 2 3 4 5)
-
     @set_1.sort(SORT_ORDER).should == %w(e d c b a)
-    @set_3.sort(SORT_BY).should == %w(m_1 m_2)        
+
+    @set_2 << 2 << 4 << 3 << 1 << 5
+    @set_2.sort.should == %w(1 2 3 4 5)
     @set_2.sort(SORT_LIMIT).should == %w(3 4)
 
+    @set_3 << 'm_4' << 'm_5' << 'm_1' << 'm_3' << 'm_2'
+    @set_3.sort(:by => 'm_*').should == %w(m_1 m_2 m_3 m_4 m_5)        
+
     val1 = Redis::Value.new('spec/3/sorted')
     val2 = Redis::Value.new('spec/4/sorted')
 
@@ -743,7 +762,7 @@ describe Redis::SortedSet do
     @set_3.clear
   end
 
-  it "should handle sets of simple values" do
+  it "should handle sorted sets of simple values" do
     @set.should.be.empty
     @set['a'] = 11
     @set['a'] = 21
@@ -781,6 +800,7 @@ describe Redis::SortedSet do
     @set['b'] = 5
     @set['b'] = 6
     @set.score('b').should == 6
+    @set.score('f').should == nil
     @set.delete('c')
     @set.to_s.should == 'a, b'
     @set.should == ['a','b']
@@ -836,7 +856,7 @@ describe Redis::SortedSet do
     @set.size.should == 3
   end
 
-  it "should support renaming sets" do
+  it "should support renaming sorted sets" do
     @set.should.be.empty
     @set['zynga'] = 151
     @set['playfish'] = 202

data/spec/redis_objects_model_spec.rb

@@ -504,15 +504,14 @@ describe Redis::Objects do
     @roster.outfielders.should == ['a']
     @roster.outfielders.get.should == ['a']
     @roster.outfielders << 'b' << 'b'
-    @roster.outfielders.to_s.should == 'a, b'
-    @roster.outfielders.should == ['a','b']
-    @roster.outfielders.members.should == ['a','b']
-    @roster.outfielders.get.should == ['a','b']
+    @roster.outfielders.sort.should == ['a','b']
+    @roster.outfielders.members.sort.should == ['a','b']
+    @roster.outfielders.get.sort.should == ['a','b']
     @roster.outfielders << 'c'
     @roster.outfielders.sort.should == ['a','b','c']
     @roster.outfielders.get.sort.should == ['a','b','c']
     @roster.outfielders.delete('c')
-    @roster.outfielders.should == ['a','b']
+    @roster.outfielders.sort.should == ['a','b']
     @roster.outfielders.get.sort.should == ['a','b']
     @roster.outfielders.length.should == 2
     @roster.outfielders.size.should == 2
@@ -524,9 +523,9 @@ describe Redis::Objects do
     i.should == @roster.outfielders.length
 
     coll = @roster.outfielders.collect{|st| st}
-    coll.should == ['a','b']
-    @roster.outfielders.should == ['a','b']
-    @roster.outfielders.get.should == ['a','b']
+    coll.sort.should == ['a','b']
+    @roster.outfielders.sort.should == ['a','b']
+    @roster.outfielders.get.sort.should == ['a','b']
 
     @roster.outfielders << 'c'
     @roster.outfielders.member?('c').should.be.true
@@ -641,15 +640,14 @@ describe Redis::Objects do
     Roster.all_players_online.should == ['a']
     Roster.all_players_online.get.should == ['a']
     Roster.all_players_online << 'b' << 'b'
-    Roster.all_players_online.to_s.should == 'a, b'
-    Roster.all_players_online.should == ['a','b']
-    Roster.all_players_online.members.should == ['a','b']
-    Roster.all_players_online.get.should == ['a','b']
+    Roster.all_players_online.sort.should == ['a','b']
+    Roster.all_players_online.members.sort.should == ['a','b']
+    Roster.all_players_online.get.sort.should == ['a','b']
     Roster.all_players_online << 'c'
     Roster.all_players_online.sort.should == ['a','b','c']
     Roster.all_players_online.get.sort.should == ['a','b','c']
     Roster.all_players_online.delete('c')
-    Roster.all_players_online.should == ['a','b']
+    Roster.all_players_online.sort.should == ['a','b']
     Roster.all_players_online.get.sort.should == ['a','b']
     Roster.all_players_online.length.should == 2
     Roster.all_players_online.size.should == 2
@@ -661,9 +659,9 @@ describe Redis::Objects do
     i.should == Roster.all_players_online.length
 
     coll = Roster.all_players_online.collect{|st| st}
-    coll.should == ['a','b']
-    Roster.all_players_online.should == ['a','b']
-    Roster.all_players_online.get.should == ['a','b']
+    coll.sort.should == ['a','b']
+    Roster.all_players_online.sort.should == ['a','b']
+    Roster.all_players_online.get.sort.should == ['a','b']
 
     Roster.all_players_online << 'c'
     Roster.all_players_online.member?('c').should.be.true
@@ -731,13 +729,14 @@ describe Redis::Objects do
   end
   
   it "should handle sets of complex data types" do
-    @roster.outfielders << {:a => 1} << {:b => 2}
+    @roster.outfielders << {:a => 1}
+    @roster.outfielders.members.should == [{:a => 1}]
+    @roster.outfielders << {:b => 2}
     @roster.outfielders.member?({:b => 2})
-    @roster.outfielders.members.should == [{:b => 2}, {:a => 1}]
     @roster_1.outfielders << {:a => 1} << {:b => 2}
     @roster_2.outfielders << {:b => 2} << {:c => 3}
     (@roster_1.outfielders & @roster_2.outfielders).should == [{:b => 2}]
-    (@roster_1.outfielders | @roster_2.outfielders).should == [{:b=>2}, {:c=>3}, {:a=>1}]
+    #(@roster_1.outfielders | @roster_2.outfielders).members.should ==
   end
 
   it "should provide a lock method that accepts a block" do

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'rubygems'  # poor people still on 1.8
-gem 'redis', '>= 2.1.1'
+gem 'redis', '>= 3.0.0'
 require 'redis'
 
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
@@ -28,7 +28,8 @@ at_exit do
   puts "=> Killing #{REDIS_BIN} with pid #{pid}"
   Process.kill "TERM", pid
   Process.kill "KILL", pid
-  File.unlink REDIS_PID, REDIS_DUMP
+  File.unlink REDIS_PID
+  File.unlink REDIS_DUMP if File.exists? REDIS_DUMP
 end
 
 # Grab a global handle

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-objects
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,91 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+- !ruby/object:Gem::Dependency
+  name: redis-namespace
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &2165783560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,29 +101,44 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165783560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &2165782960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *2165782960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &2165782480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 3.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2165782480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.2
 description: Map Redis types directly to Ruby objects. Works with any class or ORM.
 email: nate@wiger.org
 executables: []
@@ -53,6 +148,8 @@ extra_rdoc_files:
 files:
 - ATOMICITY.rdoc
 - CHANGELOG.rdoc
+- Gemfile
+- Gemfile.lock
 - README.rdoc
 - Rakefile
 - VERSION
@@ -92,6 +189,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4220055926051714921
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -99,9 +199,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- redis, v2.1.1 or greater
+- redis, v3.0.2 or greater
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Map Redis types directly to Ruby objects