redis-objects 0.7.0 → 0.8.0

data/lib/redis/objects/version.rb

@@ -0,0 +1,5 @@
+class Redis
+  module Objects
+    VERSION = "0.8.0"
+  end
+end

data/lib/redis/sorted_set.rb

@@ -115,14 +115,20 @@ class Redis
       from_redis redis.zrangebyscore(key, min, max, args)
     end
 
-    # Forwards compat (not yet implemented in Redis)
-    def revrangebyscore(min, max, options={})
+    # Returns all the elements in the sorted set at key with a score between max and min
+    # (including elements with score equal to max or min). In contrary to the default ordering of sorted sets,
+    # for this command the elements are considered to be ordered from high to low scores.
+    # Options:
+    #     :count, :offset - passed to LIMIT
+    #     :withscores     - if true, scores are returned as well
+    # Redis: ZREVRANGEBYSCORE
+    def revrangebyscore(max, min, options={})
       args = {}
       args[:limit] = [options[:offset] || 0, options[:limit] || options[:count]] if
                 options[:offset] || options[:limit] || options[:count]
       args[:with_scores] = true if options[:withscores] || options[:with_scores]
 
-      from_redis redis.zrevrangebyscore(key, min, max, args)
+      from_redis redis.zrevrangebyscore(key, max, min, args)
     end
 
     # Remove all elements in the sorted set at key with rank between start and end. Start and end are
@@ -160,14 +166,14 @@ class Redis
     # Increment the rank of that member atomically and return the new value. This
     # method is aliased as incr() for brevity. Redis: ZINCRBY
     def increment(member, by=1)
-      redis.zincrby(key, by, member).to_i
+      redis.zincrby(key, by, to_redis(member)).to_i
     end
     alias_method :incr, :increment
     alias_method :incrby, :increment
 
     # Convenience to calling increment() with a negative number.
     def decrement(member, by=1)
-      redis.zincrby(key, -by, member).to_i
+      redis.zincrby(key, -by, to_redis(member)).to_i
     end
     alias_method :decr, :decrement
     alias_method :decrby, :decrement

data/redis-objects.gemspec

@@ -1,76 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'redis/objects/version'
 
-Gem::Specification.new do |s|
-  s.name = "redis-objects"
-  s.version = "0.7.0"
+Gem::Specification.new do |spec|
+  spec.name          = "redis-objects"
+  spec.version       = Redis::Objects::VERSION
+  spec.authors       = ["Nate Wiger"]
+  spec.email         = ["nwiger@gmail.com"]
+  spec.description   = %q{Map Redis types directly to Ruby objects. Works with any class or ORM.}
+  spec.summary       = %q{Map Redis types directly to Ruby objects}
+  spec.homepage      = "http://github.com/nateware/redis-objects"
+  spec.license       = "Artistic"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nate Wiger"]
-  s.date = "2013-02-27"
-  s.description = "Map Redis types directly to Ruby objects. Works with any class or ORM."
-  s.email = "nwiger@gmail.com"
-  s.extra_rdoc_files = [
-    "README.md"
-  ]
-  s.files = [
-    "ATOMICITY.rdoc",
-    "CHANGELOG.rdoc",
-    "Gemfile",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "lib/redis-objects.rb",
-    "lib/redis/base_object.rb",
-    "lib/redis/counter.rb",
-    "lib/redis/hash_key.rb",
-    "lib/redis/helpers/core_commands.rb",
-    "lib/redis/helpers/serialize.rb",
-    "lib/redis/list.rb",
-    "lib/redis/lock.rb",
-    "lib/redis/objects.rb",
-    "lib/redis/objects/counters.rb",
-    "lib/redis/objects/hashes.rb",
-    "lib/redis/objects/lists.rb",
-    "lib/redis/objects/locks.rb",
-    "lib/redis/objects/sets.rb",
-    "lib/redis/objects/sorted_sets.rb",
-    "lib/redis/objects/values.rb",
-    "lib/redis/set.rb",
-    "lib/redis/sorted_set.rb",
-    "lib/redis/value.rb",
-    "redis-objects.gemspec",
-    "spec/redis_autoload_objects_spec.rb",
-    "spec/redis_namespace_compat_spec.rb",
-    "spec/redis_objects_active_record_spec.rb",
-    "spec/redis_objects_conn_spec.rb",
-    "spec/redis_objects_instance_spec.rb",
-    "spec/redis_objects_model_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = "http://github.com/nateware/redis-objects"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "Map Redis types directly to Ruby objects"
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  spec.add_dependency "redis", ">= 3.0.2"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<redis>, [">= 3.0.2"])
-      s.add_development_dependency(%q<bacon>, [">= 0"])
-      s.add_development_dependency(%q<redis-namespace>, [">= 1.2.0"])
-    else
-      s.add_dependency(%q<redis>, [">= 3.0.2"])
-      s.add_dependency(%q<bacon>, [">= 0"])
-      s.add_dependency(%q<redis-namespace>, [">= 1.2.0"])
-    end
-  else
-    s.add_dependency(%q<redis>, [">= 3.0.2"])
-    s.add_dependency(%q<bacon>, [">= 0"])
-    s.add_dependency(%q<redis-namespace>, [">= 1.2.0"])
-  end
-end
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "bacon"
 
+  # compatability testing
+  spec.add_development_dependency "redis-namespace"
+  spec.add_development_dependency "activerecord", "~> 3.2"
+end

data/spec/redis_objects_instance_spec.rb

@@ -8,7 +8,7 @@ describe Redis::Value do
     @value = Redis::Value.new('spec/value')
     @value.delete
   end
-  
+
   it "should marshal default value" do
     @value = Redis::Value.new('spec/value', :default => {:json => 'data'}, :marshal => true)
     @value.value.should == {:json => 'data'}
@@ -30,7 +30,7 @@ describe Redis::Value do
     @value.should == nil
     @value.value = {:json => 'data'}
     @value.should == {:json => 'data'}
-    
+
     # no marshaling
     @value.options[:marshal] = false
     v = {:json => 'data'}
@@ -171,6 +171,9 @@ describe Redis::List do
       @list.get.should == ['a','c','f']
       @list << 'j'
       @list.should == ['a','c','f','j']
+      @list.push 'h'
+      @list.push 'i', 'j'
+      @list.should == ['a','c','f','j','h','i','j']
       # Test against similar Ruby functionality
       a = @list.values
       @list[0..2].should == a[0..2]
@@ -184,34 +187,35 @@ describe Redis::List do
       @list.slice(1, 3).should == a.slice(1, 3)
       @list[0, 0].should == []
       @list[0, -1].should == a[0, -1]
-      @list.length.should == 4
-      @list.size.should == 4
+      @list.length.should == 7
       @list.should == a
       @list.get.should == a
+      @list.pop # lose 'j'
+      @list.size.should == 6
 
       i = -1
       @list.each do |st|
         st.should == @list[i += 1]
       end
-      @list.should == ['a','c','f','j']
-      @list.get.should == ['a','c','f','j']
+      @list.should == ['a','c','f','j','h','i']
+      @list.get.should == ['a','c','f','j','h','i']
 
       @list.each_with_index do |st,i|
         st.should == @list[i]
       end
-      @list.should == ['a','c','f','j']
-      @list.get.should == ['a','c','f','j']
+      @list.should == ['a','c','f','j','h','i']
+      @list.get.should == ['a','c','f','j','h','i']
 
       coll = @list.collect{|st| st}
-      coll.should == ['a','c','f','j']
-      @list.should == ['a','c','f','j']
-      @list.get.should == ['a','c','f','j']
+      coll.should == ['a','c','f','j','h','i']
+      @list.should == ['a','c','f','j','h','i']
+      @list.get.should == ['a','c','f','j','h','i']
 
       @list << 'a'
       coll = @list.select{|st| st == 'a'}
       coll.should == ['a','a']
-      @list.should == ['a','c','f','j','a']
-      @list.get.should == ['a','c','f','j','a']
+      @list.should == ['a','c','f','j','h','i','a']
+      @list.get.should == ['a','c','f','j','h','i','a']
     end
 
     it "should handle rpoplpush" do
@@ -234,23 +238,42 @@ describe Redis::List do
 			@list.should == ['z','a','b','c','d','e']
 		end
 
+		it "should handle insert at a specific index" do
+			@list << 'b' << 'd'
+			@list.should == ['b','d']
+			@list[0] = 'a'
+			@list.should == ['a', 'd']
+			@list[1] = 'b'
+			@list.should == ['a', 'b']
+		end
+
     it "should handle lists of complex data types" do
       @list.options[:marshal] = true
       v1 = {:json => 'data'}
       v2 = {:json2 => 'data2'}
+      v3 = [1,2,3]
       @list << v1
       @list << v2
       @list.first.should == v1
+      @list[0] = @list[0].tap{|d| d[:json] = 'data_4'}
+      @list.first.should == {:json => 'data_4'}
       @list.last.should == v2
-      @list << [1,2,3,[4,5]]
-      @list.last.should == [1,2,3,[4,5]]
-      @list.shift.should == {:json => 'data'}
+      @list << [1,2,3,[4,5],6]
+      @list.last.should == [1,2,3,[4,5],6]
+      @list.shift.should == {:json => 'data_4'}
       @list.size.should == 2
       @list.delete(v2)
       @list.size.should == 1
+      @list.push v1, v2
+      @list[1].should == v1
+      @list.last.should == v2
+      @list.size.should == 3
+      @list.unshift v2, v3
+      @list.size.should == 5
+      @list.first.should == v3
       @list.options[:marshal] = false
     end
-    
+
     it "should support renaming lists" do
       @list.should.be.empty
       @list << 'a' << 'b' << 'a' << 3
@@ -292,7 +315,7 @@ describe Redis::Counter do
     @counter.key.should == 'spec/counter'
     @counter.incr(10)
     @counter.should == 10
-    
+
     # math proxy ops
     (@counter == 10).should.be.true
     (@counter <= 10).should.be.true
@@ -446,13 +469,13 @@ describe Redis::HashKey do
     @hash = Redis::HashKey.new('test_hash')
     @hash.clear
   end
-  
+
   it "should handle complex marshaled values" do
     @hash.options[:marshal] = true
     @hash['abc'].should == nil
     @hash['abc'] = {:json => 'data'}
     @hash['abc'].should == {:json => 'data'}
-    
+
     # no marshaling
     @hash.options[:marshal] = false
     v = {:json => 'data'}
@@ -465,26 +488,26 @@ describe Redis::HashKey do
     @hash.fetch('abc').should == [[1,2], {:t3 => 4}]
     @hash.delete('abc').should == 1
     @hash.fetch('abc').should.be.nil
-    
+
     @hash.options[:marshal] = true
     @hash.bulk_set('abc' => [[1,2], {:t3 => 4}], 'def' => [[6,8], {:t4 => 8}])
     hsh = @hash.bulk_get('abc', 'def', 'foo')
     hsh['abc'].should == [[1,2], {:t3 => 4}]
     hsh['def'].should == [[6,8], {:t4 => 8}]
     hsh['foo'].should.be.nil
-    
+
     hsh = @hash.all
     hsh['abc'].should == [[1,2], {:t3 => 4}]
     hsh['def'].should == [[6,8], {:t4 => 8}]
-    
-    @hash.values.should == [[[1,2], {:t3 => 4}], [[6,8], {:t4 => 8}]]
-    
+
+    @hash.values.sort.should == [[[1,2], {:t3 => 4}], [[6,8], {:t4 => 8}]].sort
+
     @hash.delete('def').should == 1
     @hash.delete('abc').should == 1
-    
+
     @hash.options[:marshal] = false
   end
-  
+
   it "should get and set values" do
     @hash['foo'] = 'bar'
     @hash['foo'].should == 'bar'
@@ -508,7 +531,7 @@ describe Redis::HashKey do
       val.should == 'bar'
     end
   end
-  
+
   it "should have 1 item" do
     @hash['foo'] = 'bar'
     @hash.size.should == 1
@@ -539,7 +562,7 @@ describe Redis::HashKey do
     @hash.clear
     @hash.should.be.empty
   end
-  
+
   it "should respond to bulk_set" do
     @hash.bulk_set({'abc' => 'xyz', 'bizz' => 'bazz'})
     @hash['abc'].should == 'xyz'
@@ -569,18 +592,20 @@ describe Redis::HashKey do
 
   it "should respond to fill" do
     @hash['foo'] = 'bar'
-    
+
     @hash.fill('abc' => '123', 'bang' => 'michael')
     @hash['foo'].should == 'bar'
     @hash['abc'].should == '123'
     @hash['bang'].should == 'michael'
+
+    it "raises an error if a non-Hash is passed to fill" do
+      lambda { @hash.fill([]) }.should.raise(ArgumentError)
+    end
   end
-  
 
   after do
     @hash.clear
   end
-  
 end
 
 describe Redis::Set do
@@ -616,7 +641,7 @@ describe Redis::Set do
     @set.size.should == 2
     @set.delete('a')
     @set.pop.should == 'b'
-    
+
     @set.add('a')
     @set.add('b')
 
@@ -641,7 +666,7 @@ describe Redis::Set do
     @set.delete_if{|m| m == 'c'}
     @set.sort.should == ['a','b']
   end
-  
+
   it "should handle set intersections, unions, and diffs" do
     @set_1 << 'a' << 'b' << 'c' << 'd' << 'e'
     @set_2 << 'c' << 'd' << 'e' << 'f' << 'g'
@@ -716,14 +741,21 @@ describe Redis::Set do
     @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)        
+		### incorrect interpretation of what the :by parameter means
+		### :by will look up values of keys so it would try to find a value in
+		### redis of "m_m_1" which doesn't exist at this point, it is not a way to
+		### alter the value to sort by but rather use a different value for this value
+		### in the set (Kris Fox)
+    # @set_3.sort(:by => 'm_*').should == %w(m_1 m_2 m_3 m_4 m_5)
+		# below passes just fine
+		@set_3.sort.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')
 
     val1.set('val3')
     val2.set('val4')
- 
+
     @set_2.sort(SORT_GET).should == ['val3', 'val4']
     @set_2.sort(SORT_STORE).should == 2
     @set_2.redis.type(SORT_STORE[:store]).should == 'list'
@@ -740,7 +772,6 @@ describe Redis::Set do
     @set_1.clear
     @set_2.clear
     @set_3.clear
-
   end
 end
 
@@ -750,10 +781,12 @@ describe Redis::SortedSet do
     @set_1 = Redis::SortedSet.new('spec/zset_1')
     @set_2 = Redis::SortedSet.new('spec/zset_2')
     @set_3 = Redis::SortedSet.new('spec/zset_3')
+    @set_4 = Redis::SortedSet.new('spec/zset_3', :marshal => true)
     @set.clear
     @set_1.clear
     @set_2.clear
     @set_3.clear
+    @set_4.clear
   end
 
   it "should handle sorted sets of simple values" do
@@ -800,18 +833,17 @@ describe Redis::SortedSet do
     @set.should == ['a','b']
     @set.members.should == ['a','b']
     @set['d'] = 0
-    
+
     @set.rangebyscore(0, 4).should == ['d','a']
     @set.rangebyscore(0, 4, :count => 1).should == ['d']
     @set.rangebyscore(0, 4, :count => 2).should == ['d','a']
     @set.rangebyscore(0, 4, :limit => 2).should == ['d','a']
 
-    # Redis 1.3.5
-    # @set.rangebyscore(0,4, :withscores => true).should == [['d',4],['a',3]]
-    # @set.revrangebyscore(0,4).should == ['d','a']
-    # @set.revrangebyscore(0,4, :count => 2).should == ['a','d']
-    # @set.rank('b').should == 2
-    # @set.revrank('b').should == 3
+    @set.revrangebyscore(4, 0, :withscores => true).should == [['a', 3], ['d', 0]]
+    @set.revrangebyscore(4, 0).should == ['a', 'd']
+    @set.revrangebyscore(4, 0, :count => 2).should == ['a','d']
+    @set.rank('b').should == 2
+    @set.revrank('b').should == 0
 
     # shouldn't report a rank for a key that doesn't exist
     @set.rank('foo').should.not == @set.rank(@set.first)
@@ -841,15 +873,24 @@ describe Redis::SortedSet do
     @set.delete('c')
     @set.length.should == 4
     @set.size.should == 4
-    
+
     @set.range_size(100, 120).should == 0
     @set.range_size(0, 100).should == 2
     @set.range_size('-inf', 'inf').should == 4
-    
+
     @set.delete_if{|m| m == 'b'}
     @set.size.should == 3
   end
 
+  it "should support marshaling key names" do
+    @set_4[Object] = 1.20
+    @set_4[Module] = 2.30
+    @set_4.incr(Object, 0.5)
+    @set_4.decr(Module, 0.5)
+    @set_4[Object].round(1).should == 1.7
+    @set_4[Module].round(1).should == 1.8
+  end
+
   it "should support renaming sorted sets" do
     @set.should.be.empty
     @set['zynga'] = 151
@@ -873,5 +914,6 @@ describe Redis::SortedSet do
     @set_1.clear
     @set_2.clear
     @set_3.clear
+    @set_4.clear
   end
 end