redis-objects 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95f1e710f5708a5b30fb2a843fcfdacaff0af044
-  data.tar.gz: 1d4816620d04019576ae1e277be3c5676b0c5be0
+  metadata.gz: 4ddda2781d9f2c900706e383d1079321a1499153
+  data.tar.gz: 0120673e2299b6739dd24d4a1e8aea2ee42b1d18
 SHA512:
-  metadata.gz: d68499ab0eafd74dcd51838f1723ee14d561bd772725dbef69ce26d86dc66bca412c7520be5f02c5cad9b761a77670e9c8707f5b34737409ada232c99b5a44d4
-  data.tar.gz: 0a59d05c7d974f0e7d20f5f938b6451a582ec5c025d450cb85073ff328b9abc19d250971f13fe6e2b191f3f3e7c6312a3f81f8f10e93c1b47c9459b12680f775
+  metadata.gz: 5e677129dc40412d9a6c11585f84c4703703006d6b02b5a71e047a6bcd8fabf44a22c90073f1f730eec0025776689c75e586ceb8203a7791167f6528b177d96e
+  data.tar.gz: d7c948a177c2dea105ce215e4792f490324331e1f9a2acefaa95ee053be71acb3c4065a3517b801125e7f4952161565bd9bf579aac31639e4857641b88cea5e0

data/CHANGELOG.rdoc

@@ -1,5 +1,13 @@
 = Changelog for Redis::Objects
 
+== 0.9.1 (25 Mar 2024)
+
+* Fix bad marshal calls in SortedSet [Fleurer, nateware]
+
+* Handle marshalling/unmarshalling of nil values [anujdas]
+
+* Add :default as synonym to :start for Counter [Fleurer]
+
 == 0.9.0 (6 Feb 2014)
 
 * Ensure we don't double-unmarshal values, which could be a security issue [markijbema, nateware]
@@ -54,7 +62,7 @@
 
 == 0.6.0 (13 Dec 2012)
 
-* Add +@set.merge()+ method to add multiple members at once [hfwang] 
+* Add +@set.merge()+ method to add multiple members at once [hfwang]
 
 * Add +insert+ method to Redis::List instances [giglemad]
 
@@ -62,7 +70,7 @@
 
 * Add HashKey#bulk_values for fetching values in the same order than the given keys [aspgems]
 
-* Lists now handle the insert command 
+* Lists now handle the insert command
 
 * Changed +@sset.score+ method on SortedSet to return nil for invalid members [hkarthik]
 
@@ -88,7 +96,7 @@
 
 * Added zcount method to SortedSet [dunedain289]
 
-* Updated redis-objects to look for Redis.current and prefer it over global $redis variable [Jean Boussier] 
+* Updated redis-objects to look for Redis.current and prefer it over global $redis variable [Jean Boussier]
 
 * Updated URLs to reflect new redis.io website [Jérémy Lecour]
 

data/lib/redis/counter.rb

@@ -15,7 +15,7 @@ class Redis
     attr_reader :key, :options
     def initialize(key, *args)
       super(key, *args)
-      @options[:start] ||= 0
+      @options[:start] ||= @options[:default] || 0
       raise ArgumentError, "Marshalling redis counters does not make sense" if @options[:marshal]
       redis.setnx(key, @options[:start]) unless @options[:start] == 0 || @options[:init] === false
     end

data/lib/redis/helpers/core_commands.rb

@@ -57,9 +57,7 @@ class Redis
       end
 
       def marshal(value, domarshal=false)
-        if value.nil?
-          nil
-        elsif options[:marshal] || domarshal
+        if options[:marshal] || domarshal
           Marshal.dump(value)
         else
           value

data/lib/redis/objects/version.rb

@@ -1,5 +1,5 @@
 class Redis
   module Objects
-    VERSION = "0.9.0"
+    VERSION = "0.9.1"
   end
 end

data/lib/redis/sorted_set.rb

@@ -86,8 +86,7 @@ class Redis
     # Return all members of the sorted set with their scores.  Extremely CPU-intensive.
     # Better to use a range instead.
     def members(options={})
-      vals = range(0, -1, options)
-      vals.nil? ? [] : vals.map{|v| unmarshal(v) }
+      range(0, -1, options) || []
     end
 
     # Return a range of values from +start_index+ to +end_index+.  Can also use
@@ -103,7 +102,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]
-        redis.zrevrange(key, start_index, end_index, :with_scores => true).map{|v| unmarshal(v) }
+        redis.zrevrange(key, start_index, end_index, :with_scores => true).map{|v,s| [unmarshal(v), s] }
       else
         redis.zrevrange(key, start_index, end_index).map{|v| unmarshal(v) }
       end

data/spec/redis_objects_instance_spec.rb

@@ -580,6 +580,18 @@ describe Redis::HashKey do
     @hash.options[:marshal] = false
   end
 
+  it "should marshal nil correctly" do
+    @hash.options[:marshal] = true
+
+    @hash['test'].should.be.nil
+    @hash['test'] = nil
+    @hash['test'].should.be.nil
+    @hash.delete('test').should == 1
+    @hash['test'].should.be.nil
+
+    @hash.options[:marshal] = false
+  end
+
   it "should get and set values" do
     @hash['foo'] = 'bar'
     @hash['foo'].should == 'bar'
@@ -954,6 +966,7 @@ describe Redis::SortedSet do
     @set.range(0, 2).should == a[0..2]
     @set[0, 0].should == []
     @set.range(0,1,:withscores => true).should == [['a',3],['c',4]]
+    @set.revrange(0,1,:withscores => true).should == [['b',5.6],['c',4]]
     @set.range(0,-1).should == a[0..-1]
     @set.revrange(0,-1).should == a[0..-1].reverse
     @set[0..1].should == a[0..1]
@@ -967,6 +980,8 @@ describe Redis::SortedSet do
     @set.members(:withscores => true).should == [['a',3],['c',4],['b',5.6]]
     @set.members(:with_scores => true).should == [['a',3],['c',4],['b',5.6]]
     @set.members(:withscores => true).reverse.should == [['b',5.6],['c',4],['a',3]]
+    @set.members(:withscores => true).should == @set.range(0,-1,:withscores => true)
+    @set.members(:withscores => true).reverse.should == @set.revrange(0,-1,:withscores => true)
 
     @set['b'] = 5
     @set['b'] = 6
@@ -1038,12 +1053,21 @@ describe Redis::SortedSet do
   end
 
   it "should support marshaling key names" do
+    @set_4.members.should == []
+
     @set_4[Object] = 1.20
     @set_4[Module] = 2.30
+    @set_4[nil] = 3.40
+
     @set_4.incr(Object, 0.5)
     @set_4.decr(Module, 0.5)
+    @set_4.incr(nil, 0.5)
+
     @set_4[Object].round(1).should == 1.7
     @set_4[Module].round(1).should == 1.8
+    @set_4[nil].round(1).should == 3.9
+
+    @set_4.members.should == [Object, Module, nil]
   end
 
   it "should support renaming sorted sets" do

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: redis-objects
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Nate Wiger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: bacon
   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: redis-namespace
   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
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 description: Map Redis types directly to Ruby objects. Works with any class or ORM.
@@ -101,8 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - ATOMICITY.rdoc
 - CHANGELOG.rdoc
 - Gemfile
@@ -147,17 +147,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Map Redis types directly to Ruby objects